Compare commits
281 Commits
Author | SHA1 | Date |
---|---|---|
Rafael | 20de3627d5 | |
Syping | 13b6d614fc | |
Syping | d7b28c2468 | |
Syping | 5e6c4e6ad1 | |
Syping | 3cd6cc903d | |
Syping | c42cc1dc26 | |
Syping | 204f55a11d | |
Syping | de17747c38 | |
Syping | aa83221db2 | |
Syping | b6241a8ff5 | |
Syping | 4a293b6acd | |
Syping | f4b4450f69 | |
Syping | 268e8d3468 | |
Syping | b47a0119a5 | |
Syping | 1770ec23e0 | |
Syping | cbe92af194 | |
Syping | 35924c4696 | |
Syping | 9c937ff270 | |
Syping | fc08d29fe8 | |
VenJam1n | bdf2c35f35 | |
Syping | a952eff26d | |
Syping | 955f015de3 | |
Syping | 7013ade1b5 | |
Syping | 5244f72ec2 | |
Syping | 522cb469b7 | |
Syping | 2f135cd373 | |
Syping | 3c673beed1 | |
Syping | e572c9c60e | |
VADemon | 6fdab04c05 | |
Syping | 1c02c37e9c | |
Syping | 8a24060fb2 | |
Ray | 694ebc030a | |
Syping | 817f356b33 | |
Syping | 04603af8ff | |
Syping | 44ab5caedf | |
Syping | b747f7cda5 | |
Syping | 23e9c48248 | |
Syping | a4bc9a3b75 | |
Syping | 4e004b1d68 | |
Syping | b0f95d1cae | |
Syping | 962b1c82c3 | |
Syping | 0686b9a65d | |
Syping | 3ed26d4f9d | |
Syping | 263e714022 | |
Syping | dd9c4a7f16 | |
Syping | c1b0053ac8 | |
Syping | 5fd4b48538 | |
Syping | 929d341826 | |
Syping | fd5006e70f | |
Syping | 2f7e4a154d | |
Syping | d4a6db068b | |
Syping | 01ad3fd04e | |
Syping | 03f696877e | |
Syping | bcbe69491b | |
Syping | 056ef79aff | |
Syping | 013bfeb8ed | |
Syping | d9eb8d5f95 | |
Syping | dd7667b9f7 | |
Syping | 7adf8f2c90 | |
Syping | 5dbc06f393 | |
Syping | 9adc8d9650 | |
VenJam1n | 0fcd4615cd | |
VenJam1n | 47fdacc8bf | |
Syping | e448bd4f63 | |
Syping | 099400b439 | |
Syping | 563b09e060 | |
Syping | f432ae068e | |
VADemon | 48c4aa4a97 | |
Syping | e82cec5fd5 | |
Syping | 070b82d530 | |
Syping | 25ec67ec8b | |
Ray | 4a699f2f56 | |
Syping | 8c6e609ecc | |
Syping | 40e1b288c3 | |
Ray | b50170645c | |
VADemon | 1b8aea96d7 | |
Syping | 5a34dd7b05 | |
Syping | 2b2cfc210f | |
Syping | f6f75c1f89 | |
Syping | 94a263f501 | |
Syping | 1b6cb511be | |
Syping | c0a3e08527 | |
Syping | 2cf9119c54 | |
Syping | 05ccdc6689 | |
Syping | 0c6c6ca9fb | |
Syping | 6befe33596 | |
Syping | e34ee22ed9 | |
Syping | 2c725c796e | |
Syping | 3cf6aedc85 | |
Syping | 2bb3f7f62d | |
Syping | 18083a3b0f | |
Syping | 186df05cea | |
Syping | b3e1520a8f | |
Syping | b70396f77e | |
Syping | a798be0b53 | |
Syping | 4d9cd2d9ff | |
Syping | 699f5b8f55 | |
Syping | d55ea46b47 | |
Syping | 6af5f94d70 | |
Syping | fcbe264d63 | |
Syping | f8049c8178 | |
Syping | d0899623ad | |
Syping | 547922329a | |
Syping | 1fbe4d9e67 | |
Syping | 678425a7c5 | |
Syping | f9129f8364 | |
Syping | 4e5592566a | |
Syping | 39436a6dbf | |
Syping | 15dfc2c84b | |
Syping | 57c32eea58 | |
Syping | 90744ced60 | |
Syping | 90846e6fb6 | |
Syping | 2735325f4c | |
Syping | 8b8e22c958 | |
Syping | 91ccdca77a | |
Syping | ae0c7c2905 | |
Syping | 4a026640e3 | |
Syping | 8be9fd6d5e | |
Syping | 8295e38ab4 | |
Syping | 24cd9a16f9 | |
Syping | aa142c9ec9 | |
Syping | 4c42f06b39 | |
Syping | 94fb78c59a | |
Syping | 3f910c16b0 | |
Syping | bbf7f08980 | |
Syping | ec93fa8ce0 | |
Syping | d37fbdf055 | |
Syping | 1c00871e80 | |
Syping | a74e7847b2 | |
Syping | e41d4946f8 | |
Syping | 28fedfdd0b | |
Syping | a882738735 | |
Syping | 23245a3324 | |
Syping | af86e70f4b | |
Syping | 2bf6bb5630 | |
Syping | 6b2b18ed16 | |
Syping | c936fed2f8 | |
Syping | cb8793f3b3 | |
Syping | 1038f000f7 | |
Syping | 3c124f9f27 | |
Syping | 27075778c6 | |
Syping | 2b0455e2ff | |
Syping | ab248413ea | |
Syping | 279cd5ac3b | |
Syping | 1f62f6fe48 | |
Syping | c8a955e8de | |
Syping | 5250bad4b6 | |
Syping | 9121987142 | |
Syping | cabd44f066 | |
Syping | 01fb80fdd1 | |
Syping | f63645a1fb | |
Syping | 8732b9d64d | |
Syping | bb4a9b484c | |
Syping | c79c8dbe6e | |
Syping | 4e31d159fa | |
Syping | 0633d14d6b | |
Syping | c6b39546ba | |
Syping | eac9caa2c6 | |
Syping | a80b5843a7 | |
Syping | 07797f6e60 | |
Syping | 55186e8b88 | |
Syping | eee9100d8b | |
Syping | b73719ed4e | |
Syping | a143b43d15 | |
Syping | 032475ddfd | |
Syping | bdde72573b | |
Syping | 827676768a | |
Syping | 0c02c3ce98 | |
Syping | 6063803d5e | |
Syping | 1f3c036b47 | |
Syping | ea0526ae9d | |
Syping | aeae6c9311 | |
Syping | c39c3a3e9f | |
Syping | 9989d9d869 | |
Syping | fa86e8f8a7 | |
Syping | f9880fff70 | |
Syping | 7ba5322643 | |
Syping | 1f409b0f25 | |
Syping | dea33f8ab0 | |
Syping | 6b54b2e6ae | |
VADemon | 38f2877ea3 | |
Syping | c67a0a0fc9 | |
Syping | 7a15c3e56b | |
Syping | feabaac48e | |
Jean | 6ab75420ec | |
Syping | cda974d5df | |
VenJam1n | 36677ed07a | |
Syping | 17014925c5 | |
Syping | f151035574 | |
Syping | 53ef2bdb54 | |
Syping | 2606cd8965 | |
Syping | 973fb58a5d | |
Syping | 39f20aca9d | |
Syping | c29cc44717 | |
Syping | 9ced2253fc | |
Syping | 778abdd36a | |
Syping | 30a6b55c9e | |
Syping | b02f06ae97 | |
Syping | 193bb60caa | |
Syping | 414867f13e | |
Syping | 7b68bb10b5 | |
Syping | 2487a188d5 | |
Syping | c34d3331fb | |
Syping | afeab6120d | |
Syping | 4c6962ab23 | |
Syping | 08ecd5ca61 | |
Syping | 5f35428cd0 | |
Syping | 714be43280 | |
Syping | 1165c3b536 | |
Syping | 06eb2e4277 | |
Syping | 00db9ecab2 | |
Syping | dc101a66da | |
Syping | 541a7d18bd | |
Syping | f932a8d5ee | |
Syping | 81ea0490cf | |
Syping | a8db3985a2 | |
Syping | 0127bc61e6 | |
Syping | 25c64b7f5d | |
Syping | c3d684436b | |
Syping | 4135b1f588 | |
Syping | 7c08e1486e | |
Syping | d61cbd4743 | |
Syping | efa88cc46e | |
Syping | f1cfbbf573 | |
Syping | ca8003c2e8 | |
Syping | 69a7ec8dbe | |
Syping | 0321d79136 | |
Syping | e2b7062e26 | |
Syping | 99f3c22ab0 | |
Syping | 9b5cb46c35 | |
Syping | c909e20178 | |
Syping | 0e337b4dec | |
Syping | 3b305fb809 | |
Syping | 06a8657423 | |
Syping | caffd9f246 | |
Syping | caaa6a1d85 | |
Syping | 196cb8bc55 | |
Syping | 2d62bbb97e | |
Syping | c3e030e827 | |
Syping | 291236ff2c | |
Syping | c7ec038e26 | |
Syping | cde4b380f8 | |
Syping | bcd7e3cd15 | |
Syping | 1f1025787e | |
Syping | fd5ce958bd | |
Syping | 681e76737e | |
Syping | 24ca667537 | |
Syping | e6c8a48e12 | |
Syping | 867281f80a | |
Syping | a33bc8145b | |
Syping | e3a8edae2d | |
Syping | 609efb7fba | |
Syping | 29f883555d | |
Syping | 8fc3dc6c7c | |
Syping | 72377e49eb | |
Syping | 5840d8e8e9 | |
Syping | d0e157bf1c | |
Syping | 9b41d80d9a | |
Syping | 06ada3d770 | |
Syping | cd20e0b512 | |
Syping | bd97ee86ba | |
Syping | 7b98e75f8d | |
Syping | 99ffbf4178 | |
Syping | 108f1725f6 | |
Syping | 5c7cb24c36 | |
Syping | 6e335638a3 | |
Syping | 5a4b2f1d67 | |
Syping | d91b9f5f43 | |
Syping | 3dfc2e001b | |
Syping | 1b54c8c456 | |
Syping | 979747b8f5 | |
Syping | e74b19fed0 | |
Syping | d94a3712be | |
Syping | e765511614 | |
Syping | 61864c65eb | |
Syping | bf81aea0c9 | |
Syping | 48650633a5 | |
Syping | 2b3a22b893 | |
Syping | 9b373669b2 | |
Syping | 55a01e7fe4 | |
Syping | fdf07dd681 |
|
@ -0,0 +1,33 @@
|
||||||
|
IDI_ICON1 ICON DISCARDABLE "5sync.ico"
|
||||||
|
#define RT_MANIFEST 24
|
||||||
|
#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
|
||||||
|
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest"
|
||||||
|
#include <windows.h>
|
||||||
|
VS_VERSION_INFO VERSIONINFO
|
||||||
|
FILEVERSION MAJOR_VER, MINOR_VER, PATCH_VER, INT_BUILD_VER
|
||||||
|
PRODUCTVERSION MAJOR_VER, MINOR_VER, PATCH_VER, INT_BUILD_VER
|
||||||
|
FILEFLAGSMASK 0x3fL
|
||||||
|
FILEFLAGS 0
|
||||||
|
FILEOS VOS_NT_WINDOWS32
|
||||||
|
FILETYPE VFT_APP
|
||||||
|
FILESUBTYPE VFT2_UNKNOWN
|
||||||
|
BEGIN
|
||||||
|
BLOCK "VarFileInfo"
|
||||||
|
BEGIN
|
||||||
|
VALUE "Translation", 0x0809, 1200
|
||||||
|
END
|
||||||
|
BLOCK "StringFileInfo"
|
||||||
|
BEGIN
|
||||||
|
BLOCK "040904b0"
|
||||||
|
BEGIN
|
||||||
|
VALUE "CompanyName", "Syping"
|
||||||
|
VALUE "FileDescription", "gta5view"
|
||||||
|
VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER"
|
||||||
|
VALUE "InternalName", "gta5view"
|
||||||
|
VALUE "LegalCopyright", "Copyright © 2016-2023 Syping"
|
||||||
|
VALUE "OriginalFilename", "gta5view.exe"
|
||||||
|
VALUE "ProductName", "gta5view"
|
||||||
|
VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER"
|
||||||
|
END
|
||||||
|
END
|
||||||
|
END
|
|
@ -0,0 +1,72 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
if [ $(git name-rev --tags --name-only $(git rev-parse HEAD)) == "undefined" ]; then
|
||||||
|
export APPLICATION_VERSION=$(lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end')
|
||||||
|
else
|
||||||
|
export APPLICATION_VERSION=$(git name-rev --tags --name-only $(git rev-parse HEAD))
|
||||||
|
fi
|
||||||
|
export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION)
|
||||||
|
export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION)
|
||||||
|
export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}${EXECUTABLE_TAG}
|
||||||
|
|
||||||
|
export APPLICATION_MAJOR_VERSION=$(cut -d. -f1 <<< $APPLICATION_VERSION)
|
||||||
|
export APPLICATION_MINOR_VERSION=$(cut -d. -f2 <<< $APPLICATION_VERSION)
|
||||||
|
export APPLICATION_PATCH_VERSION=$(cut -d. -f3 <<< $APPLICATION_VERSION)
|
||||||
|
|
||||||
|
if [ "${PACKAGE_BUILD}" == "" ]; then
|
||||||
|
export PACKAGE_BUILD=1
|
||||||
|
else
|
||||||
|
export APPLICATION_BUILD_INT_VERSION=$(grep -oE '[1-9]*$' <<< $PACKAGE_BUILD)
|
||||||
|
export APPLICATION_BUILD_STR_VERSION=-${PACKAGE_BUILD}
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat ".ci/app.rc" | sed \
|
||||||
|
-e "s/MAJOR_VER/$APPLICATION_MAJOR_VERSION/g" \
|
||||||
|
-e "s/MINOR_VER/$APPLICATION_MINOR_VERSION/g" \
|
||||||
|
-e "s/PATCH_VER/$APPLICATION_PATCH_VERSION/g" \
|
||||||
|
-e "s/INT_BUILD_VER/0/g" \
|
||||||
|
-e "s/STR_BUILD_VER/$APPLICATION_BUILD_STR_VERSION/g" \
|
||||||
|
-e "s/STR_BUILD_VER/$APPLICATION_BUILD_STR_VERSION/g" \
|
||||||
|
> "res/app.rc"
|
||||||
|
|
||||||
|
if [ "${BUILD_TYPE}" == "ALPHA" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Alpha"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Alpha\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Alpha" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Alpha"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Alpha\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "BETA" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Beta"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Beta\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Beta" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Beta"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Beta\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "DEV" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Developer"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Development" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Developer"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "DAILY" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Daily Build"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Daily Build\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Daily" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Daily Build"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Daily Build\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "RC" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release Candidate"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release Candidate\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Release Candidate" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release Candidate"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release Candidate\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "REL" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\""
|
||||||
|
elif [ "${BUILD_TYPE}" == "Release" ]; then
|
||||||
|
export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release"
|
||||||
|
export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
export PROJECT_DIR=$(pwd)
|
||||||
|
|
||||||
|
.ci/${BUILD_SCRIPT}
|
|
@ -0,0 +1,38 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Creating folders
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
||||||
|
mkdir -p build && \
|
||||||
|
mkdir -p assets && \
|
||||||
|
chmod -x res/gta5sync_*.qm res/*.desktop res/*gta5view*.png && \
|
||||||
|
cd build && \
|
||||||
|
mkdir -p qt5 && \
|
||||||
|
cd qt5 && \
|
||||||
|
echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./description-pak && \
|
||||||
|
cd .. && \
|
||||||
|
|
||||||
|
# Set compiler
|
||||||
|
export CC=clang && \
|
||||||
|
export CXX=clang++ && \
|
||||||
|
|
||||||
|
# Prepare checkinstall step
|
||||||
|
mkdir -p /usr/share/gta5view && \
|
||||||
|
|
||||||
|
# Starting build
|
||||||
|
cd qt5 && \
|
||||||
|
cmake \
|
||||||
|
"-DCMAKE_INSTALL_PREFIX=/usr" \
|
||||||
|
"${CMAKE_BUILD_TYPE}" \
|
||||||
|
"-DFORCE_QT_VERSION=5" \
|
||||||
|
"-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
|
||||||
|
"-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
|
||||||
|
"-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
|
||||||
|
"-DWITH_DONATE=ON" \
|
||||||
|
"-DWITH_TELEMETRY=ON" \
|
||||||
|
"-DDONATE_ADDRESSES=$(cat ${PROJECT_DIR}/.ci/donate.txt)" \
|
||||||
|
"-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \
|
||||||
|
"-DQCONF_BUILD=ON" \
|
||||||
|
../../ && \
|
||||||
|
make -j 4 && \
|
||||||
|
checkinstall -D --default --nodoc --install=no --pkgname=gta5view --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5svg5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view-qt4,gta5view-qt5 --replaces=gta5view-qt4,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Install packages
|
||||||
|
.ci/debian_install.sh && \
|
||||||
|
|
||||||
|
# Build gta5view
|
||||||
|
.ci/debian_build.sh && \
|
||||||
|
cd ${PROJECT_DIR}
|
|
@ -0,0 +1,15 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
if [ "${DOCKER_USER}" != "" ]; then
|
||||||
|
DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION}
|
||||||
|
else
|
||||||
|
DOCKER_IMAGE=debian:${DEBIAN_VERSION}
|
||||||
|
fi
|
||||||
|
PROJECT_DIR_DOCKER=/gta5view
|
||||||
|
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
docker pull ${DOCKER_IMAGE} && \
|
||||||
|
docker run --rm \
|
||||||
|
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
||||||
|
${DOCKER_IMAGE} \
|
||||||
|
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export BUILD_TYPE=${BUILD_TYPE} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} && export QMAKE_BUILD_TYPE=${QMAKE_BUILD_TYPE} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/debian_install.sh && .ci/debian_build.sh"
|
|
@ -0,0 +1,13 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Source OS Release
|
||||||
|
source /etc/os-release
|
||||||
|
|
||||||
|
# When Debian add backports
|
||||||
|
if [ "${ID}" == "debian" ]; then
|
||||||
|
echo "deb http://deb.debian.org/debian ${VERSION_CODENAME}-backports main" >> /etc/apt/sources.list
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install packages
|
||||||
|
apt-get update -qq && \
|
||||||
|
apt-get install -qq ${APT_INSTALL} checkinstall cmake dpkg-dev fakeroot g++ gcc qtbase5-dev qt5-qmake qttranslations5-l10n libqt5svg5-dev
|
|
@ -0,0 +1 @@
|
||||||
|
btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz
|
File diff suppressed because it is too large
Load Diff
|
@ -1,11 +1,12 @@
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
!define APP_NAME "gta5view"
|
!define APP_NAME "gta5view"
|
||||||
|
!define APP_EXT ".g5e"
|
||||||
!define COMP_NAME "Syping"
|
!define COMP_NAME "Syping"
|
||||||
!define WEB_SITE "https://gta5view.syping.de/"
|
!define WEB_SITE "https://gta5view.syping.de/"
|
||||||
!define VERSION "1.5.4.0"
|
!define VERSION "1.10.2.0"
|
||||||
!define COPYRIGHT "Copyright © 2016-2018 Syping"
|
!define COPYRIGHT "Copyright © 2016-2022 Syping"
|
||||||
!define DESCRIPTION "Grand Theft Auto V Savegame and Snapmatic Viewer/Editor"
|
!define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V"
|
||||||
!define INSTALLER_NAME "gta5view_setup.exe"
|
!define INSTALLER_NAME "gta5view_setup.exe"
|
||||||
!define MAIN_APP_EXE "gta5view.exe"
|
!define MAIN_APP_EXE "gta5view.exe"
|
||||||
!define INSTALL_TYPE "SetShellVarContext all"
|
!define INSTALL_TYPE "SetShellVarContext all"
|
||||||
|
@ -33,6 +34,7 @@ Caption "${APP_NAME}"
|
||||||
OutFile "${INSTALLER_NAME}"
|
OutFile "${INSTALLER_NAME}"
|
||||||
#BrandingText "${APP_NAME}"
|
#BrandingText "${APP_NAME}"
|
||||||
XPStyle on
|
XPStyle on
|
||||||
|
Unicode true
|
||||||
InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
|
InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
|
||||||
InstallDir "$PROGRAMFILES64\Syping\gta5view"
|
InstallDir "$PROGRAMFILES64\Syping\gta5view"
|
||||||
|
|
||||||
|
@ -78,7 +80,9 @@ InstallDir "$PROGRAMFILES64\Syping\gta5view"
|
||||||
!insertmacro MUI_LANGUAGE "English"
|
!insertmacro MUI_LANGUAGE "English"
|
||||||
!insertmacro MUI_LANGUAGE "French"
|
!insertmacro MUI_LANGUAGE "French"
|
||||||
!insertmacro MUI_LANGUAGE "German"
|
!insertmacro MUI_LANGUAGE "German"
|
||||||
|
!insertmacro MUI_LANGUAGE "Korean"
|
||||||
!insertmacro MUI_LANGUAGE "Russian"
|
!insertmacro MUI_LANGUAGE "Russian"
|
||||||
|
!insertmacro MUI_LANGUAGE "Ukrainian"
|
||||||
!insertmacro MUI_LANGUAGE "TradChinese"
|
!insertmacro MUI_LANGUAGE "TradChinese"
|
||||||
|
|
||||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||||
|
@ -88,7 +92,7 @@ InstallDir "$PROGRAMFILES64\Syping\gta5view"
|
||||||
Function .onInit
|
Function .onInit
|
||||||
!insertmacro MUI_LANGDLL_DISPLAY
|
!insertmacro MUI_LANGDLL_DISPLAY
|
||||||
!ifdef WIN32
|
!ifdef WIN32
|
||||||
MessageBox MB_OK|MB_ICONSTOP "Can't install the 64bit version on a 32bit system, please download the 32bit version!"
|
MessageBox MB_OK|MB_ICONSTOP "Windows 32-Bit is not supported anymore!"
|
||||||
Quit
|
Quit
|
||||||
!endif
|
!endif
|
||||||
SetRegView 64
|
SetRegView 64
|
||||||
|
@ -100,45 +104,80 @@ Section -MainProgram
|
||||||
${INSTALL_TYPE}
|
${INSTALL_TYPE}
|
||||||
SetOverwrite ifnewer
|
SetOverwrite ifnewer
|
||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
File "../build/release/gta5view.exe"
|
File "../build/gta5view.exe"
|
||||||
File "/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libgcc_s_seh-1.dll"
|
File "/opt/llvm-mingw/x86_64-w64-mingw32/bin/libc++.dll"
|
||||||
File "/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libstdc++-6.dll"
|
File "/opt/llvm-mingw/x86_64-w64-mingw32/bin/libunwind.dll"
|
||||||
File "/opt/windev/libressl-latest_qt64d/bin/libcrypto-43.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/openssl/bin/libcrypto-1_1-x64.dll"
|
||||||
File "/opt/windev/libressl-latest_qt64d/bin/libssl-45.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/openssl/bin/libssl-1_1-x64.dll"
|
||||||
File "/opt/windev/libjpeg-turbo-latest_qt64d/bin/libjpeg-62.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Core.dll"
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5Core.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Gui.dll"
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5Gui.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Network.dll"
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5Network.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Svg.dll"
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5Svg.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Widgets.dll"
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5Widgets.dll"
|
|
||||||
File "/opt/windev/qt64d-latest/bin/Qt5WinExtras.dll"
|
|
||||||
SetOutPath "$INSTDIR\lang"
|
SetOutPath "$INSTDIR\lang"
|
||||||
File "../res/gta5sync_en_US.qm"
|
File "../build/gta5sync_en_US.qm"
|
||||||
File "../res/gta5sync_de.qm"
|
File "../build/gta5sync_de.qm"
|
||||||
File "../res/gta5sync_fr.qm"
|
File "../build/gta5sync_fr.qm"
|
||||||
File "../res/gta5sync_ru.qm"
|
File "../build/gta5sync_ko.qm"
|
||||||
File "../res/gta5sync_uk.qm"
|
File "../build/gta5sync_ru.qm"
|
||||||
File "../res/gta5sync_zh_TW.qm"
|
File "../build/gta5sync_uk.qm"
|
||||||
File "../res/qtbase_en_GB.qm"
|
File "../build/gta5sync_zh_TW.qm"
|
||||||
File "../res/qtbase_de.qm"
|
File "../build/qtbase_en_GB.qm"
|
||||||
File "../res/qtbase_fr.qm"
|
File "../res/qt5/qtbase_de.qm"
|
||||||
File "../res/qtbase_ru.qm"
|
File "../res/qt5/qtbase_fr.qm"
|
||||||
File "../res/qtbase_uk.qm"
|
File "../res/qt5/qtbase_ko.qm"
|
||||||
File "../res/qtbase_zh_TW.qm"
|
File "../res/qt5/qtbase_ru.qm"
|
||||||
SetOutPath "$INSTDIR\audio"
|
File "../res/qt5/qtbase_uk.qm"
|
||||||
File "/opt/windev/qt64d-latest/plugins/audio/qtaudio_windows.dll"
|
File "../res/qt5/qtbase_zh_TW.qm"
|
||||||
|
SetOutPath "$INSTDIR\resources"
|
||||||
|
File "../res/add.svgz"
|
||||||
|
File "../res/avatararea.png"
|
||||||
|
File "../res/avatarareaimport.png"
|
||||||
|
File "../res/back.svgz"
|
||||||
|
File "../res/flag-de.png"
|
||||||
|
File "../res/flag-fr.png"
|
||||||
|
File "../res/flag-gb.png"
|
||||||
|
File "../res/flag-kr.png"
|
||||||
|
File "../res/flag-ru.png"
|
||||||
|
File "../res/flag-tw.png"
|
||||||
|
File "../res/flag-ua.png"
|
||||||
|
File "../res/flag-us.png"
|
||||||
|
File "../res/gta5view-16.png"
|
||||||
|
File "../res/gta5view-24.png"
|
||||||
|
File "../res/gta5view-32.png"
|
||||||
|
File "../res/gta5view-40.png"
|
||||||
|
File "../res/gta5view-48.png"
|
||||||
|
File "../res/gta5view-64.png"
|
||||||
|
File "../res/gta5view-96.png"
|
||||||
|
File "../res/gta5view-128.png"
|
||||||
|
File "../res/gta5view-256.png"
|
||||||
|
File "../res/mapcayoperico.jpg"
|
||||||
|
File "../res/mappreview.jpg"
|
||||||
|
File "../res/next.svgz"
|
||||||
|
File "../res/pointmaker-8.png"
|
||||||
|
File "../res/pointmaker-16.png"
|
||||||
|
File "../res/pointmaker-24.png"
|
||||||
|
File "../res/pointmaker-32.png"
|
||||||
|
File "../res/savegame.svgz"
|
||||||
|
File "../res/watermark_1b.png"
|
||||||
|
File "../res/watermark_2b.png"
|
||||||
|
File "../res/watermark_2r.png"
|
||||||
SetOutPath "$INSTDIR\imageformats"
|
SetOutPath "$INSTDIR\imageformats"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qgif.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qgif.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qicns.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qicns.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qico.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qico.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qjpeg.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qjpeg.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qsvg.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qsvg.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qtga.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qtga.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qtiff.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qtiff.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qwbmp.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qwbmp.dll"
|
||||||
File "/opt/windev/qt64d-latest/plugins/imageformats/qwebp.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qwebp.dll"
|
||||||
SetOutPath "$INSTDIR\platforms"
|
SetOutPath "$INSTDIR\platforms"
|
||||||
File "/opt/windev/qt64d-latest/plugins/platforms/qwindows.dll"
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/platforms/qwindows.dll"
|
||||||
|
SetOutPath "$INSTDIR\styles"
|
||||||
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/styles/qcleanlooksstyle.dll"
|
||||||
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/styles/qplastiquestyle.dll"
|
||||||
|
File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/styles/qwindowsvistastyle.dll"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -185,33 +224,88 @@ SectionEnd
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
|
Section -ShellAssoc
|
||||||
|
WriteRegStr ${REG_ROOT} "Software\Classes\${APP_NAME}\DefaultIcon" "" "$INSTDIR\${MAIN_APP_EXE},0"
|
||||||
|
WriteRegStr ${REG_ROOT} "Software\Classes\${APP_NAME}\shell\open\command" "" '"$INSTDIR\${MAIN_APP_EXE}" "%1"'
|
||||||
|
WriteRegStr ${REG_ROOT} "Software\Classes\${APP_EXT}" "" "${APP_NAME}"
|
||||||
|
WriteRegStr ${REG_ROOT} "Software\Classes\${APP_EXT}" "Content Type" "application/x-gta5view-export"
|
||||||
|
System::Call 'SHELL32::SHChangeNotify(i0x8000000,i0,p0,p0)'
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
|
######################################################################
|
||||||
|
|
||||||
|
Section -un.ShellAssoc
|
||||||
|
ClearErrors
|
||||||
|
ReadRegStr $0 ${REG_ROOT} "Software\Classes\${APP_EXT}" ""
|
||||||
|
DeleteRegKey ${REG_ROOT} "Software\Classes\${APP_NAME}"
|
||||||
|
${IfNot} ${Errors}
|
||||||
|
${AndIf} $0 == "${APP_NAME}"
|
||||||
|
DeleteRegValue ${REG_ROOT} "Software\Classes\${APP_EXT}" ""
|
||||||
|
DeleteRegKey /IfEmpty ${REG_ROOT} "Software\Classes\${APP_EXT}"
|
||||||
|
${EndIf}
|
||||||
|
System::Call 'SHELL32::SHChangeNotify(i0x8000000,i0,p0,p0)'
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
|
######################################################################
|
||||||
|
|
||||||
Section Uninstall
|
Section Uninstall
|
||||||
${INSTALL_TYPE}
|
${INSTALL_TYPE}
|
||||||
Delete "$INSTDIR\gta5view.exe"
|
Delete "$INSTDIR\gta5view.exe"
|
||||||
Delete "$INSTDIR\libgcc_s_seh-1.dll"
|
Delete "$INSTDIR\libc++.dll"
|
||||||
Delete "$INSTDIR\libstdc++-6.dll"
|
Delete "$INSTDIR\libunwind.dll"
|
||||||
Delete "$INSTDIR\libcrypto-43.dll"
|
Delete "$INSTDIR\libcrypto-1_1-x64.dll"
|
||||||
Delete "$INSTDIR\libssl-45.dll"
|
Delete "$INSTDIR\libssl-1_1-x64.dll"
|
||||||
Delete "$INSTDIR\libjpeg-62.dll"
|
|
||||||
Delete "$INSTDIR\Qt5Core.dll"
|
Delete "$INSTDIR\Qt5Core.dll"
|
||||||
Delete "$INSTDIR\Qt5Gui.dll"
|
Delete "$INSTDIR\Qt5Gui.dll"
|
||||||
Delete "$INSTDIR\Qt5Network.dll"
|
Delete "$INSTDIR\Qt5Network.dll"
|
||||||
Delete "$INSTDIR\Qt5Svg.dll"
|
Delete "$INSTDIR\Qt5Svg.dll"
|
||||||
Delete "$INSTDIR\Qt5Widgets.dll"
|
Delete "$INSTDIR\Qt5Widgets.dll"
|
||||||
Delete "$INSTDIR\Qt5WinExtras.dll"
|
|
||||||
Delete "$INSTDIR\lang\gta5sync_en_US.qm"
|
Delete "$INSTDIR\lang\gta5sync_en_US.qm"
|
||||||
Delete "$INSTDIR\lang\gta5sync_de.qm"
|
Delete "$INSTDIR\lang\gta5sync_de.qm"
|
||||||
Delete "$INSTDIR\lang\gta5sync_fr.qm"
|
Delete "$INSTDIR\lang\gta5sync_fr.qm"
|
||||||
|
Delete "$INSTDIR\lang\gta5sync_ko.qm"
|
||||||
Delete "$INSTDIR\lang\gta5sync_ru.qm"
|
Delete "$INSTDIR\lang\gta5sync_ru.qm"
|
||||||
Delete "$INSTDIR\lang\gta5sync_uk.qm"
|
Delete "$INSTDIR\lang\gta5sync_uk.qm"
|
||||||
Delete "$INSTDIR\lang\gta5sync_zh_TW.qm"
|
Delete "$INSTDIR\lang\gta5sync_zh_TW.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_en_GB.qm"
|
Delete "$INSTDIR\lang\qtbase_en_GB.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_de.qm"
|
Delete "$INSTDIR\lang\qtbase_de.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_fr.qm"
|
Delete "$INSTDIR\lang\qtbase_fr.qm"
|
||||||
|
Delete "$INSTDIR\lang\qtbase_ko.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_ru.qm"
|
Delete "$INSTDIR\lang\qtbase_ru.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_uk.qm"
|
Delete "$INSTDIR\lang\qtbase_uk.qm"
|
||||||
Delete "$INSTDIR\lang\qtbase_zh_TW.qm"
|
Delete "$INSTDIR\lang\qtbase_zh_TW.qm"
|
||||||
Delete "$INSTDIR\audio\qtaudio_windows.dll"
|
Delete "$INSTDIR\resources\add.svgz"
|
||||||
|
Delete "$INSTDIR\resources\avatararea.png"
|
||||||
|
Delete "$INSTDIR\resources\avatarareaimport.png"
|
||||||
|
Delete "$INSTDIR\resources\back.svgz"
|
||||||
|
Delete "$INSTDIR\resources\flag-de.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-fr.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-gb.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-kr.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-ru.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-tw.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-ua.png"
|
||||||
|
Delete "$INSTDIR\resources\flag-us.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-16.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-24.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-32.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-40.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-48.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-64.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-96.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-128.png"
|
||||||
|
Delete "$INSTDIR\resources\gta5view-256.png"
|
||||||
|
Delete "$INSTDIR\resources\mapcayoperico.jpg"
|
||||||
|
Delete "$INSTDIR\resources\mappreview.jpg"
|
||||||
|
Delete "$INSTDIR\resources\next.svgz"
|
||||||
|
Delete "$INSTDIR\resources\pointmaker-8.png"
|
||||||
|
Delete "$INSTDIR\resources\pointmaker-16.png"
|
||||||
|
Delete "$INSTDIR\resources\pointmaker-24.png"
|
||||||
|
Delete "$INSTDIR\resources\pointmaker-32.png"
|
||||||
|
Delete "$INSTDIR\resources\savegame.svgz"
|
||||||
|
Delete "$INSTDIR\resources\watermark_1b.png"
|
||||||
|
Delete "$INSTDIR\resources\watermark_2b.png"
|
||||||
|
Delete "$INSTDIR\resources\watermark_2r.png"
|
||||||
Delete "$INSTDIR\imageformats\qgif.dll"
|
Delete "$INSTDIR\imageformats\qgif.dll"
|
||||||
Delete "$INSTDIR\imageformats\qicns.dll"
|
Delete "$INSTDIR\imageformats\qicns.dll"
|
||||||
Delete "$INSTDIR\imageformats\qico.dll"
|
Delete "$INSTDIR\imageformats\qico.dll"
|
||||||
|
@ -222,10 +316,13 @@ Delete "$INSTDIR\imageformats\qtiff.dll"
|
||||||
Delete "$INSTDIR\imageformats\qwbmp.dll"
|
Delete "$INSTDIR\imageformats\qwbmp.dll"
|
||||||
Delete "$INSTDIR\imageformats\qwebp.dll"
|
Delete "$INSTDIR\imageformats\qwebp.dll"
|
||||||
Delete "$INSTDIR\platforms\qwindows.dll"
|
Delete "$INSTDIR\platforms\qwindows.dll"
|
||||||
|
Delete "$INSTDIR\styles\qcleanlooksstyle.dll"
|
||||||
|
Delete "$INSTDIR\styles\qplastiquestyle.dll"
|
||||||
|
Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
|
||||||
RmDir "$INSTDIR\lang"
|
RmDir "$INSTDIR\lang"
|
||||||
RmDir "$INSTDIR\platforms"
|
|
||||||
RmDir "$INSTDIR\imageformats"
|
RmDir "$INSTDIR\imageformats"
|
||||||
|
RmDir "$INSTDIR\platforms"
|
||||||
|
RmDir "$INSTDIR\styles"
|
||||||
|
|
||||||
Delete "$INSTDIR\uninstall.exe"
|
Delete "$INSTDIR\uninstall.exe"
|
||||||
!ifdef WEB_SITE
|
!ifdef WEB_SITE
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Creating folders
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
||||||
|
echo "gta5view image name is gta5view-osx_${APPLICATION_VERSION}.dmg" && \
|
||||||
|
mkdir -p build && \
|
||||||
|
mkdir -p assets && \
|
||||||
|
cd build && \
|
||||||
|
|
||||||
|
/usr/local/bin/cmake \
|
||||||
|
"-DCMAKE_PREFIX_PATH=/usr/local/opt/qt" \
|
||||||
|
"${CMAKE_BUILD_TYPE}" \
|
||||||
|
"-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
|
||||||
|
"-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
|
||||||
|
"-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
|
||||||
|
"-DWITH_DONATE=ON" \
|
||||||
|
"-DWITH_TELEMETRY=ON" \
|
||||||
|
"-DDONATE_ADDRESSES=$(cat ${PROJECT_DIR}/.ci/donate.txt)" \
|
||||||
|
"-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \
|
||||||
|
../ && \
|
||||||
|
make -j 4 && \
|
||||||
|
/usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \
|
||||||
|
cp -Rf gta5view.dmg ../assets/gta5view-osx_${APPLICATION_VERSION}.dmg
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Install packages
|
||||||
|
.ci/osx_install.sh && \
|
||||||
|
|
||||||
|
# Build gta5view
|
||||||
|
.ci/osx_build.sh && \
|
||||||
|
cd ${PROJECT_DIR}
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Install packages
|
||||||
|
brew upgrade cmake qt
|
|
@ -0,0 +1,28 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Prepare environment variable
|
||||||
|
export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \
|
||||||
|
|
||||||
|
# Creating folders
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
||||||
|
echo "gta5view executable is ${GTA5VIEW_EXECUTABLE}" && \
|
||||||
|
mkdir -p build && \
|
||||||
|
mkdir -p assets && \
|
||||||
|
|
||||||
|
# Starting build
|
||||||
|
cd build && \
|
||||||
|
mingw64-qt-cmake \
|
||||||
|
"${CMAKE_BUILD_TYPE}" \
|
||||||
|
"-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
|
||||||
|
"-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
|
||||||
|
"-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
|
||||||
|
"-DWITH_DONATE=ON" \
|
||||||
|
"-DWITH_TELEMETRY=ON" \
|
||||||
|
"-DDONATE_ADDRESSES=$(cat ${PROJECT_DIR}/.ci/donate.txt)" \
|
||||||
|
"-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \
|
||||||
|
.. && \
|
||||||
|
make -j 4 && \
|
||||||
|
x86_64-w64-mingw32-strip -s gta5view.exe && \
|
||||||
|
cp -Rf *.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \
|
||||||
|
cd ${PROJECT_DIR}/assets
|
|
@ -0,0 +1,25 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
DOCKER_IMAGE=sypingauto/gta5view-build:1.10-static
|
||||||
|
PROJECT_DIR_DOCKER=/gta5view
|
||||||
|
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
docker pull ${DOCKER_IMAGE} && \
|
||||||
|
docker run --rm \
|
||||||
|
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
||||||
|
${DOCKER_IMAGE} \
|
||||||
|
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export BUILD_TYPE=${BUILD_TYPE} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} && export QMAKE_BUILD_TYPE=${QMAKE_BUILD_TYPE} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/windows_build.sh" && \
|
||||||
|
|
||||||
|
# Prepare environment variable
|
||||||
|
export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \
|
||||||
|
|
||||||
|
# Upload Assets to Dropbox
|
||||||
|
if [ "${PACKAGE_CODE}" == "gta5-mods" ]; then
|
||||||
|
${PROJECT_DIR}/.ci/dropbox_uploader.sh mkdir gta5-mods/${PACKAGE_VERSION}
|
||||||
|
${PROJECT_DIR}/.ci/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5-mods/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \
|
||||||
|
rm -rf ${GTA5VIEW_EXECUTABLE}
|
||||||
|
elif [ "${PACKAGE_CODE}" == "gtainside" ]; then
|
||||||
|
${PROJECT_DIR}/.ci/dropbox_uploader.sh mkdir gtainside/${PACKAGE_VERSION}
|
||||||
|
${PROJECT_DIR}/.ci/dropbox_uploader.sh upload ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gtainside/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \
|
||||||
|
rm -rf ${GTA5VIEW_EXECUTABLE}
|
||||||
|
fi
|
|
@ -0,0 +1,29 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Creating folders
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
||||||
|
mkdir -p build && \
|
||||||
|
mkdir -p assets && \
|
||||||
|
|
||||||
|
# Starting build
|
||||||
|
cd build && \
|
||||||
|
mingw64-qt-cmake \
|
||||||
|
"${CMAKE_BUILD_TYPE}" \
|
||||||
|
"-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
|
||||||
|
"-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
|
||||||
|
"-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
|
||||||
|
"-DWITH_DONATE=ON" \
|
||||||
|
"-DWITH_TELEMETRY=ON" \
|
||||||
|
"-DDONATE_ADDRESSES=$(cat ${PROJECT_DIR}/.ci/donate.txt)" \
|
||||||
|
"-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \
|
||||||
|
"-DQCONF_BUILD=ON" \
|
||||||
|
"-DGTA5VIEW_INLANG=RUNDIR:SEPARATOR:lang" \
|
||||||
|
"-DGTA5VIEW_LANG=RUNDIR:SEPARATOR:lang" \
|
||||||
|
"-DGTA5VIEW_PLUG=RUNDIR:SEPARATOR:plugins" \
|
||||||
|
.. && \
|
||||||
|
make -j 4 && \
|
||||||
|
x86_64-w64-mingw32-strip -s gta5view.exe && \
|
||||||
|
cd ${PROJECT_DIR}/assets && \
|
||||||
|
makensis "-XTarget amd64-unicode" -NOCD ${PROJECT_DIR}/.ci/gta5view.nsi && \
|
||||||
|
mv -f gta5view_setup.exe gta5view-${EXECUTABLE_VERSION}_setup.exe
|
|
@ -0,0 +1,11 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
DOCKER_IMAGE=sypingauto/gta5view-build:1.10-shared
|
||||||
|
PROJECT_DIR_DOCKER=/gta5view
|
||||||
|
|
||||||
|
cd ${PROJECT_DIR} && \
|
||||||
|
docker pull ${DOCKER_IMAGE} && \
|
||||||
|
docker run --rm \
|
||||||
|
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
||||||
|
${DOCKER_IMAGE} \
|
||||||
|
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export BUILD_TYPE=${BUILD_TYPE} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} && export QMAKE_BUILD_TYPE=${QMAKE_BUILD_TYPE} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/wininstall_build.sh"
|
|
@ -0,0 +1,36 @@
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
|
||||||
|
environment:
|
||||||
|
BUILD_TYPE: "REL"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Windows Installer
|
||||||
|
image: sypingauto/gta5view-build:1.10-shared
|
||||||
|
environment:
|
||||||
|
BUILD_SCRIPT: "wininstall_build.sh"
|
||||||
|
QT_SELECT: "qt5-x86_64-w64-mingw32"
|
||||||
|
TCA_PASS:
|
||||||
|
from_secret: tca_pass
|
||||||
|
commands:
|
||||||
|
- .drone/drone.sh
|
||||||
|
volumes:
|
||||||
|
- name: gta5view
|
||||||
|
path: /srv/gta5view
|
||||||
|
- name: Windows Portable
|
||||||
|
image: sypingauto/gta5view-build:1.10-static
|
||||||
|
environment:
|
||||||
|
BUILD_SCRIPT: "windows_build.sh"
|
||||||
|
QT_SELECT: "qt5-x86_64-w64-mingw32"
|
||||||
|
TCA_PASS:
|
||||||
|
from_secret: tca_pass
|
||||||
|
commands:
|
||||||
|
- .drone/drone.sh
|
||||||
|
volumes:
|
||||||
|
- name: gta5view
|
||||||
|
path: /srv/gta5view
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: gta5view
|
||||||
|
host:
|
||||||
|
path: /srv/gta5view
|
Binary file not shown.
|
@ -0,0 +1,33 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Cleanup previous Drone build
|
||||||
|
if [ -d "assets" ]; then
|
||||||
|
rm -rf assets
|
||||||
|
fi
|
||||||
|
if [ -d "build" ]; then
|
||||||
|
rm -rf build
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Decrypt Telemetry Authenticator
|
||||||
|
rm -rf tmext/TelemetryClassAuthenticator.cpp && \
|
||||||
|
openssl aes-256-cbc -k ${TCA_PASS} -in .drone/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d -pbkdf2
|
||||||
|
|
||||||
|
# Check if build is not tagged
|
||||||
|
if [ "${DRONE_TAG}" == "" ]; then
|
||||||
|
export EXECUTABLE_TAG=-$(git rev-parse --short HEAD)
|
||||||
|
else
|
||||||
|
export EXECUTABLE_TAG=
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if package code is not set
|
||||||
|
if [ "${PACKAGE_CODE}" == "" ]; then
|
||||||
|
export PACKAGE_CODE=Drone
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Init Application Commit Hash
|
||||||
|
export APPLICATION_COMMIT=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
# Start CI script and copying assets into gta5view directory
|
||||||
|
.ci/ci.sh && \
|
||||||
|
mkdir -p /srv/gta5view/${APPLICATION_COMMIT} && \
|
||||||
|
cp -Rf assets/* /srv/gta5view/${APPLICATION_COMMIT}/
|
|
@ -0,0 +1,22 @@
|
||||||
|
app-id: de.syping.gta5view
|
||||||
|
runtime: org.kde.Platform
|
||||||
|
runtime-version: '5.15-21.08'
|
||||||
|
sdk: org.kde.Sdk
|
||||||
|
command: gta5view
|
||||||
|
finish-args:
|
||||||
|
- --share=network
|
||||||
|
- --share=ipc
|
||||||
|
- --socket=fallback-x11
|
||||||
|
- --socket=wayland
|
||||||
|
- --device=dri
|
||||||
|
modules:
|
||||||
|
- name: gta5view
|
||||||
|
buildsystem: cmake-ninja
|
||||||
|
config-opts:
|
||||||
|
- -DFLATPAK_BUILD=ON
|
||||||
|
- -DQCONF_BUILD=ON
|
||||||
|
- -DGTA5VIEW_BUILDCODE=Flatpak
|
||||||
|
- -DGTA5VIEW_BUILDTYPE=Release
|
||||||
|
sources:
|
||||||
|
- type: dir
|
||||||
|
path: ../
|
|
@ -29,3 +29,7 @@
|
||||||
|
|
||||||
# Qt project user file
|
# Qt project user file
|
||||||
*.pro.user
|
*.pro.user
|
||||||
|
|
||||||
|
# Gettext translation files
|
||||||
|
*.po
|
||||||
|
*.pot
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
stages:
|
||||||
|
- build
|
||||||
|
|
||||||
|
variables:
|
||||||
|
BUILD_TYPE: "REL"
|
||||||
|
|
||||||
|
Windows Installer:
|
||||||
|
stage: build
|
||||||
|
image: sypingauto/gta5view-build:1.10-shared
|
||||||
|
variables:
|
||||||
|
BUILD_SCRIPT: "wininstall_build.sh"
|
||||||
|
QT_SELECT: "qt5-x86_64-w64-mingw32"
|
||||||
|
script:
|
||||||
|
- .gitlab/gitlab.sh
|
||||||
|
artifacts:
|
||||||
|
name: "gta5view-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}_setup"
|
||||||
|
paths:
|
||||||
|
- "gta5view-*.exe"
|
||||||
|
|
||||||
|
Windows Portable:
|
||||||
|
stage: build
|
||||||
|
image: sypingauto/gta5view-build:1.10-static
|
||||||
|
variables:
|
||||||
|
BUILD_SCRIPT: "windows_build.sh"
|
||||||
|
QT_SELECT: "qt5-x86_64-w64-mingw32"
|
||||||
|
script:
|
||||||
|
- .gitlab/gitlab.sh
|
||||||
|
artifacts:
|
||||||
|
name: "gta5view-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}_portable"
|
||||||
|
paths:
|
||||||
|
- "gta5view-*.exe"
|
Binary file not shown.
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Decrypt Telemetry Authenticator
|
||||||
|
rm -rf tmext/TelemetryClassAuthenticator.cpp && \
|
||||||
|
openssl aes-256-cbc -k ${tca_pass} -in .gitlab/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d
|
||||||
|
|
||||||
|
# Check if build is not tagged
|
||||||
|
if [ "${CI_COMMIT_TAG}" == "" ]; then
|
||||||
|
export EXECUTABLE_TAG=-$(git rev-parse --short HEAD)
|
||||||
|
else
|
||||||
|
export EXECUTABLE_TAG=
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if package code is not set
|
||||||
|
if [ "${PACKAGE_CODE}" == "" ]; then
|
||||||
|
export PACKAGE_CODE=GitLab
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Init Application Commit Hash
|
||||||
|
export APPLICATION_COMMIT=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
# Start CI script and copying assets into base directory
|
||||||
|
.ci/ci.sh && \
|
||||||
|
cp -Rf assets/* ./
|
40
.travis.yml
40
.travis.yml
|
@ -1,39 +1,40 @@
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: required
|
sudo: required
|
||||||
|
|
||||||
language: cpp
|
language: cpp
|
||||||
|
|
||||||
service:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
|
env:
|
||||||
|
global:
|
||||||
|
- BUILD_TYPE=REL
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- env:
|
- env:
|
||||||
- BUILD_SCRIPT=debian_travis.sh
|
- BUILD_SCRIPT=debian_docker.sh
|
||||||
- QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
|
- RELEASE_LABEL="Debian 64-Bit Package"
|
||||||
- DEBIAN_VERSION=jessie
|
- DEBIAN_VERSION=buster
|
||||||
- DOCKER_USER=i386
|
|
||||||
- APT_INSTALL=clang
|
|
||||||
- env:
|
|
||||||
- BUILD_SCRIPT=debian_travis.sh
|
|
||||||
- QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
|
|
||||||
- DEBIAN_VERSION=jessie
|
|
||||||
- DOCKER_USER=amd64
|
- DOCKER_USER=amd64
|
||||||
- APT_INSTALL=clang
|
- APT_INSTALL=clang
|
||||||
- env:
|
- env:
|
||||||
- BUILD_SCRIPT=windows_travis.sh
|
- BUILD_SCRIPT=windows_docker.sh
|
||||||
- QT_SELECT=qt5-i686-w64-mingw32
|
|
||||||
- env:
|
|
||||||
- BUILD_SCRIPT=windows_travis.sh
|
|
||||||
- QT_SELECT=qt5-x86_64-w64-mingw32
|
- QT_SELECT=qt5-x86_64-w64-mingw32
|
||||||
- EXECUTABLE_ARCH=_x64
|
- RELEASE_LABEL="Windows 64-Bit Portable"
|
||||||
- env:
|
- env:
|
||||||
- BUILD_SCRIPT=wininstall_travis.sh
|
- BUILD_SCRIPT=wininstall_docker.sh
|
||||||
- QT_SELECT=qt5-x86_64-w64-mingw32
|
- QT_SELECT=qt5-x86_64-w64-mingw32
|
||||||
|
- RELEASE_LABEL="Windows 64-Bit Installer"
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode14.2
|
||||||
|
env:
|
||||||
|
- BUILD_SCRIPT=osx_ci.sh
|
||||||
|
- RELEASE_LABEL="Mac OS X 64-Bit Disk Image"
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- ".travis/source.sh"
|
- ".travis/source.sh"
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ".travis/travis.sh"
|
- ".travis/travis.sh"
|
||||||
|
|
||||||
|
@ -41,6 +42,7 @@ deploy:
|
||||||
provider: releases
|
provider: releases
|
||||||
api_key:
|
api_key:
|
||||||
secure: o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg=
|
secure: o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg=
|
||||||
|
label: ${RELEASE_LABEL}
|
||||||
file_glob: true
|
file_glob: true
|
||||||
file: assets/*
|
file: assets/*
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
|
|
Binary file not shown.
|
@ -1,31 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Creating folders
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
|
||||||
mkdir -p build && \
|
|
||||||
mkdir -p assets && \
|
|
||||||
chmod -x res/gta5sync_*.qm res/gta5view.desktop res/gta5view.png && \
|
|
||||||
cd build && \
|
|
||||||
mkdir -p qt4 && \
|
|
||||||
cd qt4 && \
|
|
||||||
echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
|
|
||||||
cd .. && \
|
|
||||||
mkdir -p qt5 && \
|
|
||||||
cd qt5 && \
|
|
||||||
echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
|
|
||||||
cd .. && \
|
|
||||||
|
|
||||||
# Prepare checkinstall step
|
|
||||||
mkdir -p /usr/share/gta5view && \
|
|
||||||
|
|
||||||
# Starting build
|
|
||||||
cd qt5 && \
|
|
||||||
qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_REL "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"GitHub\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \
|
|
||||||
make -j 4 && \
|
|
||||||
checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=${PROJECT_DIR}/assets && \
|
|
||||||
cd .. && \
|
|
||||||
cd qt4 && \
|
|
||||||
qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT4} DEFINES+=GTA5SYNC_BUILDTYPE_REL "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"GitHub\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro && \
|
|
||||||
make -j 4 && \
|
|
||||||
checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets
|
|
|
@ -1,5 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Install packages
|
|
||||||
apt-get update -qq && \
|
|
||||||
apt-get install -qq ${APT_INSTALL} checkinstall dpkg-dev fakeroot g++ gcc qtbase5-dev qt5-qmake qttranslations5-l10n libqt4-dev
|
|
|
@ -1,15 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [[ ${DOCKER_USER} ]]; then
|
|
||||||
DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION}
|
|
||||||
else
|
|
||||||
DOCKER_IMAGE=debian:${DEBIAN_VERSION}
|
|
||||||
fi
|
|
||||||
PROJECT_DIR_DOCKER=/gta5view
|
|
||||||
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
docker pull ${DOCKER_IMAGE} && \
|
|
||||||
docker run --rm \
|
|
||||||
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
|
||||||
${DOCKER_IMAGE} \
|
|
||||||
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/debian_install.sh && .travis/debian_build.sh"
|
|
|
@ -0,0 +1 @@
|
||||||
|
Poァ鏖<EFBFBD>劾ラ<作1x」%几<>ャネw|RtZv<>kホ銓顴Z肄2チ廁湮ォ`<1A>ム,4vヨマ・@<>ヲeハ・~U$+<2B><><EFBFBD><1A><牾&蓬熙
|
|
@ -1,14 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Creating folders
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
|
||||||
echo "gta5view image name is gta5view-osx_${APPLICATION_VERSION}.dmg" && \
|
|
||||||
mkdir -p build && \
|
|
||||||
mkdir -p assets && \
|
|
||||||
cd build && \
|
|
||||||
|
|
||||||
/usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_REL "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"GitHub\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
|
|
||||||
make -j 4 && \
|
|
||||||
/usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \
|
|
||||||
cp -Rf gta5view.dmg ../assets/gta5view-osx_${APPLICATION_VERSION}.dmg
|
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Install packages
|
|
||||||
brew install qt
|
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Install packages
|
|
||||||
.travis/osx_install.sh && \
|
|
||||||
|
|
||||||
# Build gta5view
|
|
||||||
.travis/osx_build.sh && \
|
|
||||||
cd ${PROJECT_DIR}
|
|
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
rm -rf tmext/TelemetryClassAuthenticator.cpp && \
|
rm -rf tmext/TelemetryClassAuthenticator.cpp && \
|
||||||
openssl aes-256-cbc -K $encrypted_55502862a724_key -iv $encrypted_55502862a724_iv -in tmext/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d
|
openssl aes-256-cbc -K $encrypted_db000a5d87d6_key -iv $encrypted_db000a5d87d6_iv -in .travis/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d && \
|
||||||
|
openssl aes-256-cbc -K $encrypted_d57e7d2f8877_key -iv $encrypted_d57e7d2f8877_iv -in .travis/dropbox_uploader.enc -out ~/.dropbox_uploader -d
|
||||||
|
|
|
@ -1,18 +1,27 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Install lua
|
# Install lua
|
||||||
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
|
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
|
||||||
|
brew install lua
|
||||||
|
else
|
||||||
sudo apt-get update -qq && \
|
sudo apt-get update -qq && \
|
||||||
sudo apt-get install -qq lua5.2
|
sudo apt-get install -qq lua5.2
|
||||||
elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
|
|
||||||
brew install lua
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION=`lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end'`; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi
|
# Check if build is not tagged
|
||||||
export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION)
|
if [ "${TRAVIS_TAG}" == "" ]; then
|
||||||
export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION)
|
export EXECUTABLE_TAG=-$(git rev-parse --short HEAD)
|
||||||
export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}
|
else
|
||||||
if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi
|
export EXECUTABLE_TAG=
|
||||||
export PROJECT_DIR=$(pwd)
|
fi
|
||||||
|
|
||||||
.travis/${BUILD_SCRIPT}
|
# Check if package code is not set
|
||||||
|
if [ "${PACKAGE_CODE}" == "" ]; then
|
||||||
|
export PACKAGE_CODE=GitHub
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Init Application Commit Hash
|
||||||
|
export APPLICATION_COMMIT=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
# Start CI script
|
||||||
|
.ci/ci.sh
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
sudo .travis/debian_install.sh && \
|
sudo .ci/debian_install.sh && \
|
||||||
|
|
||||||
# Build gta5view
|
# Build gta5view
|
||||||
sudo .travis/debian_build.sh && \
|
sudo .ci/debian_build.sh && \
|
||||||
cd ${PROJECT_DIR}
|
cd ${PROJECT_DIR}
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \
|
|
||||||
|
|
||||||
# Creating folders
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
|
||||||
echo "gta5view executable is ${GTA5VIEW_EXECUTABLE}" && \
|
|
||||||
mkdir -p build && \
|
|
||||||
mkdir -p assets && \
|
|
||||||
|
|
||||||
# Starting build
|
|
||||||
cd build && \
|
|
||||||
qmake-static ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_REL "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"GitHub\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
|
|
||||||
make -j 4 && \
|
|
||||||
cp -Rf release/*.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \
|
|
||||||
cd ${PROJECT_DIR}/assets && \
|
|
||||||
upx --best ${GTA5VIEW_EXECUTABLE}
|
|
|
@ -1,12 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
QT_VERSION=5.6.3
|
|
||||||
DOCKER_IMAGE=syping/qt5-static-mingw:${QT_VERSION}
|
|
||||||
PROJECT_DIR_DOCKER=/gta5view
|
|
||||||
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
docker pull ${DOCKER_IMAGE} && \
|
|
||||||
docker run --rm \
|
|
||||||
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
|
||||||
${DOCKER_IMAGE} \
|
|
||||||
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/windows_build.sh"
|
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
apt-get update -qq && \
|
|
||||||
apt-get install -qq nsis && \
|
|
||||||
|
|
||||||
# Creating folders
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
echo "gta5view build version is ${APPLICATION_VERSION}" && \
|
|
||||||
mkdir -p build && \
|
|
||||||
mkdir -p assets && \
|
|
||||||
|
|
||||||
# Starting build
|
|
||||||
cd build && \
|
|
||||||
qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_REL "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"GitHub\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' ../gta5view.pro && \
|
|
||||||
make -j 4 && \
|
|
||||||
cd ${PROJECT_DIR}/assets && \
|
|
||||||
makensis -NOCD ${PROJECT_DIR}/.travis/gta5view.nsi
|
|
|
@ -1,12 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
QT_VERSION=5.6.3
|
|
||||||
DOCKER_IMAGE=syping/qt5-shared-mingw:${QT_VERSION}
|
|
||||||
PROJECT_DIR_DOCKER=/gta5view
|
|
||||||
|
|
||||||
cd ${PROJECT_DIR} && \
|
|
||||||
docker pull ${DOCKER_IMAGE} && \
|
|
||||||
docker run --rm \
|
|
||||||
-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
|
|
||||||
${DOCKER_IMAGE} \
|
|
||||||
/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/wininstall_build.sh"
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -29,47 +29,47 @@ AboutDialog::AboutDialog(QWidget *parent) :
|
||||||
ui(new Ui::AboutDialog)
|
ui(new Ui::AboutDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Build Strings
|
// Build Strings
|
||||||
QString appVersion = qApp->applicationVersion();
|
QString appVersion = QApplication::applicationVersion();
|
||||||
QString buildType = tr(GTA5SYNC_BUILDTYPE);
|
const char* literalBuildType = GTA5SYNC_BUILDTYPE;
|
||||||
buildType.replace("_", " ");
|
const QString buildType = tr(literalBuildType);
|
||||||
QString projectBuild = AppEnv::getBuildDateTime();
|
const QString projectBuild = AppEnv::getBuildDateTime();
|
||||||
QString buildStr = GTA5SYNC_BUILDSTRING;
|
const QString buildStr = GTA5SYNC_BUILDSTRING;
|
||||||
|
#ifdef GTA5SYNC_COMMIT
|
||||||
|
if ((strcmp(literalBuildType, REL_BUILDTYPE) != 0) && !appVersion.contains("-"))
|
||||||
|
appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Translator Comments
|
// Translator Comments
|
||||||
//: Translated by translator, example Translated by Syping
|
//: Translated by translator, example Translated by Syping
|
||||||
QString translatedByStr = tr("Translated by %1");
|
const QString translatedByStr = tr("Translated by %1");
|
||||||
//: Insert your name here and profile here in following scheme, First Translator,First Profile\\nSecond Translator\\nThird Translator,Second Profile
|
//: Insert your name here and profile here in following scheme, First Translator,First Profile\\nSecond Translator\\nThird Translator,Second Profile
|
||||||
QString translatorVal = tr("TRANSLATOR");
|
const QString translatorVal = tr("TRANSLATOR");
|
||||||
QStringList translatorContent;
|
QStringList translatorContent;
|
||||||
if (translatorVal != "TRANSLATOR")
|
if (translatorVal != "TRANSLATOR") {
|
||||||
{
|
|
||||||
const QStringList translatorList = translatorVal.split('\n');
|
const QStringList translatorList = translatorVal.split('\n');
|
||||||
for (const QString &translatorStr : translatorList)
|
for (const QString &translatorStr : translatorList) {
|
||||||
{
|
|
||||||
QStringList translatorStrList = translatorStr.split(',');
|
QStringList translatorStrList = translatorStr.split(',');
|
||||||
QString translatorName = translatorStrList.at(0);
|
const QString translatorName = translatorStrList.at(0);
|
||||||
translatorStrList.removeFirst();
|
translatorStrList.removeFirst();
|
||||||
QString translatorProfile = translatorStrList.join(QString());
|
QString translatorProfile = translatorStrList.join(QString());
|
||||||
if (!translatorProfile.isEmpty())
|
if (!translatorProfile.isEmpty()) {
|
||||||
{
|
|
||||||
translatorContent += QString("<a href=\"%1\">%2</a>").arg(translatorProfile, translatorName);
|
translatorContent += QString("<a href=\"%1\">%2</a>").arg(translatorProfile, translatorName);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
translatorContent += translatorName;
|
translatorContent += translatorName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Project Description
|
// Project Description
|
||||||
#ifdef GTA5SYNC_ENABLED
|
const QString projectDes = tr("A project for viewing Grand Theft Auto V Snapmatic<br/>\nPictures and Savegames");
|
||||||
QString projectDes = tr("A project for viewing and sync Grand Theft Auto V Snapmatic<br/>\nPictures and Savegames");
|
|
||||||
#else
|
|
||||||
QString projectDes = tr("A project for viewing Grand Theft Auto V Snapmatic<br/>\nPictures and Savegames");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Copyright Description
|
// Copyright Description
|
||||||
QString copyrightDes1 = tr("Copyright © <a href=\"%1\">%2</a> %3");
|
QString copyrightDes1 = tr("Copyright © <a href=\"%1\">%2</a> %3");
|
||||||
|
@ -77,40 +77,34 @@ AboutDialog::AboutDialog(QWidget *parent) :
|
||||||
QString copyrightDes2 = tr("%1 is licensed under <a href=\"https://www.gnu.org/licenses/gpl-3.0.html#content\">GNU GPLv3</a>");
|
QString copyrightDes2 = tr("%1 is licensed under <a href=\"https://www.gnu.org/licenses/gpl-3.0.html#content\">GNU GPLv3</a>");
|
||||||
copyrightDes2 = copyrightDes2.arg(GTA5SYNC_APPSTR);
|
copyrightDes2 = copyrightDes2.arg(GTA5SYNC_APPSTR);
|
||||||
QString copyrightDesA;
|
QString copyrightDesA;
|
||||||
if (!translatorContent.isEmpty())
|
if (!translatorContent.isEmpty()) {
|
||||||
{
|
|
||||||
copyrightDesA = copyrightDes1 % "<br/>" % translatedByStr.arg(translatorContent.join(", ")) % "<br/>" % copyrightDes2;
|
copyrightDesA = copyrightDes1 % "<br/>" % translatedByStr.arg(translatorContent.join(", ")) % "<br/>" % copyrightDes2;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
copyrightDesA = copyrightDes1 % "<br/>" % copyrightDes2;
|
copyrightDesA = copyrightDes1 % "<br/>" % copyrightDes2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup User Interface
|
// Setup User Interface
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
aboutStr = ui->labAbout->text();
|
aboutStr = ui->labAbout->text();
|
||||||
titleStr = this->windowTitle();
|
titleStr = windowTitle();
|
||||||
ui->labAbout->setText(aboutStr.arg(GTA5SYNC_APPSTR, projectDes, appVersion % " (" % buildType % ")", projectBuild, buildStr, qVersion(), copyrightDesA));
|
ui->labAbout->setText(aboutStr.arg(GTA5SYNC_APPSTR, projectDes, appVersion % " (" % buildType % ")", projectBuild, buildStr, qVersion(), copyrightDesA));
|
||||||
this->setWindowTitle(titleStr.arg(GTA5SYNC_APPSTR));
|
setWindowTitle(titleStr.arg(GTA5SYNC_APPSTR));
|
||||||
|
|
||||||
// Set Icon for Close Button
|
// Set Icon for Close Button
|
||||||
if (QIcon::hasThemeIcon("dialog-close"))
|
if (QIcon::hasThemeIcon("dialog-close")) {
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
|
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-close"))
|
else if (QIcon::hasThemeIcon("gtk-close")) {
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("gtk-close"));
|
ui->cmdClose->setIcon(QIcon::fromTheme("gtk-close"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// DPI calculation
|
// DPI calculation
|
||||||
qreal screenRatio = AppEnv::screenRatio();
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
if (!translatorContent.isEmpty())
|
if (!translatorContent.isEmpty()) {
|
||||||
{
|
|
||||||
resize(375 * screenRatio, 270 * screenRatio);
|
resize(375 * screenRatio, 270 * screenRatio);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
resize(375 * screenRatio, 260 * screenRatio);
|
resize(375 * screenRatio, 260 * screenRatio);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -122,13 +116,11 @@ AboutDialog::~AboutDialog()
|
||||||
|
|
||||||
void AboutDialog::on_labAbout_linkActivated(const QString &link)
|
void AboutDialog::on_labAbout_linkActivated(const QString &link)
|
||||||
{
|
{
|
||||||
if (link.left(12) == "g5e://about?")
|
if (link.left(12) == "g5e://about?") {
|
||||||
{
|
|
||||||
QStringList aboutStrList = QString(link).remove(0, 12).split(":");
|
QStringList aboutStrList = QString(link).remove(0, 12).split(":");
|
||||||
QMessageBox::information(this, QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(0).toUtf8())), QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(1).toUtf8())));
|
QMessageBox::information(this, QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(0).toUtf8())), QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(1).toUtf8())));
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
QDesktopServices::openUrl(QUrl(link));
|
QDesktopServices::openUrl(QUrl(link));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -28,7 +28,6 @@ class AboutDialog;
|
||||||
class AboutDialog : public QDialog
|
class AboutDialog : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit AboutDialog(QWidget *parent = 0);
|
explicit AboutDialog(QWidget *parent = 0);
|
||||||
~AboutDialog();
|
~AboutDialog();
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><span style=" font-weight:600;">%1</span><br/>
|
<string><span style="font-weight:600">%1</span><br/>
|
||||||
<br/>
|
<br/>
|
||||||
%2<br/>
|
%2<br/>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
347
AppEnv.cpp
347
AppEnv.cpp
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -22,19 +22,19 @@
|
||||||
#include "StandardPaths.h"
|
#include "StandardPaths.h"
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QDesktopWidget>
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <iostream>
|
|
||||||
using namespace std;
|
#if QT_VERSION < 0x050000
|
||||||
|
#include <QDesktopWidget>
|
||||||
|
#endif
|
||||||
|
|
||||||
AppEnv::AppEnv()
|
AppEnv::AppEnv()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build Stuff
|
// Build Stuff
|
||||||
|
@ -55,18 +55,17 @@ QString AppEnv::getGameFolder(bool *ok)
|
||||||
{
|
{
|
||||||
QDir dir;
|
QDir dir;
|
||||||
QString GTAV_FOLDER = QString::fromUtf8(qgetenv("GTAV_FOLDER"));
|
QString GTAV_FOLDER = QString::fromUtf8(qgetenv("GTAV_FOLDER"));
|
||||||
if (GTAV_FOLDER != "")
|
if (GTAV_FOLDER != "") {
|
||||||
{
|
|
||||||
dir.setPath(GTAV_FOLDER);
|
dir.setPath(GTAV_FOLDER);
|
||||||
if (dir.exists())
|
if (dir.exists()) {
|
||||||
{
|
if (ok != NULL)
|
||||||
if (ok != NULL) *ok = true;
|
*ok = true;
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString GTAV_defaultFolder = StandardPaths::documentsLocation() % QDir::separator() % "Rockstar Games" % QDir::separator() % "GTA V";
|
const QString GTAV_defaultFolder = StandardPaths::documentsLocation() % "/Rockstar Games/GTA V";
|
||||||
QString GTAV_returnFolder = GTAV_defaultFolder;
|
QString GTAV_returnFolder = GTAV_defaultFolder;
|
||||||
|
|
||||||
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
@ -75,46 +74,44 @@ QString AppEnv::getGameFolder(bool *ok)
|
||||||
GTAV_returnFolder = settings.value("dir", GTAV_defaultFolder).toString();
|
GTAV_returnFolder = settings.value("dir", GTAV_defaultFolder).toString();
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
||||||
if (forceDir)
|
if (forceDir) {
|
||||||
{
|
|
||||||
dir.setPath(GTAV_returnFolder);
|
dir.setPath(GTAV_returnFolder);
|
||||||
if (dir.exists())
|
if (dir.exists()) {
|
||||||
{
|
if (ok != 0)
|
||||||
if (ok != 0) *ok = true;
|
*ok = true;
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dir.setPath(GTAV_defaultFolder);
|
dir.setPath(GTAV_defaultFolder);
|
||||||
if (dir.exists())
|
if (dir.exists()) {
|
||||||
{
|
if (ok != 0)
|
||||||
if (ok != 0) *ok = true;
|
*ok = true;
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!forceDir)
|
if (!forceDir) {
|
||||||
{
|
|
||||||
dir.setPath(GTAV_returnFolder);
|
dir.setPath(GTAV_returnFolder);
|
||||||
if (dir.exists())
|
if (dir.exists()) {
|
||||||
{
|
if (ok != 0)
|
||||||
if (ok != 0) *ok = true;
|
*ok = true;
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ok != 0) *ok = false;
|
if (ok != 0)
|
||||||
return "";
|
*ok = false;
|
||||||
|
return QString();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AppEnv::setGameFolder(QString gameFolder)
|
bool AppEnv::setGameFolder(QString gameFolder)
|
||||||
{
|
{
|
||||||
QDir dir;
|
QDir dir;
|
||||||
dir.setPath(gameFolder);
|
dir.setPath(gameFolder);
|
||||||
if (dir.exists())
|
if (dir.exists()) {
|
||||||
{
|
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -132,13 +129,13 @@ QString AppEnv::getInLangFolder()
|
||||||
#ifdef GTA5SYNC_INLANG
|
#ifdef GTA5SYNC_INLANG
|
||||||
return StringParser::convertBuildedString(GTA5SYNC_INLANG);
|
return StringParser::convertBuildedString(GTA5SYNC_INLANG);
|
||||||
#else
|
#else
|
||||||
return StringParser::convertBuildedString(GTA5SYNC_SHARE % QLatin1String("SEPARATOR:APPNAME:SEPARATOR:translations"));
|
return StringParser::convertBuildedString(GTA5SYNC_SHARE % QLatin1String("/APPNAME:/translations"));
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#ifdef GTA5SYNC_INLANG
|
#ifdef GTA5SYNC_INLANG
|
||||||
return StringParser::convertBuildedString(GTA5SYNC_INLANG);
|
return StringParser::convertBuildedString(GTA5SYNC_INLANG);
|
||||||
#else
|
#else
|
||||||
return QString(":/tr");
|
return QLatin1String(":/tr");
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -148,18 +145,57 @@ QString AppEnv::getPluginsFolder()
|
||||||
return StringParser::convertBuildedString(GTA5SYNC_PLUG);
|
return StringParser::convertBuildedString(GTA5SYNC_PLUG);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString AppEnv::getImagesFolder()
|
||||||
|
{
|
||||||
|
#if defined(GTA5SYNC_QCONF) && defined(GTA5SYNC_CMAKE)
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
return StringParser::convertBuildedString(GTA5SYNC_SHARE % QLatin1String("/resources"));
|
||||||
|
#else
|
||||||
|
return StringParser::convertBuildedString(GTA5SYNC_SHARE % QLatin1String("/APPNAME:/resources"));
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
return QLatin1String(":/img");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
QString AppEnv::getShareFolder()
|
||||||
|
{
|
||||||
|
return StringParser::convertBuildedString(GTA5SYNC_SHARE);
|
||||||
|
}
|
||||||
|
|
||||||
// Web Stuff
|
// Web Stuff
|
||||||
|
|
||||||
QByteArray AppEnv::getUserAgent()
|
QByteArray AppEnv::getUserAgent()
|
||||||
{
|
{
|
||||||
return QString("Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0 %1/%2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER).toUtf8();
|
#if QT_VERSION >= 0x050400
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString kernelVersion = QSysInfo::kernelVersion();
|
||||||
|
const QStringList &kernelVersionList = kernelVersion.split(".");
|
||||||
|
if (kernelVersionList.length() > 2) {
|
||||||
|
kernelVersion = kernelVersionList.at(0) % "." % kernelVersionList.at(1);
|
||||||
|
}
|
||||||
|
QString runArch = QSysInfo::buildCpuArchitecture();
|
||||||
|
if (runArch == "x86_64") {
|
||||||
|
runArch = "Win64; x64";
|
||||||
|
}
|
||||||
|
else if (runArch == "i686") {
|
||||||
|
const QString &curArch = QSysInfo::currentCpuArchitecture();
|
||||||
|
if (curArch == "x86_64") {
|
||||||
|
runArch = "WOW64";
|
||||||
|
}
|
||||||
|
else if (curArch == "i686") {
|
||||||
|
runArch = "Win32; x86";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return QString("Mozilla/5.0 (Windows NT %1; %2) %3/%4").arg(kernelVersion, runArch, GTA5SYNC_APPSTR, GTA5SYNC_APPVER).toUtf8();
|
||||||
|
#else
|
||||||
|
return QString("Mozilla/5.0 (%1; %2) %3/%4").arg(QSysInfo::kernelType(), QSysInfo::kernelVersion(), GTA5SYNC_APPSTR, GTA5SYNC_APPVER).toUtf8();
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
return QString("Mozilla/5.0 %1/%2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER).toUtf8();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
|
||||||
// {
|
|
||||||
// return QUrl(QString("https://socialclub.rockstargames.com/reference/crewfeed/%1").arg(crewID));
|
|
||||||
// }
|
|
||||||
|
|
||||||
QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
||||||
{
|
{
|
||||||
return QUrl(QString("https://socialclub.rockstargames.com/crew/%1/%1").arg(crewID));
|
return QUrl(QString("https://socialclub.rockstargames.com/crew/%1/%1").arg(crewID));
|
||||||
|
@ -167,7 +203,7 @@ QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
||||||
|
|
||||||
QUrl AppEnv::getPlayerFetchingUrl(QString crewID, QString pageNumber)
|
QUrl AppEnv::getPlayerFetchingUrl(QString crewID, QString pageNumber)
|
||||||
{
|
{
|
||||||
return QUrl(QString("https://socialclub.rockstargames.com/crewsapi/GetMembersList?crewId=%1&pageNumber=%2").arg(crewID, pageNumber));
|
return QUrl(QString("https://socialclub.rockstargames.com/crewsapi/GetMembersList?crewId=%1&pageNumber=%2&pageSize=5000").arg(crewID, pageNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
QUrl AppEnv::getPlayerFetchingUrl(QString crewID, int pageNumber)
|
QUrl AppEnv::getPlayerFetchingUrl(QString crewID, int pageNumber)
|
||||||
|
@ -175,12 +211,234 @@ QUrl AppEnv::getPlayerFetchingUrl(QString crewID, int pageNumber)
|
||||||
return getPlayerFetchingUrl(crewID, QString::number(pageNumber));
|
return getPlayerFetchingUrl(crewID, QString::number(pageNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Game Stuff
|
||||||
|
|
||||||
|
GameVersion AppEnv::getGameVersion()
|
||||||
|
{
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString argumentValue;
|
||||||
|
#ifdef _WIN64
|
||||||
|
argumentValue = "\\WOW6432Node";
|
||||||
|
#endif
|
||||||
|
QSettings registrySettingsSc(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\Grand Theft Auto V").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
QString installFolderSc = registrySettingsSc.value("InstallFolder", "").toString();
|
||||||
|
QDir installFolderScDir(installFolderSc);
|
||||||
|
bool scVersionInstalled = false;
|
||||||
|
if (!installFolderSc.isEmpty() && installFolderScDir.exists()) {
|
||||||
|
#ifdef GTA5SYNC_DEBUG
|
||||||
|
qDebug() << "gameVersionFoundSocialClubVersion";
|
||||||
|
#endif
|
||||||
|
scVersionInstalled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
QSettings registrySettingsSteam(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\GTAV").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
QString installFolderSteam = registrySettingsSteam.value("installfoldersteam", "").toString();
|
||||||
|
if (installFolderSteam.right(5) == "\\GTAV") {
|
||||||
|
installFolderSteam = installFolderSteam.remove(installFolderSteam.length() - 5, 5);
|
||||||
|
}
|
||||||
|
QDir installFolderSteamDir(installFolderSteam);
|
||||||
|
bool steamVersionInstalled = false;
|
||||||
|
if (!installFolderSteam.isEmpty() && installFolderSteamDir.exists()) {
|
||||||
|
#ifdef GTA5SYNC_DEBUG
|
||||||
|
qDebug() << "gameVersionFoundSteamVersion";
|
||||||
|
#endif
|
||||||
|
steamVersionInstalled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scVersionInstalled && steamVersionInstalled) {
|
||||||
|
return GameVersion::BothVersions;
|
||||||
|
}
|
||||||
|
else if (scVersionInstalled) {
|
||||||
|
return GameVersion::SocialClubVersion;
|
||||||
|
}
|
||||||
|
else if (steamVersionInstalled) {
|
||||||
|
return GameVersion::SteamVersion;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return GameVersion::NoVersion;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return GameVersion::NoVersion;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
GameLanguage AppEnv::getGameLanguage(GameVersion gameVersion)
|
||||||
|
{
|
||||||
|
if (gameVersion == GameVersion::SocialClubVersion) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString argumentValue;
|
||||||
|
#ifdef _WIN64
|
||||||
|
argumentValue = "\\WOW6432Node";
|
||||||
|
#endif
|
||||||
|
QSettings registrySettingsSc(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\Grand Theft Auto V").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
QString languageSc = registrySettingsSc.value("Language", "").toString();
|
||||||
|
return gameLanguageFromString(languageSc);
|
||||||
|
#else
|
||||||
|
return GameLanguage::Undefined;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (gameVersion == GameVersion::SteamVersion) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString argumentValue;
|
||||||
|
#ifdef _WIN64
|
||||||
|
argumentValue = "\\WOW6432Node";
|
||||||
|
#endif
|
||||||
|
QSettings registrySettingsSteam(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\Grand Theft Auto V Steam").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
QString languageSteam = registrySettingsSteam.value("Language", "").toString();
|
||||||
|
return gameLanguageFromString(languageSteam);
|
||||||
|
#else
|
||||||
|
return GameLanguage::Undefined;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return GameLanguage::Undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
GameLanguage AppEnv::gameLanguageFromString(QString gameLanguage)
|
||||||
|
{
|
||||||
|
if (gameLanguage == "en-US") {
|
||||||
|
return GameLanguage::English;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "fr-FR") {
|
||||||
|
return GameLanguage::French;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "it-IT") {
|
||||||
|
return GameLanguage::Italian;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "de-DE") {
|
||||||
|
return GameLanguage::German;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "es-ES") {
|
||||||
|
return GameLanguage::Spanish;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "es-MX") {
|
||||||
|
return GameLanguage::Mexican;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "pt-BR") {
|
||||||
|
return GameLanguage::Brasilian;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "ru-RU") {
|
||||||
|
return GameLanguage::Russian;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "pl-PL") {
|
||||||
|
return GameLanguage::Polish;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "ja-JP") {
|
||||||
|
return GameLanguage::Japanese;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "zh-CHS") {
|
||||||
|
return GameLanguage::SChinese;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "zh-CHT") {
|
||||||
|
return GameLanguage::TChinese;
|
||||||
|
}
|
||||||
|
else if (gameLanguage == "ko-KR") {
|
||||||
|
return GameLanguage::Korean;
|
||||||
|
}
|
||||||
|
return GameLanguage::Undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString AppEnv::gameLanguageToString(GameLanguage gameLanguage)
|
||||||
|
{
|
||||||
|
switch (gameLanguage) {
|
||||||
|
case GameLanguage::English:
|
||||||
|
return "en-US";
|
||||||
|
case GameLanguage::French:
|
||||||
|
return "fr-FR";
|
||||||
|
case GameLanguage::Italian:
|
||||||
|
return "it-IT";
|
||||||
|
case GameLanguage::German:
|
||||||
|
return "de-DE";
|
||||||
|
case GameLanguage::Spanish:
|
||||||
|
return "es-ES";
|
||||||
|
case GameLanguage::Mexican:
|
||||||
|
return "es-MX";
|
||||||
|
case GameLanguage::Brasilian:
|
||||||
|
return "pt-BR";
|
||||||
|
case GameLanguage::Polish:
|
||||||
|
return "pl-PL";
|
||||||
|
case GameLanguage::Japanese:
|
||||||
|
return "ja-JP";
|
||||||
|
case GameLanguage::SChinese:
|
||||||
|
return "zh-CHS";
|
||||||
|
case GameLanguage::TChinese:
|
||||||
|
return "zh-CHT";
|
||||||
|
case GameLanguage::Korean:
|
||||||
|
return "ko-KR";
|
||||||
|
default:
|
||||||
|
return "Undefinied";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AppEnv::setGameLanguage(GameVersion gameVersion, GameLanguage gameLanguage)
|
||||||
|
{
|
||||||
|
bool socialClubVersion = false;
|
||||||
|
bool steamVersion = false;
|
||||||
|
if (gameVersion == GameVersion::SocialClubVersion) {
|
||||||
|
socialClubVersion = true;
|
||||||
|
}
|
||||||
|
else if (gameVersion == GameVersion::SteamVersion) {
|
||||||
|
steamVersion = true;
|
||||||
|
}
|
||||||
|
else if (gameVersion == GameVersion::BothVersions) {
|
||||||
|
socialClubVersion = true;
|
||||||
|
steamVersion = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (socialClubVersion) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString argumentValue;
|
||||||
|
#ifdef _WIN64
|
||||||
|
argumentValue = "\\WOW6432Node";
|
||||||
|
#endif
|
||||||
|
QSettings registrySettingsSc(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\Grand Theft Auto V").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
if (gameLanguage != GameLanguage::Undefined) {
|
||||||
|
registrySettingsSc.setValue("Language", gameLanguageToString(gameLanguage));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
registrySettingsSc.remove("Language");
|
||||||
|
}
|
||||||
|
registrySettingsSc.sync();
|
||||||
|
if (registrySettingsSc.status() != QSettings::NoError) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
Q_UNUSED(gameLanguage)
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
if (steamVersion) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
QString argumentValue;
|
||||||
|
#ifdef _WIN64
|
||||||
|
argumentValue = "\\WOW6432Node";
|
||||||
|
#endif
|
||||||
|
QSettings registrySettingsSteam(QString("HKEY_LOCAL_MACHINE\\SOFTWARE%1\\Rockstar Games\\Grand Theft Auto V Steam").arg(argumentValue), QSettings::NativeFormat);
|
||||||
|
if (gameLanguage != GameLanguage::Undefined) {
|
||||||
|
registrySettingsSteam.setValue("Language", gameLanguageToString(gameLanguage));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
registrySettingsSteam.remove("Language");
|
||||||
|
}
|
||||||
|
registrySettingsSteam.sync();
|
||||||
|
if (registrySettingsSteam.status() != QSettings::NoError) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
Q_UNUSED(gameLanguage)
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Screen Stuff
|
||||||
|
|
||||||
qreal AppEnv::screenRatio()
|
qreal AppEnv::screenRatio()
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInch();
|
qreal dpi = QApplication::primaryScreen()->logicalDotsPerInch();
|
||||||
#else
|
#else
|
||||||
qreal dpi = qApp->desktop()->logicalDpiX();
|
qreal dpi = QApplication::desktop()->logicalDpiX();
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
return (dpi / 72);
|
return (dpi / 72);
|
||||||
|
@ -188,3 +446,12 @@ qreal AppEnv::screenRatio()
|
||||||
return (dpi / 96);
|
return (dpi / 96);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qreal AppEnv::screenRatioPR()
|
||||||
|
{
|
||||||
|
#if QT_VERSION >= 0x050600
|
||||||
|
return QApplication::primaryScreen()->devicePixelRatio();
|
||||||
|
#else
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
17
AppEnv.h
17
AppEnv.h
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -22,6 +22,9 @@
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
|
||||||
|
enum class GameVersion : int { NoVersion = 0, SocialClubVersion = 1, SteamVersion = 2, BothVersions = 3 };
|
||||||
|
enum class GameLanguage : int { Undefined = 0, English = 1, French = 2, Italian = 3, German = 4, Spanish = 5, Mexican = 6, Brasilian = 7, Russian = 8, Polish = 9, Japanese = 10, SChinese = 11, TChinese = 12, Korean = 13 };
|
||||||
|
|
||||||
class AppEnv
|
class AppEnv
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -36,7 +39,9 @@ public:
|
||||||
static bool setGameFolder(QString gameFolder);
|
static bool setGameFolder(QString gameFolder);
|
||||||
static QString getExLangFolder();
|
static QString getExLangFolder();
|
||||||
static QString getInLangFolder();
|
static QString getInLangFolder();
|
||||||
|
static QString getImagesFolder();
|
||||||
static QString getPluginsFolder();
|
static QString getPluginsFolder();
|
||||||
|
static QString getShareFolder();
|
||||||
|
|
||||||
// Web Stuff
|
// Web Stuff
|
||||||
static QByteArray getUserAgent();
|
static QByteArray getUserAgent();
|
||||||
|
@ -44,8 +49,16 @@ public:
|
||||||
static QUrl getPlayerFetchingUrl(QString crewID, QString pageNumber);
|
static QUrl getPlayerFetchingUrl(QString crewID, QString pageNumber);
|
||||||
static QUrl getPlayerFetchingUrl(QString crewID, int pageNumber);
|
static QUrl getPlayerFetchingUrl(QString crewID, int pageNumber);
|
||||||
|
|
||||||
|
// Game Stuff
|
||||||
|
static GameVersion getGameVersion();
|
||||||
|
static GameLanguage getGameLanguage(GameVersion gameVersion);
|
||||||
|
static GameLanguage gameLanguageFromString(QString gameLanguage);
|
||||||
|
static QString gameLanguageToString(GameLanguage gameLanguage);
|
||||||
|
static bool setGameLanguage(GameVersion gameVersion, GameLanguage gameLanguage);
|
||||||
|
|
||||||
// Screen Stuff
|
// Screen Stuff
|
||||||
static qreal screenRatio();
|
static qreal screenRatio();
|
||||||
|
static qreal screenRatioPR();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // APPENV_H
|
#endif // APPENV_H
|
||||||
|
|
|
@ -0,0 +1,382 @@
|
||||||
|
cmake_minimum_required(VERSION 3.7)
|
||||||
|
|
||||||
|
project(gta5view LANGUAGES C CXX)
|
||||||
|
|
||||||
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
|
set(CMAKE_AUTOUIC ON)
|
||||||
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
|
set(FORCE_QT_VERSION "" CACHE STRING "Force Qt Version")
|
||||||
|
if(FORCE_QT_VERSION)
|
||||||
|
set(QT_VERSION_MAJOR ${FORCE_QT_VERSION})
|
||||||
|
else()
|
||||||
|
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
|
||||||
|
endif()
|
||||||
|
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network Svg Widgets REQUIRED)
|
||||||
|
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools QUIET)
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
list(APPEND GTA5VIEW_LIBS
|
||||||
|
dwmapi
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DUNICODE
|
||||||
|
-D_UNICODE
|
||||||
|
-DWIN32
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_RESOURCES
|
||||||
|
res/app.rc
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(APPLE)
|
||||||
|
list(APPEND GTA5VIEW_RESOURCES
|
||||||
|
res/gta5view.icns
|
||||||
|
)
|
||||||
|
set(MACOSX_BUNDLE_BUNDLE_NAME gta5view)
|
||||||
|
set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.2)
|
||||||
|
set(MACOSX_BUNDLE_ICON_FILE gta5view.icns)
|
||||||
|
set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view)
|
||||||
|
set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_CMAKE
|
||||||
|
-DGTA5SYNC_PROJECT
|
||||||
|
)
|
||||||
|
|
||||||
|
set(GTA5VIEW_SOURCES
|
||||||
|
main.cpp
|
||||||
|
AboutDialog.cpp
|
||||||
|
AppEnv.cpp
|
||||||
|
CrewDatabase.cpp
|
||||||
|
DatabaseThread.cpp
|
||||||
|
ExportDialog.cpp
|
||||||
|
ExportThread.cpp
|
||||||
|
GlobalString.cpp
|
||||||
|
IconLoader.cpp
|
||||||
|
ImportDialog.cpp
|
||||||
|
JsonEditorDialog.cpp
|
||||||
|
MapLocationDialog.cpp
|
||||||
|
OptionsDialog.cpp
|
||||||
|
PictureDialog.cpp
|
||||||
|
PictureExport.cpp
|
||||||
|
PictureWidget.cpp
|
||||||
|
PlayerListDialog.cpp
|
||||||
|
ProfileDatabase.cpp
|
||||||
|
ProfileInterface.cpp
|
||||||
|
ProfileLoader.cpp
|
||||||
|
ProfileWidget.cpp
|
||||||
|
RagePhoto.cpp
|
||||||
|
SavegameCopy.cpp
|
||||||
|
SavegameData.cpp
|
||||||
|
SavegameDialog.cpp
|
||||||
|
SavegameWidget.cpp
|
||||||
|
SidebarGenerator.cpp
|
||||||
|
SnapmaticEditor.cpp
|
||||||
|
SnapmaticPicture.cpp
|
||||||
|
SnapmaticWidget.cpp
|
||||||
|
StandardPaths.cpp
|
||||||
|
StringParser.cpp
|
||||||
|
TranslationClass.cpp
|
||||||
|
UserInterface.cpp
|
||||||
|
anpro/imagecropper.cpp
|
||||||
|
pcg/pcg_basic.c
|
||||||
|
uimod/JSHighlighter.cpp
|
||||||
|
uimod/UiModLabel.cpp
|
||||||
|
uimod/UiModWidget.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
set(GTA5VIEW_HEADERS
|
||||||
|
config.h
|
||||||
|
wrapper.h
|
||||||
|
AboutDialog.h
|
||||||
|
AppEnv.h
|
||||||
|
CrewDatabase.h
|
||||||
|
DatabaseThread.h
|
||||||
|
ExportDialog.h
|
||||||
|
ExportThread.h
|
||||||
|
GlobalString.h
|
||||||
|
IconLoader.h
|
||||||
|
ImportDialog.h
|
||||||
|
JsonEditorDialog.h
|
||||||
|
MapLocationDialog.h
|
||||||
|
OptionsDialog.h
|
||||||
|
PictureDialog.h
|
||||||
|
PictureExport.h
|
||||||
|
PictureWidget.h
|
||||||
|
PlayerListDialog.h
|
||||||
|
ProfileDatabase.h
|
||||||
|
ProfileInterface.h
|
||||||
|
ProfileLoader.h
|
||||||
|
ProfileWidget.h
|
||||||
|
RagePhoto.h
|
||||||
|
SavegameCopy.h
|
||||||
|
SavegameData.h
|
||||||
|
SavegameDialog.h
|
||||||
|
SavegameWidget.h
|
||||||
|
SidebarGenerator.h
|
||||||
|
SnapmaticEditor.h
|
||||||
|
SnapmaticPicture.h
|
||||||
|
SnapmaticWidget.h
|
||||||
|
StandardPaths.h
|
||||||
|
StringParser.h
|
||||||
|
TranslationClass.h
|
||||||
|
UserInterface.h
|
||||||
|
anpro/imagecropper.h
|
||||||
|
pcg/pcg_basic.h
|
||||||
|
uimod/JSHighlighter.h
|
||||||
|
uimod/UiModLabel.h
|
||||||
|
uimod/UiModWidget.h
|
||||||
|
)
|
||||||
|
|
||||||
|
set(GTA5VIEW_INCLUDEDIR
|
||||||
|
anpro
|
||||||
|
pcg
|
||||||
|
uimod
|
||||||
|
)
|
||||||
|
|
||||||
|
set(GTA5VIEW_FORMS
|
||||||
|
AboutDialog.ui
|
||||||
|
ExportDialog.ui
|
||||||
|
ImportDialog.ui
|
||||||
|
JsonEditorDialog.ui
|
||||||
|
MapLocationDialog.ui
|
||||||
|
OptionsDialog.ui
|
||||||
|
PictureDialog.ui
|
||||||
|
PlayerListDialog.ui
|
||||||
|
ProfileInterface.ui
|
||||||
|
SavegameDialog.ui
|
||||||
|
SavegameWidget.ui
|
||||||
|
SnapmaticEditor.ui
|
||||||
|
SnapmaticWidget.ui
|
||||||
|
UserInterface.ui
|
||||||
|
)
|
||||||
|
|
||||||
|
set(GTA5VIEW_TRANSLATIONS
|
||||||
|
res/gta5sync_de.ts
|
||||||
|
res/gta5sync_en_US.ts
|
||||||
|
res/gta5sync_fr.ts
|
||||||
|
res/gta5sync_ko.ts
|
||||||
|
res/gta5sync_ru.ts
|
||||||
|
res/gta5sync_uk.ts
|
||||||
|
res/gta5sync_zh_TW.ts
|
||||||
|
)
|
||||||
|
|
||||||
|
list(APPEND GTA5VIEW_RESOURCES
|
||||||
|
res/global.qrc
|
||||||
|
res/template.qrc
|
||||||
|
)
|
||||||
|
set_property(SOURCE res/global.qrc PROPERTY AUTORCC_OPTIONS "-threshold;0;-compress;9")
|
||||||
|
|
||||||
|
if(Qt5LinguistTools_FOUND)
|
||||||
|
qt5_add_translation(GTA5VIEW_QMFILES
|
||||||
|
${GTA5VIEW_TRANSLATIONS}
|
||||||
|
res/qt5/qtbase_en_GB.ts
|
||||||
|
)
|
||||||
|
set(LINGUIST_FOUND TRUE)
|
||||||
|
elseif(Qt6LinguistTools_FOUND)
|
||||||
|
qt6_add_translation(GTA5VIEW_QMFILES
|
||||||
|
${GTA5VIEW_TRANSLATIONS}
|
||||||
|
res/qt6/qtbase_en_GB.ts
|
||||||
|
)
|
||||||
|
set(LINGUIST_FOUND TRUE)
|
||||||
|
else()
|
||||||
|
set(GTA5VIEW_QMFILES
|
||||||
|
res/gta5sync_de.qm
|
||||||
|
res/gta5sync_en_US.qm
|
||||||
|
res/gta5sync_fr.qm
|
||||||
|
res/gta5sync_ko.qm
|
||||||
|
res/gta5sync_ru.qm
|
||||||
|
res/gta5sync_uk.qm
|
||||||
|
res/gta5sync_zh_TW.qm
|
||||||
|
res/qt${QT_VERSION_MAJOR}/qtbase_en_GB.qm
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(QCONF_BUILD "System installation intended Qconf build" OFF)
|
||||||
|
if(QCONF_BUILD)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_QCONF
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
list(APPEND GTA5VIEW_RESOURCES
|
||||||
|
res/img.qrc
|
||||||
|
res/tr_g5p.qrc
|
||||||
|
res/qt${QT_VERSION_MAJOR}/tr_qt.qrc
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(FLATPAK_BUILD "Flatpak modifications and optimisations" OFF)
|
||||||
|
if(FLATPAK_BUILD)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_FLATPAK
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(WITH_DONATE "Donate menu option and donation dialog" OFF)
|
||||||
|
if(WITH_DONATE)
|
||||||
|
set(DONATE_ADDRESSES "" CACHE STRING "Donation addresses")
|
||||||
|
list(APPEND GTA5VIEW_HEADERS
|
||||||
|
anpro/QrCode.h
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_SOURCES
|
||||||
|
anpro/QrCode.cpp
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_DONATE
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_RESOURCES
|
||||||
|
res/donate.qrc
|
||||||
|
)
|
||||||
|
if(DONATE_ADDRESSES)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_DONATE_ADDRESSES=\"${DONATE_ADDRESSES}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(WITH_MOTD "Developer message system directed to users" OFF)
|
||||||
|
if(WITH_MOTD)
|
||||||
|
set(MOTD_WEBURL "" CACHE STRING "Messages WebURL")
|
||||||
|
list(APPEND GTA5VIEW_HEADERS
|
||||||
|
MessageThread.h
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_SOURCES
|
||||||
|
MessageThread.cpp
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_MOTD
|
||||||
|
)
|
||||||
|
if(MOTD_WEBURL)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_MOTD_WEBURL=\"${MOTD_WEBURL}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(WITH_TELEMETRY "Hardware survey and basic telemetry system" OFF)
|
||||||
|
if(WITH_TELEMETRY)
|
||||||
|
set(TELEMETRY_AUTHID "" CACHE STRING "Telemetry AuthID")
|
||||||
|
set(TELEMETRY_AUTHPW "" CACHE STRING "Telemetry AuthPW")
|
||||||
|
set(TELEMETRY_PUSHURL "" CACHE STRING "Telemetry PushURL")
|
||||||
|
set(TELEMETRY_REGURL "" CACHE STRING "Telemetry RegURL")
|
||||||
|
set(TELEMETRY_WEBURL "" CACHE STRING "Telemetry WebURL")
|
||||||
|
list(APPEND GTA5VIEW_HEADERS
|
||||||
|
TelemetryClass.h
|
||||||
|
tmext/TelemetryClassAuthenticator.h
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_SOURCES
|
||||||
|
TelemetryClass.cpp
|
||||||
|
tmext/TelemetryClassAuthenticator.cpp
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_INCLUDEDIR
|
||||||
|
tmext
|
||||||
|
)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
-DGTA5SYNC_TELEMETRY
|
||||||
|
)
|
||||||
|
if(TELEMETRY_AUTHID AND TELEMETRY_AUTHPW AND TELEMETRY_PUSHURL AND TELEMETRY_REGURL)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_TELEMETRY_AUTHID=\"${TELEMETRY_AUTHID}\""
|
||||||
|
"-DGTA5SYNC_TELEMETRY_AUTHPW=\"${TELEMETRY_AUTHPW}\""
|
||||||
|
"-DGTA5SYNC_TELEMETRY_PUSHURL=\"${TELEMETRY_PUSHURL}\""
|
||||||
|
"-DGTA5SYNC_TELEMETRY_REGURL=\"${TELEMETRY_REGURL}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(TELEMETRY_WEBURL)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_TELEMETRY_WEBURL=\"${TELEMETRY_WEBURL}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(WIN32)
|
||||||
|
list(APPEND GTA5VIEW_LIBS
|
||||||
|
d3d9
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(GTA5VIEW_APPVER)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_APPVER=\"${GTA5VIEW_APPVER}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(GTA5VIEW_BUILDCODE)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_BUILDCODE=\"${GTA5VIEW_BUILDCODE}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(GTA5VIEW_BUILDTYPE)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_BUILDTYPE=\"${GTA5VIEW_BUILDTYPE}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(GTA5VIEW_COMMIT)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_COMMIT=\"${GTA5VIEW_COMMIT}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(GTA5VIEW_INLANG)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_INLANG=\"${GTA5VIEW_INLANG}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(GTA5VIEW_LANG)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_LANG=\"${GTA5VIEW_LANG}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(GTA5VIEW_PLUG)
|
||||||
|
list(APPEND GTA5VIEW_DEFINES
|
||||||
|
"-DGTA5SYNC_PLUG=\"${GTA5VIEW_PLUG}\""
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_executable(gta5view
|
||||||
|
WIN32 MACOSX_BUNDLE
|
||||||
|
${GTA5VIEW_HEADERS}
|
||||||
|
${GTA5VIEW_SOURCES}
|
||||||
|
${GTA5VIEW_FORMS}
|
||||||
|
${GTA5VIEW_RESOURCES}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(LINGUIST_FOUND AND QCONF_BUILD)
|
||||||
|
add_custom_target(translations DEPENDS ${GTA5VIEW_QMFILES})
|
||||||
|
add_dependencies(gta5view translations)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0")
|
||||||
|
target_precompile_headers(gta5view PRIVATE config.h)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(Qt5Core_VERSION VERSION_GREATER_EQUAL "5.14.0")
|
||||||
|
qt5_import_plugins(gta5view INCLUDE Qt5::QSvgPlugin)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_compile_definitions(gta5view PRIVATE ${GTA5VIEW_DEFINES})
|
||||||
|
target_include_directories(gta5view PRIVATE ${GTA5VIEW_INCLUDEDIR})
|
||||||
|
target_link_libraries(gta5view PRIVATE Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::Widgets ${GTA5VIEW_LIBS})
|
||||||
|
|
||||||
|
install(TARGETS gta5view DESTINATION bin)
|
||||||
|
install(FILES res/de.syping.gta5view.desktop DESTINATION share/applications)
|
||||||
|
install(FILES res/de.syping.gta5view.metainfo.xml DESTINATION share/metainfo)
|
||||||
|
install(FILES res/de.syping.gta5view.xml DESTINATION share/mime/packages)
|
||||||
|
install(FILES res/gta5view-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME de.syping.gta5view.png)
|
||||||
|
install(FILES res/gta5view-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME de.syping.gta5view.png)
|
||||||
|
if(QCONF_BUILD)
|
||||||
|
include(res/img.cmake)
|
||||||
|
install(FILES ${GTA5VIEW_IMGFILES} DESTINATION share/gta5view/resources)
|
||||||
|
install(FILES ${GTA5VIEW_QMFILES} DESTINATION share/gta5view/translations)
|
||||||
|
endif()
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -44,137 +44,65 @@ void DatabaseThread::run()
|
||||||
{
|
{
|
||||||
QEventLoop threadLoop;
|
QEventLoop threadLoop;
|
||||||
|
|
||||||
QStringList crewList;
|
|
||||||
QStringList crewListR;
|
|
||||||
|
|
||||||
// Register thread loop end signal
|
|
||||||
QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
|
QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
|
||||||
|
|
||||||
// Setup crewList for Quick time scan
|
while (threadRunning) {
|
||||||
crewList = crewDB->getCrews();
|
QTimer::singleShot(300000, &threadLoop, SLOT(quit()));
|
||||||
if (!crewList.isEmpty())
|
threadLoop.exec();
|
||||||
{
|
|
||||||
crewListR = deleteCompatibleCrews(crewList);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
while (crewList.isEmpty() && threadRunning)
|
|
||||||
{
|
|
||||||
QTimer::singleShot(1000, &threadLoop, SLOT(quit()));
|
|
||||||
threadLoop.exec();
|
|
||||||
if (!crewDB->isAddingCrews())
|
|
||||||
{
|
|
||||||
crewList = crewDB->getCrews();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (threadRunning)
|
|
||||||
{
|
|
||||||
crewListR = deleteCompatibleCrews(crewList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only do QTS when Thread should be run
|
|
||||||
if (threadRunning)
|
|
||||||
{
|
|
||||||
// Quick time scan
|
|
||||||
#ifdef GTA5SYNC_DEBUG
|
|
||||||
qDebug() << "Start QTS";
|
|
||||||
#endif
|
|
||||||
if (crewListR.length() <= 5)
|
|
||||||
{
|
|
||||||
scanCrewReference(crewListR, 2500);
|
|
||||||
emit crewNameUpdated();
|
|
||||||
}
|
|
||||||
if (crewList.length() <= 3)
|
|
||||||
{
|
|
||||||
scanCrewMembersList(crewList, 3, 2500);
|
|
||||||
emit playerNameUpdated();
|
|
||||||
}
|
|
||||||
else if (crewList.length() <= 5)
|
|
||||||
{
|
|
||||||
scanCrewMembersList(crewList, 2, 2500);
|
|
||||||
emit playerNameUpdated();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (threadRunning)
|
|
||||||
{
|
|
||||||
QTimer::singleShot(10000, &threadLoop, SLOT(quit()));
|
|
||||||
threadLoop.exec();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while (threadRunning)
|
|
||||||
{
|
|
||||||
crewList = crewDB->getCrews();
|
|
||||||
crewListR = deleteCompatibleCrews(crewList);
|
|
||||||
|
|
||||||
// Long time scan
|
|
||||||
#ifdef GTA5SYNC_DEBUG
|
|
||||||
qDebug() << "Start LTS";
|
|
||||||
#endif
|
|
||||||
scanCrewReference(crewListR, 10000);
|
|
||||||
emit crewNameUpdated();
|
|
||||||
scanCrewMembersList(crewList, crewMaxPages, 10000);
|
|
||||||
emit playerNameUpdated();
|
|
||||||
|
|
||||||
if (threadRunning)
|
|
||||||
{
|
|
||||||
QTimer::singleShot(300000, &threadLoop, SLOT(quit()));
|
|
||||||
threadLoop.exec();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &requestDelay)
|
void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &requestDelay)
|
||||||
{
|
{
|
||||||
for (QString crewID : crewList)
|
for (const QString &crewID : crewList) {
|
||||||
{
|
if (threadRunning && crewID != QLatin1String("0")) {
|
||||||
if (threadRunning && crewID != QLatin1String("0"))
|
|
||||||
{
|
|
||||||
QNetworkAccessManager *netManager = new QNetworkAccessManager();
|
QNetworkAccessManager *netManager = new QNetworkAccessManager();
|
||||||
QNetworkRequest netRequest(AppEnv::getCrewFetchingUrl(crewID));
|
QNetworkRequest netRequest(AppEnv::getCrewFetchingUrl(crewID));
|
||||||
#if QT_VERSION >= 0x050600
|
#if QT_VERSION >= 0x050600
|
||||||
|
#if QT_VERSION < 0x060000
|
||||||
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
|
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
|
netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
|
||||||
netRequest.setRawHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
|
netRequest.setRawHeader("Accept", "text/html");
|
||||||
netRequest.setRawHeader("Accept-Language", "en-US;q=0.5,en;q=0.3");
|
netRequest.setRawHeader("Accept-Charset", "utf-8");
|
||||||
|
netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
|
||||||
netRequest.setRawHeader("Connection", "keep-alive");
|
netRequest.setRawHeader("Connection", "keep-alive");
|
||||||
|
|
||||||
QNetworkReply *netReply = netManager->get(netRequest);
|
QNetworkReply *netReply = netManager->get(netRequest);
|
||||||
|
|
||||||
QEventLoop *downloadLoop = new QEventLoop();
|
QEventLoop *downloadLoop = new QEventLoop();
|
||||||
QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
|
QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
|
||||||
if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit())); }
|
if (!continueLastCrew)
|
||||||
|
QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit()));
|
||||||
QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
|
QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
|
||||||
downloadLoop->exec();
|
downloadLoop->exec();
|
||||||
downloadLoop->disconnect();
|
downloadLoop->disconnect();
|
||||||
delete downloadLoop;
|
delete downloadLoop;
|
||||||
|
|
||||||
if (netReply->isFinished())
|
if (netReply->isFinished()) {
|
||||||
{
|
|
||||||
QString crewName;
|
QString crewName;
|
||||||
QByteArray crewHtml = netReply->readAll();
|
QByteArray crewHtml = netReply->readAll();
|
||||||
QStringList crewHtmlSplit1 = QString::fromUtf8(crewHtml).split("<title>Rockstar Games Social Club - Crew : ");
|
QStringList crewHtmlSplit1 = QString::fromUtf8(crewHtml).split("<title>Rockstar Games Social Club - Crew : ");
|
||||||
if (crewHtmlSplit1.length() >= 2)
|
if (crewHtmlSplit1.length() >= 2) {
|
||||||
{
|
|
||||||
QStringList crewHtmlSplit2 = QString(crewHtmlSplit1.at(1)).split("</title>");
|
QStringList crewHtmlSplit2 = QString(crewHtmlSplit1.at(1)).split("</title>");
|
||||||
if (crewHtmlSplit2.length() >= 1)
|
if (crewHtmlSplit2.length() >= 1) {
|
||||||
{
|
|
||||||
crewName = crewHtmlSplit2.at(0);
|
crewName = crewHtmlSplit2.at(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!crewName.isEmpty())
|
if (!crewName.isEmpty()) {
|
||||||
{
|
|
||||||
emit crewNameFound(crewID.toInt(), crewName);
|
emit crewNameFound(crewID.toInt(), crewName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
netReply->abort();
|
||||||
|
}
|
||||||
|
|
||||||
if (threadRunning)
|
if (threadRunning) {
|
||||||
{
|
|
||||||
QEventLoop *waitingLoop = new QEventLoop();
|
QEventLoop *waitingLoop = new QEventLoop();
|
||||||
QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
|
QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
|
||||||
if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit())); }
|
if (!continueLastCrew)
|
||||||
|
QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit()));
|
||||||
waitingLoop->exec();
|
waitingLoop->exec();
|
||||||
waitingLoop->disconnect();
|
waitingLoop->disconnect();
|
||||||
delete waitingLoop;
|
delete waitingLoop;
|
||||||
|
@ -188,39 +116,39 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r
|
||||||
|
|
||||||
void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay)
|
void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay)
|
||||||
{
|
{
|
||||||
for (QString crewID : crewList)
|
for (const QString &crewID : crewList) {
|
||||||
{
|
if (threadRunning && crewID != QLatin1String("0")) {
|
||||||
if (threadRunning && crewID != QLatin1String("0"))
|
|
||||||
{
|
|
||||||
int currentFail = 0;
|
int currentFail = 0;
|
||||||
int currentPage = 0;
|
int currentPage = 0;
|
||||||
int foundPlayers = 0;
|
int foundPlayers = 0;
|
||||||
int totalPlayers = 1000;
|
int totalPlayers = 1000;
|
||||||
|
|
||||||
while(foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning))
|
while(foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning)) {
|
||||||
{
|
|
||||||
QNetworkAccessManager *netManager = new QNetworkAccessManager();
|
QNetworkAccessManager *netManager = new QNetworkAccessManager();
|
||||||
QNetworkRequest netRequest(AppEnv::getPlayerFetchingUrl(crewID, currentPage));
|
QNetworkRequest netRequest(AppEnv::getPlayerFetchingUrl(crewID, currentPage));
|
||||||
#if QT_VERSION >= 0x050600
|
#if QT_VERSION >= 0x050600
|
||||||
|
#if QT_VERSION < 0x060000
|
||||||
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
|
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
|
netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
|
||||||
netRequest.setRawHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
|
netRequest.setRawHeader("Accept", "application/json");
|
||||||
netRequest.setRawHeader("Accept-Language", "en-US;q=0.5,en;q=0.3");
|
netRequest.setRawHeader("Accept-Charset", "utf-8");
|
||||||
|
netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
|
||||||
netRequest.setRawHeader("Connection", "keep-alive");
|
netRequest.setRawHeader("Connection", "keep-alive");
|
||||||
|
|
||||||
QNetworkReply *netReply = netManager->get(netRequest);
|
QNetworkReply *netReply = netManager->get(netRequest);
|
||||||
|
|
||||||
QEventLoop *downloadLoop = new QEventLoop();
|
QEventLoop *downloadLoop = new QEventLoop();
|
||||||
QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
|
QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
|
||||||
if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit())); }
|
if (!continueLastCrew)
|
||||||
|
QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit()));
|
||||||
QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
|
QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
|
||||||
downloadLoop->exec();
|
downloadLoop->exec();
|
||||||
downloadLoop->disconnect();
|
downloadLoop->disconnect();
|
||||||
delete downloadLoop;
|
delete downloadLoop;
|
||||||
|
|
||||||
if (netReply->isFinished())
|
if (netReply->isFinished()) {
|
||||||
{
|
|
||||||
QByteArray crewJson = netReply->readAll();
|
QByteArray crewJson = netReply->readAll();
|
||||||
QJsonDocument crewDocument = QJsonDocument::fromJson(crewJson);
|
QJsonDocument crewDocument = QJsonDocument::fromJson(crewJson);
|
||||||
QJsonObject crewObject = crewDocument.object();
|
QJsonObject crewObject = crewDocument.object();
|
||||||
|
@ -228,32 +156,25 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
|
||||||
|
|
||||||
if (crewMap.contains("Total")) { totalPlayers = crewMap["Total"].toInt(); }
|
if (crewMap.contains("Total")) { totalPlayers = crewMap["Total"].toInt(); }
|
||||||
|
|
||||||
if (crewMap.contains("Members"))
|
if (crewMap.contains("Members")) {
|
||||||
{
|
|
||||||
const QList<QVariant> memberList = crewMap["Members"].toList();
|
const QList<QVariant> memberList = crewMap["Members"].toList();
|
||||||
for (QVariant memberVariant : memberList)
|
for (const QVariant &memberVariant : memberList) {
|
||||||
{
|
|
||||||
QMap<QString, QVariant> memberMap = memberVariant.toMap();
|
QMap<QString, QVariant> memberMap = memberVariant.toMap();
|
||||||
if (memberMap.contains("RockstarId") && memberMap.contains("Name"))
|
if (memberMap.contains("RockstarId") && memberMap.contains("Name")) {
|
||||||
{
|
|
||||||
int RockstarId = memberMap["RockstarId"].toInt();
|
int RockstarId = memberMap["RockstarId"].toInt();
|
||||||
QString memberName = memberMap["Name"].toString();
|
QString memberName = memberMap["Name"].toString();
|
||||||
if (!memberName.isEmpty() && RockstarId != 0)
|
if (!memberName.isEmpty() && RockstarId != 0) {
|
||||||
{
|
|
||||||
foundPlayers++;
|
foundPlayers++;
|
||||||
emit playerNameFound(RockstarId, memberName);
|
emit playerNameFound(RockstarId, memberName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
currentPage++;
|
currentPage++;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
currentFail++;
|
currentFail++;
|
||||||
if (currentFail == maxLoadFails)
|
if (currentFail == maxLoadFails) {
|
||||||
{
|
|
||||||
currentFail = 0;
|
currentFail = 0;
|
||||||
currentPage++;
|
currentPage++;
|
||||||
}
|
}
|
||||||
|
@ -262,8 +183,7 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
|
||||||
delete netReply;
|
delete netReply;
|
||||||
delete netManager;
|
delete netManager;
|
||||||
|
|
||||||
if (foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning))
|
if (foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning)) {
|
||||||
{
|
|
||||||
QEventLoop *waitingLoop = new QEventLoop();
|
QEventLoop *waitingLoop = new QEventLoop();
|
||||||
QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
|
QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
|
||||||
if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit())); }
|
if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit())); }
|
||||||
|
@ -278,10 +198,8 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
|
||||||
|
|
||||||
void DatabaseThread::deleteCompatibleCrews(QStringList *crewList)
|
void DatabaseThread::deleteCompatibleCrews(QStringList *crewList)
|
||||||
{
|
{
|
||||||
for (QString crewNID : *crewList)
|
for (const QString &crewNID : *crewList) {
|
||||||
{
|
if (crewDB->isCompatibleCrew(crewNID)) {
|
||||||
if (crewDB->isCompatibleCrew(crewNID))
|
|
||||||
{
|
|
||||||
crewList->removeAll(crewNID);
|
crewList->removeAll(crewNID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -290,10 +208,8 @@ void DatabaseThread::deleteCompatibleCrews(QStringList *crewList)
|
||||||
QStringList DatabaseThread::deleteCompatibleCrews(const QStringList &crewList)
|
QStringList DatabaseThread::deleteCompatibleCrews(const QStringList &crewList)
|
||||||
{
|
{
|
||||||
QStringList crewListR = crewList;
|
QStringList crewListR = crewList;
|
||||||
for (QString crewNID : crewListR)
|
for (const QString &crewNID : crewListR) {
|
||||||
{
|
if (crewDB->isCompatibleCrew(crewNID)) {
|
||||||
if (crewDB->isCompatibleCrew(crewNID))
|
|
||||||
{
|
|
||||||
crewListR.removeAll(crewNID);
|
crewListR.removeAll(crewNID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2020 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -22,14 +22,19 @@
|
||||||
#include "ProfileWidget.h"
|
#include "ProfileWidget.h"
|
||||||
#include "ExportThread.h"
|
#include "ExportThread.h"
|
||||||
#include "SavegameData.h"
|
#include "SavegameData.h"
|
||||||
|
#include "AppEnv.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QDesktopWidget>
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QDebug>
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
#include <QScreen>
|
||||||
|
#else
|
||||||
|
#include <QDesktopWidget>
|
||||||
|
#endif
|
||||||
|
|
||||||
ExportThread::ExportThread(QMap<ProfileWidget*,QString> profileMap, QString exportDirectory, bool pictureCopyEnabled, bool pictureExportEnabled, int exportCount, QObject *parent) : QThread(parent),
|
ExportThread::ExportThread(QMap<ProfileWidget*,QString> profileMap, QString exportDirectory, bool pictureCopyEnabled, bool pictureExportEnabled, int exportCount, QObject *parent) : QThread(parent),
|
||||||
profileMap(profileMap), exportDirectory(exportDirectory), pictureCopyEnabled(pictureCopyEnabled), pictureExportEnabled(pictureExportEnabled), exportCount(exportCount)
|
profileMap(profileMap), exportDirectory(exportDirectory), pictureCopyEnabled(pictureCopyEnabled), pictureExportEnabled(pictureExportEnabled), exportCount(exportCount)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +49,7 @@ void ExportThread::run()
|
||||||
// Quality Settings
|
// Quality Settings
|
||||||
settings.beginGroup("Pictures");
|
settings.beginGroup("Pictures");
|
||||||
int defaultQuality = 100;
|
int defaultQuality = 100;
|
||||||
QSize defExportSize = QSize(960, 536);
|
QSize defExportSize = SnapmaticPicture::getSnapmaticResolution();
|
||||||
int customQuality = settings.value("CustomQuality", defaultQuality).toInt();
|
int customQuality = settings.value("CustomQuality", defaultQuality).toInt();
|
||||||
if (customQuality < 1 || customQuality > 100)
|
if (customQuality < 1 || customQuality > 100)
|
||||||
{
|
{
|
||||||
|
@ -101,8 +106,17 @@ void ExportThread::run()
|
||||||
QImage exportPicture = picture->getImage();
|
QImage exportPicture = picture->getImage();
|
||||||
if (sizeMode == "Desktop")
|
if (sizeMode == "Desktop")
|
||||||
{
|
{
|
||||||
QRect desktopResolution = qApp->desktop()->screenGeometry();
|
#if QT_VERSION >= 0x050000
|
||||||
exportPicture = exportPicture.scaled(desktopResolution.width(), desktopResolution.height(), aspectRatio, Qt::SmoothTransformation);
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
QRect desktopResolution = QApplication::primaryScreen()->geometry();
|
||||||
|
int desktopSizeWidth = qRound((double)desktopResolution.width() * screenRatioPR);
|
||||||
|
int desktopSizeHeight = qRound((double)desktopResolution.height() * screenRatioPR);
|
||||||
|
#else
|
||||||
|
QRect desktopResolution = QApplication::desktop()->screenGeometry();
|
||||||
|
int desktopSizeWidth = desktopResolution.width();
|
||||||
|
int desktopSizeHeight = desktopResolution.height();
|
||||||
|
#endif
|
||||||
|
exportPicture = exportPicture.scaled(desktopSizeWidth, desktopSizeHeight, aspectRatio, Qt::SmoothTransformation);
|
||||||
}
|
}
|
||||||
else if (sizeMode == "Custom")
|
else if (sizeMode == "Custom")
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -28,17 +28,17 @@
|
||||||
|
|
||||||
GlobalString::GlobalString()
|
GlobalString::GlobalString()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QMap<QString, QString> GlobalString::getGlobalMap()
|
QMap<QString, QString> GlobalString::getGlobalMap()
|
||||||
{
|
{
|
||||||
QMap<QString, QString> globalMap;
|
QMap<QString, QString> globalMap;
|
||||||
QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
|
QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
|
||||||
|
#if QT_VERSION < 0x060000
|
||||||
globalFile.setIniCodec("UTF-8");
|
globalFile.setIniCodec("UTF-8");
|
||||||
|
#endif
|
||||||
globalFile.beginGroup("Global");
|
globalFile.beginGroup("Global");
|
||||||
for (QString globalStr : globalFile.childKeys())
|
for (const QString &globalStr : globalFile.childKeys()) {
|
||||||
{
|
|
||||||
globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString();
|
globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString();
|
||||||
}
|
}
|
||||||
globalFile.endGroup();
|
globalFile.endGroup();
|
||||||
|
@ -49,12 +49,14 @@ QString GlobalString::getString(QString valueStr, bool *ok)
|
||||||
{
|
{
|
||||||
QString globalString = valueStr;
|
QString globalString = valueStr;
|
||||||
QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
|
QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
|
||||||
|
#if QT_VERSION < 0x060000
|
||||||
globalFile.setIniCodec("UTF-8");
|
globalFile.setIniCodec("UTF-8");
|
||||||
|
#endif
|
||||||
globalFile.beginGroup("Global");
|
globalFile.beginGroup("Global");
|
||||||
QStringList globalStrList = globalFile.childKeys();
|
QStringList globalStrList = globalFile.childKeys();
|
||||||
if (globalStrList.contains(valueStr))
|
if (globalStrList.contains(valueStr)) {
|
||||||
{
|
if (ok != nullptr)
|
||||||
if (ok != nullptr) *ok = true;
|
*ok = true;
|
||||||
globalString = globalFile.value(valueStr, valueStr).toString();
|
globalString = globalFile.value(valueStr, valueStr).toString();
|
||||||
}
|
}
|
||||||
globalFile.endGroup();
|
globalFile.endGroup();
|
||||||
|
@ -65,10 +67,14 @@ QString GlobalString::getLanguageFile()
|
||||||
{
|
{
|
||||||
QString language = getLanguage();
|
QString language = getLanguage();
|
||||||
QString languageFile = ":/global/global." % language % ".ini";
|
QString languageFile = ":/global/global." % language % ".ini";
|
||||||
if (!QFileInfo(languageFile).exists())
|
#if QT_VERSION >= 0x050200
|
||||||
{
|
if (!QFileInfo::exists(languageFile))
|
||||||
languageFile = ":/global/global.en.ini";
|
languageFile = ":/global/global.en.ini";
|
||||||
}
|
#else
|
||||||
|
if (!QFileInfo(languageFile).exists())
|
||||||
|
languageFile = ":/global/global.en.ini";
|
||||||
|
#endif
|
||||||
|
|
||||||
return languageFile;
|
return languageFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -17,34 +17,45 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include "IconLoader.h"
|
#include "IconLoader.h"
|
||||||
|
#include "AppEnv.h"
|
||||||
|
#include <QStringBuilder>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
|
||||||
IconLoader::IconLoader()
|
IconLoader::IconLoader()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QIcon IconLoader::loadingAppIcon()
|
QIcon IconLoader::loadingAppIcon()
|
||||||
{
|
{
|
||||||
QIcon appIcon;
|
QIcon appIcon;
|
||||||
appIcon.addFile(":/img/5sync-16.png", QSize(16, 16));
|
#if defined(GTA5SYNC_QCONF) && defined(GTA5SYNC_CMAKE)
|
||||||
appIcon.addFile(":/img/5sync-24.png", QSize(24, 24));
|
#ifdef Q_OS_WIN
|
||||||
appIcon.addFile(":/img/5sync-32.png", QSize(32, 32));
|
const QString pattern = AppEnv::getImagesFolder() % QLatin1String("/gta5view-%1.png");
|
||||||
appIcon.addFile(":/img/5sync-40.png", QSize(40, 40));
|
#else
|
||||||
appIcon.addFile(":/img/5sync-48.png", QSize(48, 48));
|
const QString pattern = AppEnv::getShareFolder() % QLatin1String("/icons/hicolor/%1x%1/apps/de.syping.gta5view.png");
|
||||||
appIcon.addFile(":/img/5sync-64.png", QSize(64, 64));
|
#endif
|
||||||
appIcon.addFile(":/img/5sync-96.png", QSize(96, 96));
|
#else
|
||||||
appIcon.addFile(":/img/5sync-128.png", QSize(128, 128));
|
const QString pattern = AppEnv::getImagesFolder() % QLatin1String("/gta5view-%1.png");
|
||||||
appIcon.addFile(":/img/5sync-256.png", QSize(256, 256));
|
#endif
|
||||||
|
appIcon.addFile(pattern.arg("16"), QSize(16, 16));
|
||||||
|
appIcon.addFile(pattern.arg("24"), QSize(24, 24));
|
||||||
|
appIcon.addFile(pattern.arg("32"), QSize(32, 32));
|
||||||
|
appIcon.addFile(pattern.arg("40"), QSize(40, 40));
|
||||||
|
appIcon.addFile(pattern.arg("48"), QSize(48, 48));
|
||||||
|
appIcon.addFile(pattern.arg("64"), QSize(64, 64));
|
||||||
|
appIcon.addFile(pattern.arg("96"), QSize(96, 96));
|
||||||
|
appIcon.addFile(pattern.arg("128"), QSize(128, 128));
|
||||||
|
appIcon.addFile(pattern.arg("256"), QSize(256, 256));
|
||||||
return appIcon;
|
return appIcon;
|
||||||
}
|
}
|
||||||
|
|
||||||
QIcon IconLoader::loadingPointmakerIcon()
|
QIcon IconLoader::loadingPointmakerIcon()
|
||||||
{
|
{
|
||||||
QIcon pointmakerIcon;
|
QIcon pointmakerIcon;
|
||||||
pointmakerIcon.addFile(":/img/pointmaker-8.png", QSize(8, 8));
|
const QString pattern = AppEnv::getImagesFolder() % QLatin1String("/pointmaker-%1.png");
|
||||||
pointmakerIcon.addFile(":/img/pointmaker-16.png", QSize(16, 16));
|
pointmakerIcon.addFile(pattern.arg("8"), QSize(8, 8));
|
||||||
pointmakerIcon.addFile(":/img/pointmaker-24.png", QSize(24, 24));
|
pointmakerIcon.addFile(pattern.arg("16"), QSize(16, 16));
|
||||||
pointmakerIcon.addFile(":/img/pointmaker-32.png", QSize(32, 32));
|
pointmakerIcon.addFile(pattern.arg("24"), QSize(24, 24));
|
||||||
|
pointmakerIcon.addFile(pattern.arg("32"), QSize(32, 32));
|
||||||
return pointmakerIcon;
|
return pointmakerIcon;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,211 +0,0 @@
|
||||||
/*****************************************************************************
|
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
|
||||||
* Copyright (C) 2017-2018 Syping
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*****************************************************************************/
|
|
||||||
|
|
||||||
#include "ImageEditorDialog.h"
|
|
||||||
#include "ui_ImageEditorDialog.h"
|
|
||||||
#include "ProfileInterface.h"
|
|
||||||
#include "SidebarGenerator.h"
|
|
||||||
#include "StandardPaths.h"
|
|
||||||
#include "ImportDialog.h"
|
|
||||||
#include "AppEnv.h"
|
|
||||||
#include "config.h"
|
|
||||||
#include <QStringBuilder>
|
|
||||||
#include <QImageReader>
|
|
||||||
#include <QFileDialog>
|
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
ImageEditorDialog::ImageEditorDialog(SnapmaticPicture *picture, QString profileName, QWidget *parent) :
|
|
||||||
QDialog(parent), smpic(picture), profileName(profileName),
|
|
||||||
ui(new Ui::ImageEditorDialog)
|
|
||||||
{
|
|
||||||
// Set Window Flags
|
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
|
||||||
|
|
||||||
ui->setupUi(this);
|
|
||||||
ui->cmdClose->setFocus();
|
|
||||||
|
|
||||||
// Set Icon for Close Button
|
|
||||||
if (QIcon::hasThemeIcon("dialog-close"))
|
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
|
|
||||||
}
|
|
||||||
else if (QIcon::hasThemeIcon("gtk-close"))
|
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("gtk-close"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set Icon for Import Button
|
|
||||||
if (QIcon::hasThemeIcon("document-import"))
|
|
||||||
{
|
|
||||||
ui->cmdReplace->setIcon(QIcon::fromTheme("document-import"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set Icon for Overwrite Button
|
|
||||||
if (QIcon::hasThemeIcon("document-save"))
|
|
||||||
{
|
|
||||||
ui->cmdSave->setIcon(QIcon::fromTheme("document-save"));
|
|
||||||
}
|
|
||||||
else if (QIcon::hasThemeIcon("gtk-save"))
|
|
||||||
{
|
|
||||||
ui->cmdSave->setIcon(QIcon::fromTheme("gtk-save"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// DPI calculation
|
|
||||||
qreal screenRatio = AppEnv::screenRatio();
|
|
||||||
|
|
||||||
snapmaticResolutionLW = 516 * screenRatio; // 430
|
|
||||||
snapmaticResolutionLH = 288 * screenRatio; // 240
|
|
||||||
ui->labPicture->setMinimumSize(snapmaticResolutionLW, snapmaticResolutionLH);
|
|
||||||
ui->labCapacity->setText(tr("Capacity: %1").arg(QString::number(qRound((double)picture->getContentMaxLength() / 1024)) % " KB"));
|
|
||||||
|
|
||||||
imageIsChanged = false;
|
|
||||||
pictureCache = picture->getImage();
|
|
||||||
ui->labPicture->setPixmap(QPixmap::fromImage(pictureCache).scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
|
||||||
|
|
||||||
setMaximumSize(sizeHint());
|
|
||||||
setMinimumSize(sizeHint());
|
|
||||||
setFixedSize(sizeHint());
|
|
||||||
}
|
|
||||||
|
|
||||||
ImageEditorDialog::~ImageEditorDialog()
|
|
||||||
{
|
|
||||||
delete ui;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageEditorDialog::on_cmdClose_clicked()
|
|
||||||
{
|
|
||||||
close();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageEditorDialog::on_cmdReplace_clicked()
|
|
||||||
{
|
|
||||||
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
|
||||||
settings.beginGroup("FileDialogs");
|
|
||||||
bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
|
|
||||||
settings.beginGroup("ImportReplace");
|
|
||||||
|
|
||||||
fileDialogPreOpen: //Work?
|
|
||||||
QFileDialog fileDialog(this);
|
|
||||||
fileDialog.setFileMode(QFileDialog::ExistingFile);
|
|
||||||
fileDialog.setViewMode(QFileDialog::Detail);
|
|
||||||
fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
|
|
||||||
fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
|
|
||||||
fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
|
|
||||||
fileDialog.setWindowTitle(ProfileInterface::tr("Import..."));
|
|
||||||
fileDialog.setLabelText(QFileDialog::Accept, ProfileInterface::tr("Import"));
|
|
||||||
|
|
||||||
// Getting readable Image formats
|
|
||||||
QString imageFormatsStr = " ";
|
|
||||||
for (QByteArray imageFormat : QImageReader::supportedImageFormats())
|
|
||||||
{
|
|
||||||
imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
|
|
||||||
}
|
|
||||||
|
|
||||||
QStringList filters;
|
|
||||||
filters << ProfileInterface::tr("All image files (%1)").arg(imageFormatsStr.trimmed());
|
|
||||||
filters << ProfileInterface::tr("All files (**)");
|
|
||||||
fileDialog.setNameFilters(filters);
|
|
||||||
|
|
||||||
QList<QUrl> sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls());
|
|
||||||
|
|
||||||
fileDialog.setSidebarUrls(sidebarUrls);
|
|
||||||
fileDialog.setDirectory(settings.value(profileName % "+Directory", StandardPaths::documentsLocation()).toString());
|
|
||||||
fileDialog.restoreGeometry(settings.value(profileName % "+Geometry", "").toByteArray());
|
|
||||||
|
|
||||||
if (fileDialog.exec())
|
|
||||||
{
|
|
||||||
QStringList selectedFiles = fileDialog.selectedFiles();
|
|
||||||
if (selectedFiles.length() == 1)
|
|
||||||
{
|
|
||||||
QString selectedFile = selectedFiles.at(0);
|
|
||||||
QString selectedFileName = QFileInfo(selectedFile).fileName();
|
|
||||||
|
|
||||||
QFile snapmaticFile(selectedFile);
|
|
||||||
if (!snapmaticFile.open(QFile::ReadOnly))
|
|
||||||
{
|
|
||||||
QMessageBox::warning(this, ProfileInterface::tr("Import"), ProfileInterface::tr("Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
|
|
||||||
goto fileDialogPreOpen;
|
|
||||||
}
|
|
||||||
QImage *importImage = new QImage();
|
|
||||||
QImageReader snapmaticImageReader;
|
|
||||||
snapmaticImageReader.setDecideFormatFromContent(true);
|
|
||||||
snapmaticImageReader.setDevice(&snapmaticFile);
|
|
||||||
if (!snapmaticImageReader.read(importImage))
|
|
||||||
{
|
|
||||||
QMessageBox::warning(this, ProfileInterface::tr("Import"), ProfileInterface::tr("Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
|
|
||||||
delete importImage;
|
|
||||||
goto fileDialogPreOpen;
|
|
||||||
}
|
|
||||||
ImportDialog *importDialog = new ImportDialog(this);
|
|
||||||
importDialog->setImage(importImage);
|
|
||||||
importDialog->setModal(true);
|
|
||||||
importDialog->show();
|
|
||||||
importDialog->exec();
|
|
||||||
if (importDialog->isImportAgreed())
|
|
||||||
{
|
|
||||||
pictureCache = importDialog->image();
|
|
||||||
ui->labPicture->setPixmap(QPixmap::fromImage(pictureCache).scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
|
||||||
imageIsChanged = true;
|
|
||||||
}
|
|
||||||
delete importDialog;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
settings.setValue(profileName % "+Geometry", fileDialog.saveGeometry());
|
|
||||||
settings.setValue(profileName % "+Directory", fileDialog.directory().absolutePath());
|
|
||||||
settings.endGroup();
|
|
||||||
settings.endGroup();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageEditorDialog::on_cmdSave_clicked()
|
|
||||||
{
|
|
||||||
if (imageIsChanged)
|
|
||||||
{
|
|
||||||
const QByteArray previousPicture = smpic->getPictureStream();
|
|
||||||
bool success = smpic->setImage(pictureCache);
|
|
||||||
if (success)
|
|
||||||
{
|
|
||||||
QString currentFilePath = smpic->getPictureFilePath();
|
|
||||||
QString originalFilePath = smpic->getOriginalPictureFilePath();
|
|
||||||
QString backupFileName = originalFilePath % ".bak";
|
|
||||||
if (!QFile::exists(backupFileName))
|
|
||||||
{
|
|
||||||
QFile::copy(currentFilePath, backupFileName);
|
|
||||||
}
|
|
||||||
if (!smpic->exportPicture(currentFilePath))
|
|
||||||
{
|
|
||||||
smpic->setPictureStream(previousPicture);
|
|
||||||
QMessageBox::warning(this, tr("Snapmatic Image Editor"), tr("Patching of Snapmatic Image failed because of I/O Error"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
smpic->emitCustomSignal("PictureUpdated");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
QMessageBox::warning(this, tr("Snapmatic Image Editor"), tr("Patching of Snapmatic Image failed because of Image Error"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageEditorDialog::on_cmdQuestion_clicked()
|
|
||||||
{
|
|
||||||
QMessageBox::information(this, tr("Snapmatic Image Editor"), tr("Every taken Snapmatic have a different Capacity, a Snapmatic with higher Capacity can store a picture with better quality."));
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,130 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>ImageEditorDialog</class>
|
|
||||||
<widget class="QDialog" name="ImageEditorDialog">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>516</width>
|
|
||||||
<height>335</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Overwrite Image...</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="vlInterface">
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labPicture">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>516</width>
|
|
||||||
<height>288</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QFrame" name="buttomFrame">
|
|
||||||
<property name="frameShape">
|
|
||||||
<enum>QFrame::NoFrame</enum>
|
|
||||||
</property>
|
|
||||||
<property name="frameShadow">
|
|
||||||
<enum>QFrame::Plain</enum>
|
|
||||||
</property>
|
|
||||||
<property name="lineWidth">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="vlButtons">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="hlCapacity">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labCapacity">
|
|
||||||
<property name="text">
|
|
||||||
<string>Capacity: %1</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QToolButton" name="cmdQuestion">
|
|
||||||
<property name="text">
|
|
||||||
<string>?</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="hsCapacity">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="hlButtons">
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cmdReplace">
|
|
||||||
<property name="text">
|
|
||||||
<string>&Import...</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="hsButtons">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cmdSave">
|
|
||||||
<property name="text">
|
|
||||||
<string>&Overwrite</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cmdClose">
|
|
||||||
<property name="text">
|
|
||||||
<string>&Close</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
789
ImportDialog.cpp
789
ImportDialog.cpp
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017-2018 Syping
|
* Copyright (C) 2017-2022 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -16,13 +16,16 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include "ImportDialog.h"
|
|
||||||
#include "ui_ImportDialog.h"
|
#include "ui_ImportDialog.h"
|
||||||
|
#include "SnapmaticPicture.h"
|
||||||
#include "SidebarGenerator.h"
|
#include "SidebarGenerator.h"
|
||||||
#include "StandardPaths.h"
|
#include "StandardPaths.h"
|
||||||
|
#include "ImportDialog.h"
|
||||||
|
#include "imagecropper.h"
|
||||||
#include "AppEnv.h"
|
#include "AppEnv.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
|
#include <QInputDialog>
|
||||||
#include <QImageReader>
|
#include <QImageReader>
|
||||||
#include <QColorDialog>
|
#include <QColorDialog>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
@ -32,46 +35,50 @@
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QStyle>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QRgb>
|
#include <QRgb>
|
||||||
|
|
||||||
// IMAGES VALUES
|
// IMAGES VALUES
|
||||||
#define snapmaticResolutionW 960
|
|
||||||
#define snapmaticResolutionH 536
|
|
||||||
#define snapmaticAvatarResolution 470
|
#define snapmaticAvatarResolution 470
|
||||||
#define snapmaticAvatarPlacementW 145
|
#define snapmaticAvatarPlacementW 145
|
||||||
#define snapmaticAvatarPlacementH 66
|
#define snapmaticAvatarPlacementH 66
|
||||||
|
|
||||||
ImportDialog::ImportDialog(QWidget *parent) :
|
ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent), profileName(profileName),
|
||||||
ui(new Ui::ImportDialog)
|
ui(new Ui::ImportDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ui->cmdOK->setDefault(true);
|
||||||
|
ui->cmdOK->setFocus();
|
||||||
importAgreed = false;
|
importAgreed = false;
|
||||||
|
settingsLocked = false;
|
||||||
|
watermarkAvatar = true;
|
||||||
|
watermarkPicture = false;
|
||||||
insideAvatarZone = false;
|
insideAvatarZone = false;
|
||||||
avatarAreaImage = QImage(":/img/avatarareaimport.png");
|
avatarAreaImage = QImage(AppEnv::getImagesFolder() % "/avatarareaimport.png");
|
||||||
selectedColour = QColor::fromRgb(0, 0, 0, 255);
|
selectedColour = QColor::fromRgb(0, 0, 0, 255);
|
||||||
|
|
||||||
// Set Icon for OK Button
|
// Set Icon for OK Button
|
||||||
if (QIcon::hasThemeIcon("dialog-ok"))
|
if (QIcon::hasThemeIcon("dialog-ok")) {
|
||||||
{
|
|
||||||
ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
|
ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-ok"))
|
else if (QIcon::hasThemeIcon("gtk-ok")) {
|
||||||
{
|
|
||||||
ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
|
ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Icon for Cancel Button
|
// Set Icon for Cancel Button
|
||||||
if (QIcon::hasThemeIcon("dialog-cancel"))
|
if (QIcon::hasThemeIcon("dialog-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-cancel"))
|
else if (QIcon::hasThemeIcon("gtk-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,6 +87,21 @@ ImportDialog::ImportDialog(QWidget *parent) :
|
||||||
ui->labBackgroundImage->setText(tr("Background Image:"));
|
ui->labBackgroundImage->setText(tr("Background Image:"));
|
||||||
ui->cmdBackgroundWipe->setVisible(false);
|
ui->cmdBackgroundWipe->setVisible(false);
|
||||||
|
|
||||||
|
// Snapmatic Resolution
|
||||||
|
snapmaticResolution = SnapmaticPicture::getSnapmaticResolution();
|
||||||
|
ui->cbResolution->addItem("GTA V", snapmaticResolution);
|
||||||
|
ui->cbResolution->addItem("FiveM", QSize(1920, 1072));
|
||||||
|
ui->cbResolution->addItem("1280x720", QSize(1280, 720));
|
||||||
|
ui->cbResolution->addItem("1920x1080", QSize(1920, 1080));
|
||||||
|
ui->cbResolution->addItem("2560x1440", QSize(2560, 1440));
|
||||||
|
|
||||||
|
// Set Import Settings
|
||||||
|
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
settings.beginGroup("Import");
|
||||||
|
QString currentProfile = settings.value("Profile", "Default").toString();
|
||||||
|
settings.endGroup();
|
||||||
|
processSettings(currentProfile);
|
||||||
|
|
||||||
// DPI calculation
|
// DPI calculation
|
||||||
qreal screenRatio = AppEnv::screenRatio();
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
snapmaticResolutionLW = 516 * screenRatio; // 430
|
snapmaticResolutionLW = 516 * screenRatio; // 430
|
||||||
|
@ -90,19 +112,29 @@ ImportDialog::ImportDialog(QWidget *parent) :
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
||||||
#else
|
#else
|
||||||
if (QApplication::style()->objectName() == "macintosh")
|
#if QT_VERSION >= 0x060000
|
||||||
{
|
if (QApplication::style()->objectName() == "macos") {
|
||||||
|
#else
|
||||||
|
if (QApplication::style()->objectName() == "macintosh") {
|
||||||
|
#endif
|
||||||
ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
setMaximumSize(sizeHint());
|
// Options menu
|
||||||
setMinimumSize(sizeHint());
|
optionsMenu.addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture()));
|
||||||
setFixedSize(sizeHint());
|
optionsMenu.addAction(tr("&Crop Picture..."), this, SLOT(cropPicture()));
|
||||||
|
optionsMenu.addSeparator();
|
||||||
|
optionsMenu.addAction(tr("&Load Settings..."), this, SLOT(loadImportSettings()));
|
||||||
|
optionsMenu.addAction(tr("&Save Settings..."), this, SLOT(saveImportSettings()));
|
||||||
|
ui->cmdOptions->setMenu(&optionsMenu);
|
||||||
|
|
||||||
|
const QSize windowSize = sizeHint();
|
||||||
|
setMinimumSize(windowSize);
|
||||||
|
setMaximumSize(windowSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImportDialog::~ImportDialog()
|
ImportDialog::~ImportDialog()
|
||||||
|
@ -112,134 +144,591 @@ ImportDialog::~ImportDialog()
|
||||||
|
|
||||||
void ImportDialog::processImage()
|
void ImportDialog::processImage()
|
||||||
{
|
{
|
||||||
if (workImage.isNull()) return;
|
if (workImage.isNull())
|
||||||
|
return;
|
||||||
|
|
||||||
QImage snapmaticImage = workImage;
|
QImage snapmaticImage = workImage;
|
||||||
QPixmap snapmaticPixmap(snapmaticResolutionW, snapmaticResolutionH);
|
QPixmap snapmaticPixmap(snapmaticResolution);
|
||||||
snapmaticPixmap.fill(selectedColour);
|
snapmaticPixmap.fill(selectedColour);
|
||||||
QPainter snapmaticPainter(&snapmaticPixmap);
|
QPainter snapmaticPainter(&snapmaticPixmap);
|
||||||
if (!backImage.isNull())
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
{
|
if (!backImage.isNull()) {
|
||||||
if (!ui->cbStretch->isChecked())
|
if (!ui->cbStretch->isChecked()) {
|
||||||
{
|
|
||||||
int diffWidth = 0;
|
int diffWidth = 0;
|
||||||
int diffHeight = 0;
|
int diffHeight = 0;
|
||||||
if (backImage.width() != snapmaticResolutionW)
|
if (backImage.width() != snapmaticResolution.width()) {
|
||||||
{
|
diffWidth = snapmaticResolution.width() - backImage.width();
|
||||||
diffWidth = snapmaticResolutionW - backImage.width();
|
|
||||||
diffWidth = diffWidth / 2;
|
diffWidth = diffWidth / 2;
|
||||||
}
|
}
|
||||||
else if (backImage.height() != snapmaticResolutionH)
|
else if (backImage.height() != snapmaticResolution.height()) {
|
||||||
{
|
diffHeight = snapmaticResolution.height() - backImage.height();
|
||||||
diffHeight = snapmaticResolutionH - backImage.height();
|
|
||||||
diffHeight = diffHeight / 2;
|
diffHeight = diffHeight / 2;
|
||||||
}
|
}
|
||||||
snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, backImage);
|
snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, backImage);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
snapmaticPainter.drawImage(0, 0, QImage(backImage).scaled(snapmaticResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
||||||
snapmaticPainter.drawImage(0, 0, QImage(backImage).scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
|
||||||
}
|
}
|
||||||
if (ui->cbAvatar->isChecked() && ui->cbForceAvatarColour->isChecked())
|
if (ui->cbAvatar->isChecked() && ui->cbForceAvatarColour->isChecked()) {
|
||||||
{
|
|
||||||
snapmaticPainter.fillRect(snapmaticAvatarPlacementW, snapmaticAvatarPlacementH, snapmaticAvatarResolution, snapmaticAvatarResolution, selectedColour);
|
snapmaticPainter.fillRect(snapmaticAvatarPlacementW, snapmaticAvatarPlacementH, snapmaticAvatarResolution, snapmaticAvatarResolution, selectedColour);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (insideAvatarZone)
|
if (insideAvatarZone) {
|
||||||
{
|
|
||||||
// Avatar mode
|
// Avatar mode
|
||||||
int diffWidth = 0;
|
int diffWidth = 0;
|
||||||
int diffHeight = 0;
|
int diffHeight = 0;
|
||||||
if (!ui->cbIgnore->isChecked())
|
if (ui->cbIgnore->isChecked()) {
|
||||||
{
|
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||||
|
}
|
||||||
|
else if (ui->cbBorderless->isChecked()) {
|
||||||
|
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
|
||||||
|
if (snapmaticImage.width() > snapmaticAvatarResolution) {
|
||||||
|
int diffWidth = snapmaticImage.width() - snapmaticAvatarResolution;
|
||||||
|
diffWidth = diffWidth / 2;
|
||||||
|
QImage croppedImage(snapmaticAvatarResolution, snapmaticAvatarResolution, QImage::Format_ARGB32);
|
||||||
|
croppedImage.fill(Qt::transparent);
|
||||||
|
QPainter croppedPainter(&croppedImage);
|
||||||
|
croppedPainter.drawImage(0 - diffWidth, 0, snapmaticImage);
|
||||||
|
croppedPainter.end();
|
||||||
|
snapmaticImage = croppedImage;
|
||||||
|
}
|
||||||
|
else if (snapmaticImage.height() > snapmaticAvatarResolution) {
|
||||||
|
int diffHeight = snapmaticImage.height() - snapmaticAvatarResolution;
|
||||||
|
diffHeight = diffHeight / 2;
|
||||||
|
QImage croppedImage(snapmaticAvatarResolution, snapmaticAvatarResolution, QImage::Format_ARGB32);
|
||||||
|
croppedImage.fill(Qt::transparent);
|
||||||
|
QPainter croppedPainter(&croppedImage);
|
||||||
|
croppedPainter.drawImage(0, 0 - diffHeight, snapmaticImage);
|
||||||
|
croppedPainter.end();
|
||||||
|
snapmaticImage = croppedImage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
||||||
if (snapmaticImage.width() > snapmaticImage.height())
|
if (snapmaticImage.width() > snapmaticImage.height()) {
|
||||||
{
|
|
||||||
diffHeight = snapmaticAvatarResolution - snapmaticImage.height();
|
diffHeight = snapmaticAvatarResolution - snapmaticImage.height();
|
||||||
diffHeight = diffHeight / 2;
|
diffHeight = diffHeight / 2;
|
||||||
}
|
}
|
||||||
else if (snapmaticImage.width() < snapmaticImage.height())
|
else if (snapmaticImage.width() < snapmaticImage.height()) {
|
||||||
{
|
|
||||||
diffWidth = snapmaticAvatarResolution - snapmaticImage.width();
|
diffWidth = snapmaticAvatarResolution - snapmaticImage.width();
|
||||||
diffWidth = diffWidth / 2;
|
diffWidth = diffWidth / 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
|
||||||
}
|
|
||||||
snapmaticPainter.drawImage(snapmaticAvatarPlacementW + diffWidth, snapmaticAvatarPlacementH + diffHeight, snapmaticImage);
|
snapmaticPainter.drawImage(snapmaticAvatarPlacementW + diffWidth, snapmaticAvatarPlacementH + diffHeight, snapmaticImage);
|
||||||
|
if (ui->cbWatermark->isChecked())
|
||||||
|
processWatermark(&snapmaticPainter);
|
||||||
imageTitle = tr("Custom Avatar", "Custom Avatar Description in SC, don't use Special Character!");
|
imageTitle = tr("Custom Avatar", "Custom Avatar Description in SC, don't use Special Character!");
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
// Picture mode
|
// Picture mode
|
||||||
int diffWidth = 0;
|
int diffWidth = 0;
|
||||||
int diffHeight = 0;
|
int diffHeight = 0;
|
||||||
if (!ui->cbIgnore->isChecked())
|
if (ui->cbIgnore->isChecked()) {
|
||||||
{
|
snapmaticImage = snapmaticImage.scaled(snapmaticResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||||
snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
}
|
||||||
if (snapmaticImage.width() != snapmaticResolutionW)
|
else if (ui->cbBorderless->isChecked()) {
|
||||||
{
|
snapmaticImage = snapmaticImage.scaled(snapmaticResolution, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
|
||||||
diffWidth = snapmaticResolutionW - snapmaticImage.width();
|
if (snapmaticImage.width() > snapmaticResolution.width()) {
|
||||||
|
int diffWidth = snapmaticImage.width() - snapmaticResolution.width();
|
||||||
|
diffWidth = diffWidth / 2;
|
||||||
|
QImage croppedImage(snapmaticResolution, QImage::Format_ARGB32);
|
||||||
|
croppedImage.fill(Qt::transparent);
|
||||||
|
QPainter croppedPainter(&croppedImage);
|
||||||
|
croppedPainter.drawImage(0 - diffWidth, 0, snapmaticImage);
|
||||||
|
croppedPainter.end();
|
||||||
|
snapmaticImage = croppedImage;
|
||||||
|
}
|
||||||
|
else if (snapmaticImage.height() > snapmaticResolution.height()) {
|
||||||
|
int diffHeight = snapmaticImage.height() - snapmaticResolution.height();
|
||||||
|
diffHeight = diffHeight / 2;
|
||||||
|
QImage croppedImage(snapmaticResolution, QImage::Format_ARGB32);
|
||||||
|
croppedImage.fill(Qt::transparent);
|
||||||
|
QPainter croppedPainter(&croppedImage);
|
||||||
|
croppedPainter.drawImage(0, 0 - diffHeight, snapmaticImage);
|
||||||
|
croppedPainter.end();
|
||||||
|
snapmaticImage = croppedImage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
snapmaticImage = snapmaticImage.scaled(snapmaticResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
||||||
|
if (snapmaticImage.width() != snapmaticResolution.width()) {
|
||||||
|
diffWidth = snapmaticResolution.width() - snapmaticImage.width();
|
||||||
diffWidth = diffWidth / 2;
|
diffWidth = diffWidth / 2;
|
||||||
}
|
}
|
||||||
else if (snapmaticImage.height() != snapmaticResolutionH)
|
else if (snapmaticImage.height() != snapmaticResolution.height()) {
|
||||||
{
|
diffHeight = snapmaticResolution.height() - snapmaticImage.height();
|
||||||
diffHeight = snapmaticResolutionH - snapmaticImage.height();
|
|
||||||
diffHeight = diffHeight / 2;
|
diffHeight = diffHeight / 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
|
||||||
}
|
|
||||||
snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, snapmaticImage);
|
snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, snapmaticImage);
|
||||||
|
if (ui->cbWatermark->isChecked())
|
||||||
|
processWatermark(&snapmaticPainter);
|
||||||
imageTitle = tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!");
|
imageTitle = tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!");
|
||||||
}
|
}
|
||||||
snapmaticPainter.end();
|
snapmaticPainter.end();
|
||||||
newImage = snapmaticPixmap.toImage();
|
newImage = snapmaticPixmap.toImage();
|
||||||
ui->labPicture->setPixmap(snapmaticPixmap.scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
#if QT_VERSION >= 0x050600
|
||||||
|
snapmaticPixmap.setDevicePixelRatio(screenRatioPR);
|
||||||
|
#endif
|
||||||
|
ui->labPicture->setPixmap(snapmaticPixmap.scaled(snapmaticResolutionLW * screenRatioPR, snapmaticResolutionLH * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::reworkImage()
|
||||||
|
{
|
||||||
|
workImage = QImage();
|
||||||
|
if (origImage.width() == origImage.height()) {
|
||||||
|
if (ui->cbResolution->currentIndex() == 0) {
|
||||||
|
insideAvatarZone = true;
|
||||||
|
ui->cbAvatar->setChecked(true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
}
|
||||||
|
if (origImage.height() > snapmaticResolution.height()) {
|
||||||
|
workImage = origImage.scaled(snapmaticResolution.height(), snapmaticResolution.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
workImage = origImage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (origImage.width() > snapmaticResolution.width() && origImage.width() > origImage.height()) {
|
||||||
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
workImage = origImage.scaledToWidth(snapmaticResolution.width(), Qt::SmoothTransformation);
|
||||||
|
}
|
||||||
|
else if (origImage.height() > snapmaticResolution.height() && origImage.height() > origImage.width()) {
|
||||||
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
workImage = origImage.scaledToHeight(snapmaticResolution.height(), Qt::SmoothTransformation);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
workImage = origImage;
|
||||||
|
}
|
||||||
|
processImage();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::processWatermark(QPainter *snapmaticPainter)
|
||||||
|
{
|
||||||
|
bool blackWatermark = false;
|
||||||
|
bool redWatermark = false;
|
||||||
|
if (selectedColour.red() > 127) {
|
||||||
|
if (selectedColour.green() > 127 || selectedColour.blue() > 127) {
|
||||||
|
redWatermark = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
redWatermark = true;
|
||||||
|
}
|
||||||
|
if (selectedColour.lightness() > 127) {
|
||||||
|
blackWatermark = true;
|
||||||
|
}
|
||||||
|
// draw watermark
|
||||||
|
if (redWatermark) {
|
||||||
|
const QImage viewWatermark = QImage(AppEnv::getImagesFolder() % "/watermark_2r.png");
|
||||||
|
snapmaticPainter->drawImage(snapmaticResolution.width() - viewWatermark.width(), 0, viewWatermark);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QImage viewWatermark = QImage(AppEnv::getImagesFolder() % "/watermark_2b.png");
|
||||||
|
if (!blackWatermark) {
|
||||||
|
viewWatermark.invertPixels(QImage::InvertRgb);
|
||||||
|
}
|
||||||
|
snapmaticPainter->drawImage(snapmaticResolution.width() - viewWatermark.width(), 0, viewWatermark);
|
||||||
|
}
|
||||||
|
QImage textWatermark = QImage(AppEnv::getImagesFolder() % "/watermark_1b.png");
|
||||||
|
if (!blackWatermark) {
|
||||||
|
textWatermark.invertPixels(QImage::InvertRgb);
|
||||||
|
}
|
||||||
|
snapmaticPainter->drawImage(snapmaticResolution.width() - textWatermark.width(), 0, textWatermark);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::processSettings(QString settingsProfile, bool setDefault)
|
||||||
|
{
|
||||||
|
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
settings.beginGroup("Import");
|
||||||
|
if (setDefault) {
|
||||||
|
settings.setValue("Profile", settingsProfile);
|
||||||
|
}
|
||||||
|
if (settingsProfile == "Default") {
|
||||||
|
watermarkAvatar = true;
|
||||||
|
watermarkPicture = false;
|
||||||
|
selectedColour = QColor::fromRgb(0, 0, 0, 255);
|
||||||
|
backImage = QImage();
|
||||||
|
ui->cbBorderless->setChecked(false);
|
||||||
|
ui->cbStretch->setChecked(false);
|
||||||
|
ui->cbForceAvatarColour->setChecked(false);
|
||||||
|
ui->cbUnlimited->setChecked(false);
|
||||||
|
ui->cbImportAsIs->setChecked(false);
|
||||||
|
ui->cbResolution->setCurrentIndex(0);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
settings.beginGroup(settingsProfile);
|
||||||
|
watermarkAvatar = settings.value("WatermarkAvatar", true).toBool();
|
||||||
|
watermarkPicture = settings.value("WatermarkPicture", false).toBool();
|
||||||
|
backImage = qvariant_cast<QImage>(settings.value("BackgroundImage", QImage()));
|
||||||
|
selectedColour = qvariant_cast<QColor>(settings.value("SelectedColour", QColor::fromRgb(0, 0, 0, 255)));
|
||||||
|
ui->cbBorderless->setChecked(settings.value("BorderlessImage", false).toBool());
|
||||||
|
ui->cbStretch->setChecked(settings.value("BackgroundStretch", false).toBool());
|
||||||
|
ui->cbForceAvatarColour->setChecked(settings.value("ForceAvatarColour", false).toBool());
|
||||||
|
ui->cbUnlimited->setChecked(settings.value("UnlimitedBuffer", false).toBool());
|
||||||
|
ui->cbImportAsIs->setChecked(settings.value("ImportAsIs", false).toBool());
|
||||||
|
const QVariant data = settings.value("Resolution", SnapmaticPicture::getSnapmaticResolution());
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
if (data.typeId() == QMetaType::QSize)
|
||||||
|
#else
|
||||||
|
if (data.type() == QVariant::Size)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
int index = ui->cbResolution->findData(data);
|
||||||
|
if (index != -1) {
|
||||||
|
ui->cbResolution->setCurrentIndex(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
if (!workImage.isNull()) {
|
||||||
|
if (ui->cbAvatar->isChecked()) {
|
||||||
|
ui->cbWatermark->setChecked(watermarkAvatar);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->cbWatermark->setChecked(watermarkPicture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name()));
|
||||||
|
if (!backImage.isNull()) {
|
||||||
|
ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("Storage", "Background Image: Storage")));
|
||||||
|
ui->cmdBackgroundWipe->setVisible(true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labBackgroundImage->setText(tr("Background Image:"));
|
||||||
|
ui->cmdBackgroundWipe->setVisible(false);
|
||||||
|
}
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::saveSettings(QString settingsProfile)
|
||||||
|
{
|
||||||
|
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
settings.beginGroup("Import");
|
||||||
|
settings.beginGroup(settingsProfile);
|
||||||
|
settings.setValue("WatermarkAvatar", watermarkAvatar);
|
||||||
|
settings.setValue("WatermarkPicture", watermarkPicture);
|
||||||
|
settings.setValue("BackgroundImage", backImage);
|
||||||
|
settings.setValue("SelectedColour", selectedColour);
|
||||||
|
settings.setValue("BorderlessImage", ui->cbBorderless->isChecked());
|
||||||
|
settings.setValue("BackgroundStretch", ui->cbStretch->isChecked());
|
||||||
|
settings.setValue("ForceAvatarColour", ui->cbForceAvatarColour->isChecked());
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
const QVariant data = ui->cbResolution->currentData();
|
||||||
|
#else
|
||||||
|
const QVariant data = ui->cbResolution->itemData(ui->cbResolution->currentIndex());
|
||||||
|
#endif
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
if (data.typeId() == QMetaType::QSize)
|
||||||
|
#else
|
||||||
|
if (data.type() == QVariant::Size)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
settings.setValue("Resolution", data);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
settings.setValue("Resolution", SnapmaticPicture::getSnapmaticResolution());
|
||||||
|
}
|
||||||
|
settings.setValue("UnlimitedBuffer", ui->cbUnlimited->isChecked());
|
||||||
|
settings.setValue("ImportAsIs", ui->cbImportAsIs->isChecked());
|
||||||
|
settings.endGroup();
|
||||||
|
settings.setValue("Profile", settingsProfile);
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::cropPicture()
|
||||||
|
{
|
||||||
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
|
|
||||||
|
QDialog cropDialog(this);
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
cropDialog.setObjectName(QStringLiteral("CropDialog"));
|
||||||
|
#else
|
||||||
|
cropDialog.setObjectName(QString::fromUtf8("CropDialog"));
|
||||||
|
#endif
|
||||||
|
cropDialog.setWindowTitle(tr("Crop Picture..."));
|
||||||
|
cropDialog.setWindowFlags(cropDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
cropDialog.setModal(true);
|
||||||
|
|
||||||
|
QVBoxLayout cropLayout;
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
cropLayout.setObjectName(QStringLiteral("CropLayout"));
|
||||||
|
#else
|
||||||
|
cropLayout.setObjectName(QString::fromUtf8("CropLayout"));
|
||||||
|
#endif
|
||||||
|
cropLayout.setContentsMargins(0, 0, 0, 0);
|
||||||
|
cropLayout.setSpacing(0);
|
||||||
|
cropDialog.setLayout(&cropLayout);
|
||||||
|
|
||||||
|
ImageCropper imageCropper(&cropDialog);
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
imageCropper.setObjectName(QStringLiteral("ImageCropper"));
|
||||||
|
#else
|
||||||
|
imageCropper.setObjectName(QString::fromUtf8("ImageCropper"));
|
||||||
|
#endif
|
||||||
|
imageCropper.setBackgroundColor(Qt::black);
|
||||||
|
imageCropper.setCroppingRectBorderColor(QColor(255, 255, 255, 127));
|
||||||
|
imageCropper.setImage(QPixmap::fromImage(origImage, Qt::AutoColor));
|
||||||
|
imageCropper.setProportion(QSize(1, 1));
|
||||||
|
imageCropper.setFixedSize(workImage.size());
|
||||||
|
cropLayout.addWidget(&imageCropper);
|
||||||
|
|
||||||
|
QHBoxLayout buttonLayout;
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
cropLayout.setObjectName(QStringLiteral("ButtonLayout"));
|
||||||
|
#else
|
||||||
|
cropLayout.setObjectName(QString::fromUtf8("ButtonLayout"));
|
||||||
|
#endif
|
||||||
|
cropLayout.addLayout(&buttonLayout);
|
||||||
|
|
||||||
|
QPushButton cropButton(&cropDialog);
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
cropButton.setObjectName(QStringLiteral("CropButton"));
|
||||||
|
#else
|
||||||
|
cropButton.setObjectName(QString::fromUtf8("CropButton"));
|
||||||
|
#endif
|
||||||
|
cropButton.setMinimumSize(0, 40 * screenRatio);
|
||||||
|
cropButton.setText(tr("&Crop"));
|
||||||
|
cropButton.setToolTip(tr("Crop Picture"));
|
||||||
|
QObject::connect(&cropButton, SIGNAL(clicked(bool)), &cropDialog, SLOT(accept()));
|
||||||
|
|
||||||
|
buttonLayout.addWidget(&cropButton);
|
||||||
|
|
||||||
|
cropDialog.show();
|
||||||
|
cropDialog.setFixedSize(cropDialog.sizeHint());
|
||||||
|
if (cropDialog.exec() == QDialog::Accepted) {
|
||||||
|
QImage *croppedImage = new QImage(imageCropper.cropImage().toImage());
|
||||||
|
setImage(croppedImage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::importNewPicture()
|
||||||
|
{
|
||||||
|
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
settings.beginGroup("FileDialogs");
|
||||||
|
bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
|
||||||
|
settings.beginGroup("ImportCopy");
|
||||||
|
|
||||||
|
fileDialogPreOpen: //Work?
|
||||||
|
QFileDialog fileDialog(this);
|
||||||
|
fileDialog.setFileMode(QFileDialog::ExistingFile);
|
||||||
|
fileDialog.setViewMode(QFileDialog::Detail);
|
||||||
|
fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
|
||||||
|
fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
|
||||||
|
fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
fileDialog.setWindowTitle(QApplication::translate("ProfileInterface", "Import..."));
|
||||||
|
fileDialog.setLabelText(QFileDialog::Accept, QApplication::translate("ProfileInterface", "Import"));
|
||||||
|
|
||||||
|
// Getting readable Image formats
|
||||||
|
QString imageFormatsStr = " ";
|
||||||
|
for (const QByteArray &imageFormat : QImageReader::supportedImageFormats()) {
|
||||||
|
imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList filters;
|
||||||
|
filters << QApplication::translate("ProfileInterface", "All image files (%1)").arg(imageFormatsStr.trimmed());
|
||||||
|
filters << QApplication::translate("ProfileInterface", "All files (**)");
|
||||||
|
fileDialog.setNameFilters(filters);
|
||||||
|
|
||||||
|
QList<QUrl> sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls());
|
||||||
|
|
||||||
|
fileDialog.setSidebarUrls(sidebarUrls);
|
||||||
|
fileDialog.setDirectory(settings.value(profileName % "+Directory", StandardPaths::documentsLocation()).toString());
|
||||||
|
fileDialog.restoreGeometry(settings.value(profileName % "+Geometry", "").toByteArray());
|
||||||
|
|
||||||
|
if (fileDialog.exec()) {
|
||||||
|
QStringList selectedFiles = fileDialog.selectedFiles();
|
||||||
|
if (selectedFiles.length() == 1) {
|
||||||
|
QString selectedFile = selectedFiles.at(0);
|
||||||
|
QString selectedFileName = QFileInfo(selectedFile).fileName();
|
||||||
|
|
||||||
|
QFile snapmaticFile(selectedFile);
|
||||||
|
if (!snapmaticFile.open(QFile::ReadOnly)) {
|
||||||
|
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
|
||||||
|
goto fileDialogPreOpen;
|
||||||
|
}
|
||||||
|
QImage *importImage = new QImage();
|
||||||
|
QImageReader snapmaticImageReader;
|
||||||
|
snapmaticImageReader.setDecideFormatFromContent(true);
|
||||||
|
snapmaticImageReader.setDevice(&snapmaticFile);
|
||||||
|
if (!snapmaticImageReader.read(importImage)) {
|
||||||
|
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
|
||||||
|
delete importImage;
|
||||||
|
goto fileDialogPreOpen;
|
||||||
|
}
|
||||||
|
setImage(importImage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
settings.setValue(profileName % "+Geometry", fileDialog.saveGeometry());
|
||||||
|
settings.setValue(profileName % "+Directory", fileDialog.directory().absolutePath());
|
||||||
|
settings.endGroup();
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::loadImportSettings()
|
||||||
|
{
|
||||||
|
if (settingsLocked) {
|
||||||
|
QMessageBox::information(this, tr("Load Settings..."), tr("Please import a new picture first"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bool ok;
|
||||||
|
QStringList profileList;
|
||||||
|
profileList << tr("Default", "Default as Default Profile")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("1")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("2")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("3")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("4")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("5");
|
||||||
|
QString sProfile = QInputDialog::getItem(this, tr("Load Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags());
|
||||||
|
if (ok) {
|
||||||
|
QString pProfile;
|
||||||
|
if (sProfile == tr("Default", "Default as Default Profile")) {
|
||||||
|
pProfile = "Default";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("1")) {
|
||||||
|
pProfile = "Profile 1";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("2")) {
|
||||||
|
pProfile = "Profile 2";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("3")) {
|
||||||
|
pProfile = "Profile 3";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("4"))
|
||||||
|
{
|
||||||
|
pProfile = "Profile 4";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("5")) {
|
||||||
|
pProfile = "Profile 5";
|
||||||
|
}
|
||||||
|
processSettings(pProfile, true);
|
||||||
|
processImage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::saveImportSettings()
|
||||||
|
{
|
||||||
|
if (settingsLocked) {
|
||||||
|
QMessageBox::information(this, tr("Save Settings..."), tr("Please import a new picture first"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bool ok;
|
||||||
|
QStringList profileList;
|
||||||
|
profileList << tr("Profile %1", "Profile %1 as Profile 1").arg("1")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("2")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("3")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("4")
|
||||||
|
<< tr("Profile %1", "Profile %1 as Profile 1").arg("5");
|
||||||
|
QString sProfile = QInputDialog::getItem(this, tr("Save Settings..."), tr("Please select your settings profile"), profileList, 0, false, &ok, windowFlags());
|
||||||
|
if (ok) {
|
||||||
|
QString pProfile;
|
||||||
|
if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("1")) {
|
||||||
|
pProfile = "Profile 1";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("2")) {
|
||||||
|
pProfile = "Profile 2";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("3")) {
|
||||||
|
pProfile = "Profile 3";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("4")) {
|
||||||
|
pProfile = "Profile 4";
|
||||||
|
}
|
||||||
|
else if (sProfile == tr("Profile %1", "Profile %1 as Profile 1").arg("5")) {
|
||||||
|
pProfile = "Profile 5";
|
||||||
|
}
|
||||||
|
saveSettings(pProfile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QImage ImportDialog::image()
|
QImage ImportDialog::image()
|
||||||
{
|
{
|
||||||
return newImage;
|
if (ui->cbImportAsIs->isChecked()) {
|
||||||
|
return origImage;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return newImage;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImportDialog::setImage(QImage *image_)
|
void ImportDialog::setImage(QImage *image_)
|
||||||
{
|
{
|
||||||
|
origImage = *image_;
|
||||||
workImage = QImage();
|
workImage = QImage();
|
||||||
if (image_->width() == image_->height())
|
if (image_->width() == image_->height()) {
|
||||||
{
|
if (ui->cbResolution->currentIndex() == 0) {
|
||||||
insideAvatarZone = true;
|
insideAvatarZone = true;
|
||||||
ui->cbAvatar->setChecked(true);
|
ui->cbAvatar->setChecked(true);
|
||||||
if (image_->height() > snapmaticResolutionH)
|
}
|
||||||
{
|
else {
|
||||||
workImage = image_->scaled(snapmaticResolutionH, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
}
|
||||||
|
if (image_->height() > snapmaticResolution.height()) {
|
||||||
|
workImage = image_->scaled(snapmaticResolution.height(), snapmaticResolution.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||||
delete image_;
|
delete image_;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
workImage = *image_;
|
workImage = *image_;
|
||||||
delete image_;
|
delete image_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height())
|
else if (image_->width() > snapmaticResolution.width() && image_->width() > image_->height()) {
|
||||||
{
|
insideAvatarZone = false;
|
||||||
workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation);
|
ui->cbAvatar->setChecked(false);
|
||||||
|
workImage = image_->scaledToWidth(snapmaticResolution.width(), Qt::SmoothTransformation);
|
||||||
delete image_;
|
delete image_;
|
||||||
}
|
}
|
||||||
else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width())
|
else if (image_->height() > snapmaticResolution.height() && image_->height() > image_->width()) {
|
||||||
{
|
insideAvatarZone = false;
|
||||||
workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation);
|
ui->cbAvatar->setChecked(false);
|
||||||
|
workImage = image_->scaledToHeight(snapmaticResolution.height(), Qt::SmoothTransformation);
|
||||||
delete image_;
|
delete image_;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
insideAvatarZone = false;
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
workImage = *image_;
|
workImage = *image_;
|
||||||
delete image_;
|
delete image_;
|
||||||
}
|
}
|
||||||
processImage();
|
processImage();
|
||||||
|
lockSettings(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::lockSettings(bool lock)
|
||||||
|
{
|
||||||
|
ui->gbAdvanced->setDisabled(lock);
|
||||||
|
if (ui->cbImportAsIs->isChecked()) {
|
||||||
|
ui->gbBackground->setDisabled(true);
|
||||||
|
ui->gbSettings->setDisabled(true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->gbBackground->setDisabled(lock);
|
||||||
|
ui->gbSettings->setDisabled(lock);
|
||||||
|
}
|
||||||
|
ui->cmdOK->setDisabled(lock);
|
||||||
|
settingsLocked = lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::enableOverwriteMode()
|
||||||
|
{
|
||||||
|
setWindowTitle(QApplication::translate("ImageEditorDialog", "Overwrite Image..."));
|
||||||
|
ui->cmdOK->setText(QApplication::translate("ImageEditorDialog", "&Overwrite"));
|
||||||
|
ui->cmdOK->setToolTip(QApplication::translate("ImageEditorDialog", "Apply changes"));
|
||||||
|
ui->cmdCancel->setText(QApplication::translate("ImageEditorDialog", "&Close"));
|
||||||
|
ui->cmdCancel->setToolTip(QApplication::translate("ImageEditorDialog", "Discard changes"));
|
||||||
|
ui->cmdCancel->setDefault(true);
|
||||||
|
ui->cmdCancel->setFocus();
|
||||||
|
lockSettings(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ImportDialog::isImportAgreed()
|
bool ImportDialog::isImportAgreed()
|
||||||
|
@ -247,29 +736,53 @@ bool ImportDialog::isImportAgreed()
|
||||||
return importAgreed;
|
return importAgreed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ImportDialog::isUnlimitedBuffer()
|
||||||
|
{
|
||||||
|
return ui->cbUnlimited->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ImportDialog::areSettingsLocked()
|
||||||
|
{
|
||||||
|
return settingsLocked;
|
||||||
|
}
|
||||||
|
|
||||||
QString ImportDialog::getImageTitle()
|
QString ImportDialog::getImageTitle()
|
||||||
{
|
{
|
||||||
return imageTitle;
|
if (ui->cbImportAsIs->isChecked()) {
|
||||||
|
return tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return imageTitle;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImportDialog::on_cbIgnore_toggled(bool checked)
|
void ImportDialog::on_cbIgnore_toggled(bool checked)
|
||||||
{
|
{
|
||||||
Q_UNUSED(checked)
|
ui->cbBorderless->setDisabled(checked);
|
||||||
processImage();
|
processImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImportDialog::on_cbAvatar_toggled(bool checked)
|
void ImportDialog::on_cbAvatar_toggled(bool checked)
|
||||||
{
|
{
|
||||||
if (workImage.width() == workImage.height() && !checked)
|
if (ui->cbResolution->currentIndex() != 0)
|
||||||
{
|
return;
|
||||||
if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No))
|
|
||||||
{
|
if (!workImage.isNull() && workImage.width() == workImage.height() && !checked) {
|
||||||
|
if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) {
|
||||||
ui->cbAvatar->setChecked(true);
|
ui->cbAvatar->setChecked(true);
|
||||||
insideAvatarZone = true;
|
insideAvatarZone = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
insideAvatarZone = ui->cbAvatar->isChecked();
|
insideAvatarZone = ui->cbAvatar->isChecked();
|
||||||
|
watermarkBlock = true;
|
||||||
|
if (insideAvatarZone) {
|
||||||
|
ui->cbWatermark->setChecked(watermarkAvatar);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->cbWatermark->setChecked(watermarkPicture);
|
||||||
|
}
|
||||||
|
watermarkBlock = false;
|
||||||
processImage();
|
processImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,11 +799,9 @@ void ImportDialog::on_cmdOK_clicked()
|
||||||
|
|
||||||
void ImportDialog::on_labPicture_labelPainted()
|
void ImportDialog::on_labPicture_labelPainted()
|
||||||
{
|
{
|
||||||
if (insideAvatarZone)
|
if (insideAvatarZone) {
|
||||||
{
|
|
||||||
QImage avatarAreaFinalImage(avatarAreaImage);
|
QImage avatarAreaFinalImage(avatarAreaImage);
|
||||||
if (selectedColour.lightness() > 127)
|
if (selectedColour.lightness() > 127) {
|
||||||
{
|
|
||||||
avatarAreaFinalImage.setColor(1, qRgb(0, 0, 0));
|
avatarAreaFinalImage.setColor(1, qRgb(0, 0, 0));
|
||||||
}
|
}
|
||||||
QPainter labelPainter(ui->labPicture);
|
QPainter labelPainter(ui->labPicture);
|
||||||
|
@ -302,8 +813,7 @@ void ImportDialog::on_labPicture_labelPainted()
|
||||||
void ImportDialog::on_cmdColourChange_clicked()
|
void ImportDialog::on_cmdColourChange_clicked()
|
||||||
{
|
{
|
||||||
QColor newSelectedColour = QColorDialog::getColor(selectedColour, this, tr("Select Colour..."));
|
QColor newSelectedColour = QColorDialog::getColor(selectedColour, this, tr("Select Colour..."));
|
||||||
if (newSelectedColour.isValid())
|
if (newSelectedColour.isValid()) {
|
||||||
{
|
|
||||||
selectedColour = newSelectedColour;
|
selectedColour = newSelectedColour;
|
||||||
ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name()));
|
ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name()));
|
||||||
processImage();
|
processImage();
|
||||||
|
@ -329,8 +839,7 @@ fileDialogPreOpen:
|
||||||
|
|
||||||
// Getting readable Image formats
|
// Getting readable Image formats
|
||||||
QString imageFormatsStr = " ";
|
QString imageFormatsStr = " ";
|
||||||
for (QByteArray imageFormat : QImageReader::supportedImageFormats())
|
for (const QByteArray &imageFormat : QImageReader::supportedImageFormats()) {
|
||||||
{
|
|
||||||
imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
|
imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -345,17 +854,14 @@ fileDialogPreOpen:
|
||||||
fileDialog.setDirectory(settings.value("Directory", StandardPaths::documentsLocation()).toString());
|
fileDialog.setDirectory(settings.value("Directory", StandardPaths::documentsLocation()).toString());
|
||||||
fileDialog.restoreGeometry(settings.value("Geometry", "").toByteArray());
|
fileDialog.restoreGeometry(settings.value("Geometry", "").toByteArray());
|
||||||
|
|
||||||
if (fileDialog.exec())
|
if (fileDialog.exec()) {
|
||||||
{
|
|
||||||
QStringList selectedFiles = fileDialog.selectedFiles();
|
QStringList selectedFiles = fileDialog.selectedFiles();
|
||||||
if (selectedFiles.length() == 1)
|
if (selectedFiles.length() == 1) {
|
||||||
{
|
|
||||||
QString selectedFile = selectedFiles.at(0);
|
QString selectedFile = selectedFiles.at(0);
|
||||||
QString selectedFileName = QFileInfo(selectedFile).fileName();
|
QString selectedFileName = QFileInfo(selectedFile).fileName();
|
||||||
|
|
||||||
QFile snapmaticFile(selectedFile);
|
QFile snapmaticFile(selectedFile);
|
||||||
if (!snapmaticFile.open(QFile::ReadOnly))
|
if (!snapmaticFile.open(QFile::ReadOnly)) {
|
||||||
{
|
|
||||||
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
|
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
|
||||||
goto fileDialogPreOpen;
|
goto fileDialogPreOpen;
|
||||||
}
|
}
|
||||||
|
@ -363,12 +869,11 @@ fileDialogPreOpen:
|
||||||
QImageReader snapmaticImageReader;
|
QImageReader snapmaticImageReader;
|
||||||
snapmaticImageReader.setDecideFormatFromContent(true);
|
snapmaticImageReader.setDecideFormatFromContent(true);
|
||||||
snapmaticImageReader.setDevice(&snapmaticFile);
|
snapmaticImageReader.setDevice(&snapmaticFile);
|
||||||
if (!snapmaticImageReader.read(&importImage))
|
if (!snapmaticImageReader.read(&importImage)) {
|
||||||
{
|
|
||||||
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
|
QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
|
||||||
goto fileDialogPreOpen;
|
goto fileDialogPreOpen;
|
||||||
}
|
}
|
||||||
backImage = importImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
backImage = importImage.scaled(snapmaticResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
||||||
backgroundPath = selectedFile;
|
backgroundPath = selectedFile;
|
||||||
ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("File", "Background Image: File")));
|
ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("File", "Background Image: File")));
|
||||||
ui->cmdBackgroundWipe->setVisible(true);
|
ui->cmdBackgroundWipe->setVisible(true);
|
||||||
|
@ -401,3 +906,69 @@ void ImportDialog::on_cbForceAvatarColour_toggled(bool checked)
|
||||||
Q_UNUSED(checked)
|
Q_UNUSED(checked)
|
||||||
processImage();
|
processImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ImportDialog::on_cbWatermark_toggled(bool checked)
|
||||||
|
{
|
||||||
|
if (!watermarkBlock) {
|
||||||
|
if (insideAvatarZone) {
|
||||||
|
watermarkAvatar = checked;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
watermarkPicture = checked;
|
||||||
|
}
|
||||||
|
processImage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::on_cbBorderless_toggled(bool checked)
|
||||||
|
{
|
||||||
|
ui->cbIgnore->setDisabled(checked);
|
||||||
|
processImage();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::on_cbImportAsIs_toggled(bool checked)
|
||||||
|
{
|
||||||
|
ui->cbResolution->setDisabled(checked);
|
||||||
|
ui->labResolution->setDisabled(checked);
|
||||||
|
ui->gbBackground->setDisabled(checked);
|
||||||
|
ui->gbSettings->setDisabled(checked);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImportDialog::on_cbResolution_currentIndexChanged(int index)
|
||||||
|
{
|
||||||
|
Q_UNUSED(index)
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
const QVariant data = ui->cbResolution->currentData();
|
||||||
|
#else
|
||||||
|
const QVariant data = ui->cbResolution->itemData(ui->cbResolution->currentIndex());
|
||||||
|
#endif
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
if (data.typeId() == QMetaType::QSize)
|
||||||
|
#else
|
||||||
|
if (data.type() == QVariant::Size)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
const QSize dataSize = data.toSize();
|
||||||
|
if (dataSize == SnapmaticPicture::getSnapmaticResolution()) {
|
||||||
|
ui->cbAvatar->setEnabled(true);
|
||||||
|
snapmaticResolution = dataSize;
|
||||||
|
reworkImage();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (!workImage.isNull() && workImage.width() == workImage.height() && ui->cbAvatar->isChecked()) {
|
||||||
|
if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) {
|
||||||
|
ui->cbResolution->setCurrentIndex(0);
|
||||||
|
ui->cbAvatar->setChecked(true);
|
||||||
|
insideAvatarZone = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ui->cbAvatar->setChecked(false);
|
||||||
|
ui->cbAvatar->setDisabled(true);
|
||||||
|
insideAvatarZone = false;
|
||||||
|
ui->cbWatermark->setChecked(watermarkPicture);
|
||||||
|
snapmaticResolution = dataSize;
|
||||||
|
reworkImage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017 Syping
|
* Copyright (C) 2017-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,6 +20,7 @@
|
||||||
#define IMPORTDIALOG_H
|
#define IMPORTDIALOG_H
|
||||||
|
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
#include <QMenu>
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ImportDialog;
|
class ImportDialog;
|
||||||
|
@ -30,15 +31,24 @@ class ImportDialog : public QDialog
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit ImportDialog(QWidget *parent = 0);
|
explicit ImportDialog(QString profileName, QWidget *parent = 0);
|
||||||
~ImportDialog();
|
~ImportDialog();
|
||||||
QImage image();
|
QImage image();
|
||||||
QString getImageTitle();
|
QString getImageTitle();
|
||||||
void setImage(QImage *image);
|
void setImage(QImage *image);
|
||||||
|
void lockSettings(bool lock);
|
||||||
|
void enableOverwriteMode();
|
||||||
bool isImportAgreed();
|
bool isImportAgreed();
|
||||||
|
bool isUnlimitedBuffer();
|
||||||
|
bool areSettingsLocked();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void processImage();
|
void processImage();
|
||||||
|
void reworkImage();
|
||||||
|
void cropPicture();
|
||||||
|
void importNewPicture();
|
||||||
|
void loadImportSettings();
|
||||||
|
void saveImportSettings();
|
||||||
void on_cbIgnore_toggled(bool checked);
|
void on_cbIgnore_toggled(bool checked);
|
||||||
void on_cbAvatar_toggled(bool checked);
|
void on_cbAvatar_toggled(bool checked);
|
||||||
void on_cmdCancel_clicked();
|
void on_cmdCancel_clicked();
|
||||||
|
@ -49,20 +59,35 @@ private slots:
|
||||||
void on_cmdBackgroundWipe_clicked();
|
void on_cmdBackgroundWipe_clicked();
|
||||||
void on_cbStretch_toggled(bool checked);
|
void on_cbStretch_toggled(bool checked);
|
||||||
void on_cbForceAvatarColour_toggled(bool checked);
|
void on_cbForceAvatarColour_toggled(bool checked);
|
||||||
|
void on_cbWatermark_toggled(bool checked);
|
||||||
|
void on_cbBorderless_toggled(bool checked);
|
||||||
|
void on_cbImportAsIs_toggled(bool checked);
|
||||||
|
void on_cbResolution_currentIndexChanged(int index);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QString profileName;
|
||||||
Ui::ImportDialog *ui;
|
Ui::ImportDialog *ui;
|
||||||
QImage avatarAreaImage;
|
QImage avatarAreaImage;
|
||||||
QString backgroundPath;
|
QString backgroundPath;
|
||||||
QString imageTitle;
|
QString imageTitle;
|
||||||
QImage backImage;
|
QImage backImage;
|
||||||
QImage workImage;
|
QImage workImage;
|
||||||
|
QImage origImage;
|
||||||
QImage newImage;
|
QImage newImage;
|
||||||
QColor selectedColour;
|
QColor selectedColour;
|
||||||
|
QMenu optionsMenu;
|
||||||
|
QSize snapmaticResolution;
|
||||||
bool insideAvatarZone;
|
bool insideAvatarZone;
|
||||||
|
bool watermarkPicture;
|
||||||
|
bool watermarkAvatar;
|
||||||
|
bool watermarkBlock;
|
||||||
|
bool settingsLocked;
|
||||||
bool importAgreed;
|
bool importAgreed;
|
||||||
int snapmaticResolutionLW;
|
int snapmaticResolutionLW;
|
||||||
int snapmaticResolutionLH;
|
int snapmaticResolutionLH;
|
||||||
|
void processWatermark(QPainter *snapmaticPainter);
|
||||||
|
void processSettings(QString settingsProfile, bool setDefault = false);
|
||||||
|
void saveSettings(QString settingsProfile);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IMPORTDIALOG_H
|
#endif // IMPORTDIALOG_H
|
||||||
|
|
145
ImportDialog.ui
145
ImportDialog.ui
|
@ -7,13 +7,13 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>516</width>
|
<width>516</width>
|
||||||
<height>425</height>
|
<height>673</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>516</width>
|
<width>516</width>
|
||||||
<height>425</height>
|
<height>512</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -85,30 +85,32 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlSettings">
|
<layout class="QVBoxLayout" name="vlSettings">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="hlCheckboxes">
|
<layout class="QGridLayout" name="glPicture">
|
||||||
<item>
|
<item row="0" column="1">
|
||||||
<widget class="QCheckBox" name="cbAvatar">
|
<widget class="QCheckBox" name="cbIgnore">
|
||||||
<property name="sizePolicy">
|
<property name="text">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
<string>Ignore Aspect Ratio</string>
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QCheckBox" name="cbAvatar">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Avatar</string>
|
<string>Avatar</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="1" column="0">
|
||||||
<widget class="QCheckBox" name="cbIgnore">
|
<widget class="QCheckBox" name="cbWatermark">
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Ignore Aspect Ratio</string>
|
<string>Watermark</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QCheckBox" name="cbBorderless">
|
||||||
|
<property name="text">
|
||||||
|
<string>Crop to Aspect Ratio</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -124,8 +126,8 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlBackground">
|
<layout class="QVBoxLayout" name="vlBackground">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="hlColor">
|
<layout class="QGridLayout" name="glBackground">
|
||||||
<item>
|
<item row="0" column="0">
|
||||||
<layout class="QHBoxLayout" name="hlColourManage">
|
<layout class="QHBoxLayout" name="hlColourManage">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labColour">
|
<widget class="QLabel" name="labColour">
|
||||||
|
@ -153,8 +155,11 @@
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="cmdColourChange">
|
<widget class="QToolButton" name="cmdColourChange">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Select background colour</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>...</string>
|
<string notr="true">...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -175,7 +180,24 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="2" column="1">
|
||||||
|
<widget class="QCheckBox" name="cbStretch">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Ignore Aspect Ratio</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QCheckBox" name="cbForceAvatarColour">
|
||||||
|
<property name="text">
|
||||||
|
<string>Force Colour in Avatar Zone</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
<layout class="QHBoxLayout" name="hlBackgroundManage">
|
<layout class="QHBoxLayout" name="hlBackgroundManage">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labBackgroundImage">
|
<widget class="QLabel" name="labBackgroundImage">
|
||||||
|
@ -203,15 +225,21 @@
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="cmdBackgroundChange">
|
<widget class="QToolButton" name="cmdBackgroundChange">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Select background image</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>...</string>
|
<string notr="true">...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="cmdBackgroundWipe">
|
<widget class="QToolButton" name="cmdBackgroundWipe">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Remove background image</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>X</string>
|
<string notr="true">X</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -234,25 +262,61 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="gbAdvanced">
|
||||||
|
<property name="title">
|
||||||
|
<string>Advanced</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="vlAdvanced">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="hlBackground">
|
<layout class="QGridLayout" name="glAdvanced">
|
||||||
<item>
|
<item row="1" column="0">
|
||||||
<widget class="QCheckBox" name="cbForceAvatarColour">
|
<widget class="QCheckBox" name="cbUnlimited">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Force Colour in Avatar Zone</string>
|
<string>Unlimited Buffer</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="1" column="1">
|
||||||
<widget class="QCheckBox" name="cbStretch">
|
<widget class="QCheckBox" name="cbImportAsIs">
|
||||||
<property name="enabled">
|
<property name="toolTip">
|
||||||
<bool>true</bool>
|
<string>Import as-is, don't change the picture at all, guaranteed to break Snapmatic unless you know what you doing</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Ignore Aspect Ratio</string>
|
<string>Import as-is</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0" colspan="2">
|
||||||
|
<layout class="QHBoxLayout" name="hlResolution">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labResolution">
|
||||||
|
<property name="text">
|
||||||
|
<string>Resolution:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cbResolution">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Snapmatic resolution</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
@ -273,6 +337,19 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="hlButtons">
|
<layout class="QHBoxLayout" name="hlButtons">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="cmdOptions">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Import options</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>&Options</string>
|
||||||
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="hsButtons">
|
<spacer name="hsButtons">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017-2018 Syping
|
* Copyright (C) 2017-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,13 +20,18 @@
|
||||||
#include "ui_JsonEditorDialog.h"
|
#include "ui_JsonEditorDialog.h"
|
||||||
#include "SnapmaticEditor.h"
|
#include "SnapmaticEditor.h"
|
||||||
#include "AppEnv.h"
|
#include "AppEnv.h"
|
||||||
|
#include "config.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
#include <QJsonObject>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050200
|
#if QT_VERSION >= 0x050200
|
||||||
#include <QFontDatabase>
|
#include <QFontDatabase>
|
||||||
#include <QDebug>
|
#endif
|
||||||
|
|
||||||
|
#ifdef GTA5SYNC_TELEMETRY
|
||||||
|
#include "TelemetryClass.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
|
JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
|
||||||
|
@ -34,28 +39,30 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
|
||||||
ui(new Ui::JsonEditorDialog)
|
ui(new Ui::JsonEditorDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
setWindowFlag(Qt::WindowMinMaxButtonsHint, true);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint^Qt::WindowMinMaxButtonsHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint^Qt::WindowMinMaxButtonsHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ui->cmdClose->setDefault(true);
|
||||||
ui->cmdClose->setFocus();
|
ui->cmdClose->setFocus();
|
||||||
|
|
||||||
// Set Icon for Close Button
|
// Set Icon for Close Button
|
||||||
if (QIcon::hasThemeIcon("dialog-close"))
|
if (QIcon::hasThemeIcon("dialog-close")) {
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
|
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-close"))
|
else if (QIcon::hasThemeIcon("gtk-close")) {
|
||||||
{
|
|
||||||
ui->cmdClose->setIcon(QIcon::fromTheme("gtk-close"));
|
ui->cmdClose->setIcon(QIcon::fromTheme("gtk-close"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Icon for Save Button
|
// Set Icon for Save Button
|
||||||
if (QIcon::hasThemeIcon("document-save"))
|
if (QIcon::hasThemeIcon("document-save")) {
|
||||||
{
|
|
||||||
ui->cmdSave->setIcon(QIcon::fromTheme("document-save"));
|
ui->cmdSave->setIcon(QIcon::fromTheme("document-save"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-save"))
|
else if (QIcon::hasThemeIcon("gtk-save")) {
|
||||||
{
|
|
||||||
ui->cmdSave->setIcon(QIcon::fromTheme("gtk-save"));
|
ui->cmdSave->setIcon(QIcon::fromTheme("gtk-save"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,9 +70,18 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050200
|
#if QT_VERSION >= 0x050200
|
||||||
ui->txtJSON->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
|
ui->txtJSON->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
|
||||||
|
#else
|
||||||
|
QFont jsonFont = ui->txtJSON->font();
|
||||||
|
jsonFont.setStyleHint(QFont::Monospace);
|
||||||
|
jsonFont.setFixedPitch(true);
|
||||||
|
ui->txtJSON->setFont(jsonFont);
|
||||||
#endif
|
#endif
|
||||||
QFontMetrics fontMetrics(ui->txtJSON->font());
|
QFontMetrics fontMetrics(ui->txtJSON->font());
|
||||||
|
#if QT_VERSION >= 0x050B00
|
||||||
|
ui->txtJSON->setTabStopDistance(fontMetrics.horizontalAdvance(" "));
|
||||||
|
#else
|
||||||
ui->txtJSON->setTabStopWidth(fontMetrics.width(" "));
|
ui->txtJSON->setTabStopWidth(fontMetrics.width(" "));
|
||||||
|
#endif
|
||||||
|
|
||||||
QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonCode.toUtf8());
|
QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonCode.toUtf8());
|
||||||
ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color: rgb(46, 47, 48); color: rgb(238, 231, 172);}");
|
ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color: rgb(46, 47, 48); color: rgb(238, 231, 172);}");
|
||||||
|
@ -83,10 +99,10 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
|
||||||
ui->hlButtons->setContentsMargins(9 * screenRatio, 0, 9 * screenRatio, 0);
|
ui->hlButtons->setContentsMargins(9 * screenRatio, 0, 9 * screenRatio, 0);
|
||||||
ui->vlInterface->setContentsMargins(0, 0, 0, 9 * screenRatio);
|
ui->vlInterface->setContentsMargins(0, 0, 0, 9 * screenRatio);
|
||||||
#endif
|
#endif
|
||||||
if (screenRatio > 1)
|
if (screenRatio > 1) {
|
||||||
{
|
|
||||||
ui->lineJSON->setMinimumHeight(qRound(1 * screenRatio));
|
ui->lineJSON->setMinimumHeight(qRound(1 * screenRatio));
|
||||||
ui->lineJSON->setMaximumHeight(qRound(1 * screenRatio));
|
ui->lineJSON->setMaximumHeight(qRound(1 * screenRatio));
|
||||||
|
ui->lineJSON->setLineWidth(qRound(1 * screenRatio));
|
||||||
}
|
}
|
||||||
resize(450 * screenRatio, 550 * screenRatio);
|
resize(450 * screenRatio, 550 * screenRatio);
|
||||||
}
|
}
|
||||||
|
@ -104,28 +120,22 @@ void JsonEditorDialog::closeEvent(QCloseEvent *ev)
|
||||||
QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
|
QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
|
||||||
QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
|
QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
|
||||||
QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
|
QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
|
||||||
if (newCode != originalCode)
|
if (newCode != originalCode) {
|
||||||
{
|
|
||||||
QMessageBox::StandardButton button = QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("<h4>Unsaved changes detected</h4>You want to save the JSON content before you quit?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Cancel);
|
QMessageBox::StandardButton button = QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("<h4>Unsaved changes detected</h4>You want to save the JSON content before you quit?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Cancel);
|
||||||
if (button == QMessageBox::Yes)
|
if (button == QMessageBox::Yes) {
|
||||||
{
|
if (saveJsonContent()) {
|
||||||
if (saveJsonContent())
|
|
||||||
{
|
|
||||||
ev->accept();
|
ev->accept();
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
ev->ignore();
|
ev->ignore();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (button == QMessageBox::No)
|
else if (button == QMessageBox::No) {
|
||||||
{
|
|
||||||
ev->accept();
|
ev->accept();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
ev->ignore();
|
ev->ignore();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -136,59 +146,69 @@ bool JsonEditorDialog::saveJsonContent()
|
||||||
{
|
{
|
||||||
QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", " ");
|
QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", " ");
|
||||||
QJsonDocument jsonNew = QJsonDocument::fromJson(jsonPatched.toUtf8());
|
QJsonDocument jsonNew = QJsonDocument::fromJson(jsonPatched.toUtf8());
|
||||||
if (!jsonNew.isEmpty())
|
if (!jsonNew.isEmpty()) {
|
||||||
{
|
|
||||||
QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
|
QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
|
||||||
QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
|
QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
|
||||||
QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
|
QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
|
||||||
if (newCode != originalCode)
|
if (newCode != originalCode) {
|
||||||
{
|
|
||||||
QString currentFilePath = smpic->getPictureFilePath();
|
QString currentFilePath = smpic->getPictureFilePath();
|
||||||
QString originalFilePath = smpic->getOriginalPictureFilePath();
|
QString originalFilePath = smpic->getOriginalPictureFilePath();
|
||||||
QString backupFileName = originalFilePath % ".bak";
|
QString backupFileName = originalFilePath % ".bak";
|
||||||
if (!QFile::exists(backupFileName))
|
if (!QFile::exists(backupFileName)) {
|
||||||
{
|
|
||||||
QFile::copy(currentFilePath, backupFileName);
|
QFile::copy(currentFilePath, backupFileName);
|
||||||
}
|
}
|
||||||
smpic->setJsonStr(newCode, true);
|
smpic->setJsonStr(newCode, true);
|
||||||
if (!smpic->isJsonOk())
|
if (!smpic->isJsonOk()) {
|
||||||
{
|
|
||||||
QString lastStep = smpic->getLastStep(false);
|
QString lastStep = smpic->getLastStep(false);
|
||||||
QString readableError;
|
QString readableError;
|
||||||
if (lastStep.contains("JSONINCOMPLETE") && lastStep.contains("JSONERROR"))
|
if (lastStep.contains("JSONINCOMPLETE") && lastStep.contains("JSONERROR")) {
|
||||||
{
|
|
||||||
readableError = SnapmaticPicture::tr("JSON is incomplete and malformed");
|
readableError = SnapmaticPicture::tr("JSON is incomplete and malformed");
|
||||||
}
|
}
|
||||||
else if (lastStep.contains("JSONINCOMPLETE"))
|
else if (lastStep.contains("JSONINCOMPLETE")) {
|
||||||
{
|
|
||||||
readableError = SnapmaticPicture::tr("JSON is incomplete");
|
readableError = SnapmaticPicture::tr("JSON is incomplete");
|
||||||
}
|
}
|
||||||
else if (lastStep.contains("JSONERROR"))
|
else if (lastStep.contains("JSONERROR")) {
|
||||||
{
|
|
||||||
readableError = SnapmaticPicture::tr("JSON is malformed");
|
readableError = SnapmaticPicture::tr("JSON is malformed");
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
readableError = tr("JSON Error");
|
readableError = tr("JSON Error");
|
||||||
}
|
}
|
||||||
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of %1").arg(readableError));
|
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of %1").arg(readableError));
|
||||||
smpic->setJsonStr(originalCode, true);
|
smpic->setJsonStr(originalCode, true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!smpic->exportPicture(currentFilePath))
|
if (!smpic->exportPicture(currentFilePath)) {
|
||||||
{
|
|
||||||
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of I/O Error"));
|
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of I/O Error"));
|
||||||
smpic->setJsonStr(originalCode, true);
|
smpic->setJsonStr(originalCode, true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
jsonCode = newCode;
|
jsonCode = newCode;
|
||||||
|
smpic->updateStrings();
|
||||||
smpic->emitUpdate();
|
smpic->emitUpdate();
|
||||||
|
#ifdef GTA5SYNC_TELEMETRY
|
||||||
|
QSettings telemetrySettings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
|
telemetrySettings.beginGroup("Telemetry");
|
||||||
|
bool pushUsageData = telemetrySettings.value("PushUsageData", false).toBool();
|
||||||
|
telemetrySettings.endGroup();
|
||||||
|
if (pushUsageData && Telemetry->canPush()) {
|
||||||
|
QJsonDocument jsonDocument;
|
||||||
|
QJsonObject jsonObject;
|
||||||
|
jsonObject["Type"] = "JSONEdited";
|
||||||
|
jsonObject["EditedSize"] = QString::number(smpic->getContentMaxLength());
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toSecsSinceEpoch());
|
||||||
|
#else
|
||||||
|
jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
|
||||||
|
#endif
|
||||||
|
jsonDocument.setObject(jsonObject);
|
||||||
|
Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of JSON Error"));
|
QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of JSON Error"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -196,13 +216,11 @@ bool JsonEditorDialog::saveJsonContent()
|
||||||
|
|
||||||
void JsonEditorDialog::on_cmdClose_clicked()
|
void JsonEditorDialog::on_cmdClose_clicked()
|
||||||
{
|
{
|
||||||
this->close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void JsonEditorDialog::on_cmdSave_clicked()
|
void JsonEditorDialog::on_cmdSave_clicked()
|
||||||
{
|
{
|
||||||
if (saveJsonContent())
|
if (saveJsonContent())
|
||||||
{
|
close();
|
||||||
this->close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017 Syping
|
* Copyright (C) 2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -112,6 +112,9 @@
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Apply changes</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Save</string>
|
<string>&Save</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -125,6 +128,9 @@
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Discard changes</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Close</string>
|
<string>&Close</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017 Syping
|
* Copyright (C) 2017-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,15 +20,20 @@
|
||||||
#include "ui_MapLocationDialog.h"
|
#include "ui_MapLocationDialog.h"
|
||||||
#include "IconLoader.h"
|
#include "IconLoader.h"
|
||||||
#include "AppEnv.h"
|
#include "AppEnv.h"
|
||||||
|
#include <QStringBuilder>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QDebug>
|
#include <QStyle>
|
||||||
|
|
||||||
MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
|
MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
|
||||||
QDialog(parent), xpos_old(x), ypos_old(y),
|
QDialog(parent), xpos_old(x), ypos_old(y),
|
||||||
ui(new Ui::MapLocationDialog)
|
ui(new Ui::MapLocationDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->cmdDone->setVisible(false);
|
ui->cmdDone->setVisible(false);
|
||||||
|
@ -44,12 +49,10 @@ MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
|
||||||
ui->vlMapDialog->setSpacing(widgetMargin);
|
ui->vlMapDialog->setSpacing(widgetMargin);
|
||||||
setMinimumSize(500 * screenRatio, 600 * screenRatio);
|
setMinimumSize(500 * screenRatio, 600 * screenRatio);
|
||||||
setMaximumSize(500 * screenRatio, 600 * screenRatio);
|
setMaximumSize(500 * screenRatio, 600 * screenRatio);
|
||||||
setFixedSize(500 * screenRatio, 600 * screenRatio);
|
|
||||||
setMouseTracking(true);
|
|
||||||
|
|
||||||
|
zoomPercent = 100;
|
||||||
changeMode = false;
|
changeMode = false;
|
||||||
propUpdate = false;
|
propUpdate = false;
|
||||||
drawPointOnMap(xpos_old, ypos_old);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MapLocationDialog::~MapLocationDialog()
|
MapLocationDialog::~MapLocationDialog()
|
||||||
|
@ -59,36 +62,224 @@ MapLocationDialog::~MapLocationDialog()
|
||||||
|
|
||||||
void MapLocationDialog::drawPointOnMap(double xpos_d, double ypos_d)
|
void MapLocationDialog::drawPointOnMap(double xpos_d, double ypos_d)
|
||||||
{
|
{
|
||||||
qreal screenRatio = AppEnv::screenRatio();
|
ui->labPos->setText(tr("X: %1\nY: %2", "X and Y position").arg(QString::number(xpos_d), QString::number(ypos_d)));
|
||||||
int pointMakerSize = 8 * screenRatio;
|
|
||||||
QPixmap pointMakerPixmap = IconLoader::loadingPointmakerIcon().pixmap(QSize(pointMakerSize, pointMakerSize));
|
|
||||||
QSize mapPixelSize = size();
|
|
||||||
|
|
||||||
int pointMakerHalfSize = pointMakerSize / 2;
|
|
||||||
long xpos_ms = qRound(xpos_d);
|
|
||||||
long ypos_ms = qRound(ypos_d);
|
|
||||||
double xpos_ma = xpos_ms + 4000;
|
|
||||||
double ypos_ma = ypos_ms + 4000;
|
|
||||||
double xrat = (double)mapPixelSize.width() / 10000;
|
|
||||||
double yrat = (double)mapPixelSize.height() / 12000;
|
|
||||||
long xpos_mp = qRound(xpos_ma * xrat);
|
|
||||||
long ypos_mp = qRound(ypos_ma * yrat);
|
|
||||||
long xpos_pr = xpos_mp - pointMakerHalfSize;
|
|
||||||
long ypos_pr = ypos_mp + pointMakerHalfSize;
|
|
||||||
|
|
||||||
QPixmap mapPixmap(mapPixelSize);
|
|
||||||
QPainter mapPainter(&mapPixmap);
|
|
||||||
mapPainter.drawPixmap(0, 0, mapPixelSize.width(), mapPixelSize.height(), QPixmap(":/img/mappreview.jpg").scaled(mapPixelSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
|
||||||
mapPainter.drawPixmap(xpos_pr, mapPixelSize.height() - ypos_pr, pointMakerSize, pointMakerSize, pointMakerPixmap);
|
|
||||||
mapPainter.end();
|
|
||||||
|
|
||||||
QPalette backgroundPalette;
|
|
||||||
backgroundPalette.setBrush(backgroundRole(), QBrush(mapPixmap));
|
|
||||||
setPalette(backgroundPalette);
|
|
||||||
|
|
||||||
xpos_new = xpos_d;
|
xpos_new = xpos_d;
|
||||||
ypos_new = ypos_d;
|
ypos_new = ypos_d;
|
||||||
ui->labPos->setText(tr("X: %1\nY: %2", "X and Y position").arg(QString::number(xpos_d), QString::number(ypos_d)));
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::setCayoPerico(bool isCayoPerico)
|
||||||
|
{
|
||||||
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
|
p_isCayoPerico = isCayoPerico;
|
||||||
|
if (isCayoPerico) {
|
||||||
|
setMinimumSize(500 * screenRatio, 500 * screenRatio);
|
||||||
|
setMaximumSize(500 * screenRatio, 500 * screenRatio);
|
||||||
|
ui->hlMapDialog->removeItem(ui->vlMapDialog);
|
||||||
|
ui->hlMapDialog->insertLayout(0, ui->vlMapDialog);
|
||||||
|
ui->hlMapDialog->removeItem(ui->vlPosLayout);
|
||||||
|
ui->hlMapDialog->addLayout(ui->vlPosLayout);
|
||||||
|
ui->labPos->setAlignment(Qt::AlignRight);
|
||||||
|
mapImage = QImage(AppEnv::getImagesFolder() % "/mapcayoperico.jpg");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
mapImage = QImage(AppEnv::getImagesFolder() % "/mappreview.jpg");
|
||||||
|
}
|
||||||
|
drawPointOnMap(xpos_old, ypos_old);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::updatePosFromEvent(double x, double y)
|
||||||
|
{
|
||||||
|
QSize mapPixelSize = size();
|
||||||
|
double x_per = x / mapPixelSize.width(); // get X %
|
||||||
|
double y_per = y / mapPixelSize.height(); // get Y %
|
||||||
|
double x_pos, y_pos;
|
||||||
|
if (p_isCayoPerico) {
|
||||||
|
x_pos = x_per * 2340; // 2340 is 100% for X (Cayo Perico)
|
||||||
|
y_pos = y_per * -2340; // -2340 is 100% for Y (Cayo Perico)
|
||||||
|
x_pos = x_pos + 3560; // +3560 gets corrected for X (Cayo Perico)
|
||||||
|
y_pos = y_pos - 3980; // -3980 gets corrected for Y (Cayo Perico)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
x_pos = x_per * 10000; // 10000 is 100% for X (Los Santos)
|
||||||
|
y_pos = y_per * -12000; // -12000 is 100% for Y (Los Santos)
|
||||||
|
x_pos = x_pos - 4000; // -4000 gets corrected for X (Los Santos)
|
||||||
|
y_pos = y_pos + 8000; // +8000 gets corrected for Y (Los Santos)
|
||||||
|
}
|
||||||
|
drawPointOnMap(x_pos, y_pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::paintEvent(QPaintEvent *ev)
|
||||||
|
{
|
||||||
|
QPainter painter(this);
|
||||||
|
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
|
||||||
|
|
||||||
|
// Screen Ratio
|
||||||
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
|
||||||
|
// Paint Map
|
||||||
|
const double zoomLevel = static_cast<double>(zoomPercent) / 100;
|
||||||
|
const QSize mapImageSize = mapImage.size();
|
||||||
|
const QPointF mapImageMid(static_cast<double>(mapImageSize.width()) / 2, static_cast<double>(mapImageSize.height()) / 2);
|
||||||
|
const QSizeF srcImageSize(static_cast<double>(mapImageSize.width()) / zoomLevel , static_cast<double>(mapImageSize.height()) / zoomLevel);
|
||||||
|
const QPointF mapImageTopLeft(mapImageMid.x() - (srcImageSize.width() / 2), mapImageMid.y() - (srcImageSize.height() / 2));
|
||||||
|
const QPointF mapImageBottomRight(mapImageMid.x() + (srcImageSize.width() / 2), mapImageMid.y() + (srcImageSize.height() / 2));
|
||||||
|
painter.drawImage(QRect(QPoint(0, 0), size()), mapImage, QRectF(mapImageTopLeft, mapImageBottomRight));
|
||||||
|
|
||||||
|
// Paint Marker
|
||||||
|
QSize mapPixelSize = size();
|
||||||
|
int pointMarkerSize = 8 * screenRatio;
|
||||||
|
int pointMarkerHalfSize = pointMarkerSize / 2;
|
||||||
|
double xpos_mp, ypos_mp;
|
||||||
|
if (p_isCayoPerico) {
|
||||||
|
double xpos_per = xpos_new - 3560; // correct X in reserve
|
||||||
|
double ypos_per = ypos_new + 3980; // correct y in reserve
|
||||||
|
xpos_per = xpos_per / 2340; // divide 100% for X
|
||||||
|
ypos_per = ypos_per / -2340; // divide 100% for Y
|
||||||
|
xpos_mp = xpos_per * mapPixelSize.width(); // locate window width pos
|
||||||
|
ypos_mp = ypos_per * mapPixelSize.height(); // locate window height pos
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
double xpos_per = xpos_new + 4000; // correct X in reserve
|
||||||
|
double ypos_per = ypos_new - 8000; // correct y in reserve
|
||||||
|
xpos_per = xpos_per / 10000; // divide 100% for X
|
||||||
|
ypos_per = ypos_per / -12000; // divide 100% for Y
|
||||||
|
xpos_mp = xpos_per * mapPixelSize.width(); // locate window width pos
|
||||||
|
ypos_mp = ypos_per * mapPixelSize.height(); // locate window height pos
|
||||||
|
}
|
||||||
|
QPointF pointMarkerPos(xpos_mp, ypos_mp);
|
||||||
|
if (screenRatioPR != 1) {
|
||||||
|
pointMarkerPos.setX(pointMarkerPos.x() - pointMarkerHalfSize + screenRatioPR);
|
||||||
|
pointMarkerPos.setY(pointMarkerPos.y() - pointMarkerHalfSize + screenRatioPR);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
pointMarkerPos.setX(pointMarkerPos.x() - pointMarkerHalfSize);
|
||||||
|
pointMarkerPos.setY(pointMarkerPos.y() - pointMarkerHalfSize);
|
||||||
|
}
|
||||||
|
QPixmap mapMarkerPixmap = IconLoader::loadingPointmakerIcon().pixmap(QSize(pointMarkerSize, pointMarkerSize));
|
||||||
|
painter.drawPixmap(pointMarkerPos, mapMarkerPixmap);
|
||||||
|
|
||||||
|
QDialog::paintEvent(ev);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
|
||||||
|
{
|
||||||
|
if (changeMode && ev->buttons() & Qt::LeftButton) {
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
const QPointF localPos = ev->position();
|
||||||
|
#elif QT_VERSION >= 0x050000
|
||||||
|
const QPointF localPos = ev->localPos();
|
||||||
|
#else
|
||||||
|
const QPointF localPos = ev->posF();
|
||||||
|
#endif
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
if (screenRatioPR != 1) {
|
||||||
|
updatePosFromEvent(localPos.x() - screenRatioPR, localPos.y() - screenRatioPR);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
updatePosFromEvent(localPos.x(), localPos.y());
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
updatePosFromEvent(localPos.x(), localPos.y());
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (dragStart && ev->buttons() & Qt::LeftButton) {
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
const QPointF dragNewPosition = ev->position();
|
||||||
|
#elif QT_VERSION >= 0x050000
|
||||||
|
const QPointF dragNewPosition = ev->localPos();
|
||||||
|
#else
|
||||||
|
const QPointF dragNewPosition = ev->posF();
|
||||||
|
#endif
|
||||||
|
mapDiffPosition = dragNewPosition - dragPosition + mapDiffPosition;
|
||||||
|
dragPosition = dragNewPosition;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::mousePressEvent(QMouseEvent *ev)
|
||||||
|
{
|
||||||
|
if (!changeMode && ev->button() == Qt::LeftButton) {
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
dragPosition = ev->position();
|
||||||
|
#elif QT_VERSION >= 0x050000
|
||||||
|
dragPosition = ev->localPos();
|
||||||
|
#else
|
||||||
|
dragPosition = ev->posF();
|
||||||
|
#endif
|
||||||
|
dragStart = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::mouseReleaseEvent(QMouseEvent *ev)
|
||||||
|
{
|
||||||
|
if (changeMode && ev->button() == Qt::LeftButton) {
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
const QPointF localPos = ev->position();
|
||||||
|
#elif QT_VERSION >= 0x050000
|
||||||
|
const QPointF localPos = ev->localPos();
|
||||||
|
#else
|
||||||
|
const QPointF localPos = ev->posF();
|
||||||
|
#endif
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
if (screenRatioPR != 1) {
|
||||||
|
updatePosFromEvent(localPos.x() - screenRatioPR, localPos.y() - screenRatioPR);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
updatePosFromEvent(localPos.x(), localPos.y());
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
updatePosFromEvent(localPos.x(), localPos.y());
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if (dragStart && ev->button() == Qt::LeftButton) {
|
||||||
|
dragStart = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MapLocationDialog::wheelEvent(QWheelEvent *ev)
|
||||||
|
{
|
||||||
|
#ifdef GTA5SYNC_EXPERIMENTAL
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
const QPoint numPixels = ev->pixelDelta();
|
||||||
|
const QPoint numDegrees = ev->angleDelta();
|
||||||
|
#else
|
||||||
|
QPoint numDegrees;
|
||||||
|
if (ev->orientation() == Qt::Horizontal) {
|
||||||
|
numDegrees.setX(ev->delta());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
numDegrees.setY(ev->delta());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
if (!numPixels.isNull()) {
|
||||||
|
if (numPixels.y() < 0 && zoomPercent != 100) {
|
||||||
|
zoomPercent = zoomPercent - 10;
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
else if (numPixels.y() > 0 && zoomPercent != 400) {
|
||||||
|
zoomPercent = zoomPercent + 10;
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (!numDegrees.isNull()) {
|
||||||
|
if (numDegrees.y() < 0 && zoomPercent != 100) {
|
||||||
|
zoomPercent = zoomPercent - 10;
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
else if (numDegrees.y() > 0 && zoomPercent != 400) {
|
||||||
|
zoomPercent = zoomPercent + 10;
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
Q_UNUSED(ev)
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapLocationDialog::on_cmdChange_clicked()
|
void MapLocationDialog::on_cmdChange_clicked()
|
||||||
|
@ -110,58 +301,14 @@ void MapLocationDialog::on_cmdDone_clicked()
|
||||||
{
|
{
|
||||||
ui->cmdDone->setVisible(false);
|
ui->cmdDone->setVisible(false);
|
||||||
ui->cmdChange->setVisible(true);
|
ui->cmdChange->setVisible(true);
|
||||||
if (xpos_new != xpos_old || ypos_new != ypos_old)
|
if (xpos_new != xpos_old || ypos_new != ypos_old) {
|
||||||
{
|
|
||||||
ui->cmdApply->setVisible(true);
|
ui->cmdApply->setVisible(true);
|
||||||
ui->cmdRevert->setVisible(true);
|
ui->cmdRevert->setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
setCursor(Qt::ArrowCursor);
|
setCursor(Qt::ArrowCursor);
|
||||||
changeMode = false;
|
changeMode = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapLocationDialog::updatePosFromEvent(int x, int y)
|
|
||||||
{
|
|
||||||
QSize mapPixelSize = size();
|
|
||||||
int xpos_ad = x;
|
|
||||||
int ypos_ad = mapPixelSize.height() - y;
|
|
||||||
double xrat = 10000 / (double)mapPixelSize.width();
|
|
||||||
double yrat = 12000 / (double)mapPixelSize.height();
|
|
||||||
double xpos_rv = xrat * xpos_ad;
|
|
||||||
double ypos_rv = yrat * ypos_ad;
|
|
||||||
double xpos_fp = xpos_rv - 4000;
|
|
||||||
double ypos_fp = ypos_rv - 4000;
|
|
||||||
drawPointOnMap(xpos_fp, ypos_fp);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
|
|
||||||
{
|
|
||||||
if (!changeMode) { ev->ignore(); }
|
|
||||||
else if (ev->buttons() & Qt::LeftButton)
|
|
||||||
{
|
|
||||||
updatePosFromEvent(ev->x(), ev->y());
|
|
||||||
ev->accept();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ev->ignore();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MapLocationDialog::mouseReleaseEvent(QMouseEvent *ev)
|
|
||||||
{
|
|
||||||
if (!changeMode) { ev->ignore(); }
|
|
||||||
else if (ev->button() == Qt::LeftButton)
|
|
||||||
{
|
|
||||||
updatePosFromEvent(ev->x(), ev->y());
|
|
||||||
ev->accept();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ev->ignore();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MapLocationDialog::on_cmdApply_clicked()
|
void MapLocationDialog::on_cmdApply_clicked()
|
||||||
{
|
{
|
||||||
propUpdate = true;
|
propUpdate = true;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2017 Syping
|
* Copyright (C) 2017-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -33,30 +33,40 @@ class MapLocationDialog : public QDialog
|
||||||
public:
|
public:
|
||||||
explicit MapLocationDialog(double x, double y, QWidget *parent = 0);
|
explicit MapLocationDialog(double x, double y, QWidget *parent = 0);
|
||||||
void drawPointOnMap(double x, double y);
|
void drawPointOnMap(double x, double y);
|
||||||
|
void setCayoPerico(bool isCayoPerico);
|
||||||
bool propUpdated();
|
bool propUpdated();
|
||||||
double getXpos();
|
double getXpos();
|
||||||
double getYpos();
|
double getYpos();
|
||||||
~MapLocationDialog();
|
~MapLocationDialog();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
void paintEvent(QPaintEvent *ev);
|
||||||
void mouseMoveEvent(QMouseEvent *ev);
|
void mouseMoveEvent(QMouseEvent *ev);
|
||||||
|
void mousePressEvent(QMouseEvent *ev);
|
||||||
void mouseReleaseEvent(QMouseEvent *ev);
|
void mouseReleaseEvent(QMouseEvent *ev);
|
||||||
|
void wheelEvent(QWheelEvent *ev);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_cmdDone_clicked();
|
|
||||||
void on_cmdApply_clicked();
|
void on_cmdApply_clicked();
|
||||||
|
void on_cmdDone_clicked();
|
||||||
|
void on_cmdClose_clicked();
|
||||||
void on_cmdChange_clicked();
|
void on_cmdChange_clicked();
|
||||||
void on_cmdRevert_clicked();
|
void on_cmdRevert_clicked();
|
||||||
void updatePosFromEvent(int x, int y);
|
void updatePosFromEvent(double x, double y);
|
||||||
void on_cmdClose_clicked();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
int zoomPercent;
|
||||||
double xpos_old;
|
double xpos_old;
|
||||||
double ypos_old;
|
double ypos_old;
|
||||||
double xpos_new;
|
double xpos_new;
|
||||||
double ypos_new;
|
double ypos_new;
|
||||||
|
bool dragStart;
|
||||||
bool propUpdate;
|
bool propUpdate;
|
||||||
bool changeMode;
|
bool changeMode;
|
||||||
|
bool p_isCayoPerico;
|
||||||
|
QImage mapImage;
|
||||||
|
QPointF dragPosition;
|
||||||
|
QPointF mapDiffPosition;
|
||||||
Ui::MapLocationDialog *ui;
|
Ui::MapLocationDialog *ui;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,11 @@
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Snapmatic Map Viewer</string>
|
<string>Snapmatic Map Viewer</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">QDialog#MapLocationDialog {
|
||||||
|
background-color: transparent;
|
||||||
|
}</string>
|
||||||
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlMapPreview">
|
<layout class="QVBoxLayout" name="vlMapPreview">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
|
@ -134,6 +139,9 @@ color: rgb(255, 255, 255);
|
||||||
<property name="focusPolicy">
|
<property name="focusPolicy">
|
||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Close viewer</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Close</string>
|
<string>&Close</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -160,6 +168,9 @@ color: rgb(255, 255, 255);
|
||||||
<property name="focusPolicy">
|
<property name="focusPolicy">
|
||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Apply new position</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Apply</string>
|
<string>&Apply</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -173,6 +184,9 @@ color: rgb(255, 255, 255);
|
||||||
<property name="focusPolicy">
|
<property name="focusPolicy">
|
||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Revert old position</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Revert</string>
|
<string>&Revert</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -186,8 +200,11 @@ color: rgb(255, 255, 255);
|
||||||
<property name="focusPolicy">
|
<property name="focusPolicy">
|
||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Select new position</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Set</string>
|
<string>&Select</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="autoDefault">
|
<property name="autoDefault">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
|
@ -199,6 +216,9 @@ color: rgb(255, 255, 255);
|
||||||
<property name="focusPolicy">
|
<property name="focusPolicy">
|
||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Quit select position</string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Done</string>
|
<string>&Done</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -0,0 +1,111 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
|
* Copyright (C) 2020 Syping
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include "TranslationClass.h"
|
||||||
|
#include "MessageThread.h"
|
||||||
|
#include "AppEnv.h"
|
||||||
|
#include "config.h"
|
||||||
|
#include <QNetworkAccessManager>
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QEventLoop>
|
||||||
|
#include <QUrlQuery>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QUrl>
|
||||||
|
|
||||||
|
MessageThread::MessageThread(uint cacheId, QObject *parent) : QThread(parent), cacheId(cacheId)
|
||||||
|
{
|
||||||
|
threadRunning = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MessageThread::run()
|
||||||
|
{
|
||||||
|
QEventLoop threadLoop;
|
||||||
|
|
||||||
|
QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
|
||||||
|
|
||||||
|
while (threadRunning) {
|
||||||
|
{
|
||||||
|
#ifdef GTA5SYNC_MOTD_WEBURL
|
||||||
|
QUrl motdWebUrl = QUrl(GTA5SYNC_MOTD_WEBURL);
|
||||||
|
#else
|
||||||
|
QUrl motdWebUrl = QUrl("https://motd.syping.de/gta5view-dev/");
|
||||||
|
#endif
|
||||||
|
QUrlQuery urlQuery(motdWebUrl);
|
||||||
|
urlQuery.addQueryItem("code", GTA5SYNC_BUILDCODE);
|
||||||
|
urlQuery.addQueryItem("cacheid", QString::number(cacheId));
|
||||||
|
urlQuery.addQueryItem("lang", Translator->getCurrentLanguage());
|
||||||
|
urlQuery.addQueryItem("version", GTA5SYNC_APPVER);
|
||||||
|
motdWebUrl.setQuery(urlQuery);
|
||||||
|
|
||||||
|
QNetworkAccessManager *netManager = new QNetworkAccessManager();
|
||||||
|
QNetworkRequest netRequest(motdWebUrl);
|
||||||
|
netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
|
||||||
|
QNetworkReply *netReply = netManager->get(netRequest);
|
||||||
|
|
||||||
|
QEventLoop downloadLoop;
|
||||||
|
QObject::connect(netManager, SIGNAL(finished(QNetworkReply*)), &downloadLoop, SLOT(quit()));
|
||||||
|
QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
|
||||||
|
QTimer::singleShot(60000, &downloadLoop, SLOT(quit()));
|
||||||
|
downloadLoop.exec();
|
||||||
|
|
||||||
|
if (netReply->isFinished()) {
|
||||||
|
QByteArray jsonContent = netReply->readAll();
|
||||||
|
QString headerData = QString::fromUtf8(netReply->rawHeader("gta5view"));
|
||||||
|
if (!headerData.isEmpty()) {
|
||||||
|
QMap<QString,QString> headerMap;
|
||||||
|
const QStringList headerVarList = headerData.split(';');
|
||||||
|
for (QString headerVar : headerVarList) {
|
||||||
|
QStringList varValueList = headerVar.split('=');
|
||||||
|
if (varValueList.length() >= 2) {
|
||||||
|
const QString variable = varValueList.at(0).trimmed();
|
||||||
|
varValueList.removeFirst();
|
||||||
|
const QString value = varValueList.join('=');
|
||||||
|
headerMap.insert(variable, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (headerMap.value("update", "false") == "true") {
|
||||||
|
QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonContent);
|
||||||
|
emit messagesArrived(jsonDocument.object());
|
||||||
|
}
|
||||||
|
if (headerMap.contains("cache")) {
|
||||||
|
bool uintOk;
|
||||||
|
uint cacheVal = headerMap.value("cache").toUInt(&uintOk);
|
||||||
|
if (uintOk) {
|
||||||
|
cacheId = cacheVal;
|
||||||
|
emit updateCacheId(cacheId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delete netReply;
|
||||||
|
delete netManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTimer::singleShot(300000, &threadLoop, SLOT(quit()));
|
||||||
|
threadLoop.exec();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MessageThread::terminateThread()
|
||||||
|
{
|
||||||
|
threadRunning = false;
|
||||||
|
emit threadTerminated();
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2020 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -16,38 +16,33 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#ifndef IMAGEEDITORDIALOG_H
|
#ifndef MESSAGETHREAD_H
|
||||||
#define IMAGEEDITORDIALOG_H
|
#define MESSAGETHREAD_H
|
||||||
|
|
||||||
#include "SnapmaticPicture.h"
|
#include <QJsonObject>
|
||||||
#include <QDialog>
|
#include <QObject>
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
namespace Ui {
|
class MessageThread : public QThread
|
||||||
class ImageEditorDialog;
|
|
||||||
}
|
|
||||||
|
|
||||||
class ImageEditorDialog : public QDialog
|
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit ImageEditorDialog(SnapmaticPicture *picture, QString profileName, QWidget *parent = 0);
|
explicit MessageThread(uint cacheId, QObject *parent = 0);
|
||||||
~ImageEditorDialog();
|
|
||||||
|
|
||||||
private slots:
|
public slots:
|
||||||
void on_cmdClose_clicked();
|
void terminateThread();
|
||||||
void on_cmdReplace_clicked();
|
|
||||||
void on_cmdSave_clicked();
|
|
||||||
void on_cmdQuestion_clicked();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SnapmaticPicture *smpic;
|
bool threadRunning;
|
||||||
QString profileName;
|
uint cacheId;
|
||||||
Ui::ImageEditorDialog *ui;
|
|
||||||
int snapmaticResolutionLW;
|
protected:
|
||||||
int snapmaticResolutionLH;
|
void run();
|
||||||
bool imageIsChanged;
|
|
||||||
QImage pictureCache;
|
signals:
|
||||||
|
void messagesArrived(const QJsonObject &messageObject);
|
||||||
|
void updateCacheId(uint cacheId);
|
||||||
|
void threadTerminated();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IMAGEEDITORDIALOG_H
|
#endif // MESSAGETHREAD_H
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -21,15 +21,16 @@
|
||||||
#include "TranslationClass.h"
|
#include "TranslationClass.h"
|
||||||
#include "StandardPaths.h"
|
#include "StandardPaths.h"
|
||||||
#include "UserInterface.h"
|
#include "UserInterface.h"
|
||||||
|
#include "wrapper.h"
|
||||||
#include "AppEnv.h"
|
#include "AppEnv.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QDesktopWidget>
|
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QStyleFactory>
|
#include <QStyleFactory>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
#include <QFontDialog>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
|
@ -40,6 +41,12 @@
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
#include <QScreen>
|
||||||
|
#else
|
||||||
|
#include <QDesktopWidget>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef GTA5SYNC_TELEMETRY
|
#ifdef GTA5SYNC_TELEMETRY
|
||||||
#include "TelemetryClass.h"
|
#include "TelemetryClass.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -49,19 +56,31 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
|
||||||
ui(new Ui::OptionsDialog)
|
ui(new Ui::OptionsDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Setup User Interface
|
// Setup User Interface
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->tabWidget->setCurrentIndex(0);
|
ui->tabWidget->setCurrentIndex(0);
|
||||||
ui->labPicCustomRes->setVisible(false);
|
ui->labPicCustomRes->setVisible(false);
|
||||||
|
ui->cmdCancel->setDefault(true);
|
||||||
ui->cmdCancel->setFocus();
|
ui->cmdCancel->setFocus();
|
||||||
|
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
QRect desktopResolution = QApplication::primaryScreen()->geometry();
|
||||||
|
int desktopSizeWidth = qRound((double)desktopResolution.width() * screenRatioPR);
|
||||||
|
int desktopSizeHeight = qRound((double)desktopResolution.height() * screenRatioPR);
|
||||||
|
#else
|
||||||
QRect desktopResolution = QApplication::desktop()->screenGeometry(this);
|
QRect desktopResolution = QApplication::desktop()->screenGeometry(this);
|
||||||
int desktopSizeWidth = desktopResolution.width();
|
int desktopSizeWidth = desktopResolution.width();
|
||||||
int desktopSizeHeight = desktopResolution.height();
|
int desktopSizeHeight = desktopResolution.height();
|
||||||
|
#endif
|
||||||
aspectRatio = Qt::KeepAspectRatio;
|
aspectRatio = Qt::KeepAspectRatio;
|
||||||
defExportSize = QSize(960, 536);
|
defExportSize = SnapmaticPicture::getSnapmaticResolution();
|
||||||
cusExportSize = defExportSize;
|
cusExportSize = defExportSize;
|
||||||
defaultQuality = 100;
|
defaultQuality = 100;
|
||||||
customQuality = 100;
|
customQuality = 100;
|
||||||
|
@ -74,25 +93,26 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
|
||||||
ui->rbPicDefaultRes->setText(ui->rbPicDefaultRes->text().arg(QString::number(defExportSize.width()), QString::number(defExportSize.height())));
|
ui->rbPicDefaultRes->setText(ui->rbPicDefaultRes->text().arg(QString::number(defExportSize.width()), QString::number(defExportSize.height())));
|
||||||
|
|
||||||
// Set Icon for OK Button
|
// Set Icon for OK Button
|
||||||
if (QIcon::hasThemeIcon("dialog-ok"))
|
if (QIcon::hasThemeIcon("dialog-ok")) {
|
||||||
{
|
|
||||||
ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
|
ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-ok"))
|
else if (QIcon::hasThemeIcon("gtk-ok")) {
|
||||||
{
|
|
||||||
ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
|
ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Icon for Cancel Button
|
// Set Icon for Cancel Button
|
||||||
if (QIcon::hasThemeIcon("dialog-cancel"))
|
if (QIcon::hasThemeIcon("dialog-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-cancel"))
|
else if (QIcon::hasThemeIcon("gtk-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set Icon for Copy Button
|
||||||
|
if (QIcon::hasThemeIcon("edit-copy")) {
|
||||||
|
ui->cmdCopyStatsID->setIcon(QIcon::fromTheme("edit-copy"));
|
||||||
|
}
|
||||||
|
|
||||||
setupTreeWidget();
|
setupTreeWidget();
|
||||||
setupLanguageBox();
|
setupLanguageBox();
|
||||||
setupRadioButtons();
|
setupRadioButtons();
|
||||||
|
@ -102,6 +122,7 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
|
||||||
setupInterfaceSettings();
|
setupInterfaceSettings();
|
||||||
setupStatisticsSettings();
|
setupStatisticsSettings();
|
||||||
setupSnapmaticPictureViewer();
|
setupSnapmaticPictureViewer();
|
||||||
|
setupWindowsGameSettings();
|
||||||
|
|
||||||
#ifndef Q_QS_ANDROID
|
#ifndef Q_QS_ANDROID
|
||||||
// DPI calculation
|
// DPI calculation
|
||||||
|
@ -109,11 +130,9 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
|
||||||
resize(435 * screenRatio, 405 * screenRatio);
|
resize(435 * screenRatio, 405 * screenRatio);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GTA5SYNC_DISABLED
|
ui->rbModern->setText(ui->rbModern->text().arg(GTA5SYNC_APPSTR));
|
||||||
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabSync));
|
ui->rbClassic->setText(ui->rbClassic->text().arg(GTA5SYNC_APPSTR));
|
||||||
#endif
|
setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
|
||||||
|
|
||||||
this->setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
OptionsDialog::~OptionsDialog()
|
OptionsDialog::~OptionsDialog()
|
||||||
|
@ -126,24 +145,28 @@ OptionsDialog::~OptionsDialog()
|
||||||
|
|
||||||
void OptionsDialog::setupTreeWidget()
|
void OptionsDialog::setupTreeWidget()
|
||||||
{
|
{
|
||||||
for (QString playerIDStr : profileDB->getPlayers())
|
const QStringList players = profileDB->getPlayers();
|
||||||
{
|
if (players.length() != 0) {
|
||||||
bool ok;
|
for (auto it = players.constBegin(); it != players.constEnd(); it++) {
|
||||||
int playerID = playerIDStr.toInt(&ok);
|
bool ok;
|
||||||
if (ok)
|
int playerID = it->toInt(&ok);
|
||||||
{
|
if (ok) {
|
||||||
QString playerName = profileDB->getPlayerName(playerID);
|
const QString playerName = profileDB->getPlayerName(playerID);
|
||||||
|
|
||||||
QStringList playerTreeViewList;
|
QStringList playerTreeViewList;
|
||||||
playerTreeViewList += playerIDStr;
|
playerTreeViewList += *it;
|
||||||
playerTreeViewList += playerName;
|
playerTreeViewList += playerName;
|
||||||
|
|
||||||
QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
|
QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
|
||||||
ui->twPlayers->addTopLevelItem(playerItem);
|
ui->twPlayers->addTopLevelItem(playerItem);
|
||||||
playerItems += playerItem;
|
playerItems += playerItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
ui->twPlayers->sortItems(1, Qt::AscendingOrder);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabPlayers));
|
||||||
}
|
}
|
||||||
ui->twPlayers->sortItems(1, Qt::AscendingOrder);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OptionsDialog::setupLanguageBox()
|
void OptionsDialog::setupLanguageBox()
|
||||||
|
@ -153,9 +176,19 @@ void OptionsDialog::setupLanguageBox()
|
||||||
currentAreaLanguage = settings->value("AreaLanguage", "Auto").toString();
|
currentAreaLanguage = settings->value("AreaLanguage", "Auto").toString();
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
QString cbSysStr = tr("%1 (Next Closest Language)", "First language a person can talk with a different person/application. \"Native\" or \"Not Native\".").arg(tr("System",
|
const QString cbSysStr = tr("%1 (Language priority)", "First language a person can talk with a different person/application. \"Native\" or \"Not Native\".").arg(tr("System",
|
||||||
"System in context of System default"));
|
"System in context of System default"));
|
||||||
QString cbAutoStr = tr("%1 (Closest to Interface)", "Next closest language compared to the Interface").arg(tr("Auto", "Automatic language choice."));
|
#ifdef Q_OS_WIN
|
||||||
|
QString cbAutoStr;
|
||||||
|
if (AppEnv::getGameLanguage(AppEnv::getGameVersion()) != GameLanguage::Undefined) {
|
||||||
|
cbAutoStr = tr("%1 (Game language)", "Next closest language compared to the Game settings").arg(tr("Auto", "Automatic language choice."));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
cbAutoStr = tr("%1 (Closest to Interface)", "Next closest language compared to the Interface").arg(tr("Auto", "Automatic language choice."));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
const QString cbAutoStr = tr("%1 (Closest to Interface)", "Next closest language compared to the Interface").arg(tr("Auto", "Automatic language choice."));
|
||||||
|
#endif
|
||||||
ui->cbLanguage->addItem(cbSysStr, "System");
|
ui->cbLanguage->addItem(cbSysStr, "System");
|
||||||
ui->cbAreaLanguage->addItem(cbAutoStr, "Auto");
|
ui->cbAreaLanguage->addItem(cbAutoStr, "Auto");
|
||||||
|
|
||||||
|
@ -168,15 +201,18 @@ void OptionsDialog::setupLanguageBox()
|
||||||
availableLanguages.removeDuplicates();
|
availableLanguages.removeDuplicates();
|
||||||
availableLanguages.sort();
|
availableLanguages.sort();
|
||||||
|
|
||||||
for (QString lang : availableLanguages)
|
for (const QString &lang : qAsConst(availableLanguages)) {
|
||||||
{
|
|
||||||
QLocale langLocale(lang);
|
QLocale langLocale(lang);
|
||||||
QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % lang % "]";
|
const QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % lang % "]";
|
||||||
QString langIconStr = "flag-" % TranslationClass::getCountryCode(langLocale);
|
const QString langIconPath = AppEnv::getImagesFolder() % "/flag-" % TranslationClass::getCountryCode(langLocale) % ".png";
|
||||||
|
|
||||||
ui->cbLanguage->addItem(QIcon::fromTheme(langIconStr), cbLangStr, lang);
|
if (QFile::exists(langIconPath)) {
|
||||||
if (currentLanguage == lang)
|
ui->cbLanguage->addItem(QIcon(langIconPath), cbLangStr, lang);
|
||||||
{
|
}
|
||||||
|
else {
|
||||||
|
ui->cbLanguage->addItem(cbLangStr, lang);
|
||||||
|
}
|
||||||
|
if (currentLanguage == lang) {
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
ui->cbLanguage->setCurrentText(cbLangStr);
|
ui->cbLanguage->setCurrentText(cbLangStr);
|
||||||
#else
|
#else
|
||||||
|
@ -187,7 +223,8 @@ void OptionsDialog::setupLanguageBox()
|
||||||
}
|
}
|
||||||
|
|
||||||
QString aCurrentLanguage = QString("en_GB");
|
QString aCurrentLanguage = QString("en_GB");
|
||||||
if (Translator->isLanguageLoaded()) { aCurrentLanguage = Translator->getCurrentLanguage(); }
|
if (Translator->isLanguageLoaded())
|
||||||
|
aCurrentLanguage = Translator->getCurrentLanguage();
|
||||||
QLocale currentLocale = QLocale(aCurrentLanguage);
|
QLocale currentLocale = QLocale(aCurrentLanguage);
|
||||||
ui->labCurrentLanguage->setText(tr("Current: %1").arg(currentLocale.nativeLanguageName() % " (" % currentLocale.nativeCountryName() % ") [" % aCurrentLanguage % "]"));
|
ui->labCurrentLanguage->setText(tr("Current: %1").arg(currentLocale.nativeLanguageName() % " (" % currentLocale.nativeCountryName() % ") [" % aCurrentLanguage % "]"));
|
||||||
|
|
||||||
|
@ -196,27 +233,21 @@ void OptionsDialog::setupLanguageBox()
|
||||||
availableLanguages.removeDuplicates();
|
availableLanguages.removeDuplicates();
|
||||||
availableLanguages.sort();
|
availableLanguages.sort();
|
||||||
|
|
||||||
for (QString lang : availableLanguages)
|
for (const QString &lang : qAsConst(availableLanguages)) {
|
||||||
{
|
|
||||||
// correcting Language Location if possible
|
// correcting Language Location if possible
|
||||||
QString aLang = lang;
|
QString aLang = lang;
|
||||||
if (QFile::exists(":/global/global." % lang % ".loc"))
|
if (QFile::exists(":/global/global." % lang % ".loc")) {
|
||||||
{
|
|
||||||
QFile locFile(":/global/global." % lang % ".loc");
|
QFile locFile(":/global/global." % lang % ".loc");
|
||||||
if (locFile.open(QFile::ReadOnly))
|
if (locFile.open(QFile::ReadOnly)) {
|
||||||
{
|
|
||||||
aLang = QString::fromUtf8(locFile.readLine()).trimmed();
|
aLang = QString::fromUtf8(locFile.readLine()).trimmed();
|
||||||
locFile.close();
|
locFile.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QLocale langLocale(aLang);
|
QLocale langLocale(aLang);
|
||||||
QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % aLang % "]";
|
const QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % aLang % "]";
|
||||||
QString langIconStr = "flag-" % TranslationClass::getCountryCode(langLocale);
|
ui->cbAreaLanguage->addItem(cbLangStr, lang);
|
||||||
|
if (currentAreaLanguage == lang) {
|
||||||
ui->cbAreaLanguage->addItem(QIcon::fromTheme(langIconStr), cbLangStr, lang);
|
|
||||||
if (currentAreaLanguage == lang)
|
|
||||||
{
|
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
ui->cbAreaLanguage->setCurrentText(cbLangStr);
|
ui->cbAreaLanguage->setCurrentText(cbLangStr);
|
||||||
#else
|
#else
|
||||||
|
@ -227,12 +258,10 @@ void OptionsDialog::setupLanguageBox()
|
||||||
}
|
}
|
||||||
|
|
||||||
QString aCurrentAreaLanguage = Translator->getCurrentAreaLanguage();
|
QString aCurrentAreaLanguage = Translator->getCurrentAreaLanguage();
|
||||||
if (QFile::exists(":/global/global." % aCurrentAreaLanguage % ".loc"))
|
if (QFile::exists(":/global/global." % aCurrentAreaLanguage % ".loc")) {
|
||||||
{
|
|
||||||
qDebug() << "locFile found";
|
qDebug() << "locFile found";
|
||||||
QFile locFile(":/global/global." % aCurrentAreaLanguage % ".loc");
|
QFile locFile(":/global/global." % aCurrentAreaLanguage % ".loc");
|
||||||
if (locFile.open(QFile::ReadOnly))
|
if (locFile.open(QFile::ReadOnly)) {
|
||||||
{
|
|
||||||
aCurrentAreaLanguage = QString::fromUtf8(locFile.readLine()).trimmed();
|
aCurrentAreaLanguage = QString::fromUtf8(locFile.readLine()).trimmed();
|
||||||
locFile.close();
|
locFile.close();
|
||||||
}
|
}
|
||||||
|
@ -248,18 +277,26 @@ void OptionsDialog::setupRadioButtons()
|
||||||
contentMode = settings->value("ContentMode", 0).toInt(&contentModeOk);
|
contentMode = settings->value("ContentMode", 0).toInt(&contentModeOk);
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
if (contentModeOk)
|
if (contentModeOk) {
|
||||||
{
|
switch (contentMode) {
|
||||||
switch (contentMode)
|
|
||||||
{
|
|
||||||
case 0:
|
case 0:
|
||||||
ui->rbOpenWithSC->setChecked(true);
|
case 20:
|
||||||
|
ui->rbModern->setChecked(true);
|
||||||
|
ui->cbDoubleclick->setChecked(false);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
ui->rbOpenWithDC->setChecked(true);
|
|
||||||
break;
|
|
||||||
case 2:
|
case 2:
|
||||||
ui->rbSelectWithSC->setChecked(true);
|
case 21:
|
||||||
|
ui->rbModern->setChecked(true);
|
||||||
|
ui->cbDoubleclick->setChecked(true);
|
||||||
|
break;
|
||||||
|
case 10:
|
||||||
|
ui->rbClassic->setChecked(true);
|
||||||
|
ui->cbDoubleclick->setChecked(false);
|
||||||
|
break;
|
||||||
|
case 11:
|
||||||
|
ui->rbClassic->setChecked(true);
|
||||||
|
ui->cbDoubleclick->setChecked(true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -268,55 +305,40 @@ void OptionsDialog::setupRadioButtons()
|
||||||
void OptionsDialog::setupInterfaceSettings()
|
void OptionsDialog::setupInterfaceSettings()
|
||||||
{
|
{
|
||||||
settings->beginGroup("Startup");
|
settings->beginGroup("Startup");
|
||||||
bool alwaysUseMessageFont = settings->value("AlwaysUseMessageFont", false).toBool();
|
const QString currentStyle = QApplication::style()->objectName();
|
||||||
ui->cbAlwaysUseMessageFont->setChecked(alwaysUseMessageFont);
|
const QString appStyle = settings->value("AppStyle", currentStyle).toString();
|
||||||
#ifdef GTA5SYNC_WIN
|
|
||||||
if (QSysInfo::windowsVersion() >= 0x0080)
|
|
||||||
{
|
|
||||||
ui->gbFont->setVisible(false);
|
|
||||||
ui->cbAlwaysUseMessageFont->setVisible(false);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
ui->gbFont->setVisible(false);
|
|
||||||
ui->cbAlwaysUseMessageFont->setVisible(false);
|
|
||||||
#endif
|
|
||||||
QString currentStyle = QApplication::style()->objectName();
|
|
||||||
QString appStyle = settings->value("AppStyle", currentStyle).toString();
|
|
||||||
bool customStyle = settings->value("CustomStyle", false).toBool();
|
bool customStyle = settings->value("CustomStyle", false).toBool();
|
||||||
const QStringList availableStyles = QStyleFactory::keys();
|
const QStringList availableStyles = QStyleFactory::keys();
|
||||||
ui->cbStyleList->addItems(availableStyles);
|
ui->cbStyleList->addItems(availableStyles);
|
||||||
if (availableStyles.contains(appStyle, Qt::CaseInsensitive))
|
if (availableStyles.contains(appStyle, Qt::CaseInsensitive)) {
|
||||||
{
|
|
||||||
// use 'for' for select to be sure it's case insensitive
|
// use 'for' for select to be sure it's case insensitive
|
||||||
int currentIndex = 0;
|
int currentIndex = 0;
|
||||||
for (QString currentStyleFF : availableStyles)
|
for (const QString ¤tStyleFF : availableStyles) {
|
||||||
{
|
if (currentStyleFF.toLower() == appStyle.toLower()) {
|
||||||
if (currentStyleFF.toLower() == appStyle.toLower())
|
|
||||||
{
|
|
||||||
ui->cbStyleList->setCurrentIndex(currentIndex);
|
ui->cbStyleList->setCurrentIndex(currentIndex);
|
||||||
}
|
}
|
||||||
currentIndex++;
|
currentIndex++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
if (availableStyles.contains(currentStyle, Qt::CaseInsensitive)) {
|
||||||
if (availableStyles.contains(currentStyle, Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
int currentIndex = 0;
|
int currentIndex = 0;
|
||||||
for (QString currentStyleFF : availableStyles)
|
for (const QString ¤tStyleFF : availableStyles) {
|
||||||
{
|
if (currentStyleFF.toLower() == currentStyle.toLower()) {
|
||||||
if (currentStyleFF.toLower() == currentStyle.toLower())
|
|
||||||
{
|
|
||||||
ui->cbStyleList->setCurrentIndex(currentIndex);
|
ui->cbStyleList->setCurrentIndex(currentIndex);
|
||||||
}
|
}
|
||||||
currentIndex++;
|
currentIndex++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (customStyle)
|
ui->cbDefaultStyle->setChecked(!customStyle);
|
||||||
{
|
ui->cbStyleList->setEnabled(customStyle);
|
||||||
ui->cbDefaultStyle->setChecked(false);
|
const QFont currentFont = QApplication::font();
|
||||||
}
|
const QFont appFont = qvariant_cast<QFont>(settings->value("AppFont", currentFont));
|
||||||
|
bool customFont = settings->value("CustomFont", false).toBool();
|
||||||
|
ui->cbDefaultFont->setChecked(!customFont);
|
||||||
|
ui->cbFont->setEnabled(customFont);
|
||||||
|
ui->cbFont->setCurrentFont(appFont);
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,26 +358,25 @@ void OptionsDialog::applySettings()
|
||||||
settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()));
|
settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()));
|
||||||
settings->setValue("AreaLanguage", ui->cbAreaLanguage->itemData(ui->cbAreaLanguage->currentIndex()));
|
settings->setValue("AreaLanguage", ui->cbAreaLanguage->itemData(ui->cbAreaLanguage->currentIndex()));
|
||||||
#endif
|
#endif
|
||||||
#ifdef GTA5SYNC_WIN
|
#ifdef Q_OS_WIN
|
||||||
#if QT_VERSION >= 0x050200
|
#if QT_VERSION >= 0x050200
|
||||||
settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
|
settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
|
||||||
#endif
|
#endif
|
||||||
|
#else
|
||||||
|
settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
|
||||||
#endif
|
#endif
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
settings->beginGroup("Profile");
|
settings->beginGroup("Profile");
|
||||||
int newContentMode = 0;
|
int newContentMode = 20;
|
||||||
if (ui->rbOpenWithSC->isChecked())
|
if (ui->rbModern->isChecked()) {
|
||||||
{
|
newContentMode = 20;
|
||||||
newContentMode = 0;
|
|
||||||
}
|
}
|
||||||
else if (ui->rbOpenWithDC->isChecked())
|
else if (ui->rbClassic->isChecked()) {
|
||||||
{
|
newContentMode = 10;
|
||||||
newContentMode = 1;
|
|
||||||
}
|
}
|
||||||
else if (ui->rbSelectWithSC->isChecked())
|
if (ui->cbDoubleclick->isChecked()) {
|
||||||
{
|
newContentMode++;
|
||||||
newContentMode = 2;
|
|
||||||
}
|
}
|
||||||
settings->setValue("ContentMode", newContentMode);
|
settings->setValue("ContentMode", newContentMode);
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
|
@ -366,18 +387,15 @@ void OptionsDialog::applySettings()
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
settings->beginGroup("Pictures");
|
settings->beginGroup("Pictures");
|
||||||
if (ui->cbPicCustomQuality->isChecked())
|
if (ui->cbPicCustomQuality->isChecked()) {
|
||||||
{
|
|
||||||
settings->setValue("CustomQuality", ui->hsPicQuality->value());
|
settings->setValue("CustomQuality", ui->hsPicQuality->value());
|
||||||
}
|
}
|
||||||
settings->setValue("CustomQualityEnabled", ui->cbPicCustomQuality->isChecked());
|
settings->setValue("CustomQualityEnabled", ui->cbPicCustomQuality->isChecked());
|
||||||
QString sizeMode = "Default";
|
QString sizeMode = "Default";
|
||||||
if (ui->rbPicDesktopRes->isChecked())
|
if (ui->rbPicDesktopRes->isChecked()) {
|
||||||
{
|
|
||||||
sizeMode = "Desktop";
|
sizeMode = "Desktop";
|
||||||
}
|
}
|
||||||
else if (ui->rbPicCustomRes->isChecked())
|
else if (ui->rbPicCustomRes->isChecked()) {
|
||||||
{
|
|
||||||
sizeMode = "Custom";
|
sizeMode = "Custom";
|
||||||
settings->setValue("CustomSize", QSize(ui->sbPicExportWidth->value(), ui->sbPicExportHeight->value()));
|
settings->setValue("CustomSize", QSize(ui->sbPicExportWidth->value(), ui->sbPicExportHeight->value()));
|
||||||
}
|
}
|
||||||
|
@ -393,27 +411,47 @@ void OptionsDialog::applySettings()
|
||||||
|
|
||||||
bool defaultStyle = ui->cbDefaultStyle->isChecked();
|
bool defaultStyle = ui->cbDefaultStyle->isChecked();
|
||||||
settings->beginGroup("Startup");
|
settings->beginGroup("Startup");
|
||||||
if (!defaultStyle)
|
if (!defaultStyle) {
|
||||||
{
|
|
||||||
QString newStyle = ui->cbStyleList->currentText();
|
QString newStyle = ui->cbStyleList->currentText();
|
||||||
settings->setValue("CustomStyle", true);
|
settings->setValue("CustomStyle", true);
|
||||||
settings->setValue("AppStyle", newStyle);
|
settings->setValue("AppStyle", newStyle);
|
||||||
QApplication::setStyle(QStyleFactory::create(newStyle));
|
QApplication::setStyle(QStyleFactory::create(newStyle));
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
settings->setValue("CustomStyle", false);
|
settings->setValue("CustomStyle", false);
|
||||||
}
|
}
|
||||||
settings->setValue("AlwaysUseMessageFont", ui->cbAlwaysUseMessageFont->isChecked());
|
bool defaultFont = ui->cbDefaultFont->isChecked();
|
||||||
|
if (!defaultFont) {
|
||||||
|
QFont newFont = ui->cbFont->currentFont();
|
||||||
|
settings->setValue("CustomFont", true);
|
||||||
|
settings->setValue("AppFont", newFont);
|
||||||
|
QApplication::setFont(newFont);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
settings->setValue("CustomFont", false);
|
||||||
|
}
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
#ifdef GTA5SYNC_TELEMETRY
|
#ifdef GTA5SYNC_TELEMETRY
|
||||||
settings->beginGroup("Telemetry");
|
settings->beginGroup("Telemetry");
|
||||||
settings->setValue("PushAppConf", ui->cbAppConfigStats->isChecked());
|
settings->setValue("PushAppConf", ui->cbAppConfigStats->isChecked());
|
||||||
|
settings->setValue("PushUsageData", ui->cbUsageData->isChecked());
|
||||||
if (!Telemetry->isStateForced()) { settings->setValue("IsEnabled", ui->cbParticipateStats->isChecked()); }
|
if (!Telemetry->isStateForced()) { settings->setValue("IsEnabled", ui->cbParticipateStats->isChecked()); }
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
Telemetry->refresh();
|
Telemetry->refresh();
|
||||||
Telemetry->work();
|
Telemetry->work();
|
||||||
|
if (ui->cbUsageData->isChecked() && Telemetry->canPush()) {
|
||||||
|
QJsonDocument jsonDocument;
|
||||||
|
QJsonObject jsonObject;
|
||||||
|
jsonObject["Type"] = "SettingsUpdated";
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
jsonObject["UpdateTime"] = QString::number(QDateTime::currentDateTimeUtc().toSecsSinceEpoch());
|
||||||
|
#else
|
||||||
|
jsonObject["UpdateTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
|
||||||
|
#endif
|
||||||
|
jsonDocument.setObject(jsonObject);
|
||||||
|
Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
|
@ -423,21 +461,19 @@ void OptionsDialog::applySettings()
|
||||||
bool languageChanged = ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentLanguage;
|
bool languageChanged = ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentLanguage;
|
||||||
bool languageAreaChanged = ui->cbAreaLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentAreaLanguage;
|
bool languageAreaChanged = ui->cbAreaLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentAreaLanguage;
|
||||||
#endif
|
#endif
|
||||||
if (languageChanged)
|
if (languageChanged) {
|
||||||
{
|
|
||||||
Translator->unloadTranslation(qApp);
|
Translator->unloadTranslation(qApp);
|
||||||
Translator->initUserLanguage();
|
Translator->initUserLanguage();
|
||||||
Translator->loadTranslation(qApp);
|
Translator->loadTranslation(qApp);
|
||||||
}
|
}
|
||||||
else if (languageAreaChanged)
|
else if (languageAreaChanged) {
|
||||||
{
|
|
||||||
Translator->initUserLanguage();
|
Translator->initUserLanguage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
settings->sync();
|
||||||
emit settingsApplied(newContentMode, languageChanged);
|
emit settingsApplied(newContentMode, languageChanged);
|
||||||
|
|
||||||
if ((forceCustomFolder && ui->txtFolder->text() != currentCFolder) || (forceCustomFolder != currentFFolder && forceCustomFolder))
|
if ((forceCustomFolder && ui->txtFolder->text() != currentCFolder) || (forceCustomFolder != currentFFolder && forceCustomFolder)) {
|
||||||
{
|
|
||||||
QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialise after you restart %1.").arg(GTA5SYNC_APPSTR));
|
QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialise after you restart %1.").arg(GTA5SYNC_APPSTR));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -454,11 +490,9 @@ void OptionsDialog::setupDefaultProfile()
|
||||||
|
|
||||||
void OptionsDialog::commitProfiles(const QStringList &profiles)
|
void OptionsDialog::commitProfiles(const QStringList &profiles)
|
||||||
{
|
{
|
||||||
for (QString profile : profiles)
|
for (const QString &profile : profiles) {
|
||||||
{
|
|
||||||
ui->cbProfiles->addItem(tr("Profile: %1").arg(profile), profile);
|
ui->cbProfiles->addItem(tr("Profile: %1").arg(profile), profile);
|
||||||
if (defaultProfile == profile)
|
if (defaultProfile == profile) {
|
||||||
{
|
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
ui->cbProfiles->setCurrentText(tr("Profile: %1").arg(profile));
|
ui->cbProfiles->setCurrentText(tr("Profile: %1").arg(profile));
|
||||||
#else
|
#else
|
||||||
|
@ -496,8 +530,7 @@ void OptionsDialog::setupPictureSettings()
|
||||||
|
|
||||||
// Quality Settings
|
// Quality Settings
|
||||||
customQuality = settings->value("CustomQuality", defaultQuality).toInt();
|
customQuality = settings->value("CustomQuality", defaultQuality).toInt();
|
||||||
if (customQuality < 1 || customQuality > 100)
|
if (customQuality < 1 || customQuality > 100) {
|
||||||
{
|
|
||||||
customQuality = 100;
|
customQuality = 100;
|
||||||
}
|
}
|
||||||
ui->hsPicQuality->setValue(customQuality);
|
ui->hsPicQuality->setValue(customQuality);
|
||||||
|
@ -505,42 +538,34 @@ void OptionsDialog::setupPictureSettings()
|
||||||
|
|
||||||
// Size Settings
|
// Size Settings
|
||||||
cusExportSize = settings->value("CustomSize", defExportSize).toSize();
|
cusExportSize = settings->value("CustomSize", defExportSize).toSize();
|
||||||
if (cusExportSize.width() > 3840)
|
if (cusExportSize.width() > 3840) {
|
||||||
{
|
|
||||||
cusExportSize.setWidth(3840);
|
cusExportSize.setWidth(3840);
|
||||||
}
|
}
|
||||||
else if (cusExportSize.height() > 2160)
|
else if (cusExportSize.height() > 2160) {
|
||||||
{
|
|
||||||
cusExportSize.setHeight(2160);
|
cusExportSize.setHeight(2160);
|
||||||
}
|
}
|
||||||
if (cusExportSize.width() < 1)
|
if (cusExportSize.width() < 1) {
|
||||||
{
|
|
||||||
cusExportSize.setWidth(1);
|
cusExportSize.setWidth(1);
|
||||||
}
|
}
|
||||||
else if (cusExportSize.height() < 1)
|
else if (cusExportSize.height() < 1) {
|
||||||
{
|
|
||||||
cusExportSize.setHeight(1);
|
cusExportSize.setHeight(1);
|
||||||
}
|
}
|
||||||
ui->sbPicExportWidth->setValue(cusExportSize.width());
|
ui->sbPicExportWidth->setValue(cusExportSize.width());
|
||||||
ui->sbPicExportHeight->setValue(cusExportSize.height());
|
ui->sbPicExportHeight->setValue(cusExportSize.height());
|
||||||
|
|
||||||
QString sizeMode = settings->value("ExportSizeMode", "Default").toString();
|
QString sizeMode = settings->value("ExportSizeMode", "Default").toString();
|
||||||
if (sizeMode == "Desktop")
|
if (sizeMode == "Desktop") {
|
||||||
{
|
|
||||||
ui->rbPicDesktopRes->setChecked(true);
|
ui->rbPicDesktopRes->setChecked(true);
|
||||||
}
|
}
|
||||||
else if (sizeMode == "Custom")
|
else if (sizeMode == "Custom") {
|
||||||
{
|
|
||||||
ui->rbPicCustomRes->setChecked(true);
|
ui->rbPicCustomRes->setChecked(true);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
ui->rbPicDefaultRes->setChecked(true);
|
ui->rbPicDefaultRes->setChecked(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
aspectRatio = (Qt::AspectRatioMode)settings->value("AspectRatio", Qt::KeepAspectRatio).toInt();
|
aspectRatio = (Qt::AspectRatioMode)settings->value("AspectRatio", Qt::KeepAspectRatio).toInt();
|
||||||
if (aspectRatio == Qt::IgnoreAspectRatio)
|
if (aspectRatio == Qt::IgnoreAspectRatio) {
|
||||||
{
|
|
||||||
ui->cbIgnoreAspectRatio->setChecked(true);
|
ui->cbIgnoreAspectRatio->setChecked(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -553,30 +578,20 @@ void OptionsDialog::setupStatisticsSettings()
|
||||||
ui->cbParticipateStats->setText(tr("Participate in %1 User Statistics").arg(GTA5SYNC_APPSTR));
|
ui->cbParticipateStats->setText(tr("Participate in %1 User Statistics").arg(GTA5SYNC_APPSTR));
|
||||||
ui->labUserStats->setText(QString("<a href=\"%2\">%1</a>").arg(tr("View %1 User Statistics Online").arg(GTA5SYNC_APPSTR), TelemetryClass::getWebURL().toString()));
|
ui->labUserStats->setText(QString("<a href=\"%2\">%1</a>").arg(tr("View %1 User Statistics Online").arg(GTA5SYNC_APPSTR), TelemetryClass::getWebURL().toString()));
|
||||||
|
|
||||||
ui->gbUserFeedback->setVisible(false);
|
|
||||||
// settings->beginGroup("Startup");
|
|
||||||
// if (settings->value("IsFirstStart", true).toBool() == true)
|
|
||||||
// {
|
|
||||||
// ui->gbUserFeedback->setVisible(false);
|
|
||||||
// }
|
|
||||||
// settings->endGroup();
|
|
||||||
|
|
||||||
settings->beginGroup("Telemetry");
|
settings->beginGroup("Telemetry");
|
||||||
ui->cbParticipateStats->setChecked(Telemetry->isEnabled());
|
ui->cbParticipateStats->setChecked(Telemetry->isEnabled());
|
||||||
ui->cbAppConfigStats->setChecked(settings->value("PushAppConf", false).toBool());
|
ui->cbAppConfigStats->setChecked(settings->value("PushAppConf", false).toBool());
|
||||||
|
ui->cbUsageData->setChecked(settings->value("PushUsageData", false).toBool());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
if (Telemetry->isStateForced())
|
if (Telemetry->isStateForced()) {
|
||||||
{
|
|
||||||
ui->cbParticipateStats->setEnabled(false);
|
ui->cbParticipateStats->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Telemetry->isRegistered())
|
if (Telemetry->isRegistered()) {
|
||||||
{
|
|
||||||
ui->labParticipationID->setText(tr("Participation ID: %1").arg(Telemetry->getRegisteredID()));
|
ui->labParticipationID->setText(tr("Participation ID: %1").arg(Telemetry->getRegisteredID()));
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
ui->labParticipationID->setText(tr("Participation ID: %1").arg(tr("Not registered")));
|
ui->labParticipationID->setText(tr("Participation ID: %1").arg(tr("Not registered")));
|
||||||
ui->cmdCopyStatsID->setVisible(false);
|
ui->cmdCopyStatsID->setVisible(false);
|
||||||
}
|
}
|
||||||
|
@ -585,14 +600,70 @@ void OptionsDialog::setupStatisticsSettings()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OptionsDialog::setupWindowsGameSettings()
|
||||||
|
{
|
||||||
|
#ifdef GTA5SYNC_GAME
|
||||||
|
GameVersion gameVersion = AppEnv::getGameVersion();
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
if (gameVersion != GameVersion::NoVersion) {
|
||||||
|
if (gameVersion == GameVersion::SocialClubVersion) {
|
||||||
|
ui->gbSteam->setDisabled(true);
|
||||||
|
ui->labSocialClubFound->setText(tr("Found: %1").arg(QString("<span style=\"color: green\">%1</span>").arg(tr("Yes"))));
|
||||||
|
ui->labSteamFound->setText(tr("Found: %1").arg(QString("<span style=\"color: red\">%1</span>").arg(tr("No"))));
|
||||||
|
if (AppEnv::getGameLanguage(GameVersion::SocialClubVersion) != GameLanguage::Undefined) {
|
||||||
|
ui->labSocialClubLanguage->setText(tr("Language: %1").arg(QLocale(AppEnv::gameLanguageToString(AppEnv::getGameLanguage(GameVersion::SocialClubVersion))).nativeLanguageName()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labSocialClubLanguage->setText(tr("Language: %1").arg(tr("OS defined")));
|
||||||
|
}
|
||||||
|
ui->labSteamLanguage->setVisible(false);
|
||||||
|
}
|
||||||
|
else if (gameVersion == GameVersion::SteamVersion) {
|
||||||
|
ui->gbSocialClub->setDisabled(true);
|
||||||
|
ui->labSocialClubFound->setText(tr("Found: %1").arg(QString("<span style=\"color: red\">%1</span>").arg(tr("No"))));
|
||||||
|
ui->labSteamFound->setText(tr("Found: %1").arg(QString("<span style=\"color: green\">%1</span>").arg(tr("Yes"))));
|
||||||
|
ui->labSocialClubLanguage->setVisible(false);
|
||||||
|
if (AppEnv::getGameLanguage(GameVersion::SteamVersion) != GameLanguage::Undefined) {
|
||||||
|
ui->labSteamLanguage->setText(tr("Language: %1").arg(QLocale(AppEnv::gameLanguageToString(AppEnv::getGameLanguage(GameVersion::SteamVersion))).nativeLanguageName()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labSteamLanguage->setText(tr("Language: %1").arg(tr("Steam defined")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labSocialClubFound->setText(tr("Found: %1").arg(QString("<span style=\"color: green\">%1</span>").arg(tr("Yes"))));
|
||||||
|
ui->labSteamFound->setText(tr("Found: %1").arg(QString("<span style=\"color: green\">%1</span>").arg(tr("Yes"))));
|
||||||
|
if (AppEnv::getGameLanguage(GameVersion::SocialClubVersion) != GameLanguage::Undefined) {
|
||||||
|
ui->labSocialClubLanguage->setText(tr("Language: %1").arg(QLocale(AppEnv::gameLanguageToString(AppEnv::getGameLanguage(GameVersion::SocialClubVersion))).nativeLanguageName()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labSocialClubLanguage->setText(tr("Language: %1").arg(tr("OS defined")));
|
||||||
|
}
|
||||||
|
if (AppEnv::getGameLanguage(GameVersion::SteamVersion) != GameLanguage::Undefined) {
|
||||||
|
ui->labSteamLanguage->setText(tr("Language: %1").arg(QLocale(AppEnv::gameLanguageToString(AppEnv::getGameLanguage(GameVersion::SteamVersion))).nativeLanguageName()));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->labSteamLanguage->setText(tr("Language: %1").arg(tr("Steam defined")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabGame));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabGame));
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabGame));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void OptionsDialog::on_cbIgnoreAspectRatio_toggled(bool checked)
|
void OptionsDialog::on_cbIgnoreAspectRatio_toggled(bool checked)
|
||||||
{
|
{
|
||||||
if (checked)
|
if (checked) {
|
||||||
{
|
|
||||||
aspectRatio = Qt::IgnoreAspectRatio;
|
aspectRatio = Qt::IgnoreAspectRatio;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
aspectRatio = Qt::KeepAspectRatio;
|
aspectRatio = Qt::KeepAspectRatio;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -604,8 +675,7 @@ void OptionsDialog::setupCustomGTAFolder()
|
||||||
settings->beginGroup("dir");
|
settings->beginGroup("dir");
|
||||||
currentCFolder = settings->value("dir", "").toString();
|
currentCFolder = settings->value("dir", "").toString();
|
||||||
currentFFolder = settings->value("force", false).toBool();
|
currentFFolder = settings->value("force", false).toBool();
|
||||||
if (currentCFolder == "" && ok)
|
if (currentCFolder == "" && ok) {
|
||||||
{
|
|
||||||
currentCFolder = defaultGameFolder;
|
currentCFolder = defaultGameFolder;
|
||||||
}
|
}
|
||||||
ui->txtFolder->setText(currentCFolder);
|
ui->txtFolder->setText(currentCFolder);
|
||||||
|
@ -615,26 +685,26 @@ void OptionsDialog::setupCustomGTAFolder()
|
||||||
|
|
||||||
void OptionsDialog::setupSnapmaticPictureViewer()
|
void OptionsDialog::setupSnapmaticPictureViewer()
|
||||||
{
|
{
|
||||||
#ifdef GTA5SYNC_WIN
|
#ifdef Q_OS_WIN
|
||||||
#if QT_VERSION >= 0x050200
|
#if QT_VERSION >= 0x050200
|
||||||
settings->beginGroup("Interface");
|
settings->beginGroup("Interface");
|
||||||
ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", false).toBool());
|
ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool());
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
#else
|
#else
|
||||||
ui->cbSnapmaticNavigationBar->setVisible(false);
|
ui->cbSnapmaticNavigationBar->setVisible(false);
|
||||||
ui->gbSnapmaticPictureViewer->setVisible(false);
|
ui->gbSnapmaticPictureViewer->setVisible(false);
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
ui->cbSnapmaticNavigationBar->setVisible(false);
|
settings->beginGroup("Interface");
|
||||||
ui->gbSnapmaticPictureViewer->setVisible(false);
|
ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool());
|
||||||
|
settings->endGroup();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void OptionsDialog::on_cmdExploreFolder_clicked()
|
void OptionsDialog::on_cmdExploreFolder_clicked()
|
||||||
{
|
{
|
||||||
QString GTAV_Folder = QFileDialog::getExistingDirectory(this, UserInterface::tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly);
|
const QString GTAV_Folder = QFileDialog::getExistingDirectory(this, UserInterface::tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly);
|
||||||
if (QFileInfo(GTAV_Folder).exists())
|
if (QDir(GTAV_Folder).exists()) {
|
||||||
{
|
|
||||||
ui->txtFolder->setText(GTAV_Folder);
|
ui->txtFolder->setText(GTAV_Folder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -642,25 +712,14 @@ void OptionsDialog::on_cmdExploreFolder_clicked()
|
||||||
void OptionsDialog::on_cbDefaultStyle_toggled(bool checked)
|
void OptionsDialog::on_cbDefaultStyle_toggled(bool checked)
|
||||||
{
|
{
|
||||||
ui->cbStyleList->setDisabled(checked);
|
ui->cbStyleList->setDisabled(checked);
|
||||||
|
ui->labStyle->setDisabled(checked);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OptionsDialog::on_cmdUserFeedbackSend_clicked()
|
void OptionsDialog::on_cbDefaultFont_toggled(bool checked)
|
||||||
{
|
{
|
||||||
#ifdef GTA5SYNC_TELEMETRY
|
ui->cbFont->setDisabled(checked);
|
||||||
if (ui->txtUserFeedback->toPlainText().length() < 1024 && ui->txtUserFeedback->toPlainText().length() >= 3)
|
ui->cmdFont->setDisabled(checked);
|
||||||
{
|
ui->labFont->setDisabled(checked);
|
||||||
QJsonDocument feedback;
|
|
||||||
QJsonObject feedbackObject;
|
|
||||||
feedbackObject["Message"] = ui->txtUserFeedback->toPlainText();
|
|
||||||
feedback.setObject(feedbackObject);
|
|
||||||
Telemetry->push(TelemetryCategory::UserFeedback, feedback);
|
|
||||||
ui->txtUserFeedback->setPlainText(QString());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
QMessageBox::information(this, tr("User Feedback"), tr("A feedback message have to between 3-1024 characters long"));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OptionsDialog::on_cmdCopyStatsID_clicked()
|
void OptionsDialog::on_cmdCopyStatsID_clicked()
|
||||||
|
@ -669,3 +728,18 @@ void OptionsDialog::on_cmdCopyStatsID_clicked()
|
||||||
QApplication::clipboard()->setText(Telemetry->getRegisteredID());
|
QApplication::clipboard()->setText(Telemetry->getRegisteredID());
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OptionsDialog::on_cbFont_currentFontChanged(const QFont &font)
|
||||||
|
{
|
||||||
|
ui->cbFont->setFont(font);
|
||||||
|
}
|
||||||
|
|
||||||
|
void OptionsDialog::on_cmdFont_clicked()
|
||||||
|
{
|
||||||
|
bool ok;
|
||||||
|
const QFont font = QFontDialog::getFont(&ok, ui->cbFont->currentFont(), this);
|
||||||
|
if (ok) {
|
||||||
|
ui->cbFont->setCurrentFont(font);
|
||||||
|
ui->cbFont->setFont(font);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -47,8 +47,10 @@ private slots:
|
||||||
void on_cbIgnoreAspectRatio_toggled(bool checked);
|
void on_cbIgnoreAspectRatio_toggled(bool checked);
|
||||||
void on_cmdExploreFolder_clicked();
|
void on_cmdExploreFolder_clicked();
|
||||||
void on_cbDefaultStyle_toggled(bool checked);
|
void on_cbDefaultStyle_toggled(bool checked);
|
||||||
void on_cmdUserFeedbackSend_clicked();
|
void on_cbDefaultFont_toggled(bool checked);
|
||||||
void on_cmdCopyStatsID_clicked();
|
void on_cmdCopyStatsID_clicked();
|
||||||
|
void on_cbFont_currentFontChanged(const QFont &font);
|
||||||
|
void on_cmdFont_clicked();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void settingsApplied(int contentMode, bool languageChanged);
|
void settingsApplied(int contentMode, bool languageChanged);
|
||||||
|
@ -80,6 +82,7 @@ private:
|
||||||
void setupInterfaceSettings();
|
void setupInterfaceSettings();
|
||||||
void setupStatisticsSettings();
|
void setupStatisticsSettings();
|
||||||
void setupSnapmaticPictureViewer();
|
void setupSnapmaticPictureViewer();
|
||||||
|
void setupWindowsGameSettings();
|
||||||
void applySettings();
|
void applySettings();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
238
OptionsDialog.ui
238
OptionsDialog.ui
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>435</width>
|
<width>435</width>
|
||||||
<height>474</height>
|
<height>524</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>3</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tabProfile">
|
<widget class="QWidget" name="tabProfile">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
|
@ -34,9 +34,9 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlProfileContentMode">
|
<layout class="QVBoxLayout" name="vlProfileContentMode">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="rbOpenWithSC">
|
<widget class="QRadioButton" name="rbModern">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open with Singleclick</string>
|
<string notr="true">%1 1.9+</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -44,16 +44,16 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="rbOpenWithDC">
|
<widget class="QRadioButton" name="rbClassic">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open with Doubleclick</string>
|
<string notr="true">%1 1.0-1.8</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="rbSelectWithSC">
|
<widget class="QCheckBox" name="cbDoubleclick">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Select with Singleclick</string>
|
<string>Open with Doubleclick</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -382,6 +382,72 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QWidget" name="tabGame">
|
||||||
|
<attribute name="title">
|
||||||
|
<string>Game</string>
|
||||||
|
</attribute>
|
||||||
|
<layout class="QVBoxLayout" name="vlGame">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="gbSocialClub">
|
||||||
|
<property name="title">
|
||||||
|
<string>Social Club Version</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="vlGameSocialClub">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labSocialClubFound">
|
||||||
|
<property name="text">
|
||||||
|
<string>Found: %1</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labSocialClubLanguage">
|
||||||
|
<property name="text">
|
||||||
|
<string>Language: %1</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="gbSteam">
|
||||||
|
<property name="title">
|
||||||
|
<string>Steam Version</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="vlGameSteam">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labSteamFound">
|
||||||
|
<property name="text">
|
||||||
|
<string>Found: %1</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labSteamLanguage">
|
||||||
|
<property name="text">
|
||||||
|
<string>Language: %1</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="vsGame">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
<widget class="QWidget" name="tabStats">
|
<widget class="QWidget" name="tabStats">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Feedback</string>
|
<string>Feedback</string>
|
||||||
|
@ -420,11 +486,11 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="gbCategorys">
|
<widget class="QGroupBox" name="gbCategories">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Categories</string>
|
<string>Categories</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlCategorys">
|
<layout class="QVBoxLayout" name="vlCategories">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="cbGeneralStats">
|
<widget class="QCheckBox" name="cbGeneralStats">
|
||||||
<property name="enabled">
|
<property name="enabled">
|
||||||
|
@ -458,6 +524,13 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="cbUsageData">
|
||||||
|
<property name="text">
|
||||||
|
<string>Personal Usage Data</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -466,74 +539,32 @@
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Other</string>
|
<string>Other</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="hlOtherStats">
|
<layout class="QVBoxLayout" name="vlFeedbackOther">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labParticipationID">
|
<layout class="QHBoxLayout" name="hlParticipation">
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Participation ID: %1</string>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="textInteractionFlags">
|
|
||||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cmdCopyStatsID">
|
|
||||||
<property name="text">
|
|
||||||
<string>&Copy</string>
|
|
||||||
</property>
|
|
||||||
<property name="autoDefault">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="gbUserFeedback">
|
|
||||||
<property name="title">
|
|
||||||
<string>User Feedback</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="vlUserFeedback">
|
|
||||||
<item>
|
|
||||||
<widget class="QPlainTextEdit" name="txtUserFeedback"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="hlUserFeedbackButtons">
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labUserFeedback">
|
<widget class="QLabel" name="labParticipationID">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Limit: 1 message/day</string>
|
<string>Participation ID: %1</string>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="textInteractionFlags">
|
||||||
|
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="hsUserFeedbackButtons">
|
<widget class="QPushButton" name="cmdCopyStatsID">
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="cmdUserFeedbackSend">
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Send</string>
|
<string>&Copy</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="autoDefault">
|
<property name="autoDefault">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
|
@ -629,6 +660,9 @@
|
||||||
<layout class="QHBoxLayout" name="hlStyle">
|
<layout class="QHBoxLayout" name="hlStyle">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labStyle">
|
<widget class="QLabel" name="labStyle">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Style:</string>
|
<string>Style:</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -659,12 +693,52 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="vlFont">
|
<layout class="QVBoxLayout" name="vlFont">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="cbAlwaysUseMessageFont">
|
<widget class="QCheckBox" name="cbDefaultFont">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Always use Message Font (Windows 2003 and earlier)</string>
|
<string>Use Default Font (Restart)</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="hlFont">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labFont">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Font:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QFontComboBox" name="cbFont">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="cmdFont">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">...</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -683,26 +757,6 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tabSync">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>Sync</string>
|
|
||||||
</attribute>
|
|
||||||
<layout class="QVBoxLayout" name="vlSync">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labSync">
|
|
||||||
<property name="text">
|
|
||||||
<string>Sync is not implemented at current time</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -29,14 +29,6 @@
|
||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
|
|
||||||
#ifdef GTA5SYNC_WIN
|
|
||||||
#if QT_VERSION >= 0x050200
|
|
||||||
#ifdef GTA5SYNC_APV
|
|
||||||
#include <dwmapi.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class PictureDialog;
|
class PictureDialog;
|
||||||
}
|
}
|
||||||
|
@ -56,17 +48,17 @@ public:
|
||||||
void setSnapmaticPicture(SnapmaticPicture *picture, int index);
|
void setSnapmaticPicture(SnapmaticPicture *picture, int index);
|
||||||
void setSnapmaticPicture(SnapmaticPicture *picture);
|
void setSnapmaticPicture(SnapmaticPicture *picture);
|
||||||
void addPreviousNextButtons();
|
void addPreviousNextButtons();
|
||||||
void stylizeDialog();
|
void styliseDialog();
|
||||||
bool isIndexed();
|
bool isIndexed();
|
||||||
int getIndex();
|
int getIndex();
|
||||||
~PictureDialog();
|
~PictureDialog();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
void adaptDialogSize();
|
||||||
void crewNameUpdated();
|
void crewNameUpdated();
|
||||||
void playerNameUpdated();
|
void playerNameUpdated();
|
||||||
void dialogNextPictureRequested();
|
void dialogNextPictureRequested();
|
||||||
void dialogPreviousPictureRequested();
|
void dialogPreviousPictureRequested();
|
||||||
void adaptNewDialogSize(QSize newLabelSize);
|
|
||||||
void exportCustomContextMenuRequested(const QPoint &pos);
|
void exportCustomContextMenuRequested(const QPoint &pos);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
@ -97,14 +89,11 @@ protected:
|
||||||
void closeEvent(QCloseEvent *ev);
|
void closeEvent(QCloseEvent *ev);
|
||||||
bool eventFilter(QObject *obj, QEvent *ev);
|
bool eventFilter(QObject *obj, QEvent *ev);
|
||||||
void mousePressEvent(QMouseEvent *ev);
|
void mousePressEvent(QMouseEvent *ev);
|
||||||
bool event(QEvent *event);
|
#ifdef Q_OS_WIN
|
||||||
#ifdef GTA5SYNC_WIN
|
#if QT_VERSION >= 0x060000
|
||||||
#if QT_VERSION >= 0x050200
|
bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result);
|
||||||
#ifdef GTA5SYNC_APV
|
#elif QT_VERSION >= 0x050000
|
||||||
bool nativeEvent(const QByteArray &eventType, void *message, long *result);
|
bool nativeEvent(const QByteArray &eventType, void *message, long *result);
|
||||||
LRESULT HitTestNCA(HWND hWnd, LPARAM lParam);
|
|
||||||
void resizeEvent(QResizeEvent *event);
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -136,8 +125,8 @@ private:
|
||||||
int avatarLocY;
|
int avatarLocY;
|
||||||
int avatarSize;
|
int avatarSize;
|
||||||
QMenu *manageMenu;
|
QMenu *manageMenu;
|
||||||
#ifdef GTA5SYNC_WIN
|
#ifdef Q_OS_WIN
|
||||||
#if QT_VERSION >= 0x050200
|
#if QT_VERSION >= 0x050000
|
||||||
QPoint dragPosition;
|
QPoint dragPosition;
|
||||||
bool dragStart;
|
bool dragStart;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -43,27 +43,11 @@
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="pixmap">
|
|
||||||
<pixmap resource="res/app.qrc">:/img/960x536.png</pixmap>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<spacer name="vsJSONUpper">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QFrame" name="jsonFrame">
|
<widget class="QFrame" name="jsonFrame">
|
||||||
<property name="frameShape">
|
<property name="frameShape">
|
||||||
|
@ -114,10 +98,10 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><span style=" font-weight:600;">Title: </span>%6<br/>
|
<string><span style="font-weight:600">Title: </span>%6<br/>
|
||||||
<span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/>
|
<span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/>
|
||||||
<span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/>
|
<span style="font-weight:600">Players: </span>%4 (Crew %5)<br/>
|
||||||
<span style=" font-weight:600;">Created: </span>%8</string>
|
<span style="font-weight:600">Created: </span>%8</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -230,9 +214,7 @@
|
||||||
</slots>
|
</slots>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources>
|
<resources/>
|
||||||
<include location="res/app.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections>
|
<connections>
|
||||||
<connection>
|
<connection>
|
||||||
<sender>cmdClose</sender>
|
<sender>cmdClose</sender>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2020 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -17,26 +17,29 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "AppEnv.h"
|
||||||
#include "PictureExport.h"
|
#include "PictureExport.h"
|
||||||
#include "PictureDialog.h"
|
#include "PictureDialog.h"
|
||||||
#include "StandardPaths.h"
|
#include "StandardPaths.h"
|
||||||
#include "SidebarGenerator.h"
|
#include "SidebarGenerator.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QDesktopWidget>
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QRegExp>
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
#if QT_VERSION < 0x050000
|
||||||
|
#include <QDesktopWidget>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
#include <QSaveFile>
|
#include <QSaveFile>
|
||||||
|
#include <QScreen>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
PictureExport::PictureExport()
|
PictureExport::PictureExport()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PictureExport::exportAsPicture(QWidget *parent, SnapmaticPicture *picture)
|
void PictureExport::exportAsPicture(QWidget *parent, SnapmaticPicture *picture)
|
||||||
|
@ -47,30 +50,25 @@ void PictureExport::exportAsPicture(QWidget *parent, SnapmaticPicture *picture)
|
||||||
// Quality Settings
|
// Quality Settings
|
||||||
settings.beginGroup("Pictures");
|
settings.beginGroup("Pictures");
|
||||||
int defaultQuality = 100;
|
int defaultQuality = 100;
|
||||||
QSize defExportSize = QSize(960, 536);
|
QSize defExportSize = SnapmaticPicture::getSnapmaticResolution();
|
||||||
int customQuality = settings.value("CustomQuality", defaultQuality).toInt();
|
int customQuality = settings.value("CustomQuality", defaultQuality).toInt();
|
||||||
if (customQuality < 1 || customQuality > 100)
|
if (customQuality < 1 || customQuality > 100) {
|
||||||
{
|
|
||||||
customQuality = 100;
|
customQuality = 100;
|
||||||
}
|
}
|
||||||
bool useCustomQuality = settings.value("CustomQualityEnabled", false).toBool();
|
bool useCustomQuality = settings.value("CustomQualityEnabled", false).toBool();
|
||||||
|
|
||||||
// Size Settings
|
// Size Settings
|
||||||
QSize cusExportSize = settings.value("CustomSize", defExportSize).toSize();
|
QSize cusExportSize = settings.value("CustomSize", defExportSize).toSize();
|
||||||
if (cusExportSize.width() > 3840)
|
if (cusExportSize.width() > 3840) {
|
||||||
{
|
|
||||||
cusExportSize.setWidth(3840);
|
cusExportSize.setWidth(3840);
|
||||||
}
|
}
|
||||||
else if (cusExportSize.height() > 2160)
|
else if (cusExportSize.height() > 2160) {
|
||||||
{
|
|
||||||
cusExportSize.setHeight(2160);
|
cusExportSize.setHeight(2160);
|
||||||
}
|
}
|
||||||
if (cusExportSize.width() < 1)
|
if (cusExportSize.width() < 1) {
|
||||||
{
|
|
||||||
cusExportSize.setWidth(1);
|
cusExportSize.setWidth(1);
|
||||||
}
|
}
|
||||||
else if (cusExportSize.height() < 1)
|
else if (cusExportSize.height() < 1) {
|
||||||
{
|
|
||||||
cusExportSize.setHeight(1);
|
cusExportSize.setHeight(1);
|
||||||
}
|
}
|
||||||
QString sizeMode = settings.value("ExportSizeMode", "Default").toString();
|
QString sizeMode = settings.value("ExportSizeMode", "Default").toString();
|
||||||
|
@ -109,59 +107,55 @@ fileDialogPreSave: //Work?
|
||||||
QString newPictureFileName = getPictureFileName(picture) % defaultExportFormat;
|
QString newPictureFileName = getPictureFileName(picture) % defaultExportFormat;
|
||||||
fileDialog.selectFile(newPictureFileName);
|
fileDialog.selectFile(newPictureFileName);
|
||||||
|
|
||||||
if (fileDialog.exec())
|
if (fileDialog.exec()) {
|
||||||
{
|
|
||||||
QStringList selectedFiles = fileDialog.selectedFiles();
|
QStringList selectedFiles = fileDialog.selectedFiles();
|
||||||
if (selectedFiles.length() == 1)
|
if (selectedFiles.length() == 1) {
|
||||||
{
|
|
||||||
QString saveFileFormat;
|
QString saveFileFormat;
|
||||||
QString selectedFile = selectedFiles.at(0);
|
QString selectedFile = selectedFiles.at(0);
|
||||||
|
|
||||||
if (selectedFile.right(4) == ".jpg")
|
if (selectedFile.right(4) == ".jpg") {
|
||||||
{
|
|
||||||
saveFileFormat = "JPEG";
|
saveFileFormat = "JPEG";
|
||||||
}
|
}
|
||||||
else if (selectedFile.right(4) == ".jpeg")
|
else if (selectedFile.right(4) == ".jpeg") {
|
||||||
{
|
|
||||||
saveFileFormat = "JPEG";
|
saveFileFormat = "JPEG";
|
||||||
}
|
}
|
||||||
else if (selectedFile.right(4) == ".png")
|
else if (selectedFile.right(4) == ".png") {
|
||||||
{
|
|
||||||
saveFileFormat = "PNG";
|
saveFileFormat = "PNG";
|
||||||
}
|
}
|
||||||
else if (selectedFile.right(7) == ".suffix")
|
else if (selectedFile.right(7) == ".suffix") {
|
||||||
{
|
if (fileDialog.selectedNameFilter() == "JPEG picture (*.jpg)") {
|
||||||
if (fileDialog.selectedNameFilter() == "JPEG picture (*.jpg)")
|
|
||||||
{
|
|
||||||
selectedFile.replace(".suffix", ".jpg");
|
selectedFile.replace(".suffix", ".jpg");
|
||||||
}
|
}
|
||||||
else if (fileDialog.selectedNameFilter() == "Portable Network Graphics (*.png)")
|
else if (fileDialog.selectedNameFilter() == "Portable Network Graphics (*.png)") {
|
||||||
{
|
|
||||||
selectedFile.replace(".suffix", ".png");
|
selectedFile.replace(".suffix", ".png");
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
selectedFile.replace(".suffix", ".jpg");
|
selectedFile.replace(".suffix", ".jpg");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (QFile::exists(selectedFile))
|
if (QFile::exists(selectedFile)) {
|
||||||
{
|
if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) {
|
||||||
if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
|
|
||||||
{
|
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scale Picture
|
// Scale Picture
|
||||||
QImage exportPicture = picture->getImage();
|
QImage exportPicture = picture->getImage();
|
||||||
if (sizeMode == "Desktop")
|
if (sizeMode == "Desktop") {
|
||||||
{
|
#if QT_VERSION >= 0x050000
|
||||||
|
qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
|
QRect desktopResolution = QApplication::primaryScreen()->geometry();
|
||||||
|
int desktopSizeWidth = qRound((double)desktopResolution.width() * screenRatioPR);
|
||||||
|
int desktopSizeHeight = qRound((double)desktopResolution.height() * screenRatioPR);
|
||||||
|
#else
|
||||||
QRect desktopResolution = QApplication::desktop()->screenGeometry();
|
QRect desktopResolution = QApplication::desktop()->screenGeometry();
|
||||||
exportPicture = exportPicture.scaled(desktopResolution.width(), desktopResolution.height(), aspectRatio, Qt::SmoothTransformation);
|
int desktopSizeWidth = desktopResolution.width();
|
||||||
|
int desktopSizeHeight = desktopResolution.height();
|
||||||
|
#endif
|
||||||
|
exportPicture = exportPicture.scaled(desktopSizeWidth, desktopSizeHeight, aspectRatio, Qt::SmoothTransformation);
|
||||||
}
|
}
|
||||||
else if (sizeMode == "Custom")
|
else if (sizeMode == "Custom") {
|
||||||
{
|
|
||||||
exportPicture = exportPicture.scaled(cusExportSize, aspectRatio, Qt::SmoothTransformation);
|
exportPicture = exportPicture.scaled(cusExportSize, aspectRatio, Qt::SmoothTransformation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,32 +166,26 @@ fileDialogPreSave: //Work?
|
||||||
#else
|
#else
|
||||||
QFile *picFile = new QFile(selectedFile);
|
QFile *picFile = new QFile(selectedFile);
|
||||||
#endif
|
#endif
|
||||||
if (picFile->open(QIODevice::WriteOnly))
|
if (picFile->open(QIODevice::WriteOnly)) {
|
||||||
{
|
|
||||||
isSaved = exportPicture.save(picFile, saveFileFormat.toStdString().c_str(), useCustomQuality ? customQuality : defaultQuality);
|
isSaved = exportPicture.save(picFile, saveFileFormat.toStdString().c_str(), useCustomQuality ? customQuality : defaultQuality);
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
if (isSaved)
|
if (isSaved) {
|
||||||
{
|
|
||||||
isSaved = picFile->commit();
|
isSaved = picFile->commit();
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
errorId = 1;
|
errorId = 1;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
picFile->close();
|
picFile->close();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
errorId = 2;
|
errorId = 2;
|
||||||
}
|
}
|
||||||
delete picFile;
|
delete picFile;
|
||||||
|
|
||||||
if (!isSaved)
|
if (!isSaved) {
|
||||||
{
|
switch (errorId) {
|
||||||
switch (errorId)
|
|
||||||
{
|
|
||||||
case 0:
|
case 0:
|
||||||
QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because the system occurred a write failure"));
|
QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because the system occurred a write failure"));
|
||||||
break;
|
break;
|
||||||
|
@ -213,8 +201,7 @@ fileDialogPreSave: //Work?
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("No valid file is selected"));
|
QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("No valid file is selected"));
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
|
@ -250,7 +237,9 @@ fileDialogPreSave: //Work?
|
||||||
|
|
||||||
QStringList filters;
|
QStringList filters;
|
||||||
filters << PictureDialog::tr("GTA V Export (*.g5e)");
|
filters << PictureDialog::tr("GTA V Export (*.g5e)");
|
||||||
|
#ifndef GTA5SYNC_FLATPAK
|
||||||
filters << PictureDialog::tr("GTA V Raw Export (*.auto)");
|
filters << PictureDialog::tr("GTA V Raw Export (*.auto)");
|
||||||
|
#endif
|
||||||
filters << PictureDialog::tr("Snapmatic pictures (PGTA*)");
|
filters << PictureDialog::tr("Snapmatic pictures (PGTA*)");
|
||||||
fileDialog.setNameFilters(filters);
|
fileDialog.setNameFilters(filters);
|
||||||
|
|
||||||
|
@ -261,58 +250,48 @@ fileDialogPreSave: //Work?
|
||||||
fileDialog.restoreGeometry(settings.value(parent->objectName() % "+Geometry", "").toByteArray());
|
fileDialog.restoreGeometry(settings.value(parent->objectName() % "+Geometry", "").toByteArray());
|
||||||
fileDialog.selectFile(QString(picture->getExportPictureFileName() % ".g5e"));
|
fileDialog.selectFile(QString(picture->getExportPictureFileName() % ".g5e"));
|
||||||
|
|
||||||
if (fileDialog.exec())
|
if (fileDialog.exec()) {
|
||||||
{
|
|
||||||
QStringList selectedFiles = fileDialog.selectedFiles();
|
QStringList selectedFiles = fileDialog.selectedFiles();
|
||||||
if (selectedFiles.length() == 1)
|
if (selectedFiles.length() == 1) {
|
||||||
{
|
|
||||||
QString selectedFile = selectedFiles.at(0);
|
QString selectedFile = selectedFiles.at(0);
|
||||||
bool isAutoExt = false;
|
bool isAutoExt = false;
|
||||||
if (selectedFile.right(5) == ".auto")
|
#ifndef GTA5SYNC_FLATPAK
|
||||||
{
|
if (selectedFile.right(5) == ".auto") {
|
||||||
isAutoExt = true;
|
isAutoExt = true;
|
||||||
QString dirPath = QFileInfo(selectedFile).dir().path();
|
QString dirPath = QFileInfo(selectedFile).dir().path();
|
||||||
QString stockFileName = sgdFileInfo.fileName();
|
QString stockFileName = sgdFileInfo.fileName();
|
||||||
selectedFile = dirPath % "/" % stockFileName;
|
selectedFile = dirPath % "/" % stockFileName;
|
||||||
}
|
}
|
||||||
else if (selectedFile.right(4) == ".rem")
|
#endif
|
||||||
{
|
if (selectedFile.right(4) == ".rem") {
|
||||||
selectedFile.remove(selectedFile.length() - 4, 4);
|
selectedFile.remove(selectedFile.length() - 4, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (QFile::exists(selectedFile))
|
if (QFile::exists(selectedFile)) {
|
||||||
{
|
if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) {
|
||||||
if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
|
|
||||||
{
|
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selectedFile.right(4) == ".g5e")
|
if (selectedFile.right(4) == ".g5e") {
|
||||||
{
|
|
||||||
bool isExported = picture->exportPicture(selectedFile, SnapmaticFormat::G5E_Format);
|
bool isExported = picture->exportPicture(selectedFile, SnapmaticFormat::G5E_Format);
|
||||||
if (!isExported)
|
if (!isExported) {
|
||||||
{
|
|
||||||
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
|
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
bool isCopied = picture->exportPicture(selectedFile, SnapmaticFormat::PGTA_Format);
|
bool isCopied = picture->exportPicture(selectedFile, SnapmaticFormat::PGTA_Format);
|
||||||
if (!isCopied)
|
if (!isCopied) {
|
||||||
{
|
|
||||||
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
|
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
if (isAutoExt) QMessageBox::information(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Exported Snapmatic to \"%1\" because of using the .auto extension.").arg(selectedFile));
|
if (isAutoExt) QMessageBox::information(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Exported Snapmatic to \"%1\" because of using the .auto extension.").arg(selectedFile));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("No valid file is selected"));
|
QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("No valid file is selected"));
|
||||||
goto fileDialogPreSave; //Work?
|
goto fileDialogPreSave; //Work?
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2020 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -19,13 +19,12 @@
|
||||||
#include "PictureDialog.h"
|
#include "PictureDialog.h"
|
||||||
#include "PictureWidget.h"
|
#include "PictureWidget.h"
|
||||||
#include "UiModLabel.h"
|
#include "UiModLabel.h"
|
||||||
#include <QDesktopWidget>
|
#include "AppEnv.h"
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
#include <QEvent>
|
#include <QEvent>
|
||||||
#include <QDebug>
|
|
||||||
|
|
||||||
PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
|
PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +43,6 @@ PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
|
||||||
|
|
||||||
QObject::connect(pictureLabel, SIGNAL(mouseDoubleClicked(Qt::MouseButton)), this, SLOT(pictureDoubleClicked(Qt::MouseButton)));
|
QObject::connect(pictureLabel, SIGNAL(mouseDoubleClicked(Qt::MouseButton)), this, SLOT(pictureDoubleClicked(Qt::MouseButton)));
|
||||||
QObject::connect(pictureLabel, SIGNAL(customContextMenuRequested(QPoint)), parent, SLOT(exportCustomContextMenuRequested(QPoint)));
|
QObject::connect(pictureLabel, SIGNAL(customContextMenuRequested(QPoint)), parent, SLOT(exportCustomContextMenuRequested(QPoint)));
|
||||||
QObject::connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(updateWindowSize(int)));
|
|
||||||
|
|
||||||
setLayout(widgetLayout);
|
setLayout(widgetLayout);
|
||||||
}
|
}
|
||||||
|
@ -58,12 +56,10 @@ PictureWidget::~PictureWidget()
|
||||||
|
|
||||||
bool PictureWidget::eventFilter(QObject *obj, QEvent *ev)
|
bool PictureWidget::eventFilter(QObject *obj, QEvent *ev)
|
||||||
{
|
{
|
||||||
if (obj == this)
|
if (obj == this) {
|
||||||
{
|
if (ev->type() == QEvent::KeyPress) {
|
||||||
if (ev->type() == QEvent::KeyPress)
|
|
||||||
{
|
|
||||||
QKeyEvent *keyEvent = (QKeyEvent*)ev;
|
QKeyEvent *keyEvent = (QKeyEvent*)ev;
|
||||||
switch (keyEvent->key()){
|
switch (keyEvent->key()) {
|
||||||
case Qt::Key_Left:
|
case Qt::Key_Left:
|
||||||
emit previousPictureRequested();
|
emit previousPictureRequested();
|
||||||
break;
|
break;
|
||||||
|
@ -78,32 +74,29 @@ bool PictureWidget::eventFilter(QObject *obj, QEvent *ev)
|
||||||
|
|
||||||
void PictureWidget::pictureDoubleClicked(Qt::MouseButton button)
|
void PictureWidget::pictureDoubleClicked(Qt::MouseButton button)
|
||||||
{
|
{
|
||||||
if (button == Qt::LeftButton)
|
if (button == Qt::LeftButton) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PictureWidget::setImage(QImage image_, QRect rec)
|
void PictureWidget::setImage(QImage image_, QRect rec)
|
||||||
{
|
{
|
||||||
|
const qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
image = image_;
|
image = image_;
|
||||||
pictureLabel->setPixmap(QPixmap::fromImage(image.scaled(rec.width(), rec.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation)));
|
QPixmap pixmap = QPixmap::fromImage(image.scaled(rec.width() * screenRatioPR, rec.height() * screenRatioPR, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||||
|
#if QT_VERSION >= 0x050600
|
||||||
|
pixmap.setDevicePixelRatio(AppEnv::screenRatioPR());
|
||||||
|
#endif
|
||||||
|
pictureLabel->setPixmap(pixmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PictureWidget::setImage(QImage image_)
|
void PictureWidget::setImage(QImage image_)
|
||||||
{
|
{
|
||||||
|
const qreal screenRatioPR = AppEnv::screenRatioPR();
|
||||||
image = image_;
|
image = image_;
|
||||||
pictureLabel->setPixmap(QPixmap::fromImage(image.scaled(geometry().width(), geometry().height(), Qt::KeepAspectRatio, Qt::SmoothTransformation)));
|
QPixmap pixmap = QPixmap::fromImage(image.scaled(geometry().width() * screenRatioPR, geometry().height() * screenRatioPR, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||||
}
|
#if QT_VERSION >= 0x050600
|
||||||
|
pixmap.setDevicePixelRatio(screenRatioPR);
|
||||||
void PictureWidget::updateWindowSize(int screenID)
|
#endif
|
||||||
{
|
pictureLabel->setPixmap(pixmap);
|
||||||
if (screenID == QApplication::desktop()->screenNumber(this))
|
|
||||||
{
|
|
||||||
QRect desktopRect = QApplication::desktop()->screenGeometry(this);
|
|
||||||
this->move(desktopRect.x(), desktopRect.y());
|
|
||||||
this->resize(desktopRect.width(), desktopRect.height());
|
|
||||||
this->showFullScreen();
|
|
||||||
pictureLabel->setPixmap(QPixmap::fromImage(image.scaled(desktopRect.width(), desktopRect.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -46,7 +46,6 @@ private:
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void pictureDoubleClicked(Qt::MouseButton button);
|
void pictureDoubleClicked(Qt::MouseButton button);
|
||||||
void updateWindowSize(int screenID);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void nextPictureRequested();
|
void nextPictureRequested();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -18,7 +18,9 @@
|
||||||
|
|
||||||
#include "PlayerListDialog.h"
|
#include "PlayerListDialog.h"
|
||||||
#include "ui_PlayerListDialog.h"
|
#include "ui_PlayerListDialog.h"
|
||||||
|
#include "wrapper.h"
|
||||||
#include "AppEnv.h"
|
#include "AppEnv.h"
|
||||||
|
#include <QStringBuilder>
|
||||||
#include <QFontMetrics>
|
#include <QFontMetrics>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
@ -31,54 +33,72 @@ PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profile
|
||||||
ui(new Ui::PlayerListDialog)
|
ui(new Ui::PlayerListDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
listUpdated = false;
|
listUpdated = false;
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ui->cmdCancel->setDefault(true);
|
||||||
ui->cmdCancel->setFocus();
|
ui->cmdCancel->setFocus();
|
||||||
|
|
||||||
// Set Icon for Apply Button
|
// Set Icon for Apply Button
|
||||||
if (QIcon::hasThemeIcon("dialog-ok-apply"))
|
if (QIcon::hasThemeIcon("dialog-ok-apply")) {
|
||||||
{
|
|
||||||
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok-apply"));
|
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok-apply"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("dialog-apply"))
|
else if (QIcon::hasThemeIcon("dialog-apply")) {
|
||||||
{
|
|
||||||
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-apply"));
|
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-apply"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-apply"))
|
else if (QIcon::hasThemeIcon("gtk-apply")) {
|
||||||
{
|
|
||||||
ui->cmdApply->setIcon(QIcon::fromTheme("gtk-apply"));
|
ui->cmdApply->setIcon(QIcon::fromTheme("gtk-apply"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("dialog-ok"))
|
else if (QIcon::hasThemeIcon("dialog-ok")) {
|
||||||
{
|
|
||||||
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
|
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-ok"))
|
else if (QIcon::hasThemeIcon("gtk-ok")) {
|
||||||
{
|
|
||||||
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
|
ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Icon for Cancel Button
|
// Set Icon for Cancel Button
|
||||||
if (QIcon::hasThemeIcon("dialog-cancel"))
|
if (QIcon::hasThemeIcon("dialog-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
|
||||||
}
|
}
|
||||||
else if (QIcon::hasThemeIcon("gtk-cancel"))
|
else if (QIcon::hasThemeIcon("gtk-cancel")) {
|
||||||
{
|
|
||||||
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Icon for Manage Buttons
|
// Set Icon for Manage Buttons
|
||||||
if (QIcon::hasThemeIcon("go-previous") && QIcon::hasThemeIcon("go-next") && QIcon::hasThemeIcon("list-add"))
|
if (QIcon::hasThemeIcon("go-previous") && QIcon::hasThemeIcon("go-next") && QIcon::hasThemeIcon("list-add")) {
|
||||||
{
|
#if QT_VERSION < 0x050600
|
||||||
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
|
if (screenRatio != 1) {
|
||||||
|
QSize iconSize = ui->cmdMakeAv->iconSize();
|
||||||
|
iconSize = QSize(iconSize.width() * screenRatio, iconSize.height() * screenRatio);
|
||||||
|
ui->cmdMakeAv->setIconSize(iconSize);
|
||||||
|
ui->cmdMakeSe->setIconSize(iconSize);
|
||||||
|
ui->cmdMakeAd->setIconSize(iconSize);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
ui->cmdMakeAv->setIcon(QIcon::fromTheme("go-previous"));
|
ui->cmdMakeAv->setIcon(QIcon::fromTheme("go-previous"));
|
||||||
ui->cmdMakeSe->setIcon(QIcon::fromTheme("go-next"));
|
ui->cmdMakeSe->setIcon(QIcon::fromTheme("go-next"));
|
||||||
ui->cmdMakeAd->setIcon(QIcon::fromTheme("list-add"));
|
ui->cmdMakeAd->setIcon(QIcon::fromTheme("list-add"));
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
#if QT_VERSION < 0x050600
|
||||||
drawSwitchButtons();
|
qreal screenRatio = AppEnv::screenRatio();
|
||||||
|
if (screenRatio != 1) {
|
||||||
|
QSize iconSize = ui->cmdMakeAv->iconSize();
|
||||||
|
iconSize = QSize(iconSize.width() * screenRatio, iconSize.height() * screenRatio);
|
||||||
|
ui->cmdMakeAv->setIconSize(iconSize);
|
||||||
|
ui->cmdMakeSe->setIconSize(iconSize);
|
||||||
|
ui->cmdMakeAd->setIconSize(iconSize);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
ui->cmdMakeAv->setIcon(QIcon(AppEnv::getImagesFolder() % "/back.svgz"));
|
||||||
|
ui->cmdMakeSe->setIcon(QIcon(AppEnv::getImagesFolder() % "/next.svgz"));
|
||||||
|
ui->cmdMakeAd->setIcon(QIcon(AppEnv::getImagesFolder() % "/add.svgz"));
|
||||||
}
|
}
|
||||||
buildInterface();
|
buildInterface();
|
||||||
|
|
||||||
|
@ -89,90 +109,15 @@ PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profile
|
||||||
|
|
||||||
PlayerListDialog::~PlayerListDialog()
|
PlayerListDialog::~PlayerListDialog()
|
||||||
{
|
{
|
||||||
for (QObject *object : ui->listAvPlayers->children())
|
for (QObject *object : ui->listAvPlayers->children()) {
|
||||||
{
|
|
||||||
delete object;
|
delete object;
|
||||||
}
|
}
|
||||||
for (QObject *object : ui->listSePlayers->children())
|
for (QObject *object : ui->listSePlayers->children()) {
|
||||||
{
|
|
||||||
delete object;
|
delete object;
|
||||||
}
|
}
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerListDialog::drawSwitchButtons()
|
|
||||||
{
|
|
||||||
QFont painterFont = ui->cmdApply->font();
|
|
||||||
QPalette palette;
|
|
||||||
|
|
||||||
QFontMetrics fontMetrics(painterFont);
|
|
||||||
QRect makeAvRect = fontMetrics.boundingRect(QRect(0, 0, 0, 0), Qt::AlignCenter | Qt::TextDontClip, "<");
|
|
||||||
QRect makeSeRect = fontMetrics.boundingRect(QRect(0, 0, 0, 0), Qt::AlignCenter | Qt::TextDontClip, ">");
|
|
||||||
QRect makeAdRect = fontMetrics.boundingRect(QRect(0, 0, 0, 0), Qt::AlignCenter | Qt::TextDontClip, "+");
|
|
||||||
|
|
||||||
int makeAvSize;
|
|
||||||
if (makeAvRect.height() > makeAvRect.width())
|
|
||||||
{
|
|
||||||
makeAvSize = makeAvRect.height();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
makeAvSize = makeAvRect.width();
|
|
||||||
}
|
|
||||||
int makeSeSize;
|
|
||||||
if (makeSeRect.height() > makeSeRect.width())
|
|
||||||
{
|
|
||||||
makeSeSize = makeSeRect.height();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
makeSeSize = makeSeRect.width();
|
|
||||||
}
|
|
||||||
int makeAdSize;
|
|
||||||
if (makeAdRect.height() > makeAdRect.width())
|
|
||||||
{
|
|
||||||
makeAdSize = makeAdRect.height();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
makeAdSize = makeAdRect.width();
|
|
||||||
}
|
|
||||||
|
|
||||||
QImage avImage(makeAvSize, makeAvSize, QImage::Format_ARGB32_Premultiplied);
|
|
||||||
avImage.fill(Qt::transparent);
|
|
||||||
QImage seImage(makeSeSize, makeSeSize, QImage::Format_ARGB32_Premultiplied);
|
|
||||||
seImage.fill(Qt::transparent);
|
|
||||||
QImage adImage(makeAdSize, makeAdSize, QImage::Format_ARGB32_Premultiplied);
|
|
||||||
adImage.fill(Qt::transparent);
|
|
||||||
|
|
||||||
QPainter avPainter(&avImage);
|
|
||||||
avPainter.setFont(painterFont);
|
|
||||||
avPainter.setBrush(palette.buttonText());
|
|
||||||
avPainter.setPen(palette.buttonText().color());
|
|
||||||
avPainter.drawText(0, 0, makeAvSize, makeAvSize, Qt::AlignCenter | Qt::TextDontClip, "<");
|
|
||||||
avPainter.end();
|
|
||||||
QPainter sePainter(&seImage);
|
|
||||||
sePainter.setFont(painterFont);
|
|
||||||
sePainter.setBrush(palette.buttonText());
|
|
||||||
sePainter.setPen(palette.buttonText().color());
|
|
||||||
sePainter.drawText(0, 0, makeSeSize, makeSeSize, Qt::AlignCenter | Qt::TextDontClip, ">");
|
|
||||||
sePainter.end();
|
|
||||||
QPainter adPainter(&adImage);
|
|
||||||
adPainter.setFont(painterFont);
|
|
||||||
adPainter.setBrush(palette.buttonText());
|
|
||||||
adPainter.setPen(palette.buttonText().color());
|
|
||||||
adPainter.drawText(0, 0, makeAdSize, makeAdSize, Qt::AlignCenter | Qt::TextDontClip, "+");
|
|
||||||
adPainter.end();
|
|
||||||
|
|
||||||
ui->cmdMakeAv->setIconSize(avImage.size());
|
|
||||||
ui->cmdMakeSe->setIconSize(seImage.size());
|
|
||||||
ui->cmdMakeAd->setIconSize(adImage.size());
|
|
||||||
|
|
||||||
ui->cmdMakeAv->setIcon(QIcon(QPixmap::fromImage(avImage)));
|
|
||||||
ui->cmdMakeSe->setIcon(QIcon(QPixmap::fromImage(seImage)));
|
|
||||||
ui->cmdMakeAd->setIcon(QIcon(QPixmap::fromImage(adImage)));
|
|
||||||
}
|
|
||||||
|
|
||||||
void PlayerListDialog::on_cmdCancel_clicked()
|
void PlayerListDialog::on_cmdCancel_clicked()
|
||||||
{
|
{
|
||||||
close();
|
close();
|
||||||
|
@ -181,16 +126,13 @@ void PlayerListDialog::on_cmdCancel_clicked()
|
||||||
void PlayerListDialog::buildInterface()
|
void PlayerListDialog::buildInterface()
|
||||||
{
|
{
|
||||||
const QStringList dbPlayers = profileDB->getPlayers();
|
const QStringList dbPlayers = profileDB->getPlayers();
|
||||||
for (QString sePlayer : players)
|
for (const QString &sePlayer : qAsConst(players)) {
|
||||||
{
|
|
||||||
QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(sePlayer));
|
QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(sePlayer));
|
||||||
playerItem->setData(Qt::UserRole, sePlayer);
|
playerItem->setData(Qt::UserRole, sePlayer);
|
||||||
ui->listSePlayers->addItem(playerItem);
|
ui->listSePlayers->addItem(playerItem);
|
||||||
}
|
}
|
||||||
for (QString dbPlayer : dbPlayers)
|
for (const QString &dbPlayer : dbPlayers) {
|
||||||
{
|
if (!players.contains(dbPlayer)) {
|
||||||
if (!players.contains(dbPlayer))
|
|
||||||
{
|
|
||||||
QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(dbPlayer));
|
QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(dbPlayer));
|
||||||
playerItem->setData(Qt::UserRole, dbPlayer);
|
playerItem->setData(Qt::UserRole, dbPlayer);
|
||||||
ui->listAvPlayers->addItem(playerItem);
|
ui->listAvPlayers->addItem(playerItem);
|
||||||
|
@ -201,8 +143,7 @@ void PlayerListDialog::buildInterface()
|
||||||
|
|
||||||
void PlayerListDialog::on_cmdMakeAv_clicked()
|
void PlayerListDialog::on_cmdMakeAv_clicked()
|
||||||
{
|
{
|
||||||
for (QListWidgetItem *item : ui->listSePlayers->selectedItems())
|
for (QListWidgetItem *item : ui->listSePlayers->selectedItems()) {
|
||||||
{
|
|
||||||
QString playerName = item->text();
|
QString playerName = item->text();
|
||||||
int playerID = item->data(Qt::UserRole).toInt();
|
int playerID = item->data(Qt::UserRole).toInt();
|
||||||
delete item;
|
delete item;
|
||||||
|
@ -216,13 +157,11 @@ void PlayerListDialog::on_cmdMakeAv_clicked()
|
||||||
void PlayerListDialog::on_cmdMakeSe_clicked()
|
void PlayerListDialog::on_cmdMakeSe_clicked()
|
||||||
{
|
{
|
||||||
int maxPlayers = 30;
|
int maxPlayers = 30;
|
||||||
if (maxPlayers < ui->listSePlayers->count() + ui->listAvPlayers->selectedItems().count())
|
if (maxPlayers < ui->listSePlayers->count() + ui->listAvPlayers->selectedItems().count()) {
|
||||||
{
|
|
||||||
QMessageBox::warning(this, tr("Add Players..."), tr("Failed to add more Players because the limit of Players are %1!").arg(QString::number(maxPlayers)));
|
QMessageBox::warning(this, tr("Add Players..."), tr("Failed to add more Players because the limit of Players are %1!").arg(QString::number(maxPlayers)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (QListWidgetItem *item : ui->listAvPlayers->selectedItems())
|
for (QListWidgetItem *item : ui->listAvPlayers->selectedItems()) {
|
||||||
{
|
|
||||||
QString playerName = item->text();
|
QString playerName = item->text();
|
||||||
int playerID = item->data(Qt::UserRole).toInt();
|
int playerID = item->data(Qt::UserRole).toInt();
|
||||||
delete item;
|
delete item;
|
||||||
|
@ -236,15 +175,12 @@ void PlayerListDialog::on_cmdMakeAd_clicked()
|
||||||
{
|
{
|
||||||
bool playerOk;
|
bool playerOk;
|
||||||
int playerID = QInputDialog::getInt(this, tr("Add Player..."), tr("Enter Social Club Player ID"), 1, 1, 214783647, 1, &playerOk, windowFlags());
|
int playerID = QInputDialog::getInt(this, tr("Add Player..."), tr("Enter Social Club Player ID"), 1, 1, 214783647, 1, &playerOk, windowFlags());
|
||||||
if (playerOk)
|
if (playerOk) {
|
||||||
{
|
for (int i = 0; i < ui->listAvPlayers->count(); ++i) {
|
||||||
for (int i = 0; i < ui->listAvPlayers->count(); ++i)
|
|
||||||
{
|
|
||||||
QListWidgetItem *item = ui->listAvPlayers->item(i);
|
QListWidgetItem *item = ui->listAvPlayers->item(i);
|
||||||
QString itemPlayerName = item->text();
|
QString itemPlayerName = item->text();
|
||||||
int itemPlayerID = item->data(Qt::UserRole).toInt();
|
int itemPlayerID = item->data(Qt::UserRole).toInt();
|
||||||
if (itemPlayerID == playerID)
|
if (itemPlayerID == playerID) {
|
||||||
{
|
|
||||||
delete item;
|
delete item;
|
||||||
QListWidgetItem *playerItem = new QListWidgetItem(itemPlayerName);
|
QListWidgetItem *playerItem = new QListWidgetItem(itemPlayerName);
|
||||||
playerItem->setData(Qt::UserRole, playerID);
|
playerItem->setData(Qt::UserRole, playerID);
|
||||||
|
@ -252,8 +188,7 @@ void PlayerListDialog::on_cmdMakeAd_clicked()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (int i = 0; i < ui->listSePlayers->count(); ++i)
|
for (int i = 0; i < ui->listSePlayers->count(); ++i) {
|
||||||
{
|
|
||||||
QListWidgetItem *item = ui->listSePlayers->item(i);
|
QListWidgetItem *item = ui->listSePlayers->item(i);
|
||||||
int itemPlayerID = item->data(Qt::UserRole).toInt();
|
int itemPlayerID = item->data(Qt::UserRole).toInt();
|
||||||
if (itemPlayerID == playerID)
|
if (itemPlayerID == playerID)
|
||||||
|
@ -271,8 +206,7 @@ void PlayerListDialog::on_cmdMakeAd_clicked()
|
||||||
void PlayerListDialog::on_cmdApply_clicked()
|
void PlayerListDialog::on_cmdApply_clicked()
|
||||||
{
|
{
|
||||||
players.clear();
|
players.clear();
|
||||||
for (int i = 0; i < ui->listSePlayers->count(); ++i)
|
for (int i = 0; i < ui->listSePlayers->count(); ++i) {
|
||||||
{
|
|
||||||
players += ui->listSePlayers->item(i)->data(Qt::UserRole).toString();
|
players += ui->listSePlayers->item(i)->data(Qt::UserRole).toString();
|
||||||
}
|
}
|
||||||
emit playerListUpdated(players);
|
emit playerListUpdated(players);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -48,7 +48,6 @@ private:
|
||||||
ProfileDatabase *profileDB;
|
ProfileDatabase *profileDB;
|
||||||
Ui::PlayerListDialog *ui;
|
Ui::PlayerListDialog *ui;
|
||||||
bool listUpdated;
|
bool listUpdated;
|
||||||
void drawSwitchButtons();
|
|
||||||
void buildInterface();
|
void buildInterface();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
|
@ -51,8 +51,8 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="cmdMakeSe">
|
<widget class="QPushButton" name="cmdMakeSe">
|
||||||
<property name="text">
|
<property name="focusPolicy">
|
||||||
<string/>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="autoDefault">
|
<property name="autoDefault">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
|
@ -61,6 +61,9 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="cmdMakeAv">
|
<widget class="QPushButton" name="cmdMakeAv">
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
|
@ -71,6 +74,9 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="cmdMakeAd">
|
<widget class="QPushButton" name="cmdMakeAd">
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
1832
ProfileInterface.cpp
1832
ProfileInterface.cpp
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -29,6 +29,8 @@
|
||||||
#include "ExportThread.h"
|
#include "ExportThread.h"
|
||||||
#include "SavegameData.h"
|
#include "SavegameData.h"
|
||||||
#include "CrewDatabase.h"
|
#include "CrewDatabase.h"
|
||||||
|
#include "pcg_basic.h"
|
||||||
|
#include <QFileSystemWatcher>
|
||||||
#include <QProgressDialog>
|
#include <QProgressDialog>
|
||||||
#include <QSpacerItem>
|
#include <QSpacerItem>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
@ -51,8 +53,6 @@ public:
|
||||||
void settingsApplied(int contentMode, bool languageChanged);
|
void settingsApplied(int contentMode, bool languageChanged);
|
||||||
void setupProfileInterface();
|
void setupProfileInterface();
|
||||||
void massTool(MassTool tool);
|
void massTool(MassTool tool);
|
||||||
void disableSelected();
|
|
||||||
void enableSelected();
|
|
||||||
int selectedWidgets();
|
int selectedWidgets();
|
||||||
void retranslateUi();
|
void retranslateUi();
|
||||||
~ProfileInterface();
|
~ProfileInterface();
|
||||||
|
@ -63,8 +63,11 @@ public slots:
|
||||||
void hoverProfileWidgetCheck();
|
void hoverProfileWidgetCheck();
|
||||||
void selectAllWidgets();
|
void selectAllWidgets();
|
||||||
void deselectAllWidgets();
|
void deselectAllWidgets();
|
||||||
|
void disableSelected();
|
||||||
|
void enableSelected();
|
||||||
void exportSelected();
|
void exportSelected();
|
||||||
void deleteSelected();
|
void deleteSelected();
|
||||||
|
void deleteSelectedR();
|
||||||
void updatePalette();
|
void updatePalette();
|
||||||
void importFiles();
|
void importFiles();
|
||||||
|
|
||||||
|
@ -80,9 +83,17 @@ private slots:
|
||||||
void profileLoaded_p();
|
void profileLoaded_p();
|
||||||
void profileWidgetSelected();
|
void profileWidgetSelected();
|
||||||
void profileWidgetDeselected();
|
void profileWidgetDeselected();
|
||||||
|
void massToolQualify();
|
||||||
|
void massToolPlayers();
|
||||||
|
void massToolCrew();
|
||||||
|
void massToolTitle();
|
||||||
void dialogNextPictureRequested(QWidget *dialog);
|
void dialogNextPictureRequested(QWidget *dialog);
|
||||||
void dialogPreviousPictureRequested(QWidget *dialog);
|
void dialogPreviousPictureRequested(QWidget *dialog);
|
||||||
void on_saProfileContent_dropped(const QMimeData *mimeData);
|
void on_saProfileContent_dropped(const QMimeData *mimeData);
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
void directoryChanged(const QString &path);
|
||||||
|
void directoryScanned(QVector<QString> savegameFiles, QVector<QString> snapmaticPics);
|
||||||
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool eventFilter(QObject *watched, QEvent *event);
|
bool eventFilter(QObject *watched, QEvent *event);
|
||||||
|
@ -98,32 +109,41 @@ private:
|
||||||
QList<SavegameData*> savegames;
|
QList<SavegameData*> savegames;
|
||||||
QList<SnapmaticPicture*> pictures;
|
QList<SnapmaticPicture*> pictures;
|
||||||
QMap<ProfileWidget*,QString> widgets;
|
QMap<ProfileWidget*,QString> widgets;
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
QFileSystemWatcher fileSystemWatcher;
|
||||||
|
QVector<QString> savegameFiles;
|
||||||
|
QVector<QString> snapmaticPics;
|
||||||
|
#endif
|
||||||
QSpacerItem *saSpacerItem;
|
QSpacerItem *saSpacerItem;
|
||||||
QStringList fixedPictures;
|
QStringList fixedPictures;
|
||||||
QColor highlightBackColor;
|
|
||||||
QColor highlightTextColor;
|
|
||||||
QString enabledPicStr;
|
QString enabledPicStr;
|
||||||
QString profileFolder;
|
QString profileFolder;
|
||||||
QString profileName;
|
QString profileName;
|
||||||
QString loadingStr;
|
QString loadingStr;
|
||||||
QString language;
|
QString language;
|
||||||
|
pcg32_random_t rng;
|
||||||
bool contextMenuOpened;
|
bool contextMenuOpened;
|
||||||
bool isProfileLoaded;
|
bool isProfileLoaded;
|
||||||
int selectedWidgts;
|
int selectedWidgts;
|
||||||
int contentMode;
|
int contentMode;
|
||||||
|
|
||||||
bool isSupportedImageFile(QString selectedFileName);
|
bool isSupportedImageFile(QString selectedFileName);
|
||||||
bool importFile(QString selectedFile, QDateTime importDateTime, int *currentTime, bool notMultiple);
|
bool importFile(QString selectedFile, QDateTime importDateTime, bool notMultiple);
|
||||||
void importFilesProgress(QStringList selectedFiles);
|
bool importUrls(const QMimeData *mimeData);
|
||||||
|
bool importRemote(QUrl remoteUrl);
|
||||||
|
bool importImage(QImage *snapmaticImage, QDateTime importDateTime);
|
||||||
|
bool importFilesProgress(QStringList selectedFiles);
|
||||||
bool importSnapmaticPicture(SnapmaticPicture *picture, bool warn = true);
|
bool importSnapmaticPicture(SnapmaticPicture *picture, bool warn = true);
|
||||||
bool importSavegameData(SavegameData *savegame, QString sgdPath, bool warn = true);
|
bool importSavegameData(SavegameData *savegame, QString sgdPath, bool warn = true);
|
||||||
void pictureLoaded(SnapmaticPicture *picture, bool inserted);
|
void pictureLoaded(SnapmaticPicture *picture, bool inserted);
|
||||||
void savegameLoaded(SavegameData *savegame, QString savegamePath, bool inserted);
|
void savegameLoaded(SavegameData *savegame, QString savegamePath, bool inserted);
|
||||||
void savegameDeleted(SavegameWidget *sgdWidget, bool isRemoteEmited = false);
|
void savegameDeleted(SavegameWidget *sgdWidget, bool isRemoteEmited = false);
|
||||||
void pictureDeleted(SnapmaticWidget *picWidget, bool isRemoteEmited = false);
|
void pictureDeleted(SnapmaticWidget *picWidget, bool isRemoteEmited = false);
|
||||||
|
void deleteSelectedL(bool isRemoteEmited = false);
|
||||||
void insertSnapmaticIPI(QWidget *widget);
|
void insertSnapmaticIPI(QWidget *widget);
|
||||||
void insertSavegameIPI(QWidget *widget);
|
void insertSavegameIPI(QWidget *widget);
|
||||||
void sortingProfileInterface();
|
void sortingProfileInterface();
|
||||||
|
int getRandomUid();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void profileLoaded();
|
void profileLoaded();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -16,80 +16,99 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include "ProfileLoader.h"
|
|
||||||
#include "SnapmaticPicture.h"
|
#include "SnapmaticPicture.h"
|
||||||
|
#include "ProfileLoader.h"
|
||||||
#include "SavegameData.h"
|
#include "SavegameData.h"
|
||||||
#include "CrewDatabase.h"
|
#include "CrewDatabase.h"
|
||||||
|
#include "wrapper.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QStringList>
|
#include <QVector>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QThread>
|
|
||||||
#include <QList>
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QList>
|
||||||
|
#else
|
||||||
|
#include "sys/types.h"
|
||||||
|
#include "sys/stat.h"
|
||||||
|
#include "dirent.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
ProfileLoader::ProfileLoader(QString profileFolder, CrewDatabase *crewDB, QObject *parent) : QThread(parent), profileFolder(profileFolder), crewDB(crewDB)
|
ProfileLoader::ProfileLoader(QString profileFolder, CrewDatabase *crewDB, QObject *parent) : QThread(parent), profileFolder(profileFolder), crewDB(crewDB)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProfileLoader::run()
|
void ProfileLoader::run()
|
||||||
{
|
{
|
||||||
int curFile = 1;
|
int curFile = 1;
|
||||||
QDir profileDir;
|
int maximumV = 0;
|
||||||
QList<int> crewList;
|
QVector<int> crewList;
|
||||||
profileDir.setPath(profileFolder);
|
QVector<QString> savegameFiles;
|
||||||
|
QVector<QString> snapmaticPics;
|
||||||
|
|
||||||
// Seek pictures and savegames
|
#ifdef Q_OS_WIN
|
||||||
profileDir.setNameFilters(QStringList("SGTA*"));
|
QDir dir(profileFolder);
|
||||||
QStringList SavegameFiles = profileDir.entryList(QDir::Files | QDir::NoDot, QDir::NoSort);
|
const QStringList files = dir.entryList(QDir::Files);
|
||||||
QStringList BackupFiles = SavegameFiles.filter(".bak", Qt::CaseInsensitive);
|
for (const QString &fileName : files) {
|
||||||
profileDir.setNameFilters(QStringList("PGTA*"));
|
if (fileName.startsWith("SGTA5") && !fileName.endsWith(".bak")) {
|
||||||
QStringList SnapmaticPics = profileDir.entryList(QDir::Files | QDir::NoDot, QDir::NoSort);
|
savegameFiles << fileName;
|
||||||
BackupFiles += SnapmaticPics.filter(".bak", Qt::CaseInsensitive);
|
maximumV++;
|
||||||
|
}
|
||||||
SavegameFiles.removeDuplicates();
|
if (fileName.startsWith("PGTA5") && !fileName.endsWith(".bak")) {
|
||||||
SnapmaticPics.removeDuplicates();
|
snapmaticPics << fileName;
|
||||||
for (QString BackupFile : BackupFiles)
|
maximumV++;
|
||||||
{
|
}
|
||||||
SavegameFiles.removeAll(BackupFile);
|
|
||||||
SnapmaticPics.removeAll(BackupFile);
|
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
DIR *dirp = opendir(profileFolder.toUtf8().constData());
|
||||||
|
struct dirent *dp;
|
||||||
|
while ((dp = readdir(dirp)) != 0) {
|
||||||
|
const QString fileName = QString::fromUtf8(dp->d_name);
|
||||||
|
const QString filePath = profileFolder % "/" % fileName;
|
||||||
|
struct stat fileStat;
|
||||||
|
stat(filePath.toUtf8().constData(), &fileStat);
|
||||||
|
if (S_ISREG(fileStat.st_mode) != 0) {
|
||||||
|
if (fileName.startsWith("SGTA5") && !fileName.endsWith(".bak")) {
|
||||||
|
savegameFiles << fileName;
|
||||||
|
maximumV++;
|
||||||
|
}
|
||||||
|
if (fileName.startsWith("PGTA5") && !fileName.endsWith(".bak")) {
|
||||||
|
snapmaticPics << fileName;
|
||||||
|
maximumV++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
closedir(dirp);
|
||||||
|
#endif
|
||||||
|
|
||||||
int maximumV = SavegameFiles.length() + SnapmaticPics.length();
|
// Directory successfully scanned
|
||||||
|
emit directoryScanned(savegameFiles, snapmaticPics);
|
||||||
|
|
||||||
// Loading pictures and savegames
|
// Loading pictures and savegames
|
||||||
emit loadingProgress(curFile, maximumV);
|
emit loadingProgress(curFile, maximumV);
|
||||||
for (QString SavegameFile : SavegameFiles)
|
for (const QString &SavegameFile : qAsConst(savegameFiles)) {
|
||||||
{
|
|
||||||
emit loadingProgress(curFile, maximumV);
|
emit loadingProgress(curFile, maximumV);
|
||||||
QString sgdPath = profileFolder % "/" % SavegameFile;
|
const QString sgdPath = profileFolder % "/" % SavegameFile;
|
||||||
SavegameData *savegame = new SavegameData(sgdPath);
|
SavegameData *savegame = new SavegameData(sgdPath);
|
||||||
if (savegame->readingSavegame())
|
if (savegame->readingSavegame()) {
|
||||||
{
|
|
||||||
emit savegameLoaded(savegame, sgdPath);
|
emit savegameLoaded(savegame, sgdPath);
|
||||||
}
|
}
|
||||||
curFile++;
|
curFile++;
|
||||||
}
|
}
|
||||||
for (QString SnapmaticPic : SnapmaticPics)
|
for (const QString &SnapmaticPic : qAsConst(snapmaticPics)) {
|
||||||
{
|
|
||||||
emit loadingProgress(curFile, maximumV);
|
emit loadingProgress(curFile, maximumV);
|
||||||
QString picturePath = profileFolder % "/" % SnapmaticPic;
|
const QString picturePath = profileFolder % "/" % SnapmaticPic;
|
||||||
SnapmaticPicture *picture = new SnapmaticPicture(picturePath);
|
SnapmaticPicture *picture = new SnapmaticPicture(picturePath);
|
||||||
if (picture->readingPicture(true, true, true))
|
if (picture->readingPicture(true)) {
|
||||||
{
|
if (picture->isFormatSwitched()) {
|
||||||
if (picture->isFormatSwitched())
|
|
||||||
{
|
|
||||||
picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format);
|
picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format);
|
||||||
if (picture->exportPicture(picturePath, SnapmaticFormat::PGTA_Format))
|
if (picture->exportPicture(picturePath, SnapmaticFormat::PGTA_Format)) {
|
||||||
{
|
|
||||||
emit pictureFixed(picture);
|
emit pictureFixed(picture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
emit pictureLoaded(picture);
|
emit pictureLoaded(picture);
|
||||||
int crewNumber = picture->getSnapmaticProperties().crewID;
|
int crewNumber = picture->getSnapmaticProperties().crewID;
|
||||||
if (!crewList.contains(crewNumber))
|
if (!crewList.contains(crewNumber)) {
|
||||||
{
|
|
||||||
crewList += crewNumber;
|
crewList += crewNumber;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -98,8 +117,7 @@ void ProfileLoader::run()
|
||||||
|
|
||||||
// adding found crews
|
// adding found crews
|
||||||
crewDB->setAddingCrews(true);
|
crewDB->setAddingCrews(true);
|
||||||
for (int crewID : crewList)
|
for (int crewID : qAsConst(crewList)) {
|
||||||
{
|
|
||||||
crewDB->addCrew(crewID);
|
crewDB->addCrew(crewID);
|
||||||
}
|
}
|
||||||
crewDB->setAddingCrews(false);
|
crewDB->setAddingCrews(false);
|
||||||
|
@ -107,10 +125,9 @@ void ProfileLoader::run()
|
||||||
|
|
||||||
void ProfileLoader::preloaded()
|
void ProfileLoader::preloaded()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProfileLoader::loaded()
|
void ProfileLoader::loaded()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2021 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -48,6 +48,7 @@ signals:
|
||||||
void pictureFixed(SnapmaticPicture *picture);
|
void pictureFixed(SnapmaticPicture *picture);
|
||||||
void savegameLoaded(SavegameData *savegame, QString savegamePath);
|
void savegameLoaded(SavegameData *savegame, QString savegamePath);
|
||||||
void loadingProgress(int value, int maximum);
|
void loadingProgress(int value, int maximum);
|
||||||
|
void directoryScanned(QVector<QString> savegameFiles, QVector<QString> snapmaticPics);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PROFILELOADER_H
|
#endif // PROFILELOADER_H
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
59
README.md
59
README.md
|
@ -1,42 +1,45 @@
|
||||||
## gta5view
|
## gta5view
|
||||||
Grand Theft Auto V Savegame and Snapmatic viewer/editor
|
Open Source Snapmatic and Savegame viewer/editor for GTA V
|
||||||
|
|
||||||
- View Snapmatics with the ability to disable them in-game
|
- View Snapmatics with the ability to disable them in-game
|
||||||
- Edit Snapmatic pictures and properties in multiple ways
|
- Edit Snapmatic pictures and properties in multiple ways
|
||||||
- Import/Export Snapmatics, Savegames and pictures
|
- Import/Export Snapmatics, Savegames and pictures
|
||||||
- Let choose between multiple Social Club accounts as GTA V profiles IDs
|
- Choose between multiple Social Club accounts as GTA V profiles IDs
|
||||||
|
|
||||||
#### Screenshots
|
#### Screenshots
|
||||||
![Snapmatic Picture Viewer](https://i.imgur.com/dQdW3hx.png)
|
![Snapmatic Picture Viewer](res/src/picture.png)
|
||||||
![User Interface](https://i.imgur.com/SRNQdq6.png)
|
![User Interface](res/src/mainui.png)
|
||||||
![Snapmatic Properties](https://i.imgur.com/j1Lodiu.png)
|
![Snapmatic Properties](res/src/prop.png)
|
||||||
|
|
||||||
|
#### Build gta5view for Windows
|
||||||
|
|
||||||
|
# Note: Install Docker Community Edition and Git before continuing
|
||||||
|
docker pull sypingauto/gta5view-build:1.10-static
|
||||||
|
git clone https://gitlab.com/Syping/gta5view
|
||||||
|
docker run --rm -v "$PWD/gta5view:/gta5view" -it sypingauto/gta5view-build:1.10-static
|
||||||
|
mingw64-qt-cmake -B /gta5view/build /gta5view
|
||||||
|
cmake --build /gta5view/build
|
||||||
|
|
||||||
#### Build gta5view for Debian/Ubuntu
|
#### Build gta5view for Debian/Ubuntu
|
||||||
|
|
||||||
# Note: You can use 'sudo make install' instead of 'sudo checkinstall'
|
sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n
|
||||||
sudo apt-get install git gcc g++ qtbase5-dev qttranslations5-l10n qt5-qmake make checkinstall
|
git clone https://gitlab.com/Syping/gta5view
|
||||||
git clone https://github.com/SyDevTeam/gta5view && cd gta5view
|
cmake -B gta5view-build gta5view
|
||||||
mkdir -p build && cd build
|
cmake --build gta5view-build
|
||||||
qmake -qt=5 GTA5SYNC_PREFIX=/usr ../gta5view.pro # or just qmake GTA5SYNC_PREFIX=/usr ../gta5view.pro
|
sudo cmake --install gta5view-build
|
||||||
make -j $(nproc --all)
|
|
||||||
sudo checkinstall --pkgname=gta5view --pkggroup=utility --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n
|
|
||||||
|
|
||||||
#### Build gta5view for Windows
|
|
||||||
|
|
||||||
# Note: Install Docker Community Edition and Git before continuing
|
#### Build gta5view for Arch/Manjaro
|
||||||
git clone https://github.com/SyDevTeam/gta5view && cd gta5view
|
|
||||||
docker pull syping/qt5-static-mingw
|
|
||||||
docker run --rm -v ${PWD}:/gta5view -it syping/qt5-static-mingw
|
|
||||||
cd /gta5view && mkdir -p build && cd build
|
|
||||||
qmake-static ../gta5view.pro
|
|
||||||
make -j $(nproc --all)
|
|
||||||
|
|
||||||
#### Build gta5view for Windows (Beginner)
|
sudo pacman -S cmake gcc git make qt5-base qt5-svg qt5-tools qt5-translations
|
||||||
|
git clone https://gitlab.com/Syping/gta5view
|
||||||
|
cmake -B gta5view-build gta5view
|
||||||
|
cmake --build gta5view-build
|
||||||
|
sudo cmake --install gta5view-build
|
||||||
|
|
||||||
Download the [Qt Framework](https://www.qt.io/) and install the MinGW version.
|
#### Build gta5view for Fedora/RHEL
|
||||||
Download the Source Code over [GitHub](https://github.com/SyDevTeam/gta5view/archive/1.5.x.zip) or with your Git client.
|
|
||||||
Open the gta5view.pro Project file with Qt Creator and build it over Qt Creator.
|
|
||||||
|
|
||||||
#### Download Binary Releases
|
sudo dnf install cmake git gcc gcc-c++ make qt5-qtbase-devel qt5-qtsvg-devel qt5-qttranslations
|
||||||
|
git clone https://gitlab.com/Syping/gta5view
|
||||||
Go to [gta5view release](https://github.com/SyDevTeam/gta5view/releases) and download the .exe file for Windows, .deb file for Debian/Ubuntu and .dmg file for OS X.
|
cmake -B gta5view-build gta5view
|
||||||
|
cmake --build gta5view-build
|
||||||
|
sudo cmake --install gta5view-build
|
||||||
|
|
|
@ -0,0 +1,893 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
|
* Copyright (C) 2020-2022 Syping
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include "RagePhoto.h"
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QBuffer>
|
||||||
|
#include <QFile>
|
||||||
|
#if QT_VERSION < 0x060000
|
||||||
|
#include <QTextCodec>
|
||||||
|
#else
|
||||||
|
#include <QStringEncoder>
|
||||||
|
#include <QStringDecoder>
|
||||||
|
#endif
|
||||||
|
#ifdef RAGEPHOTO_BENCHMARK
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <chrono>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
inline quint32 joaatFromSI(const char *data, size_t size)
|
||||||
|
{
|
||||||
|
quint32 val = 0xE47AB81CUL;
|
||||||
|
for (size_t i = 0; i != size; i++) {
|
||||||
|
val += data[i];
|
||||||
|
val += (val << 10);
|
||||||
|
val ^= (val >> 6);
|
||||||
|
}
|
||||||
|
val += (val << 3);
|
||||||
|
val ^= (val >> 11);
|
||||||
|
val += (val << 15);
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto::RagePhoto()
|
||||||
|
{
|
||||||
|
p_photoFormat = PhotoFormat::Undefined;
|
||||||
|
p_isLoaded = false;
|
||||||
|
p_inputMode = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto::RagePhoto(const QByteArray &data) : p_fileData(data)
|
||||||
|
{
|
||||||
|
p_photoFormat = PhotoFormat::Undefined;
|
||||||
|
p_isLoaded = false;
|
||||||
|
p_inputMode = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto::RagePhoto(const QString &filePath) : p_filePath(filePath)
|
||||||
|
{
|
||||||
|
p_photoFormat = PhotoFormat::Undefined;
|
||||||
|
p_isLoaded = false;
|
||||||
|
p_inputMode = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto::RagePhoto(QIODevice *ioDevice) : p_ioDevice(ioDevice)
|
||||||
|
{
|
||||||
|
p_photoFormat = PhotoFormat::Undefined;
|
||||||
|
p_isLoaded = false;
|
||||||
|
p_inputMode = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::isLoaded()
|
||||||
|
{
|
||||||
|
return p_isLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::load()
|
||||||
|
{
|
||||||
|
if (p_inputMode == -1)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (p_isLoaded)
|
||||||
|
clear();
|
||||||
|
|
||||||
|
if (p_inputMode == 1) {
|
||||||
|
QFile pictureFile(p_filePath);
|
||||||
|
if (pictureFile.open(QIODevice::ReadOnly)) {
|
||||||
|
p_fileData = pictureFile.readAll();
|
||||||
|
}
|
||||||
|
pictureFile.close();
|
||||||
|
}
|
||||||
|
else if (p_inputMode == 2) {
|
||||||
|
if (!p_ioDevice->isOpen()) {
|
||||||
|
if (!p_ioDevice->open(QIODevice::ReadOnly))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
p_fileData = p_ioDevice->readAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
QBuffer dataBuffer(&p_fileData);
|
||||||
|
dataBuffer.open(QIODevice::ReadOnly);
|
||||||
|
|
||||||
|
#ifdef RAGEPHOTO_BENCHMARK
|
||||||
|
auto benchmark_parse_start = std::chrono::high_resolution_clock::now();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
char uInt32Buffer[4];
|
||||||
|
qint64 size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
quint32 format = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
if (format == static_cast<quint32>(PhotoFormat::GTA5)) {
|
||||||
|
char photoHeader[256];
|
||||||
|
size = dataBuffer.read(photoHeader, 256);
|
||||||
|
if (size != 256) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (const QChar &photoChar : utf16LEToString(photoHeader, 256)) {
|
||||||
|
if (photoChar.isNull())
|
||||||
|
break;
|
||||||
|
p_photoString += photoChar;
|
||||||
|
}
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_headerSum = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_endOfFile = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_jsonOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_titlOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_descOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char markerBuffer[4];
|
||||||
|
size = dataBuffer.read(markerBuffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
if (strncmp(markerBuffer, "JPEG", 4) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_photoBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
quint32 t_photoSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *photoData = static_cast<char*>(malloc(t_photoSize));
|
||||||
|
if (!photoData)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(photoData, t_photoSize);
|
||||||
|
if (size != t_photoSize) {
|
||||||
|
free(photoData);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
p_photoData = QByteArray(photoData, t_photoSize);
|
||||||
|
free(photoData);
|
||||||
|
|
||||||
|
dataBuffer.seek(p_jsonOffset + 264);
|
||||||
|
size = dataBuffer.read(markerBuffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
if (strncmp(markerBuffer, "JSON", 4) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_jsonBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *jsonBytes = static_cast<char*>(malloc(p_jsonBuffer));
|
||||||
|
if (!jsonBytes)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(jsonBytes, p_jsonBuffer);
|
||||||
|
if (size != p_jsonBuffer) {
|
||||||
|
free(jsonBytes);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
quint32 i;
|
||||||
|
for (i = 0; i != p_jsonBuffer; i++) {
|
||||||
|
if (jsonBytes[i] == '\x00')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p_jsonData = QByteArray(jsonBytes, i);
|
||||||
|
free(jsonBytes);
|
||||||
|
QJsonDocument t_jsonDocument = QJsonDocument::fromJson(p_jsonData);
|
||||||
|
if (t_jsonDocument.isNull())
|
||||||
|
return false;
|
||||||
|
p_jsonObject = t_jsonDocument.object();
|
||||||
|
|
||||||
|
dataBuffer.seek(p_titlOffset + 264);
|
||||||
|
size = dataBuffer.read(markerBuffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
if (strncmp(markerBuffer, "TITL", 4) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_titlBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *titlBytes = static_cast<char*>(malloc(p_titlBuffer));
|
||||||
|
if (!titlBytes)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(titlBytes, p_titlBuffer);
|
||||||
|
if (size != p_titlBuffer){
|
||||||
|
free(titlBytes);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (i = 0; i != p_titlBuffer; i++) {
|
||||||
|
if (titlBytes[i] == '\x00')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p_titleString = QString::fromUtf8(titlBytes, i);
|
||||||
|
free(titlBytes);
|
||||||
|
|
||||||
|
dataBuffer.seek(p_descOffset + 264);
|
||||||
|
size = dataBuffer.read(markerBuffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
if (strncmp(markerBuffer, "DESC", 4) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_descBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *descBytes = static_cast<char*>(malloc(p_descBuffer));
|
||||||
|
if (!descBytes)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(descBytes, p_descBuffer);
|
||||||
|
if (size != p_descBuffer) {
|
||||||
|
free(descBytes);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (i = 0; i != p_descBuffer; i++) {
|
||||||
|
if (descBytes[i] == '\x00')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p_descriptionString = QString::fromUtf8(descBytes, i);
|
||||||
|
free(descBytes);
|
||||||
|
|
||||||
|
dataBuffer.seek(p_endOfFile + 260);
|
||||||
|
size = dataBuffer.read(markerBuffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
if (strncmp(markerBuffer, "JEND", 4) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
#ifdef RAGEPHOTO_BENCHMARK
|
||||||
|
auto benchmark_parse_end = std::chrono::high_resolution_clock::now();
|
||||||
|
auto benchmark_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(benchmark_parse_end - benchmark_parse_start);
|
||||||
|
if (p_inputMode == 1) {
|
||||||
|
QTextStream(stdout) << QFileInfo(p_filePath).fileName() << ": " << benchmark_ns.count() << "ns" << Qt::endl;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
QTextStream(stdout) << "PGTA5" << p_jsonObject.value("uid").toInt() << ": " << benchmark_ns.count() << "ns" << Qt::endl;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (p_photoFormat != PhotoFormat::G5EX)
|
||||||
|
p_photoFormat = PhotoFormat::GTA5;
|
||||||
|
|
||||||
|
p_fileData.clear();
|
||||||
|
p_isLoaded = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (format == static_cast<quint32>(PhotoFormat::G5EX)) {
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
format = charToUInt32LE(uInt32Buffer);
|
||||||
|
if (format == static_cast<quint32>(ExportFormat::G5E3P)) {
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
quint32 compressedSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *compressedPhotoHeader = static_cast<char*>(malloc(compressedSize));
|
||||||
|
if (!compressedPhotoHeader)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(compressedPhotoHeader, compressedSize);
|
||||||
|
if (size != compressedSize) {
|
||||||
|
free(compressedPhotoHeader);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
QByteArray t_photoHeader = QByteArray::fromRawData(compressedPhotoHeader, compressedSize);
|
||||||
|
t_photoHeader = qUncompress(t_photoHeader);
|
||||||
|
free(compressedPhotoHeader);
|
||||||
|
if (t_photoHeader.isEmpty())
|
||||||
|
return false;
|
||||||
|
p_photoString = QString::fromUtf8(t_photoHeader);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_headerSum = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_photoBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
compressedSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *compressedPhoto = static_cast<char*>(malloc(compressedSize));
|
||||||
|
if (!compressedPhoto)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(compressedPhoto, compressedSize);
|
||||||
|
if (size != compressedSize) {
|
||||||
|
free(compressedPhoto);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
QByteArray t_photoData = QByteArray::fromRawData(compressedPhoto, compressedSize);
|
||||||
|
p_photoData = qUncompress(t_photoData);
|
||||||
|
free(compressedPhoto);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_jsonOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_jsonBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
compressedSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *compressedJson = static_cast<char*>(malloc(compressedSize));
|
||||||
|
if (!compressedJson)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(compressedJson, compressedSize);
|
||||||
|
if (size != compressedSize) {
|
||||||
|
free(compressedJson);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
QByteArray t_jsonBytes = QByteArray::fromRawData(compressedJson, compressedSize);
|
||||||
|
p_jsonData = qUncompress(t_jsonBytes);
|
||||||
|
free(compressedJson);
|
||||||
|
if (p_jsonData.isEmpty())
|
||||||
|
return false;
|
||||||
|
QJsonDocument t_jsonDocument = QJsonDocument::fromJson(p_jsonData);
|
||||||
|
if (t_jsonDocument.isNull())
|
||||||
|
return false;
|
||||||
|
p_jsonObject = t_jsonDocument.object();
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_titlOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_titlBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
compressedSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *compressedTitl = static_cast<char*>(malloc(compressedSize));
|
||||||
|
if (!compressedTitl)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(compressedTitl, compressedSize);
|
||||||
|
if (size != compressedSize) {
|
||||||
|
free(compressedTitl);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
QByteArray t_titlBytes = QByteArray::fromRawData(compressedTitl, compressedSize);
|
||||||
|
t_titlBytes = qUncompress(t_titlBytes);
|
||||||
|
free(compressedTitl);
|
||||||
|
p_titleString = QString::fromUtf8(t_titlBytes);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_descOffset = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_descBuffer = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
compressedSize = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
char *compressedDesc = static_cast<char*>(malloc(compressedSize));
|
||||||
|
if (!compressedDesc)
|
||||||
|
return false;
|
||||||
|
size = dataBuffer.read(compressedDesc, compressedSize);
|
||||||
|
if (size != compressedSize) {
|
||||||
|
free(compressedDesc);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
QByteArray t_descBytes = QByteArray::fromRawData(compressedDesc, compressedSize);
|
||||||
|
t_descBytes = qUncompress(t_descBytes);
|
||||||
|
free(compressedDesc);
|
||||||
|
p_descriptionString = QString::fromUtf8(t_descBytes);
|
||||||
|
|
||||||
|
size = dataBuffer.read(uInt32Buffer, 4);
|
||||||
|
if (size != 4)
|
||||||
|
return false;
|
||||||
|
p_endOfFile = charToUInt32LE(uInt32Buffer);
|
||||||
|
|
||||||
|
#ifdef RAGEPHOTO_BENCHMARK
|
||||||
|
auto benchmark_parse_end = std::chrono::high_resolution_clock::now();
|
||||||
|
auto benchmark_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(benchmark_parse_end - benchmark_parse_start);
|
||||||
|
if (p_inputMode == 1) {
|
||||||
|
QTextStream(stdout) << QFileInfo(p_filePath).fileName() << ": " << benchmark_ns.count() << "ns" << Qt::endl;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
QTextStream(stdout) << "PGTA5" << p_jsonObject.value("uid").toInt() << ": " << benchmark_ns.count() << "ns" << Qt::endl;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
p_photoFormat = PhotoFormat::G5EX;
|
||||||
|
|
||||||
|
p_fileData.clear();
|
||||||
|
p_isLoaded = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if (format == static_cast<quint32>(ExportFormat::G5E2P)) {
|
||||||
|
p_photoFormat = PhotoFormat::G5EX;
|
||||||
|
p_fileData = qUncompress(dataBuffer.readAll());
|
||||||
|
if (p_fileData.isEmpty())
|
||||||
|
return false;
|
||||||
|
p_inputMode = 0;
|
||||||
|
return load();
|
||||||
|
}
|
||||||
|
else if (format == static_cast<quint32>(ExportFormat::G5E1P)) {
|
||||||
|
#if QT_VERSION >= 0x050A00
|
||||||
|
size = dataBuffer.skip(1);
|
||||||
|
if (size != 1)
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
|
if (!dataBuffer.seek(dataBuffer.pos() + 1))
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
char length[1];
|
||||||
|
size = dataBuffer.read(length, 1);
|
||||||
|
if (size != 1)
|
||||||
|
return false;
|
||||||
|
int i_length = QByteArray::number(static_cast<int>(length[0]), 16).toInt() + 6;
|
||||||
|
|
||||||
|
#if QT_VERSION >= 0x050A00
|
||||||
|
size = dataBuffer.skip(i_length);
|
||||||
|
if (size != i_length)
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
|
if (!dataBuffer.seek(dataBuffer.pos() + i_length))
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
p_photoFormat = PhotoFormat::G5EX;
|
||||||
|
p_fileData = qUncompress(dataBuffer.readAll());
|
||||||
|
if (p_fileData.isEmpty())
|
||||||
|
return false;
|
||||||
|
p_inputMode = 0;
|
||||||
|
return load();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::clear()
|
||||||
|
{
|
||||||
|
p_photoFormat = PhotoFormat::Undefined;
|
||||||
|
p_jsonObject = QJsonObject();
|
||||||
|
p_descriptionString.clear();
|
||||||
|
p_jsonData.clear();
|
||||||
|
p_photoData.clear();
|
||||||
|
p_photoString.clear();
|
||||||
|
p_titleString.clear();
|
||||||
|
p_headerSum = 0;
|
||||||
|
p_isLoaded = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setDescription(const QString &description)
|
||||||
|
{
|
||||||
|
p_descriptionString = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setFileData(const QByteArray &data)
|
||||||
|
{
|
||||||
|
p_fileData = data;
|
||||||
|
p_inputMode = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setFilePath(const QString &filePath)
|
||||||
|
{
|
||||||
|
p_filePath = filePath;
|
||||||
|
p_inputMode = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setIODevice(QIODevice *ioDevice)
|
||||||
|
{
|
||||||
|
p_ioDevice = ioDevice;
|
||||||
|
p_inputMode = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::setJsonData(const QByteArray &data)
|
||||||
|
{
|
||||||
|
QJsonDocument t_jsonDocument = QJsonDocument::fromJson(data);
|
||||||
|
if (t_jsonDocument.isNull())
|
||||||
|
return false;
|
||||||
|
p_jsonObject = t_jsonDocument.object();
|
||||||
|
// serializer band-aid
|
||||||
|
QJsonObject t_jsonObject = p_jsonObject;
|
||||||
|
t_jsonObject["sign"] = "__gta5view.sign";
|
||||||
|
t_jsonDocument.setObject(t_jsonObject);
|
||||||
|
p_jsonData = t_jsonDocument.toJson(QJsonDocument::Compact);
|
||||||
|
char sign_char[24];
|
||||||
|
sprintf(sign_char, "%llu", (0x100000000000000ULL | joaatFromSI(p_photoData.constData(), p_photoData.size())));
|
||||||
|
p_jsonData.replace("\"__gta5view.sign\"", sign_char);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::setPhotoBuffer(quint32 size, bool moveOffsets)
|
||||||
|
{
|
||||||
|
if (size < static_cast<quint32>(p_photoData.size()))
|
||||||
|
return false;
|
||||||
|
p_photoBuffer = size;
|
||||||
|
if (moveOffsets) {
|
||||||
|
p_jsonOffset = size + 28;
|
||||||
|
p_titlOffset = p_jsonOffset + p_jsonBuffer + 8;
|
||||||
|
p_descOffset = p_titlOffset + p_titlBuffer + 8;
|
||||||
|
p_endOfFile = p_descOffset + p_descBuffer + 12;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::setPhotoData(const QByteArray &data)
|
||||||
|
{
|
||||||
|
quint32 size = data.size();
|
||||||
|
if (size > p_photoBuffer)
|
||||||
|
return false;
|
||||||
|
p_photoData = data;
|
||||||
|
// serializer band-aid
|
||||||
|
setJsonData(p_jsonData);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RagePhoto::setPhotoData(const char *data, int size)
|
||||||
|
{
|
||||||
|
if (static_cast<quint32>(size) > p_photoBuffer)
|
||||||
|
return false;
|
||||||
|
p_photoData = QByteArray(data, size);
|
||||||
|
// serializer band-aid
|
||||||
|
setJsonData(p_jsonData);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setPhotoFormat(PhotoFormat photoFormat)
|
||||||
|
{
|
||||||
|
p_photoFormat = photoFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::setTitle(const QString &title)
|
||||||
|
{
|
||||||
|
p_titleString = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QByteArray RagePhoto::jsonData(JsonFormat jsonFormat)
|
||||||
|
{
|
||||||
|
if (jsonFormat == JsonFormat::Compact) {
|
||||||
|
return QJsonDocument(p_jsonObject).toJson(QJsonDocument::Compact);
|
||||||
|
}
|
||||||
|
else if (jsonFormat == JsonFormat::Indented) {
|
||||||
|
return QJsonDocument(p_jsonObject).toJson(QJsonDocument::Indented);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return p_jsonData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const QJsonObject RagePhoto::jsonObject()
|
||||||
|
{
|
||||||
|
return p_jsonObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QByteArray RagePhoto::photoData()
|
||||||
|
{
|
||||||
|
return p_photoData;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString RagePhoto::description()
|
||||||
|
{
|
||||||
|
return p_descriptionString;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString RagePhoto::photoString()
|
||||||
|
{
|
||||||
|
return p_photoString;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString RagePhoto::title()
|
||||||
|
{
|
||||||
|
return p_titleString;
|
||||||
|
}
|
||||||
|
|
||||||
|
quint32 RagePhoto::photoBuffer()
|
||||||
|
{
|
||||||
|
return p_photoBuffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
quint32 RagePhoto::photoSize()
|
||||||
|
{
|
||||||
|
return p_photoData.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto::PhotoFormat RagePhoto::photoFormat()
|
||||||
|
{
|
||||||
|
return p_photoFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray RagePhoto::save(PhotoFormat photoFormat)
|
||||||
|
{
|
||||||
|
QByteArray data;
|
||||||
|
QBuffer dataBuffer(&data);
|
||||||
|
dataBuffer.open(QIODevice::WriteOnly);
|
||||||
|
save(&dataBuffer, photoFormat);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::save(QIODevice *ioDevice, PhotoFormat photoFormat)
|
||||||
|
{
|
||||||
|
// serializer band-aid
|
||||||
|
setJsonData(p_jsonData);
|
||||||
|
|
||||||
|
if (photoFormat == PhotoFormat::G5EX) {
|
||||||
|
char uInt32Buffer[4];
|
||||||
|
quint32 format = static_cast<quint32>(PhotoFormat::G5EX);
|
||||||
|
uInt32ToCharLE(format, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
format = static_cast<quint32>(ExportFormat::G5E3P);
|
||||||
|
uInt32ToCharLE(format, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
QByteArray compressedData = qCompress(p_photoString.toUtf8(), 9);
|
||||||
|
quint32 compressedSize = compressedData.size();
|
||||||
|
uInt32ToCharLE(compressedSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
ioDevice->write(compressedData);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_headerSum, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_photoBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
compressedData = qCompress(p_photoData, 9);
|
||||||
|
compressedSize = compressedData.size();
|
||||||
|
uInt32ToCharLE(compressedSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
ioDevice->write(compressedData);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_jsonOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_jsonBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
compressedData = qCompress(p_jsonData, 9);
|
||||||
|
compressedSize = compressedData.size();
|
||||||
|
uInt32ToCharLE(compressedSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
ioDevice->write(compressedData);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_titlOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_titlBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
compressedData = qCompress(p_titleString.toUtf8(), 9);
|
||||||
|
compressedSize = compressedData.size();
|
||||||
|
uInt32ToCharLE(compressedSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
ioDevice->write(compressedData);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_descOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_descBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
compressedData = qCompress(p_descriptionString.toUtf8(), 9);
|
||||||
|
compressedSize = compressedData.size();
|
||||||
|
uInt32ToCharLE(compressedSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
ioDevice->write(compressedData);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_endOfFile, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
}
|
||||||
|
else if (photoFormat == PhotoFormat::GTA5) {
|
||||||
|
char uInt32Buffer[4];
|
||||||
|
quint32 format = static_cast<quint32>(PhotoFormat::GTA5);
|
||||||
|
uInt32ToCharLE(format, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
QByteArray photoHeader = stringToUtf16LE(p_photoString);
|
||||||
|
if (photoHeader.startsWith("\xFF\xFE")) {
|
||||||
|
photoHeader.remove(0, 2);
|
||||||
|
}
|
||||||
|
qint64 photoHeaderSize = photoHeader.size();
|
||||||
|
if (photoHeaderSize > 256) {
|
||||||
|
photoHeader = photoHeader.left(256);
|
||||||
|
photoHeaderSize = 256;
|
||||||
|
}
|
||||||
|
ioDevice->write(photoHeader);
|
||||||
|
for (qint64 size = photoHeaderSize; size < 256; size++) {
|
||||||
|
ioDevice->write("\x00", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_headerSum, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_endOfFile, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_jsonOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_titlOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_descOffset, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
ioDevice->write("JPEG", 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_photoBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
quint32 t_photoSize = p_photoData.size();
|
||||||
|
uInt32ToCharLE(t_photoSize, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
ioDevice->write(p_photoData);
|
||||||
|
for (qint64 size = t_photoSize; size < p_photoBuffer; size++) {
|
||||||
|
ioDevice->write("\x00", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ioDevice->seek(p_jsonOffset + 264);
|
||||||
|
ioDevice->write("JSON", 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_jsonBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
qint64 dataSize = p_jsonData.size();
|
||||||
|
ioDevice->write(p_jsonData);
|
||||||
|
for (qint64 size = dataSize; size < p_jsonBuffer; size++) {
|
||||||
|
ioDevice->write("\x00", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ioDevice->seek(p_titlOffset + 264);
|
||||||
|
ioDevice->write("TITL", 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_titlBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
QByteArray data = p_titleString.toUtf8();
|
||||||
|
dataSize = data.size();
|
||||||
|
ioDevice->write(data);
|
||||||
|
for (qint64 size = dataSize; size < p_titlBuffer; size++) {
|
||||||
|
ioDevice->write("\x00", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ioDevice->seek(p_descOffset + 264);
|
||||||
|
ioDevice->write("DESC", 4);
|
||||||
|
|
||||||
|
uInt32ToCharLE(p_descBuffer, uInt32Buffer);
|
||||||
|
ioDevice->write(uInt32Buffer, 4);
|
||||||
|
|
||||||
|
data = p_descriptionString.toUtf8();
|
||||||
|
dataSize = data.size();
|
||||||
|
ioDevice->write(data);
|
||||||
|
for (qint64 size = dataSize; size < p_descBuffer; size++) {
|
||||||
|
ioDevice->write("\x00", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ioDevice->seek(p_endOfFile + 260);
|
||||||
|
ioDevice->write("JEND", 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RagePhoto* RagePhoto::loadFile(const QString &filePath)
|
||||||
|
{
|
||||||
|
RagePhoto *ragePhoto = new RagePhoto(filePath);
|
||||||
|
ragePhoto->load();
|
||||||
|
return ragePhoto;
|
||||||
|
}
|
||||||
|
|
||||||
|
quint32 RagePhoto::charToUInt32BE(char *x)
|
||||||
|
{
|
||||||
|
return (static_cast<unsigned char>(x[0]) << 24 |
|
||||||
|
static_cast<unsigned char>(x[1]) << 16 |
|
||||||
|
static_cast<unsigned char>(x[2]) << 8 |
|
||||||
|
static_cast<unsigned char>(x[3]));
|
||||||
|
}
|
||||||
|
|
||||||
|
quint32 RagePhoto::charToUInt32LE(char *x)
|
||||||
|
{
|
||||||
|
return (static_cast<unsigned char>(x[3]) << 24 |
|
||||||
|
static_cast<unsigned char>(x[2]) << 16 |
|
||||||
|
static_cast<unsigned char>(x[1]) << 8 |
|
||||||
|
static_cast<unsigned char>(x[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::uInt32ToCharBE(quint32 x, char *y)
|
||||||
|
{
|
||||||
|
y[0] = x >> 24;
|
||||||
|
y[1] = x >> 16;
|
||||||
|
y[2] = x >> 8;
|
||||||
|
y[3] = x;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RagePhoto::uInt32ToCharLE(quint32 x, char *y)
|
||||||
|
{
|
||||||
|
y[0] = x;
|
||||||
|
y[1] = x >> 8;
|
||||||
|
y[2] = x >> 16;
|
||||||
|
y[3] = x >> 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QByteArray RagePhoto::stringToUtf16LE(const QString &string)
|
||||||
|
{
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
return QStringEncoder(QStringEncoder::Utf16LE)(string);
|
||||||
|
#else
|
||||||
|
return QTextCodec::codecForName("UTF-16LE")->fromUnicode(string);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString RagePhoto::utf16LEToString(const QByteArray &data)
|
||||||
|
{
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
return QStringDecoder(QStringDecoder::Utf16LE)(data);
|
||||||
|
#else
|
||||||
|
return QTextCodec::codecForName("UTF-16LE")->toUnicode(data);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString RagePhoto::utf16LEToString(const char *data, int size)
|
||||||
|
{
|
||||||
|
#if QT_VERSION >= 0x060000
|
||||||
|
return QStringDecoder(QStringDecoder::Utf16LE)(QByteArray::fromRawData(data, size));
|
||||||
|
#else
|
||||||
|
return QTextCodec::codecForName("UTF-16LE")->toUnicode(data, size);
|
||||||
|
#endif
|
||||||
|
}
|
|
@ -0,0 +1,110 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
|
* Copyright (C) 2020 Syping
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef RAGEPHOTO_H
|
||||||
|
#define RAGEPHOTO_H
|
||||||
|
|
||||||
|
#include <QJsonObject>
|
||||||
|
#include <QIODevice>
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
class RagePhoto : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
enum class JsonFormat : quint8 {
|
||||||
|
Original = 0,
|
||||||
|
Compact = 1,
|
||||||
|
Indented = 2,
|
||||||
|
};
|
||||||
|
enum class ExportFormat : quint32 {
|
||||||
|
G5E1P = 0x454C0010U,
|
||||||
|
G5E2P = 0x01000032U,
|
||||||
|
G5E2S = 0x02000032U,
|
||||||
|
G5E3P = 0x01000033U,
|
||||||
|
G5E3S = 0x02000033U,
|
||||||
|
Undefined = 0,
|
||||||
|
};
|
||||||
|
enum class PhotoFormat : quint32 {
|
||||||
|
G5EX = 0x45354700U,
|
||||||
|
GTA5 = 0x01000000U,
|
||||||
|
RDR2 = 0x04000000U,
|
||||||
|
Undefined = 0,
|
||||||
|
};
|
||||||
|
explicit RagePhoto();
|
||||||
|
explicit RagePhoto(const QByteArray &data);
|
||||||
|
explicit RagePhoto(const QString &filePath);
|
||||||
|
explicit RagePhoto(QIODevice *ioDevice);
|
||||||
|
bool isLoaded();
|
||||||
|
bool load();
|
||||||
|
void clear();
|
||||||
|
void setDescription(const QString &description);
|
||||||
|
void setFileData(const QByteArray &data);
|
||||||
|
void setFilePath(const QString &filePath);
|
||||||
|
void setIODevice(QIODevice *ioDevice);
|
||||||
|
bool setJsonData(const QByteArray &data);
|
||||||
|
bool setPhotoBuffer(quint32 size, bool moveOffsets = true);
|
||||||
|
bool setPhotoData(const QByteArray &data);
|
||||||
|
bool setPhotoData(const char *data, int size);
|
||||||
|
void setPhotoFormat(PhotoFormat photoFormat);
|
||||||
|
void setTitle(const QString &title);
|
||||||
|
const QJsonObject jsonObject();
|
||||||
|
const QByteArray jsonData(JsonFormat jsonFormat = JsonFormat::Original);
|
||||||
|
const QByteArray photoData();
|
||||||
|
const QString description();
|
||||||
|
const QString photoString();
|
||||||
|
const QString title();
|
||||||
|
quint32 photoBuffer();
|
||||||
|
quint32 photoSize();
|
||||||
|
PhotoFormat photoFormat();
|
||||||
|
QByteArray save(PhotoFormat photoFormat);
|
||||||
|
void save(QIODevice *ioDevice, PhotoFormat photoFormat);
|
||||||
|
static RagePhoto* loadFile(const QString &filePath);
|
||||||
|
|
||||||
|
private:
|
||||||
|
inline quint32 charToUInt32BE(char *x);
|
||||||
|
inline quint32 charToUInt32LE(char *x);
|
||||||
|
inline void uInt32ToCharBE(quint32 x, char *y);
|
||||||
|
inline void uInt32ToCharLE(quint32 x, char *y);
|
||||||
|
inline const QByteArray stringToUtf16LE(const QString &string);
|
||||||
|
inline const QString utf16LEToString(const QByteArray &data);
|
||||||
|
inline const QString utf16LEToString(const char *data, int size);
|
||||||
|
PhotoFormat p_photoFormat;
|
||||||
|
QJsonObject p_jsonObject;
|
||||||
|
QByteArray p_fileData;
|
||||||
|
QByteArray p_jsonData;
|
||||||
|
QByteArray p_photoData;
|
||||||
|
QIODevice *p_ioDevice;
|
||||||
|
QString p_descriptionString;
|
||||||
|
QString p_filePath;
|
||||||
|
QString p_photoString;
|
||||||
|
QString p_titleString;
|
||||||
|
quint32 p_descBuffer;
|
||||||
|
quint32 p_descOffset;
|
||||||
|
quint32 p_endOfFile;
|
||||||
|
quint32 p_headerSum;
|
||||||
|
quint32 p_jsonBuffer;
|
||||||
|
quint32 p_jsonOffset;
|
||||||
|
quint32 p_photoBuffer;
|
||||||
|
quint32 p_titlBuffer;
|
||||||
|
quint32 p_titlOffset;
|
||||||
|
bool p_isLoaded;
|
||||||
|
int p_inputMode;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // RAGEPHOTO_H
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -16,10 +16,10 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include "SnapmaticPicture.h"
|
||||||
#include "StringParser.h"
|
#include "StringParser.h"
|
||||||
#include "SavegameData.h"
|
#include "SavegameData.h"
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
||||||
#include <QTextCodec>
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
@ -42,7 +42,7 @@ bool SavegameData::readingSavegame()
|
||||||
QFile *saveFile = new QFile(savegameFileName);
|
QFile *saveFile = new QFile(savegameFileName);
|
||||||
if (!saveFile->open(QFile::ReadOnly))
|
if (!saveFile->open(QFile::ReadOnly))
|
||||||
{
|
{
|
||||||
lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(savegameFileName);
|
lastStep = "1;/1,OpenFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName);
|
||||||
saveFile->deleteLater();
|
saveFile->deleteLater();
|
||||||
delete saveFile;
|
delete saveFile;
|
||||||
return false;
|
return false;
|
||||||
|
@ -51,7 +51,7 @@ bool SavegameData::readingSavegame()
|
||||||
// Reading Savegame Header
|
// Reading Savegame Header
|
||||||
if (!saveFile->isReadable())
|
if (!saveFile->isReadable())
|
||||||
{
|
{
|
||||||
lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER";
|
lastStep = "2;/3,ReadingFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER";
|
||||||
saveFile->close();
|
saveFile->close();
|
||||||
saveFile->deleteLater();
|
saveFile->deleteLater();
|
||||||
delete saveFile;
|
delete saveFile;
|
||||||
|
@ -78,7 +78,7 @@ QString SavegameData::getSavegameDataString(const QByteArray &savegameHeader)
|
||||||
QList<QByteArray> savegameBytesList = savegameBytes.split(char(0x01));
|
QList<QByteArray> savegameBytesList = savegameBytes.split(char(0x01));
|
||||||
savegameBytes = savegameBytesList.at(1);
|
savegameBytes = savegameBytesList.at(1);
|
||||||
savegameBytesList.clear();
|
savegameBytesList.clear();
|
||||||
return StringParser::parseTitleString(savegameBytes, savegameBytes.length());
|
return SnapmaticPicture::parseTitleString(savegameBytes, savegameBytes.length());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SavegameData::readingSavegameFromFile(const QString &fileName)
|
bool SavegameData::readingSavegameFromFile(const QString &fileName)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2017 Syping
|
* Copyright (C) 2016-2017 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* gta5sync GRAND THEFT AUTO V SYNC
|
* gta5view Grand Theft Auto V Profile Viewer
|
||||||
* Copyright (C) 2016-2018 Syping
|
* Copyright (C) 2016-2018 Syping
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -28,7 +28,11 @@ SavegameDialog::SavegameDialog(QWidget *parent) :
|
||||||
ui(new Ui::SavegameDialog)
|
ui(new Ui::SavegameDialog)
|
||||||
{
|
{
|
||||||
// Set Window Flags
|
// Set Window Flags
|
||||||
|
#if QT_VERSION >= 0x050900
|
||||||
|
setWindowFlag(Qt::WindowContextHelpButtonHint, false);
|
||||||
|
#else
|
||||||
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Setup User Interface
|
// Setup User Interface
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue