Small Flatpak fixes, Qt6 beta build fix

APV removed

.ci/app.rc

@@ -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-2020 Syping"
+            VALUE   "OriginalFilename", "gta5view.exe"
+            VALUE   "ProductName",      "gta5view"
+            VALUE   "ProductVersion",   "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER"
+        END
+    END
+END

.ci/ci.sh

@@ -0,0 +1,72 @@
+#!/bin/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=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA"
+elif [ "${BUILD_TYPE}" == "Alpha" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_ALPHA=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA"
+elif [ "${BUILD_TYPE}" == "BETA" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_BETA=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA"
+elif [ "${BUILD_TYPE}" == "Beta" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_BETA=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA"
+elif [ "${BUILD_TYPE}" == "DEV" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DEV=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV"
+elif [ "${BUILD_TYPE}" == "Development" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DEV=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV"
+elif [ "${BUILD_TYPE}" == "DAILY" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DAILY=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY"
+elif [ "${BUILD_TYPE}" == "Daily" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DAILY=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY"
+elif [ "${BUILD_TYPE}" == "RC" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_RC=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC"
+elif [ "${BUILD_TYPE}" == "Release Candidate" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_RC=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC"
+elif [ "${BUILD_TYPE}" == "REL" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_REL=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL"
+elif [ "${BUILD_TYPE}" == "Release" ]; then
+   export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_REL=TRUE"
+   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL"
+fi
+
+export PROJECT_DIR=$(pwd)
+
+.ci/${BUILD_SCRIPT}

.ci/debian_build.sh

@@ -0,0 +1,44 @@
+#!/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/*.desktop res/*gta5view*.png && \
+cd build && \
+mkdir -p qt4 && \
+cd qt4 && \
+echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./description-pak && \
+cd .. && \
+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} \
+   "-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
+   "-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
+   "-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
+   "-DWITH_TELEMETRY=ON" \
+   "-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \
+   "-DQCONF_BUILD=ON" \
+   ../../ && \
+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,libqt5svg5,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} ${QMAKE_BUILD_TYPE} "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "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,libqt4-svg,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets

.ci/debian_ci.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Install packages
-.travis/osx_install.sh && \
+.ci/debian_install.sh && \
 
 # Build gta5view
-.travis/osx_build.sh && \
+.ci/debian_build.sh && \
 cd ${PROJECT_DIR}

.ci/debian_docker.sh

@@ -0,0 +1,15 @@
+#!/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 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"

.ci/debian_install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# 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 libqt4-dev libqt5svg5-dev

.ci/gta5view.nsi

@@ -3,8 +3,8 @@
 !define APP_NAME "gta5view"
 !define COMP_NAME "Syping"
 !define WEB_SITE "https://gta5view.syping.de/"
-!define VERSION "1.5.4.0"
-!define COPYRIGHT "Copyright © 2016-2018 Syping"
+!define VERSION "1.8.0.0"
+!define COPYRIGHT "Copyright © 2016-2020 Syping"
 !define DESCRIPTION "Grand Theft Auto V Savegame and Snapmatic Viewer/Editor"
 !define INSTALLER_NAME "gta5view_setup.exe"
 !define MAIN_APP_EXE "gta5view.exe"
@@ -33,6 +33,7 @@ Caption "${APP_NAME}"
 OutFile "${INSTALLER_NAME}"
 #BrandingText "${APP_NAME}"
 XPStyle on
+Unicode true
 InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
 InstallDir "$PROGRAMFILES64\Syping\gta5view"
 
@@ -78,7 +79,9 @@ InstallDir "$PROGRAMFILES64\Syping\gta5view"
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Korean"
 !insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "TradChinese"
 
 !insertmacro MUI_RESERVEFILE_LANGDLL
@@ -88,7 +91,7 @@ InstallDir "$PROGRAMFILES64\Syping\gta5view"
 Function .onInit
 !insertmacro MUI_LANGDLL_DISPLAY
 !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
 !endif
 SetRegView 64
@@ -100,45 +103,48 @@ Section -MainProgram
 ${INSTALL_TYPE}
 SetOverwrite ifnewer
 SetOutPath "$INSTDIR"
-File "../build/release/gta5view.exe"
-File "/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libgcc_s_seh-1.dll"
-File "/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libstdc++-6.dll"
-File "/opt/windev/libressl-latest_qt64d/bin/libcrypto-43.dll"
-File "/opt/windev/libressl-latest_qt64d/bin/libssl-45.dll"
-File "/opt/windev/libjpeg-turbo-latest_qt64d/bin/libjpeg-62.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5Core.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5Gui.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5Network.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5Svg.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5Widgets.dll"
-File "/opt/windev/qt64d-latest/bin/Qt5WinExtras.dll"
+File "../build/gta5view.exe"
+File "/opt/llvm-mingw/x86_64-w64-mingw32/bin/libc++.dll"
+File "/opt/llvm-mingw/x86_64-w64-mingw32/bin/libunwind.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/openssl/bin/libcrypto-1_1-x64.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/openssl/bin/libssl-1_1-x64.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Core.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Gui.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Network.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Svg.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5Widgets.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/bin/Qt5WinExtras.dll"
 SetOutPath "$INSTDIR\lang"
-File "../res/gta5sync_en_US.qm"
-File "../res/gta5sync_de.qm"
-File "../res/gta5sync_fr.qm"
-File "../res/gta5sync_ru.qm"
-File "../res/gta5sync_uk.qm"
-File "../res/gta5sync_zh_TW.qm"
-File "../res/qtbase_en_GB.qm"
+File "../build/gta5sync_en_US.qm"
+File "../build/gta5sync_de.qm"
+File "../build/gta5sync_fr.qm"
+File "../build/gta5sync_ko.qm"
+File "../build/gta5sync_ru.qm"
+File "../build/gta5sync_uk.qm"
+File "../build/gta5sync_zh_TW.qm"
+File "../build/qtbase_en_GB.qm"
 File "../res/qtbase_de.qm"
 File "../res/qtbase_fr.qm"
+File "../res/qtbase_ko.qm"
 File "../res/qtbase_ru.qm"
 File "../res/qtbase_uk.qm"
 File "../res/qtbase_zh_TW.qm"
-SetOutPath "$INSTDIR\audio"
-File "/opt/windev/qt64d-latest/plugins/audio/qtaudio_windows.dll"
 SetOutPath "$INSTDIR\imageformats"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qgif.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qicns.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qico.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qjpeg.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qsvg.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qtga.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qtiff.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qwbmp.dll"
-File "/opt/windev/qt64d-latest/plugins/imageformats/qwebp.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qgif.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qicns.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qico.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qjpeg.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qsvg.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qtga.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qtiff.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qwbmp.dll"
+File "/usr/local/lib/x86_64-w64-mingw32/qt5/plugins/imageformats/qwebp.dll"
 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
 
 ######################################################################
@@ -188,11 +194,10 @@ SectionEnd
 Section Uninstall
 ${INSTALL_TYPE}
 Delete "$INSTDIR\gta5view.exe"
-Delete "$INSTDIR\libgcc_s_seh-1.dll"
-Delete "$INSTDIR\libstdc++-6.dll"
-Delete "$INSTDIR\libcrypto-43.dll"
-Delete "$INSTDIR\libssl-45.dll"
-Delete "$INSTDIR\libjpeg-62.dll"
+Delete "$INSTDIR\libc++.dll"
+Delete "$INSTDIR\libunwind.dll"
+Delete "$INSTDIR\libcrypto-1_1-x64.dll"
+Delete "$INSTDIR\libssl-1_1-x64.dll"
 Delete "$INSTDIR\Qt5Core.dll"
 Delete "$INSTDIR\Qt5Gui.dll"
 Delete "$INSTDIR\Qt5Network.dll"
@@ -202,16 +207,17 @@ Delete "$INSTDIR\Qt5WinExtras.dll"
 Delete "$INSTDIR\lang\gta5sync_en_US.qm"
 Delete "$INSTDIR\lang\gta5sync_de.qm"
 Delete "$INSTDIR\lang\gta5sync_fr.qm"
+Delete "$INSTDIR\lang\gta5sync_ko.qm"
 Delete "$INSTDIR\lang\gta5sync_ru.qm"
 Delete "$INSTDIR\lang\gta5sync_uk.qm"
 Delete "$INSTDIR\lang\gta5sync_zh_TW.qm"
 Delete "$INSTDIR\lang\qtbase_en_GB.qm"
 Delete "$INSTDIR\lang\qtbase_de.qm"
 Delete "$INSTDIR\lang\qtbase_fr.qm"
+Delete "$INSTDIR\lang\qtbase_ko.qm"
 Delete "$INSTDIR\lang\qtbase_ru.qm"
 Delete "$INSTDIR\lang\qtbase_uk.qm"
 Delete "$INSTDIR\lang\qtbase_zh_TW.qm"
-Delete "$INSTDIR\audio\qtaudio_windows.dll"
 Delete "$INSTDIR\imageformats\qgif.dll"
 Delete "$INSTDIR\imageformats\qicns.dll"
 Delete "$INSTDIR\imageformats\qico.dll"
@@ -222,10 +228,13 @@ Delete "$INSTDIR\imageformats\qtiff.dll"
 Delete "$INSTDIR\imageformats\qwbmp.dll"
 Delete "$INSTDIR\imageformats\qwebp.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\platforms"
 RmDir "$INSTDIR\imageformats"
+RmDir "$INSTDIR\platforms"
+RmDir "$INSTDIR\styles"
  
 Delete "$INSTDIR\uninstall.exe"
 !ifdef WEB_SITE

.ci/osx_build.sh

@@ -0,0 +1,14 @@
+#!/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} ${QMAKE_BUILD_TYPE} "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" 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

.ci/osx_ci.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Install packages
+.ci/osx_install.sh && \
+
+# Build gta5view
+.ci/osx_build.sh && \
+cd ${PROJECT_DIR}

.ci/osx_install.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Install packages
-brew install qt
+brew upgrade qt

.ci/windows_build.sh

@@ -0,0 +1,26 @@
+#!/bin/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_TELEMETRY=ON" \
+   "-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

.ci/windows_docker.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+DOCKER_IMAGE=sypingauto/gta5view-build:1.8-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

.ci/wininstall_build.sh

@@ -0,0 +1,27 @@
+#!/bin/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_TELEMETRY=ON" \
+   "-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 -NOCD ${PROJECT_DIR}/.ci/gta5view.nsi && \
+mv -f gta5view_setup.exe gta5view-${EXECUTABLE_VERSION}_setup.exe

.ci/wininstall_docker.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DOCKER_IMAGE=sypingauto/gta5view-build:1.8-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"

.drone.yml

@@ -0,0 +1,36 @@
+kind: pipeline
+type: docker
+  
+environment:
+  BUILD_TYPE: "REL"
+
+steps:
+- name: Windows Installer
+  image: sypingauto/gta5view-build:1.8-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.8-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

.drone/drone.sh

@@ -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}/

.flatpak/de.syping.gta5view.yaml

@@ -0,0 +1,20 @@
+app-id: de.syping.gta5view
+runtime: org.kde.Platform
+runtime-version: '5.15'
+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
+    sources:
+      - type: dir
+        path: ../

.gitignore

@@ -29,3 +29,7 @@
 
 # Qt project user file
 *.pro.user
+
+# Gettext translation files
+*.po
+*.pot

.gitlab-ci.yml

@@ -0,0 +1,31 @@
+stages:
+  - build
+  
+variables:
+  BUILD_TYPE: "REL"
+
+Windows Installer:
+  stage: build
+  image: sypingauto/gta5view-build:1.8-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.8-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"

.gitlab/gitlab.sh

@@ -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/* ./

.travis.yml

@@ -1,39 +1,49 @@
-dist: trusty
+dist: bionic
 sudo: required
 
 language: cpp
 
 service:
   - docker
+  
+env:
+  global:
+    - BUILD_TYPE=REL
 
 matrix:
   include:
   - env:
-    - BUILD_SCRIPT=debian_travis.sh
-    - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
-    - DEBIAN_VERSION=jessie
-    - DOCKER_USER=i386
-    - APT_INSTALL=clang
-  - env:
-    - BUILD_SCRIPT=debian_travis.sh
-    - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
-    - DEBIAN_VERSION=jessie
+    - BUILD_SCRIPT=debian_docker.sh
+    - RELEASE_LABEL="Debian 64-Bit Package"
+    - DEBIAN_VERSION=stretch
     - DOCKER_USER=amd64
     - APT_INSTALL=clang
   - env:
-    - BUILD_SCRIPT=windows_travis.sh
-    - QT_SELECT=qt5-i686-w64-mingw32
-  - env:
-    - BUILD_SCRIPT=windows_travis.sh
+    - BUILD_SCRIPT=windows_docker.sh
     - QT_SELECT=qt5-x86_64-w64-mingw32
-    - EXECUTABLE_ARCH=_x64
+    - RELEASE_LABEL="Windows 64-Bit Portable"
   - env:
-    - BUILD_SCRIPT=wininstall_travis.sh
+    - BUILD_SCRIPT=windows_docker.sh
     - QT_SELECT=qt5-x86_64-w64-mingw32
-    
+    - RELEASE_LABEL="Windows 64-Bit Portable for gta5-mods"
+    - PACKAGE_CODE=gta5-mods
+  - env:
+    - BUILD_SCRIPT=windows_docker.sh
+    - QT_SELECT=qt5-x86_64-w64-mingw32
+    - RELEASE_LABEL="Windows 64-Bit Portable for gtainside"
+    - PACKAGE_CODE=gtainside
+  - env:
+    - BUILD_SCRIPT=wininstall_docker.sh
+    - QT_SELECT=qt5-x86_64-w64-mingw32
+    - RELEASE_LABEL="Windows 64-Bit Installer"
+  - os: osx
+    env:
+        - BUILD_SCRIPT=osx_ci.sh
+        - RELEASE_LABEL="Mac OS X 64-Bit Disk Image"
+
 before_install:
   - ".travis/source.sh"
-    
+
 script:
   - ".travis/travis.sh"
 
@@ -41,6 +51,7 @@ deploy:
   provider: releases
   api_key:
     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: assets/*
   skip_cleanup: true

.travis/debian_build.sh

@@ -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

.travis/debian_install.sh

@@ -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

.travis/debian_travis.sh

@@ -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"

.travis/dropbox_uploader.enc

@@ -0,0 +1 @@
+Poｧ鏖<EFBFBD>劾ﾗ<作1x｣%几<>ｬﾈw|RtZv<>kﾎ銓顴Z肄2ﾁ廁湮ｫ`<1A>ﾑ,4vﾖﾏ･@€<>ｦeﾊ･~U$+<2B><>€<EFBFBD><1A><牾&蓬熙

.travis/osx_build.sh

@@ -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

.travis/source.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
 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

.travis/travis.sh

@@ -1,18 +1,27 @@
 #!/bin/bash
 
 # 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 install -qq lua5.2
-elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-	brew install lua
 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
-export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION)
-export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION)
-export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}
-if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi
-export PROJECT_DIR=$(pwd)
+# Check if build is not tagged
+if [ "${TRAVIS_TAG}" == "" ]; then
+	export EXECUTABLE_TAG=-$(git rev-parse --short HEAD)
+else
+	export EXECUTABLE_TAG=
+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

.travis/ubuntu_travis.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Install packages
-sudo .travis/debian_install.sh && \
+sudo .ci/debian_install.sh && \
 
 # Build gta5view
-sudo .travis/debian_build.sh && \
+sudo .ci/debian_build.sh && \
 cd ${PROJECT_DIR}

.travis/windows_build.sh

@@ -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}

.travis/windows_travis.sh

@@ -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"

.travis/wininstall_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

.travis/wininstall_travis.sh

@@ -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"

AboutDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-2019 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
@@ -37,6 +37,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
     buildType.replace("_", " ");
     QString projectBuild = AppEnv::getBuildDateTime();
     QString buildStr = GTA5SYNC_BUILDSTRING;
+#ifndef GTA5SYNC_BUILDTYPE_REL
+#ifdef GTA5SYNC_COMMIT
+    if (!appVersion.contains("-")) { appVersion = appVersion % "-" % GTA5SYNC_COMMIT; }
+#endif
+#endif
 
     // Translator Comments
     //: Translated by translator, example Translated by Syping
@@ -65,11 +70,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     }
 
     // Project Description
-#ifdef GTA5SYNC_ENABLED
-    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
     QString copyrightDes1 = tr("Copyright &copy; <a href=\"%1\">%2</a> %3");

AboutDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

AppEnv.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -22,13 +22,17 @@
 #include "StandardPaths.h"
 #include <QtGlobal>
 #include <QStringBuilder>
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QSettings>
 #include <QScreen>
 #include <QDebug>
 #include <QRect>
 #include <QDir>
+
+#if QT_VERSION < 0x050000
+#include <QDesktopWidget>
+#endif
+
 #include <iostream>
 using namespace std;
 
@@ -152,7 +156,38 @@ QString AppEnv::getPluginsFolder()
 
 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)
@@ -167,7 +202,7 @@ QUrl AppEnv::getCrewFetchingUrl(QString crewID)
 
 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)
@@ -175,12 +210,302 @@ QUrl AppEnv::getPlayerFetchingUrl(QString crewID, int 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
+    }
+    else
+    {
+        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::Koreana;
+    }
+    else
+    {
+        return GameLanguage::Undefined;
+    }
+}
+
+QString AppEnv::gameLanguageToString(GameLanguage gameLanguage)
+{
+    if (gameLanguage == GameLanguage::English)
+    {
+        return "en-US";
+    }
+    else if (gameLanguage == GameLanguage::French)
+    {
+        return "fr-FR";
+    }
+    else if (gameLanguage == GameLanguage::Italian)
+    {
+        return "it-IT";
+    }
+    else if (gameLanguage == GameLanguage::German)
+    {
+        return "de-DE";
+    }
+    else if (gameLanguage == GameLanguage::Spanish)
+    {
+        return "es-ES";
+    }
+    else if (gameLanguage == GameLanguage::Mexican)
+    {
+        return "es-MX";
+    }
+    else if (gameLanguage == GameLanguage::Brasilian)
+    {
+        return "pt-BR";
+    }
+    else if (gameLanguage == GameLanguage::Russian)
+    {
+        return "ru-RU";
+    }
+    else if (gameLanguage == GameLanguage::Polish)
+    {
+        return "pl-PL";
+    }
+    else if (gameLanguage == GameLanguage::Japanese)
+    {
+        return "ja-JP";
+    }
+    else if (gameLanguage == GameLanguage::SChinese)
+    {
+        return "zh-CHS";
+    }
+    else if (gameLanguage == GameLanguage::TChinese)
+    {
+        return "zh-CHT";
+    }
+    else if (gameLanguage == GameLanguage::Koreana)
+    {
+        return "ko-KR";
+    }
+    else
+    {
+        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()
 {
 #if QT_VERSION >= 0x050000
-    qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInch();
+    qreal dpi = QApplication::primaryScreen()->logicalDotsPerInch();
 #else
-    qreal dpi = qApp->desktop()->logicalDpiX();
+    qreal dpi = QApplication::desktop()->logicalDpiX();
 #endif
 #ifdef Q_OS_MAC
     return (dpi / 72);
@@ -188,3 +513,12 @@ qreal AppEnv::screenRatio()
     return (dpi / 96);
 #endif
 }
+
+qreal AppEnv::screenRatioPR()
+{
+#if QT_VERSION >= 0x050600
+    return QApplication::primaryScreen()->devicePixelRatio();
+#else
+    return 1;
+#endif
+}

AppEnv.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2018 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,6 +22,9 @@
 #include <QString>
 #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, Koreana = 13 };
+
 class AppEnv
 {
 public:
@@ -44,8 +47,16 @@ public:
     static QUrl getPlayerFetchingUrl(QString crewID, QString 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
     static qreal screenRatio();
+    static qreal screenRatioPR();
 };
 
 #endif // APPENV_H

CMakeLists.txt

@@ -0,0 +1,356 @@
+cmake_minimum_required(VERSION 3.5)
+
+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)
+
+find_package(Qt5 COMPONENTS Network Svg Widgets REQUIRED)
+find_package(Qt5 COMPONENTS LinguistTools QUIET)
+
+if(WIN32)
+    find_package(Qt5 COMPONENTS WinExtras REQUIRED)
+    list(APPEND GTA5VIEW_LIBS
+        Qt5::WinExtras
+    )
+    list(APPEND GTA5VIEW_DEFINES
+        -DUNICODE
+        -D_UNICODE
+        -DWIN32
+    )
+    list(APPEND GTA5VIEW_RESOURCES
+        res/app.rc
+    )
+endif()
+
+list(APPEND GTA5VIEW_DEFINES
+    -DGTA5SYNC_CMAKE
+    -DGTA5SYNC_PROJECT
+    -DSNAPMATIC_NODEFAULT
+)
+
+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
+    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
+    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
+    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
+)
+
+list(APPEND GTA5VIEW_RESOURCES
+    res/app.qrc
+    res/global.qrc
+)
+set_property(SOURCE res/global.qrc PROPERTY AUTORCC_OPTIONS "-threshold;0;-compress;9")
+
+if(Qt5LinguistTools_FOUND)
+    qt5_add_translation(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
+        res/qtbase_en_GB.ts
+    )
+    add_custom_target(translations DEPENDS ${GTA5VIEW_TRANSLATIONS})
+else()
+    set(GTA5VIEW_TRANSLATIONS
+        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/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/tr_g5p.qrc
+        res/tr_qt5.qrc
+    )
+endif()
+
+option(FLATPAK_BUILD "Flatpak modifications and identifications" OFF)
+if(FLATPAK_BUILD)
+    list(APPEND GTA5VIEW_DEFINES
+        "-DGTA5SYNC_BUILDCODE=\"Flatpak\""
+        "-DGTA5SYNC_BUILDTYPE=\"Flatpak\""
+        -DGTA5SYNC_FLATPAK
+    )
+endif()
+
+option(WITH_MOTD "Developer message system directed to users" OFF)
+if(WITH_MOTD)
+    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)
+    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}\""
+    )
+else()
+    if(GTA5VIEW_BUILDTYPE_ALPHA)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_ALPHA
+        )
+    endif()
+    if(GTA5VIEW_BUILDTYPE_BETA)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_BETA
+        )
+    endif()
+    if(GTA5VIEW_BUILDTYPE_DEV)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_DEV
+        )
+    endif()
+    if(GTA5VIEW_BUILDTYPE_DAILY)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_DAILY
+        )
+    endif()
+    if(GTA5VIEW_BUILDTYPE_RC)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_RC
+        )
+    endif()
+    if(GTA5VIEW_BUILDTYPE_REL)
+        list(APPEND GTA5VIEW_DEFINES
+            -DGTA5SYNC_BUILDTYPE_REL
+        )
+    endif()
+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(Qt5LinguistTools_FOUND AND QCONF_BUILD)
+    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 Qt5::Network Qt5::Svg Qt5::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/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)
+install(FILES res/de.syping.gta5view.png DESTINATION share/pixmaps)
+if(QCONF_BUILD)
+    install(FILES ${GTA5VIEW_TRANSLATIONS} DESTINATION share/gta5view/translations)
+endif()

CrewDatabase.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

CrewDatabase.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

DatabaseThread.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -44,84 +44,12 @@ void DatabaseThread::run()
 {
     QEventLoop threadLoop;
 
-    QStringList crewList;
-    QStringList crewListR;
-
-    // Register thread loop end signal
     QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
 
-    // Setup crewList for Quick time scan
-    crewList = crewDB->getCrews();
-    if (!crewList.isEmpty())
-    {
-        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();
-        }
+        QTimer::singleShot(300000, &threadLoop, SLOT(quit()));
+        threadLoop.exec();
     }
 }
 
@@ -134,11 +62,14 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r
             QNetworkAccessManager *netManager = new QNetworkAccessManager();
             QNetworkRequest netRequest(AppEnv::getCrewFetchingUrl(crewID));
 #if QT_VERSION >= 0x050600
+#if QT_VERSION < 0x060000
             netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif
 #endif
             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-Language", "en-US;q=0.5,en;q=0.3");
+            netRequest.setRawHeader("Accept", "text/html");
+            netRequest.setRawHeader("Accept-Charset", "utf-8");
+            netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
             netRequest.setRawHeader("Connection", "keep-alive");
 
             QNetworkReply *netReply = netManager->get(netRequest);
@@ -169,6 +100,10 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r
                     emit crewNameFound(crewID.toInt(), crewName);
                 }
             }
+            else
+            {
+                netReply->abort();
+            }
 
             if (threadRunning)
             {
@@ -202,11 +137,14 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
                 QNetworkAccessManager *netManager = new QNetworkAccessManager();
                 QNetworkRequest netRequest(AppEnv::getPlayerFetchingUrl(crewID, currentPage));
 #if QT_VERSION >= 0x050600
+#if QT_VERSION < 0x060000
                 netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif
 #endif
                 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-Language", "en-US;q=0.5,en;q=0.3");
+                netRequest.setRawHeader("Accept", "application/json");
+                netRequest.setRawHeader("Accept-Charset", "utf-8");
+                netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
                 netRequest.setRawHeader("Connection", "keep-alive");
 
                 QNetworkReply *netReply = netManager->get(netRequest);

DatabaseThread.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ExportDialog.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ExportDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ExportThread.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -22,14 +22,19 @@
 #include "ProfileWidget.h"
 #include "ExportThread.h"
 #include "SavegameData.h"
+#include "AppEnv.h"
 #include "config.h"
 #include <QStringBuilder>
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QFileInfo>
-#include <QDebug>
 #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),
     profileMap(profileMap), exportDirectory(exportDirectory), pictureCopyEnabled(pictureCopyEnabled), pictureExportEnabled(pictureExportEnabled), exportCount(exportCount)
 {
@@ -101,8 +106,17 @@ void ExportThread::run()
                     QImage exportPicture = picture->getImage();
                     if (sizeMode == "Desktop")
                     {
-                        QRect desktopResolution = qApp->desktop()->screenGeometry();
-                        exportPicture = exportPicture.scaled(desktopResolution.width(), desktopResolution.height(), aspectRatio, Qt::SmoothTransformation);
+#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();
+                        int desktopSizeWidth = desktopResolution.width();
+                        int desktopSizeHeight = desktopResolution.height();
+#endif
+                        exportPicture = exportPicture.scaled(desktopSizeWidth, desktopSizeHeight, aspectRatio, Qt::SmoothTransformation);
                     }
                     else if (sizeMode == "Custom")
                     {

ExportThread.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

GlobalString.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -35,9 +35,11 @@ QMap<QString, QString> GlobalString::getGlobalMap()
 {
     QMap<QString, QString> globalMap;
     QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
+#if QT_VERSION < 0x060000
     globalFile.setIniCodec("UTF-8");
+#endif
     globalFile.beginGroup("Global");
-    for (QString globalStr : globalFile.childKeys())
+    for (const QString &globalStr : globalFile.childKeys())
     {
         globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString();
     }
@@ -49,7 +51,9 @@ QString GlobalString::getString(QString valueStr, bool *ok)
 {
     QString globalString = valueStr;
     QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
+#if QT_VERSION < 0x060000
     globalFile.setIniCodec("UTF-8");
+#endif
     globalFile.beginGroup("Global");
     QStringList globalStrList = globalFile.childKeys();
     if (globalStrList.contains(valueStr))

GlobalString.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

IconLoader.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -27,15 +27,15 @@ IconLoader::IconLoader()
 QIcon IconLoader::loadingAppIcon()
 {
     QIcon appIcon;
-    appIcon.addFile(":/img/5sync-16.png", QSize(16, 16));
-    appIcon.addFile(":/img/5sync-24.png", QSize(24, 24));
-    appIcon.addFile(":/img/5sync-32.png", QSize(32, 32));
-    appIcon.addFile(":/img/5sync-40.png", QSize(40, 40));
-    appIcon.addFile(":/img/5sync-48.png", QSize(48, 48));
-    appIcon.addFile(":/img/5sync-64.png", QSize(64, 64));
-    appIcon.addFile(":/img/5sync-96.png", QSize(96, 96));
-    appIcon.addFile(":/img/5sync-128.png", QSize(128, 128));
-    appIcon.addFile(":/img/5sync-256.png", QSize(256, 256));
+    appIcon.addFile(":/img/gta5view-16.png", QSize(16, 16));
+    appIcon.addFile(":/img/gta5view-24.png", QSize(24, 24));
+    appIcon.addFile(":/img/gta5view-32.png", QSize(32, 32));
+    appIcon.addFile(":/img/gta5view-40.png", QSize(40, 40));
+    appIcon.addFile(":/img/gta5view-48.png", QSize(48, 48));
+    appIcon.addFile(":/img/gta5view-64.png", QSize(64, 64));
+    appIcon.addFile(":/img/gta5view-96.png", QSize(96, 96));
+    appIcon.addFile(":/img/gta5view-128.png", QSize(128, 128));
+    appIcon.addFile(":/img/gta5view-256.png", QSize(256, 256));
     return appIcon;
 }
 

IconLoader.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ImageEditorDialog.cpp

@@ -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."));
-
-}

ImageEditorDialog.ui

@@ -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>&amp;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>&amp;Overwrite</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="cmdClose">
-          <property name="text">
-           <string>&amp;Close</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

ImportDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2017-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2017-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
@@ -20,9 +20,11 @@
 #include "ui_ImportDialog.h"
 #include "SidebarGenerator.h"
 #include "StandardPaths.h"
+#include "imagecropper.h"
 #include "AppEnv.h"
 #include "config.h"
 #include <QStringBuilder>
+#include <QInputDialog>
 #include <QImageReader>
 #include <QColorDialog>
 #include <QFileDialog>
@@ -32,6 +34,7 @@
 #include <QPixmap>
 #include <QImage>
 #include <QDebug>
+#include <QStyle>
 #include <QFile>
 #include <QRgb>
 
@@ -42,15 +45,20 @@
 #define snapmaticAvatarPlacementW 145
 #define snapmaticAvatarPlacementH 66
 
-ImportDialog::ImportDialog(QWidget *parent) :
-    QDialog(parent),
+ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
+    QDialog(parent), profileName(profileName),
     ui(new Ui::ImportDialog)
 {
     // Set Window Flags
     setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
 
     ui->setupUi(this);
+    ui->cmdOK->setDefault(true);
+    ui->cmdOK->setFocus();
     importAgreed = false;
+    settingsLocked = false;
+    watermarkAvatar = true;
+    watermarkPicture = false;
     insideAvatarZone = false;
     avatarAreaImage = QImage(":/img/avatarareaimport.png");
     selectedColour = QColor::fromRgb(0, 0, 0, 255);
@@ -80,6 +88,13 @@ ImportDialog::ImportDialog(QWidget *parent) :
     ui->labBackgroundImage->setText(tr("Background Image:"));
     ui->cmdBackgroundWipe->setVisible(false);
 
+    // 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
     qreal screenRatio = AppEnv::screenRatio();
     snapmaticResolutionLW = 516 * screenRatio; // 430
@@ -100,6 +115,15 @@ ImportDialog::ImportDialog(QWidget *parent) :
     }
 #endif
 
+    // Options menu
+    optionsMenu = new QMenu(this);
+    optionsMenu->addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture()));
+    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);
+
     setMaximumSize(sizeHint());
     setMinimumSize(sizeHint());
     setFixedSize(sizeHint());
@@ -107,6 +131,7 @@ ImportDialog::ImportDialog(QWidget *parent) :
 
 ImportDialog::~ImportDialog()
 {
+    delete optionsMenu;
     delete ui;
 }
 
@@ -117,6 +142,7 @@ void ImportDialog::processImage()
     QPixmap snapmaticPixmap(snapmaticResolutionW, snapmaticResolutionH);
     snapmaticPixmap.fill(selectedColour);
     QPainter snapmaticPainter(&snapmaticPixmap);
+    qreal screenRatioPR = AppEnv::screenRatioPR();
     if (!backImage.isNull())
     {
         if (!ui->cbStretch->isChecked())
@@ -168,6 +194,7 @@ void ImportDialog::processImage()
             snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         }
         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!");
     }
     else
@@ -194,11 +221,351 @@ void ImportDialog::processImage()
             snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         }
         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!");
     }
     snapmaticPainter.end();
     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::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)
+    {
+        snapmaticPainter->drawImage(0, 0, QImage(":/img/watermark_2r.png"));
+    }
+    else
+    {
+        QImage viewWatermark = QImage(":/img/watermark_2b.png");
+        if (!blackWatermark)
+        {
+            viewWatermark.invertPixels(QImage::InvertRgb);
+        }
+        snapmaticPainter->drawImage(0, 0, viewWatermark);
+    }
+    QImage textWatermark = QImage(":/img/watermark_1b.png");
+    if (!blackWatermark)
+    {
+        textWatermark.invertPixels(QImage::InvertRgb);
+    }
+    snapmaticPainter->drawImage(0, 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->cbStretch->setChecked(false);
+        ui->cbForceAvatarColour->setChecked(false);
+    }
+    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->cbStretch->setChecked(settings.value("BackgroundStretch", false).toBool());
+        ui->cbForceAvatarColour->setChecked(settings.value("ForceAvatarColour", false).toBool());
+        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("BackgroundStretch", ui->cbStretch->isChecked());
+    settings.setValue("ForceAvatarColour", ui->cbForceAvatarColour->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 (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()
@@ -208,6 +575,7 @@ QImage ImportDialog::image()
 
 void ImportDialog::setImage(QImage *image_)
 {
+    origImage = *image_;
     workImage = QImage();
     if (image_->width() == image_->height())
     {
@@ -226,20 +594,57 @@ void ImportDialog::setImage(QImage *image_)
     }
     else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height())
     {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
         workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation);
         delete image_;
     }
     else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width())
     {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
         workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation);
         delete image_;
     }
     else
     {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
         workImage = *image_;
         delete image_;
     }
     processImage();
+    lockSettings(false);
+}
+
+void ImportDialog::lockSettings(bool lock)
+{
+    ui->cbAvatar->setDisabled(lock);
+    ui->cbForceAvatarColour->setDisabled(lock);
+    ui->cbIgnore->setDisabled(lock);
+    ui->cbStretch->setDisabled(lock);
+    ui->cbWatermark->setDisabled(lock);
+    ui->cmdBackgroundChange->setDisabled(lock);
+    ui->cmdBackgroundWipe->setDisabled(lock);
+    ui->cmdColourChange->setDisabled(lock);
+    ui->labBackgroundImage->setDisabled(lock);
+    ui->labColour->setDisabled(lock);
+    ui->gbSettings->setDisabled(lock);
+    ui->gbBackground->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()
@@ -247,6 +652,11 @@ bool ImportDialog::isImportAgreed()
     return importAgreed;
 }
 
+bool ImportDialog::areSettingsLocked()
+{
+    return settingsLocked;
+}
+
 QString ImportDialog::getImageTitle()
 {
     return imageTitle;
@@ -260,7 +670,7 @@ void ImportDialog::on_cbIgnore_toggled(bool checked)
 
 void ImportDialog::on_cbAvatar_toggled(bool checked)
 {
-    if (workImage.width() == workImage.height() && !checked)
+    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))
         {
@@ -270,6 +680,16 @@ void ImportDialog::on_cbAvatar_toggled(bool checked)
         }
     }
     insideAvatarZone = ui->cbAvatar->isChecked();
+    watermarkBlock = true;
+    if (insideAvatarZone)
+    {
+        ui->cbWatermark->setChecked(watermarkAvatar);
+    }
+    else
+    {
+        ui->cbWatermark->setChecked(watermarkPicture);
+    }
+    watermarkBlock = false;
     processImage();
 }
 
@@ -401,3 +821,19 @@ void ImportDialog::on_cbForceAvatarColour_toggled(bool checked)
     Q_UNUSED(checked)
     processImage();
 }
+
+void ImportDialog::on_cbWatermark_toggled(bool checked)
+{
+    if (!watermarkBlock)
+    {
+        if (insideAvatarZone)
+        {
+            watermarkAvatar = checked;
+        }
+        else
+        {
+            watermarkPicture = checked;
+        }
+        processImage();
+    }
+}

ImportDialog.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2017-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
@@ -20,6 +20,7 @@
 #define IMPORTDIALOG_H
 
 #include <QDialog>
+#include <QMenu>
 
 namespace Ui {
 class ImportDialog;
@@ -30,15 +31,22 @@ class ImportDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ImportDialog(QWidget *parent = 0);
+    explicit ImportDialog(QString profileName, QWidget *parent = 0);
     ~ImportDialog();
     QImage image();
     QString getImageTitle();
     void setImage(QImage *image);
+    void lockSettings(bool lock);
+    void enableOverwriteMode();
     bool isImportAgreed();
+    bool areSettingsLocked();
 
 private slots:
     void processImage();
+    void cropPicture();
+    void importNewPicture();
+    void loadImportSettings();
+    void saveImportSettings();
     void on_cbIgnore_toggled(bool checked);
     void on_cbAvatar_toggled(bool checked);
     void on_cmdCancel_clicked();
@@ -49,20 +57,31 @@ private slots:
     void on_cmdBackgroundWipe_clicked();
     void on_cbStretch_toggled(bool checked);
     void on_cbForceAvatarColour_toggled(bool checked);
+    void on_cbWatermark_toggled(bool checked);
 
 private:
+    QString profileName;
     Ui::ImportDialog *ui;
     QImage avatarAreaImage;
     QString backgroundPath;
     QString imageTitle;
     QImage backImage;
     QImage workImage;
+    QImage origImage;
     QImage newImage;
     QColor selectedColour;
+    QMenu *optionsMenu;
     bool insideAvatarZone;
+    bool watermarkPicture;
+    bool watermarkAvatar;
+    bool watermarkBlock;
+    bool settingsLocked;
     bool importAgreed;
     int snapmaticResolutionLW;
     int snapmaticResolutionLH;
+    void processWatermark(QPainter *snapmaticPainter);
+    void processSettings(QString settingsProfile, bool setDefault = false);
+    void saveSettings(QString settingsProfile);
 };
 
 #endif // IMPORTDIALOG_H

ImportDialog.ui

@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>516</width>
-    <height>425</height>
+    <height>512</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>516</width>
-    <height>425</height>
+    <height>512</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -85,7 +85,7 @@
         </property>
         <layout class="QVBoxLayout" name="vlSettings">
          <item>
-          <layout class="QHBoxLayout" name="hlCheckboxes">
+          <layout class="QHBoxLayout" name="hlCheckboxesTop">
            <item>
             <widget class="QCheckBox" name="cbAvatar">
              <property name="sizePolicy">
@@ -114,6 +114,23 @@
            </item>
           </layout>
          </item>
+         <item>
+          <layout class="QHBoxLayout" name="hlCheckboxesButtom">
+           <item>
+            <widget class="QCheckBox" name="cbWatermark">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Watermark</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </widget>
       </item>
@@ -124,7 +141,7 @@
         </property>
         <layout class="QVBoxLayout" name="vlBackground">
          <item>
-          <layout class="QHBoxLayout" name="hlColor">
+          <layout class="QHBoxLayout" name="hlColour">
            <item>
             <layout class="QHBoxLayout" name="hlColourManage">
              <item>
@@ -153,6 +170,9 @@
                </property>
                <item>
                 <widget class="QToolButton" name="cmdColourChange">
+                 <property name="toolTip">
+                  <string>Select background colour</string>
+                 </property>
                  <property name="text">
                   <string>...</string>
                  </property>
@@ -203,6 +223,9 @@
                </property>
                <item>
                 <widget class="QToolButton" name="cmdBackgroundChange">
+                 <property name="toolTip">
+                  <string>Select background image</string>
+                 </property>
                  <property name="text">
                   <string>...</string>
                  </property>
@@ -210,6 +233,9 @@
                </item>
                <item>
                 <widget class="QToolButton" name="cmdBackgroundWipe">
+                 <property name="toolTip">
+                  <string>Remove background image</string>
+                 </property>
                  <property name="text">
                   <string>X</string>
                  </property>
@@ -273,6 +299,19 @@
       </item>
       <item>
        <layout class="QHBoxLayout" name="hlButtons">
+        <item>
+         <widget class="QPushButton" name="cmdOptions">
+          <property name="toolTip">
+           <string>Import options</string>
+          </property>
+          <property name="text">
+           <string>&amp;Options</string>
+          </property>
+          <property name="autoDefault">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
         <item>
          <spacer name="hsButtons">
           <property name="orientation">

JsonEditorDialog.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2017-2018 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,8 +20,10 @@
 #include "ui_JsonEditorDialog.h"
 #include "SnapmaticEditor.h"
 #include "AppEnv.h"
+#include "config.h"
 #include <QStringBuilder>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QMessageBox>
 
 #if QT_VERSION >= 0x050200
@@ -29,6 +31,10 @@
 #include <QDebug>
 #endif
 
+#ifdef GTA5SYNC_TELEMETRY
+#include "TelemetryClass.h"
+#endif
+
 JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
     QDialog(parent), smpic(picture),
     ui(new Ui::JsonEditorDialog)
@@ -37,6 +43,7 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
     setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint^Qt::WindowMinMaxButtonsHint);
 
     ui->setupUi(this);
+    ui->cmdClose->setDefault(true);
     ui->cmdClose->setFocus();
 
     // Set Icon for Close Button
@@ -63,9 +70,18 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
 
 #if QT_VERSION >= 0x050200
     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
     QFontMetrics fontMetrics(ui->txtJSON->font());
+#if QT_VERSION >= 0x050B00
+    ui->txtJSON->setTabStopDistance(fontMetrics.horizontalAdvance("    "));
+#else
     ui->txtJSON->setTabStopWidth(fontMetrics.width("    "));
+#endif
 
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonCode.toUtf8());
     ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color: rgb(46, 47, 48); color: rgb(238, 231, 172);}");
@@ -87,6 +103,7 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
     {
         ui->lineJSON->setMinimumHeight(qRound(1 * screenRatio));
         ui->lineJSON->setMaximumHeight(qRound(1 * screenRatio));
+        ui->lineJSON->setLineWidth(qRound(1 * screenRatio));
     }
     resize(450 * screenRatio, 550 * screenRatio);
 }
@@ -182,7 +199,24 @@ bool JsonEditorDialog::saveJsonContent()
                 return false;
             }
             jsonCode = newCode;
+            smpic->updateStrings();
             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());
+                jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
+#endif
             return true;
         }
         return true;
@@ -196,13 +230,13 @@ bool JsonEditorDialog::saveJsonContent()
 
 void JsonEditorDialog::on_cmdClose_clicked()
 {
-    this->close();
+    close();
 }
 
 void JsonEditorDialog::on_cmdSave_clicked()
 {
     if (saveJsonContent())
     {
-        this->close();
+        close();
     }
 }

JsonEditorDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

JsonEditorDialog.ui

@@ -112,6 +112,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Apply changes</string>
+       </property>
        <property name="text">
         <string>&amp;Save</string>
        </property>
@@ -125,6 +128,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Discard changes</string>
+       </property>
        <property name="text">
         <string>&amp;Close</string>
        </property>

MapLocationDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2017-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
@@ -22,6 +22,7 @@
 #include "AppEnv.h"
 #include <QPainter>
 #include <QDebug>
+#include <QStyle>
 
 MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
     QDialog(parent), xpos_old(x), ypos_old(y),
@@ -59,36 +60,10 @@ MapLocationDialog::~MapLocationDialog()
 
 void MapLocationDialog::drawPointOnMap(double xpos_d, double ypos_d)
 {
-    qreal screenRatio = AppEnv::screenRatio();
-    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);
-
+    ui->labPos->setText(tr("X: %1\nY: %2", "X and Y position").arg(QString::number(xpos_d), QString::number(ypos_d)));
     xpos_new = xpos_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::on_cmdChange_clicked()
@@ -120,6 +95,21 @@ void MapLocationDialog::on_cmdDone_clicked()
     changeMode = false;
 }
 
+#if QT_VERSION >= 0x060000
+void MapLocationDialog::updatePosFromEvent(double x, double y)
+{
+    QSize mapPixelSize = size();
+    double xpos_ad = x;
+    double 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);
+}
+#else
 void MapLocationDialog::updatePosFromEvent(int x, int y)
 {
     QSize mapPixelSize = size();
@@ -133,13 +123,60 @@ void MapLocationDialog::updatePosFromEvent(int x, int y)
     double ypos_fp = ypos_rv - 4000;
     drawPointOnMap(xpos_fp, ypos_fp);
 }
+#endif
+
+void MapLocationDialog::paintEvent(QPaintEvent *ev)
+{
+    QPainter painter(this);
+    qreal screenRatio = AppEnv::screenRatio();
+    qreal screenRatioPR = AppEnv::screenRatioPR();
+
+    // Paint Map
+    QSize mapPixelSize = QSize(width() * screenRatioPR, height() * screenRatioPR);
+    painter.drawPixmap(0, 0, width(), height(), QPixmap(":/img/mappreview.jpg").scaled(mapPixelSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+
+    // Paint Marker
+    int pointMarkerSize = 8 * screenRatio;
+    int pointMarkerHalfSize = pointMarkerSize / 2;
+    long xpos_ms = qRound(xpos_new);
+    long ypos_ms = qRound(ypos_new);
+    double xpos_ma = xpos_ms + 4000;
+    double ypos_ma = ypos_ms + 4000;
+    double xrat = (double)width() / 10000;
+    double yrat = (double)height() / 12000;
+    long xpos_mp = qRound(xpos_ma * xrat);
+    long ypos_mp = qRound(ypos_ma * yrat);
+    long xpos_pr;
+    long ypos_pr;
+    if (screenRatioPR != 1) {
+#ifdef Q_OS_WIN
+        xpos_pr = xpos_mp - pointMarkerHalfSize;
+        ypos_pr = ypos_mp + pointMarkerHalfSize;
+#else
+        xpos_pr = xpos_mp - pointMarkerHalfSize + screenRatioPR;
+        ypos_pr = ypos_mp + pointMarkerHalfSize - screenRatioPR;
+#endif
+    }
+    else {
+        xpos_pr = xpos_mp - pointMarkerHalfSize;
+        ypos_pr = ypos_mp + pointMarkerHalfSize;
+    }
+    QPixmap mapMarkerPixmap = IconLoader::loadingPointmakerIcon().pixmap(QSize(pointMarkerSize, pointMarkerSize));
+    painter.drawPixmap(xpos_pr, height() - ypos_pr, pointMarkerSize, pointMarkerSize, mapMarkerPixmap);
+
+    QDialog::paintEvent(ev);
+}
 
 void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
 {
     if (!changeMode) { ev->ignore(); }
     else if (ev->buttons() & Qt::LeftButton)
     {
+#if QT_VERSION >= 0x060000
+        updatePosFromEvent(ev->position().x(), ev->position().y());
+#else
         updatePosFromEvent(ev->x(), ev->y());
+#endif
         ev->accept();
     }
     else
@@ -153,7 +190,11 @@ void MapLocationDialog::mouseReleaseEvent(QMouseEvent *ev)
     if (!changeMode) { ev->ignore(); }
     else if (ev->button() == Qt::LeftButton)
     {
+#if QT_VERSION >= 0x060000
+        updatePosFromEvent(ev->position().x(), ev->position().y());
+#else
         updatePosFromEvent(ev->x(), ev->y());
+#endif
         ev->accept();
     }
     else

MapLocationDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -39,6 +39,7 @@ public:
     ~MapLocationDialog();
 
 protected:
+    void paintEvent(QPaintEvent *ev);
     void mouseMoveEvent(QMouseEvent *ev);
     void mouseReleaseEvent(QMouseEvent *ev);
 
@@ -47,7 +48,11 @@ private slots:
     void on_cmdApply_clicked();
     void on_cmdChange_clicked();
     void on_cmdRevert_clicked();
+#if QT_VERSION >= 0x060000
+    void updatePosFromEvent(double x, double y);
+#else
     void updatePosFromEvent(int x, int y);
+#endif
     void on_cmdClose_clicked();
 
 private:

MapLocationDialog.ui

@@ -25,6 +25,11 @@
   <property name="windowTitle">
    <string>Snapmatic Map Viewer</string>
   </property>
+  <property name="styleSheet">
+   <string notr="true">QDialog#MapLocationDialog {
+    background-color: transparent;
+}</string>
+  </property>
   <layout class="QVBoxLayout" name="vlMapPreview">
    <property name="spacing">
     <number>0</number>
@@ -134,6 +139,9 @@ color: rgb(255, 255, 255);
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="toolTip">
+          <string>Close viewer</string>
+         </property>
          <property name="text">
           <string>&amp;Close</string>
          </property>
@@ -160,6 +168,9 @@ color: rgb(255, 255, 255);
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="toolTip">
+          <string>Apply new position</string>
+         </property>
          <property name="text">
           <string>&amp;Apply</string>
          </property>
@@ -173,6 +184,9 @@ color: rgb(255, 255, 255);
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="toolTip">
+          <string>Revert old position</string>
+         </property>
          <property name="text">
           <string>&amp;Revert</string>
          </property>
@@ -186,8 +200,11 @@ color: rgb(255, 255, 255);
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="toolTip">
+          <string>Select new position</string>
+         </property>
          <property name="text">
-          <string>&amp;Set</string>
+          <string>&amp;Select</string>
          </property>
          <property name="autoDefault">
           <bool>false</bool>
@@ -199,6 +216,9 @@ color: rgb(255, 255, 255);
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="toolTip">
+          <string>Quit select position</string>
+         </property>
          <property name="text">
           <string>&amp;Done</string>
          </property>

MessageThread.cpp

@@ -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();
+}

MessageThread.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* 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
@@ -16,38 +16,33 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#ifndef IMAGEEDITORDIALOG_H
-#define IMAGEEDITORDIALOG_H
+#ifndef MESSAGETHREAD_H
+#define MESSAGETHREAD_H
 
-#include "SnapmaticPicture.h"
-#include <QDialog>
+#include <QJsonObject>
+#include <QObject>
+#include <QThread>
 
-namespace Ui {
-class ImageEditorDialog;
-}
-
-class ImageEditorDialog : public QDialog
+class MessageThread : public QThread
 {
     Q_OBJECT
-
 public:
-    explicit ImageEditorDialog(SnapmaticPicture *picture, QString profileName, QWidget *parent = 0);
-    ~ImageEditorDialog();
+    explicit MessageThread(uint cacheId, QObject *parent = 0);
 
-private slots:
-    void on_cmdClose_clicked();
-    void on_cmdReplace_clicked();
-    void on_cmdSave_clicked();
-    void on_cmdQuestion_clicked();
+public slots:
+    void terminateThread();
 
 private:
-    SnapmaticPicture *smpic;
-    QString profileName;
-    Ui::ImageEditorDialog *ui;
-    int snapmaticResolutionLW;
-    int snapmaticResolutionLH;
-    bool imageIsChanged;
-    QImage pictureCache;
+    bool threadRunning;
+    uint cacheId;
+
+protected:
+    void run();
+
+signals:
+    void messagesArrived(const QJsonObject &messageObject);
+    void updateCacheId(uint cacheId);
+    void threadTerminated();
 };
 
-#endif // IMAGEEDITORDIALOG_H
+#endif // MESSAGETHREAD_H

OptionsDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -24,7 +24,6 @@
 #include "AppEnv.h"
 #include "config.h"
 #include <QStringBuilder>
-#include <QDesktopWidget>
 #include <QJsonDocument>
 #include <QStyleFactory>
 #include <QApplication>
@@ -40,6 +39,12 @@
 #include <QList>
 #include <QDir>
 
+#if QT_VERSION >= 0x050000
+#include <QScreen>
+#else
+#include <QDesktopWidget>
+#endif
+
 #ifdef GTA5SYNC_TELEMETRY
 #include "TelemetryClass.h"
 #endif
@@ -55,11 +60,19 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     ui->setupUi(this);
     ui->tabWidget->setCurrentIndex(0);
     ui->labPicCustomRes->setVisible(false);
+    ui->cmdCancel->setDefault(true);
     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);
     int desktopSizeWidth = desktopResolution.width();
     int desktopSizeHeight = desktopResolution.height();
+#endif
     aspectRatio = Qt::KeepAspectRatio;
     defExportSize = QSize(960, 536);
     cusExportSize = defExportSize;
@@ -102,6 +115,7 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     setupInterfaceSettings();
     setupStatisticsSettings();
     setupSnapmaticPictureViewer();
+    setupWindowsGameSettings();
 
 #ifndef Q_QS_ANDROID
     // DPI calculation
@@ -109,11 +123,7 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     resize(435 * screenRatio, 405 * screenRatio);
 #endif
 
-#ifdef GTA5SYNC_DISABLED
-    ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabSync));
-#endif
-
-    this->setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
+    setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
 }
 
 OptionsDialog::~OptionsDialog()
@@ -126,24 +136,33 @@ OptionsDialog::~OptionsDialog()
 
 void OptionsDialog::setupTreeWidget()
 {
-    for (QString playerIDStr : profileDB->getPlayers())
-    {
-        bool ok;
-        int playerID = playerIDStr.toInt(&ok);
-        if (ok)
+    const QStringList players = profileDB->getPlayers();
+    if (players.length() != 0) {
+        QStringList::const_iterator it = players.constBegin();
+        QStringList::const_iterator end = players.constEnd();
+        while (it != end)
         {
-            QString playerName = profileDB->getPlayerName(playerID);
+            bool ok;
+            int playerID = it->toInt(&ok);
+            if (ok)
+            {
+                QString playerName = profileDB->getPlayerName(playerID);
 
-            QStringList playerTreeViewList;
-            playerTreeViewList += playerIDStr;
-            playerTreeViewList += playerName;
+                QStringList playerTreeViewList;
+                playerTreeViewList += *it;
+                playerTreeViewList += playerName;
 
-            QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
-            ui->twPlayers->addTopLevelItem(playerItem);
-            playerItems += playerItem;
+                QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
+                ui->twPlayers->addTopLevelItem(playerItem);
+                playerItems += playerItem;
+            }
+            it++;
         }
+        ui->twPlayers->sortItems(1, Qt::AscendingOrder);
+    }
+    else {
+        ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabPlayers));
     }
-    ui->twPlayers->sortItems(1, Qt::AscendingOrder);
 }
 
 void OptionsDialog::setupLanguageBox()
@@ -153,9 +172,21 @@ void OptionsDialog::setupLanguageBox()
     currentAreaLanguage = settings->value("AreaLanguage", "Auto").toString();
     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",
-                                                                                                                                                                      "System in context of System default"));
+    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"));
+#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
     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->cbAreaLanguage->addItem(cbAutoStr, "Auto");
 
@@ -270,7 +301,7 @@ void OptionsDialog::setupInterfaceSettings()
     settings->beginGroup("Startup");
     bool alwaysUseMessageFont = settings->value("AlwaysUseMessageFont", false).toBool();
     ui->cbAlwaysUseMessageFont->setChecked(alwaysUseMessageFont);
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
     if (QSysInfo::windowsVersion() >= 0x0080)
     {
         ui->gbFont->setVisible(false);
@@ -336,10 +367,12 @@ void OptionsDialog::applySettings()
     settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()));
     settings->setValue("AreaLanguage", ui->cbAreaLanguage->itemData(ui->cbAreaLanguage->currentIndex()));
 #endif
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
 #endif
+#else
+    settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
 #endif
     settings->endGroup();
 
@@ -410,10 +443,20 @@ void OptionsDialog::applySettings()
 #ifdef GTA5SYNC_TELEMETRY
     settings->beginGroup("Telemetry");
     settings->setValue("PushAppConf", ui->cbAppConfigStats->isChecked());
+    settings->setValue("PushUsageData", ui->cbUsageData->isChecked());
     if (!Telemetry->isStateForced()) { settings->setValue("IsEnabled", ui->cbParticipateStats->isChecked()); }
     settings->endGroup();
     Telemetry->refresh();
     Telemetry->work();
+    if (ui->cbUsageData->isChecked() && Telemetry->canPush())
+    {
+        QJsonDocument jsonDocument;
+        QJsonObject jsonObject;
+        jsonObject["Type"] = "SettingsUpdated";
+        jsonObject["UpdateTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+        jsonDocument.setObject(jsonObject);
+        Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+    }
 #endif
 
 #if QT_VERSION >= 0x050000
@@ -434,6 +477,7 @@ void OptionsDialog::applySettings()
         Translator->initUserLanguage();
     }
 
+    settings->sync();
     emit settingsApplied(newContentMode, languageChanged);
 
     if ((forceCustomFolder && ui->txtFolder->text() != currentCFolder) || (forceCustomFolder != currentFFolder && forceCustomFolder))
@@ -553,17 +597,10 @@ void OptionsDialog::setupStatisticsSettings()
     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->gbUserFeedback->setVisible(false);
-    // settings->beginGroup("Startup");
-    // if (settings->value("IsFirstStart", true).toBool() == true)
-    // {
-    //     ui->gbUserFeedback->setVisible(false);
-    // }
-    // settings->endGroup();
-
     settings->beginGroup("Telemetry");
     ui->cbParticipateStats->setChecked(Telemetry->isEnabled());
     ui->cbAppConfigStats->setChecked(settings->value("PushAppConf", false).toBool());
+    ui->cbUsageData->setChecked(settings->value("PushUsageData", false).toBool());
     settings->endGroup();
 
     if (Telemetry->isStateForced())
@@ -585,6 +622,77 @@ void OptionsDialog::setupStatisticsSettings()
 #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)
 {
     if (checked)
@@ -615,18 +723,19 @@ void OptionsDialog::setupCustomGTAFolder()
 
 void OptionsDialog::setupSnapmaticPictureViewer()
 {
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     settings->beginGroup("Interface");
-    ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", false).toBool());
+    ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool());
     settings->endGroup();
 #else
     ui->cbSnapmaticNavigationBar->setVisible(false);
     ui->gbSnapmaticPictureViewer->setVisible(false);
 #endif
 #else
-    ui->cbSnapmaticNavigationBar->setVisible(false);
-    ui->gbSnapmaticPictureViewer->setVisible(false);
+    settings->beginGroup("Interface");
+    ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool());
+    settings->endGroup();
 #endif
 }
 
@@ -644,25 +753,6 @@ void OptionsDialog::on_cbDefaultStyle_toggled(bool checked)
     ui->cbStyleList->setDisabled(checked);
 }
 
-void OptionsDialog::on_cmdUserFeedbackSend_clicked()
-{
-#ifdef GTA5SYNC_TELEMETRY
-    if (ui->txtUserFeedback->toPlainText().length() < 1024 && ui->txtUserFeedback->toPlainText().length() >= 3)
-    {
-        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()
 {
 #ifdef GTA5SYNC_TELEMETRY

OptionsDialog.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -47,7 +47,6 @@ private slots:
     void on_cbIgnoreAspectRatio_toggled(bool checked);
     void on_cmdExploreFolder_clicked();
     void on_cbDefaultStyle_toggled(bool checked);
-    void on_cmdUserFeedbackSend_clicked();
     void on_cmdCopyStatsID_clicked();
 
 signals:
@@ -80,6 +79,7 @@ private:
     void setupInterfaceSettings();
     void setupStatisticsSettings();
     void setupSnapmaticPictureViewer();
+    void setupWindowsGameSettings();
     void applySettings();
 };
 

OptionsDialog.ui

@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabProfile">
       <attribute name="title">
@@ -382,6 +382,72 @@
        </item>
       </layout>
      </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">
       <attribute name="title">
        <string>Feedback</string>
@@ -420,11 +486,11 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="gbCategorys">
+        <widget class="QGroupBox" name="gbCategories">
          <property name="title">
           <string>Categories</string>
          </property>
-         <layout class="QVBoxLayout" name="vlCategorys">
+         <layout class="QVBoxLayout" name="vlCategories">
           <item>
            <widget class="QCheckBox" name="cbGeneralStats">
             <property name="enabled">
@@ -458,6 +524,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="cbUsageData">
+            <property name="text">
+             <string>Personal Usage Data</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -466,74 +539,32 @@
          <property name="title">
           <string>Other</string>
          </property>
-         <layout class="QHBoxLayout" name="hlOtherStats">
+         <layout class="QVBoxLayout" name="vlFeedbackOther">
           <item>
-           <widget class="QLabel" name="labParticipationID">
-            <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>&amp;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">
+           <layout class="QHBoxLayout" name="hlParticipation">
             <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">
-               <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>
              </widget>
             </item>
             <item>
-             <spacer name="hsUserFeedbackButtons">
-              <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">
+             <widget class="QPushButton" name="cmdCopyStatsID">
               <property name="text">
-               <string>&amp;Send</string>
+               <string>&amp;Copy</string>
               </property>
               <property name="autoDefault">
                <bool>false</bool>
@@ -683,26 +714,6 @@
        </item>
       </layout>
      </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>
    </item>
    <item>

PictureDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -22,17 +22,22 @@
 #include "ui_PictureDialog.h"
 #include "SidebarGenerator.h"
 #include "MapLocationDialog.h"
-#include "ImageEditorDialog.h"
 #include "JsonEditorDialog.h"
 #include "SnapmaticEditor.h"
 #include "StandardPaths.h"
 #include "PictureExport.h"
+#include "ImportDialog.h"
 #include "StringParser.h"
 #include "GlobalString.h"
 #include "UiModLabel.h"
 #include "AppEnv.h"
+#include "config.h"
 
-#ifdef GTA5SYNC_WIN
+#if QT_VERSION < 0x060000
+#include <QDesktopWidget>
+#endif
+
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
 #include <QtWinExtras/QtWin>
 #include <QtWinExtras/QWinEvent>
@@ -40,10 +45,10 @@
 #endif
 
 #include <QStringBuilder>
-#include <QDesktopWidget>
 #include <QJsonDocument>
 #include <QApplication>
 #include <QFontMetrics>
+#include <QJsonObject>
 #include <QSizePolicy>
 #include <QStaticText>
 #include <QFileDialog>
@@ -66,6 +71,10 @@
 #include <QUrl>
 #include <QDir>
 
+#ifdef GTA5SYNC_TELEMETRY
+#include "TelemetryClass.h"
+#endif
+
 // Macros for better Overview + RAM
 #define locX QString::number(picture->getSnapmaticProperties().location.x)
 #define locY QString::number(picture->getSnapmaticProperties().location.y)
@@ -75,7 +84,11 @@
 #define picPath picture->getPictureFilePath()
 #define picTitl StringParser::escapeString(picture->getPictureTitle())
 #define plyrsList picture->getSnapmaticProperties().playersList
+#if QT_VERSION >= 0x060000
+#define created QLocale().toString(picture->getSnapmaticProperties().createdDateTime, QLocale::ShortFormat)
+#else
 #define created picture->getSnapmaticProperties().createdDateTime.toString(Qt::DefaultLocaleShortDate)
+#endif
 
 PictureDialog::PictureDialog(ProfileDatabase *profileDB, CrewDatabase *crewDB, QWidget *parent) :
     QDialog(parent), profileDB(profileDB), crewDB(crewDB),
@@ -129,11 +142,15 @@ void PictureDialog::setupPictureDialog()
     smpic = nullptr;
     crewStr = "";
 
+    // Get Snapmatic Resolution
+    QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution();
+
     // Avatar area
     qreal screenRatio = AppEnv::screenRatio();
-    if (screenRatio != 1)
+    qreal screenRatioPR = AppEnv::screenRatioPR();
+    if (screenRatio != 1 || screenRatioPR != 1)
     {
-        avatarAreaPicture = QImage(":/img/avatararea.png").scaledToHeight(536 * screenRatio, Qt::FastTransformation);
+        avatarAreaPicture = QImage(":/img/avatararea.png").scaledToHeight(snapmaticResolution.height() * screenRatio * screenRatioPR, Qt::FastTransformation);
     }
     else
     {
@@ -143,6 +160,11 @@ void PictureDialog::setupPictureDialog()
     avatarLocY = 66;
     avatarSize = 470;
 
+    // DPI calculation (picture)
+    ui->labPicture->setFixedSize(snapmaticResolution.width() * screenRatio, snapmaticResolution.height() * screenRatio);
+    ui->labPicture->setFocusPolicy(Qt::StrongFocus);
+    ui->labPicture->setScaledContents(true);
+
     // Overlay area
     renderOverlayPicture();
     overlayEnabled = true;
@@ -178,17 +200,21 @@ void PictureDialog::setupPictureDialog()
 
     installEventFilter(this);
     installEventFilter(ui->labPicture);
-    ui->labPicture->setFixedSize(960 * screenRatio, 536 * screenRatio);
-    ui->labPicture->setFocusPolicy(Qt::StrongFocus);
+
+    // DPI calculation
+    ui->hlButtons->setSpacing(6 * screenRatio);
+    ui->vlButtons->setSpacing(6 * screenRatio);
+    ui->vlButtons->setContentsMargins(0, 0, 5 * screenRatio, 5 * screenRatio);
+    ui->jsonLayout->setContentsMargins(4 * screenRatio, 10 * screenRatio, 4 * screenRatio, 4 * screenRatio);
 
     // Pre-adapt window for DPI
-    setFixedWidth(960 * screenRatio);
-    setFixedHeight(536 * screenRatio);
+    setFixedWidth(snapmaticResolution.width() * screenRatio);
+    setFixedHeight(snapmaticResolution.height() * screenRatio);
 }
 
 PictureDialog::~PictureDialog()
 {
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     if (naviEnabled)
     {
@@ -199,6 +225,15 @@ PictureDialog::~PictureDialog()
         delete layout()->menuBar();
     }
 #endif
+#else
+    if (naviEnabled)
+    {
+        for (QObject *obj : layout()->menuBar()->children())
+        {
+            delete obj;
+        }
+        delete layout()->menuBar();
+    }
 #endif
     for (QObject *obj : manageMenu->children())
     {
@@ -219,139 +254,42 @@ void PictureDialog::closeEvent(QCloseEvent *ev)
 
 void PictureDialog::addPreviousNextButtons()
 {
-    // Windows Vista additions
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this);
     uiToolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-    uiToolbar->setObjectName("uiToolbar");
-    uiToolbar->addAction(QIcon(":/img/back.png"), "", this, SLOT(previousPictureRequestedSlot()));
-    uiToolbar->addAction(QIcon(":/img/next.png"), "", this, SLOT(nextPictureRequestedSlot()));
+    uiToolbar->setObjectName("UiToolbar");
+    uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot()));
+    uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot()));
     layout()->setMenuBar(uiToolbar);
-
     naviEnabled = true;
 #endif
-#endif
-}
-
-#ifdef GTA5SYNC_WIN
-#if QT_VERSION >= 0x050200
-#ifdef GTA5SYNC_APV
-bool PictureDialog::nativeEvent(const QByteArray &eventType, void *message, long *result)
-{
-    *result = 0;
-    MSG *msg = static_cast<MSG*>(message);
-    LRESULT lRet = 0;
-
-    if (naviEnabled && QtWin::isCompositionEnabled())
-    {
-        if (msg->message == WM_NCCALCSIZE && msg->wParam == TRUE)
-        {
-            NCCALCSIZE_PARAMS *pncsp = reinterpret_cast<NCCALCSIZE_PARAMS*>(msg->lParam);
-
-            int sideBorderSize = ((frameSize().width() - size().width()) / 2);
-#ifdef GTA5SYNC_APV_SIDE
-            int buttomBorderSize = sideBorderSize;
 #else
-            int buttomBorderSize = (frameSize().height() - size().height());
+    QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this);
+#if QT_VERSION < 0x050600
+    qreal screenRatio = AppEnv::screenRatio();
+    if (screenRatio != 1) {
+        QSize iconSize = uiToolbar->iconSize();
+        uiToolbar->setIconSize(QSize(iconSize.width() * screenRatio, iconSize.height() * screenRatio));
+    }
+#endif
+    uiToolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    uiToolbar->setObjectName("UiToolbar");
+    uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot()));
+    uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot()));
+    layout()->setMenuBar(uiToolbar);
+    naviEnabled = true;
 #endif
-            pncsp->rgrc[0].left += sideBorderSize;
-            pncsp->rgrc[0].right -= sideBorderSize;
-            pncsp->rgrc[0].bottom -= buttomBorderSize;
-        }
-        else if (msg->message == WM_NCHITTEST)
-        {
-            int CLOSE_BUTTON_ID = 20;
-            lRet = HitTestNCA(msg->hwnd, msg->lParam);
-            DwmDefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam, &lRet);
-            *result = lRet;
-            if (lRet != CLOSE_BUTTON_ID) { return QWidget::nativeEvent(eventType, message, result); }
-        }
-        else
-        {
-            return QWidget::nativeEvent(eventType, message, result);
-        }
-    }
-    else
-    {
-        return QWidget::nativeEvent(eventType, message, result);
-    }
-    return true;
 }
 
-LRESULT PictureDialog::HitTestNCA(HWND hWnd, LPARAM lParam)
-{
-    int LEFTEXTENDWIDTH = 0;
-    int RIGHTEXTENDWIDTH = 0;
-    int BOTTOMEXTENDWIDTH = 0;
-    int TOPEXTENDWIDTH = layout()->menuBar()->height();
-
-    POINT ptMouse = {(int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam)};
-
-    RECT rcWindow;
-    GetWindowRect(hWnd, &rcWindow);
-
-    RECT rcFrame = {};
-    AdjustWindowRectEx(&rcFrame, WS_OVERLAPPEDWINDOW & ~WS_CAPTION, FALSE, NULL);
-
-    USHORT uRow = 1;
-    USHORT uCol = 1;
-    bool fOnResizeBorder = false;
-
-    if (ptMouse.y >= rcWindow.top && ptMouse.y < rcWindow.top + TOPEXTENDWIDTH)
-    {
-        fOnResizeBorder = (ptMouse.y < (rcWindow.top - rcFrame.top));
-        uRow = 0;
-    }
-    else if (ptMouse.y < rcWindow.bottom && ptMouse.y >= rcWindow.bottom - BOTTOMEXTENDWIDTH)
-    {
-        uRow = 2;
-    }
-
-    if (ptMouse.x >= rcWindow.left && ptMouse.x < rcWindow.left + LEFTEXTENDWIDTH)
-    {
-        uCol = 0;
-    }
-    else if (ptMouse.x < rcWindow.right && ptMouse.x >= rcWindow.right - RIGHTEXTENDWIDTH)
-    {
-        uCol = 2;
-    }
-
-    LRESULT hitTests[3][3] =
-    {
-        { HTTOPLEFT,    fOnResizeBorder ? HTTOP : HTCAPTION,    HTTOPRIGHT },
-        { HTLEFT,       HTNOWHERE,     HTRIGHT },
-        { HTBOTTOMLEFT, HTBOTTOM, HTBOTTOMRIGHT },
-    };
-
-    return hitTests[uRow][uCol];
-}
-
-void PictureDialog::resizeEvent(QResizeEvent *event)
-{
-    Q_UNUSED(event)
-    //    int newDialogHeight = ui->labPicture->pixmap()->height();
-    //    newDialogHeight = newDialogHeight + ui->jsonFrame->height();
-    //    if (naviEnabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height();
-    //    int buttomBorderSize = (frameSize().height() - size().height());
-    //    int sideBorderSize = ((frameSize().width() - size().width()) / 2);
-    //    int brokenDialogHeight = newDialogHeight + (buttomBorderSize - sideBorderSize);
-    //    if (event->size().height() == brokenDialogHeight)
-    //    {
-    //        qDebug() << "BROKEN 1";
-    //        setGeometry(geometry().x(), geometry().y(), width(), newDialogHeight);
-    //        qDebug() << "BROKEN 2";
-    //        event->ignore();
-    //    }
-}
-#endif
-#endif
-#endif
-
 void PictureDialog::adaptNewDialogSize(QSize newLabelSize)
 {
     Q_UNUSED(newLabelSize)
-    int newDialogHeight = ui->labPicture->pixmap()->height();
+#if QT_VERSION >= 0x050F00
+    int newDialogHeight = SnapmaticPicture::getSnapmaticResolution().height();
+#else
+    int newDialogHeight = (ui->labPicture->pixmap()->height() / AppEnv::screenRatioPR());
+#endif
     newDialogHeight = newDialogHeight + ui->jsonFrame->height();
     if (naviEnabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height();
     setMaximumSize(width(), newDialogHeight);
@@ -362,14 +300,14 @@ void PictureDialog::adaptNewDialogSize(QSize newLabelSize)
     updateGeometry();
 }
 
-void PictureDialog::stylizeDialog()
+void PictureDialog::styliseDialog()
 {
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     if (QtWin::isCompositionEnabled())
     {
         QPalette palette;
-        QtWin::extendFrameIntoClientArea(this, 0, this->layout()->menuBar()->height(), 0, 0);
+        QtWin::extendFrameIntoClientArea(this, 0, qRound(layout()->menuBar()->height() * AppEnv::screenRatioPR()), 0, 0);
         ui->jsonFrame->setStyleSheet(QString("QFrame { background: %1; }").arg(palette.window().color().name()));
         setStyleSheet("PictureDialog { background: transparent; }");
     }
@@ -386,13 +324,13 @@ void PictureDialog::stylizeDialog()
 
 bool PictureDialog::event(QEvent *event)
 {
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     if (naviEnabled)
     {
         if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange)
         {
-            stylizeDialog();
+            styliseDialog();
         }
     }
 #endif
@@ -471,7 +409,7 @@ bool PictureDialog::eventFilter(QObject *obj, QEvent *ev)
                 break;
             }
         }
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
         if (obj != ui->labPicture && naviEnabled)
         {
@@ -553,24 +491,25 @@ void PictureDialog::renderOverlayPicture()
 {
     // Generating Overlay Preview
     qreal screenRatio = AppEnv::screenRatio();
-    QRect preferedRect = QRect(0, 0, 200 * screenRatio, 160 * screenRatio);
+    qreal screenRatioPR = AppEnv::screenRatioPR();
+    QRect preferedRect = QRect(0, 0, 200 * screenRatio * screenRatioPR, 160 * screenRatio * screenRatioPR);
     QString overlayText = tr("Key 1 - Avatar Preview Mode\nKey 2 - Toggle Overlay\nArrow Keys - Navigate");
 
     QFont overlayPainterFont;
-    overlayPainterFont.setPixelSize(12 * screenRatio);
+    overlayPainterFont.setPixelSize(12 * screenRatio * screenRatioPR);
     QFontMetrics fontMetrics(overlayPainterFont);
     QRect overlaySpace = fontMetrics.boundingRect(preferedRect, Qt::AlignLeft | Qt::AlignTop | Qt::TextDontClip | Qt::TextWordWrap, overlayText);
 
     int hOverlay = Qt::AlignTop;
-    if (overlaySpace.height() < 74 * screenRatio)
+    if (overlaySpace.height() < 74 * screenRatio * screenRatioPR)
     {
         hOverlay = Qt::AlignVCenter;
-        preferedRect.setHeight(71 * screenRatio);
-        overlaySpace.setHeight(80 * screenRatio);
+        preferedRect.setHeight(71 * screenRatio * screenRatioPR);
+        overlaySpace.setHeight(80 * screenRatio * screenRatioPR);
     }
     else
     {
-        overlaySpace.setHeight(overlaySpace.height() + 6 * screenRatio);
+        overlaySpace.setHeight(overlaySpace.height() + 6 * screenRatio * screenRatioPR);
     }
 
     QImage overlayImage(overlaySpace.size(), QImage::Format_ARGB32_Premultiplied);
@@ -582,13 +521,13 @@ void PictureDialog::renderOverlayPicture()
     overlayPainter.drawText(preferedRect, Qt::AlignLeft | hOverlay | Qt::TextDontClip | Qt::TextWordWrap, overlayText);
     overlayPainter.end();
 
-    if (overlaySpace.width() < 194 * screenRatio)
+    if (overlaySpace.width() < 194 * screenRatio * screenRatioPR)
     {
-        overlaySpace.setWidth(200 * screenRatio);
+        overlaySpace.setWidth(200 * screenRatio * screenRatioPR);
     }
     else
     {
-        overlaySpace.setWidth(overlaySpace.width() + 6 * screenRatio);
+        overlaySpace.setWidth(overlaySpace.width() + 6 * screenRatio * screenRatioPR);
     }
 
     QImage overlayBorderImage(overlaySpace.width(), overlaySpace.height(), QImage::Format_ARGB6666_Premultiplied);
@@ -598,7 +537,7 @@ void PictureDialog::renderOverlayPicture()
     overlayTempImage.fill(Qt::transparent);
     QPainter overlayTempPainter(&overlayTempImage);
     overlayTempPainter.drawImage(0, 0, overlayBorderImage);
-    overlayTempPainter.drawImage(3 * screenRatio, 3 * screenRatio, overlayImage);
+    overlayTempPainter.drawImage(3 * screenRatio * screenRatioPR, 3 * screenRatio * screenRatioPR, overlayImage);
     overlayTempPainter.end();
 }
 
@@ -671,63 +610,54 @@ void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture)
 void PictureDialog::renderPicture()
 {
     qreal screenRatio = AppEnv::screenRatio();
+    qreal screenRatioPR = AppEnv::screenRatioPR();
     if (!previewMode)
     {
         if (overlayEnabled)
         {
-            QPixmap shownImagePixmap(960 * screenRatio, 536 * screenRatio);
+            QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution();
+            QPixmap shownImagePixmap(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR);
             shownImagePixmap.fill(Qt::transparent);
             QPainter shownImagePainter(&shownImagePixmap);
-            if (screenRatio == 1)
-            {
-                shownImagePainter.drawImage(0, 0, snapmaticPicture);
-                shownImagePainter.drawImage(3 * screenRatio, 3 * screenRatio, overlayTempImage);
-            }
-            else
-            {
-                shownImagePainter.drawImage(0, 0, snapmaticPicture.scaledToHeight(536 * screenRatio, Qt::SmoothTransformation));
-                shownImagePainter.drawImage(3 * screenRatio, 3 * screenRatio, overlayTempImage);
-            }
+            shownImagePainter.drawImage(0, 0, snapmaticPicture.scaled(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+            shownImagePainter.drawImage(3 * screenRatio * screenRatioPR, 3 * screenRatio * screenRatioPR, overlayTempImage);
             shownImagePainter.end();
+#if QT_VERSION >= 0x050600
+            shownImagePixmap.setDevicePixelRatio(screenRatioPR);
+#endif
             ui->labPicture->setPixmap(shownImagePixmap);
         }
         else
         {
-            if (screenRatio != 1)
-            {
-                QPixmap shownImagePixmap(960 * screenRatio, 536 * screenRatio);
-                shownImagePixmap.fill(Qt::transparent);
-                QPainter shownImagePainter(&shownImagePixmap);
-                shownImagePainter.drawImage(0, 0, snapmaticPicture.scaledToHeight(536 * screenRatio, Qt::SmoothTransformation));
-                shownImagePainter.end();
-                ui->labPicture->setPixmap(shownImagePixmap);
-            }
-            else
-            {
-                ui->labPicture->setPixmap(QPixmap::fromImage(snapmaticPicture));
-            }
+            QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution();
+            QPixmap shownImagePixmap(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR);
+            shownImagePixmap.fill(Qt::transparent);
+            QPainter shownImagePainter(&shownImagePixmap);
+            shownImagePainter.drawImage(0, 0, snapmaticPicture.scaled(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+            shownImagePainter.end();
+#if QT_VERSION >= 0x050600
+            shownImagePixmap.setDevicePixelRatio(screenRatioPR);
+#endif
+            ui->labPicture->setPixmap(shownImagePixmap);
         }
     }
     else
     {
         // Generating Avatar Preview
-        QPixmap avatarPixmap(960 * screenRatio, 536 * screenRatio);
+        QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution();
+        QPixmap avatarPixmap(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR);
         QPainter snapPainter(&avatarPixmap);
         QFont snapPainterFont;
-        snapPainterFont.setPixelSize(12 * screenRatio);
-        if (screenRatio == 1)
-        {
-            snapPainter.drawImage(0, 0, snapmaticPicture);
-        }
-        else
-        {
-            snapPainter.drawImage(0, 0, snapmaticPicture.scaledToHeight(536 * screenRatio, Qt::SmoothTransformation));
-        }
+        snapPainterFont.setPixelSize(12 * screenRatio * screenRatioPR);
+        snapPainter.drawImage(0, 0, snapmaticPicture.scaled(snapmaticResolution.width() * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
         snapPainter.drawImage(0, 0, avatarAreaPicture);
         snapPainter.setPen(QColor::fromRgb(255, 255, 255, 255));
         snapPainter.setFont(snapPainterFont);
-        snapPainter.drawText(QRect(3 * screenRatio, 3 * screenRatio, 140 * screenRatio, 536 * screenRatio), Qt::AlignLeft | Qt::TextWordWrap, tr("Avatar Preview Mode\nPress 1 for Default View"));
+        snapPainter.drawText(QRect(3 * screenRatio * screenRatioPR, 3 * screenRatio * screenRatioPR, 140 * screenRatio * screenRatioPR, snapmaticResolution.height() * screenRatio * screenRatioPR), Qt::AlignLeft | Qt::TextWordWrap, tr("Avatar Preview Mode\nPress 1 for Default View"));
         snapPainter.end();
+#if QT_VERSION >= 0x050600
+        avatarPixmap.setDevicePixelRatio(screenRatioPR);
+#endif
         ui->labPicture->setPixmap(avatarPixmap);
     }
 }
@@ -755,10 +685,15 @@ void PictureDialog::playerNameUpdated()
 QString PictureDialog::generateCrewString()
 {
     SnapmaticPicture *picture = smpic; // used by macro
-    QString crewIDStr = crewID; // save operation time
+    const QString crewIDStr = crewID; // save operation time
     if (crewIDStr != "0" && !crewIDStr.isEmpty())
     {
-        return QString("<a href=\"https://socialclub.rockstargames.com/crew/" % QString(crewStr).replace(" ", "_") % "/" % crewIDStr % "\">" % crewStr % "</a>");
+        if (crewIDStr != crewStr) {
+            return QString("<a href=\"https://socialclub.rockstargames.com/crew/" % QString(crewStr).replace(" ", "_") % "/" % crewIDStr % "\">" % crewStr % "</a>");
+        }
+        else {
+            return QString(crewIDStr);
+        }
     }
     return tr("No Crew");
 }
@@ -770,11 +705,15 @@ QString PictureDialog::generatePlayersString()
     QString plyrsStr;
     if (playersList.length() >= 1)
     {
-        for (QString player : playersList)
+        for (const QString &player : playersList)
         {
-            QString playerName;
-            playerName = profileDB->getPlayerName(player);
-            plyrsStr += ", <a href=\"https://socialclub.rockstargames.com/member/" % playerName % "/" % player % "\">" % playerName % "</a>";
+            const QString playerName = profileDB->getPlayerName(player);
+            if (player != playerName) {
+                plyrsStr += ", <a href=\"https://socialclub.rockstargames.com/member/" % playerName % "/" % player % "\">" % playerName % "</a>";
+            }
+            else {
+                plyrsStr += ", " % player;
+            }
         }
         plyrsStr.remove(0, 2);
     }
@@ -813,13 +752,17 @@ void PictureDialog::on_labPicture_mouseDoubleClicked(Qt::MouseButton button)
 {
     if (button == Qt::LeftButton)
     {
+#if QT_VERSION >= 0x060000
+        QRect desktopRect = QApplication::screenAt(pos())->geometry();
+#else
         QRect desktopRect = QApplication::desktop()->screenGeometry(this);
+#endif
         PictureWidget *pictureWidget = new PictureWidget(this); // Work!
         pictureWidget->setObjectName("PictureWidget");
 #if QT_VERSION >= 0x050600
-        pictureWidget->setWindowFlags(pictureWidget->windowFlags()^Qt::FramelessWindowHint^Qt::WindowStaysOnTopHint^Qt::MaximizeUsingFullscreenGeometryHint);
+        pictureWidget->setWindowFlags(pictureWidget->windowFlags()^Qt::FramelessWindowHint^Qt::MaximizeUsingFullscreenGeometryHint);
 #else
-        pictureWidget->setWindowFlags(pictureWidget->windowFlags()^Qt::FramelessWindowHint^Qt::WindowStaysOnTopHint);
+        pictureWidget->setWindowFlags(pictureWidget->windowFlags()^Qt::FramelessWindowHint);
 #endif
         pictureWidget->setWindowTitle(windowTitle());
         pictureWidget->setStyleSheet("QLabel#pictureLabel{background-color: black;}");
@@ -833,7 +776,7 @@ void PictureDialog::on_labPicture_mouseDoubleClicked(Qt::MouseButton button)
 
         pictureWidget->move(desktopRect.x(), desktopRect.y());
         pictureWidget->resize(desktopRect.width(), desktopRect.height());
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
         QtWin::markFullscreenWindow(pictureWidget, true);
 #endif
@@ -909,6 +852,23 @@ void PictureDialog::openPreviewMap()
         else
         {
             updated();
+#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"] = "LocationEdited";
+                jsonObject["ExtraFlags"] = "Viewer";
+                jsonObject["EditedSize"] = QString::number(picture->getContentMaxLength());
+                jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
+#endif
         }
     }
     delete mapLocDialog;
@@ -940,25 +900,66 @@ void PictureDialog::editSnapmaticProperties()
 
 void PictureDialog::editSnapmaticImage()
 {
-    SnapmaticPicture *picture = smpic;
-    ImageEditorDialog *imageEditor;
+    QImage *currentImage = new QImage(smpic->getImage());
+    ImportDialog *importDialog;
     if (rqFullscreen && fullscreenWidget != nullptr)
     {
-        imageEditor = new ImageEditorDialog(picture, profileName, fullscreenWidget);
+        importDialog = new ImportDialog(profileName, fullscreenWidget);
     }
     else
     {
-        imageEditor = new ImageEditorDialog(picture, profileName, this);
+        importDialog = new ImportDialog(profileName, this);
     }
-    imageEditor->setWindowIcon(windowIcon());
-    imageEditor->setModal(true);
-#ifndef Q_OS_ANDROID
-    imageEditor->show();
-#else
-    snapmaticEditor->showMaximized();
+    importDialog->setWindowIcon(windowIcon());
+    importDialog->setImage(currentImage);
+    importDialog->enableOverwriteMode();
+    importDialog->setModal(true);
+    importDialog->exec();
+    if (importDialog->isImportAgreed())
+    {
+        const QByteArray previousPicture = smpic->getPictureStream();
+        bool success = smpic->setImage(importDialog->image());
+        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, QApplication::translate("ImageEditorDialog", "Snapmatic Image Editor"), QApplication::translate("ImageEditorDialog", "Patching of Snapmatic Image failed because of I/O Error"));
+                return;
+            }
+            smpic->emitCustomSignal("PictureUpdated");
+#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"] = "ImageEdited";
+                jsonObject["ExtraFlags"] = "Viewer";
+                jsonObject["EditedSize"] = QString::number(smpic->getContentMaxLength());
+                jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
 #endif
-    imageEditor->exec();
-    delete imageEditor;
+        }
+        else
+        {
+            QMessageBox::warning(this, QApplication::translate("ImageEditorDialog", "Snapmatic Image Editor"), QApplication::translate("ImageEditorDialog", "Patching of Snapmatic Image failed because of Image Error"));
+            return;
+        }
+    }
+    delete importDialog;
 }
 
 void PictureDialog::editSnapmaticRawJson()

PictureDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,14 +29,6 @@
 #include <QEvent>
 #include <QMenu>
 
-#ifdef GTA5SYNC_WIN
-#if QT_VERSION >= 0x050200
-#ifdef GTA5SYNC_APV
-#include <dwmapi.h>
-#endif
-#endif
-#endif
-
 namespace Ui {
 class PictureDialog;
 }
@@ -56,7 +48,7 @@ public:
     void setSnapmaticPicture(SnapmaticPicture *picture, int index);
     void setSnapmaticPicture(SnapmaticPicture *picture);
     void addPreviousNextButtons();
-    void stylizeDialog();
+    void styliseDialog();
     bool isIndexed();
     int getIndex();
     ~PictureDialog();
@@ -98,15 +90,6 @@ protected:
     bool eventFilter(QObject *obj, QEvent *ev);
     void mousePressEvent(QMouseEvent *ev);
     bool event(QEvent *event);
-#ifdef GTA5SYNC_WIN
-#if QT_VERSION >= 0x050200
-#ifdef GTA5SYNC_APV
-    bool nativeEvent(const QByteArray &eventType, void *message, long *result);
-    LRESULT HitTestNCA(HWND hWnd, LPARAM lParam);
-    void resizeEvent(QResizeEvent *event);
-#endif
-#endif
-#endif
 
 private:
     QString generateCrewString();
@@ -136,7 +119,7 @@ private:
     int avatarLocY;
     int avatarSize;
     QMenu *manageMenu;
-#ifdef GTA5SYNC_WIN
+#ifdef Q_OS_WIN
 #if QT_VERSION >= 0x050200
     QPoint dragPosition;
     bool dragStart;

PictureDialog.ui

@@ -43,9 +43,6 @@
      <property name="text">
       <string/>
      </property>
-     <property name="pixmap">
-      <pixmap resource="res/app.qrc">:/img/960x536.png</pixmap>
-     </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
@@ -230,9 +227,7 @@
    </slots>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="res/app.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>cmdClose</sender>

PictureExport.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -17,21 +17,25 @@
 *****************************************************************************/
 
 #include "config.h"
+#include "AppEnv.h"
 #include "PictureExport.h"
 #include "PictureDialog.h"
 #include "StandardPaths.h"
 #include "SidebarGenerator.h"
 #include <QStringBuilder>
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QSettings>
-#include <QRegExp>
 #include <QDebug>
 
+#if QT_VERSION < 0x050000
+#include <QDesktopWidget>
+#endif
+
 #if QT_VERSION >= 0x050000
 #include <QSaveFile>
+#include <QScreen>
 #endif
 
 PictureExport::PictureExport()
@@ -157,8 +161,17 @@ fileDialogPreSave: //Work?
             QImage exportPicture = picture->getImage();
             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();
-                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")
             {

PictureExport.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

PictureWidget.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 #include "PictureDialog.h"
 #include "PictureWidget.h"
 #include "UiModLabel.h"
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
@@ -27,6 +26,10 @@
 #include <QEvent>
 #include <QDebug>
 
+#if QT_VERSION < 0x060000
+#include <QDesktopWidget>
+#endif
+
 PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
 {
     installEventFilter(this);
@@ -44,7 +47,9 @@ PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
 
     QObject::connect(pictureLabel, SIGNAL(mouseDoubleClicked(Qt::MouseButton)), this, SLOT(pictureDoubleClicked(Qt::MouseButton)));
     QObject::connect(pictureLabel, SIGNAL(customContextMenuRequested(QPoint)), parent, SLOT(exportCustomContextMenuRequested(QPoint)));
+#if QT_VERSION < 0x060000
     QObject::connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(updateWindowSize(int)));
+#endif
 
     setLayout(widgetLayout);
 }
@@ -98,12 +103,21 @@ void PictureWidget::setImage(QImage image_)
 
 void PictureWidget::updateWindowSize(int screenID)
 {
+#if QT_VERSION >= 0x060000
+    Q_UNUSED(screenID)
+    QRect desktopRect = QApplication::screenAt(pos())->geometry();
+    move(desktopRect.x(), desktopRect.y());
+    resize(desktopRect.width(), desktopRect.height());
+    showFullScreen();
+    pictureLabel->setPixmap(QPixmap::fromImage(image.scaled(desktopRect.width(), desktopRect.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation)));
+#else
     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();
+        move(desktopRect.x(), desktopRect.y());
+        resize(desktopRect.width(), desktopRect.height());
+        showFullScreen();
         pictureLabel->setPixmap(QPixmap::fromImage(image.scaled(desktopRect.width(), desktopRect.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation)));
     }
+#endif
 }

PictureWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

PlayerListDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -35,6 +35,7 @@ PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profile
 
     listUpdated = false;
     ui->setupUi(this);
+    ui->cmdCancel->setDefault(true);
     ui->cmdCancel->setFocus();
 
     // Set Icon for Apply Button
@@ -72,13 +73,35 @@ PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profile
     // Set Icon for Manage Buttons
     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->cmdMakeSe->setIcon(QIcon::fromTheme("go-next"));
         ui->cmdMakeAd->setIcon(QIcon::fromTheme("list-add"));
     }
     else
     {
-        drawSwitchButtons();
+#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(":/img/back.svgz"));
+        ui->cmdMakeSe->setIcon(QIcon(":/img/next.svgz"));
+        ui->cmdMakeAd->setIcon(QIcon(":/img/add.svgz"));
     }
     buildInterface();
 
@@ -100,79 +123,6 @@ PlayerListDialog::~PlayerListDialog()
     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()
 {
     close();

PlayerListDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,6 @@ private:
     ProfileDatabase *profileDB;
     Ui::PlayerListDialog *ui;
     bool listUpdated;
-    void drawSwitchButtons();
     void buildInterface();
 
 signals:

PlayerListDialog.ui

@@ -51,8 +51,8 @@
        </item>
        <item>
         <widget class="QPushButton" name="cmdMakeSe">
-         <property name="text">
-          <string/>
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
          </property>
          <property name="autoDefault">
           <bool>false</bool>
@@ -61,6 +61,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="cmdMakeAv">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -71,6 +74,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="cmdMakeAd">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="text">
           <string/>
          </property>

ProfileDatabase.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ProfileDatabase.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ProfileInterface.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
 #include "ExportThread.h"
 #include "SavegameData.h"
 #include "CrewDatabase.h"
+#include "pcg_basic.h"
 #include <QProgressDialog>
 #include <QSpacerItem>
 #include <QDateTime>
@@ -100,21 +101,23 @@ private:
     QMap<ProfileWidget*,QString> widgets;
     QSpacerItem *saSpacerItem;
     QStringList fixedPictures;
-    QColor highlightBackColor;
-    QColor highlightTextColor;
     QString enabledPicStr;
     QString profileFolder;
     QString profileName;
     QString loadingStr;
     QString language;
+    pcg32_random_t rng;
     bool contextMenuOpened;
     bool isProfileLoaded;
     int selectedWidgts;
     int contentMode;
 
     bool isSupportedImageFile(QString selectedFileName);
-    bool importFile(QString selectedFile, QDateTime importDateTime, int *currentTime, bool notMultiple);
-    void importFilesProgress(QStringList selectedFiles);
+    bool importFile(QString selectedFile, QDateTime importDateTime, bool notMultiple);
+    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 importSavegameData(SavegameData *savegame, QString sgdPath, bool warn = true);
     void pictureLoaded(SnapmaticPicture *picture, bool inserted);
@@ -124,6 +127,7 @@ private:
     void insertSnapmaticIPI(QWidget *widget);
     void insertSavegameIPI(QWidget *widget);
     void sortingProfileInterface();
+    int getRandomUid();
 
 signals:
     void profileLoaded();

ProfileLoader.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ProfileLoader.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ProfileWidget.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

ProfileWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

README.md

@@ -4,38 +4,49 @@ Grand Theft Auto V Savegame and Snapmatic viewer/editor
 - View Snapmatics with the ability to disable them in-game
 - Edit Snapmatic pictures and properties in multiple ways
 - 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
-![Snapmatic Picture Viewer](https://i.imgur.com/dQdW3hx.png)
-![User Interface](https://i.imgur.com/SRNQdq6.png)
-![Snapmatic Properties](https://i.imgur.com/j1Lodiu.png)
+![Snapmatic Picture Viewer](res/src/picture.png)  
+![User Interface](res/src/mainui.png)  
+![Snapmatic Properties](res/src/prop.png)
+
+#### Build gta5view for Windows
+
+    # Note: Install Docker Community Edition and Git before continuing
+    git clone https://gitlab.com/Syping/gta5view && cd gta5view
+    docker pull sypingauto/gta5view-build:1.8-static
+    docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.8-static
+    cd /gta5view && mkdir -p build && cd build
+    mingw64-qt-cmake ../
+    make -j $(nproc --all)
 
 #### Build gta5view for Debian/Ubuntu
 
-	# Note: You can use 'sudo make install' instead of 'sudo checkinstall'
-	sudo apt-get install git gcc g++ qtbase5-dev qttranslations5-l10n qt5-qmake make checkinstall
-	git clone https://github.com/SyDevTeam/gta5view && cd gta5view
-	mkdir -p build && cd build
-	qmake -qt=5 GTA5SYNC_PREFIX=/usr ../gta5view.pro # or just qmake GTA5SYNC_PREFIX=/usr ../gta5view.pro
-	make -j $(nproc --all)
-	sudo checkinstall --pkgname=gta5view --pkggroup=utility --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n
-	
-#### Build gta5view for Windows
+    sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n
+    git clone https://gitlab.com/Syping/gta5view && cd gta5view
+    mkdir -p build && cd build
+    cmake ../
+    make -j $(nproc --all)
+    sudo make install
 
-	# Note: Install Docker Community Edition and Git before continuing
-	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 Arch/Manjaro
 
-#### 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 && cd gta5view
+    mkdir -p build && cd build
+    cmake ../
+    make -j $(nproc --all)
+    sudo make install
 
-Download the [Qt Framework](https://www.qt.io/) and install the MinGW version.  
-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.
+#### Build gta5view for Fedora
+
+    sudo dnf install cmake git gcc gcc-c++ make qt5-qtbase-devel qt5-qtsvg-devel qt5-qttranslations
+    git clone https://gitlab.com/Syping/gta5view && cd gta5view
+    mkdir -p build && cd build
+    cmake ../
+    make -j $(nproc --all)
+    sudo make install
 
 #### Download Binary Releases
 

SavegameCopy.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SavegameCopy.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SavegameData.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * 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/>.
 *****************************************************************************/
 
+#include "SnapmaticPicture.h"
 #include "StringParser.h"
 #include "SavegameData.h"
 #include <QStringBuilder>
-#include <QTextCodec>
 #include <QByteArray>
 #include <QDebug>
 #include <QFile>
@@ -42,7 +42,7 @@ bool SavegameData::readingSavegame()
     QFile *saveFile = new QFile(savegameFileName);
     if (!saveFile->open(QFile::ReadOnly))
     {
-        lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(savegameFileName);
+        lastStep = "1;/1,OpenFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName);
         saveFile->deleteLater();
         delete saveFile;
         return false;
@@ -51,7 +51,7 @@ bool SavegameData::readingSavegame()
     // Reading Savegame Header
     if (!saveFile->isReadable())
     {
-        lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER";
+        lastStep = "2;/3,ReadingFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER";
         saveFile->close();
         saveFile->deleteLater();
         delete saveFile;
@@ -78,7 +78,7 @@ QString SavegameData::getSavegameDataString(const QByteArray &savegameHeader)
     QList<QByteArray> savegameBytesList = savegameBytes.split(char(0x01));
     savegameBytes = savegameBytesList.at(1);
     savegameBytesList.clear();
-    return StringParser::parseTitleString(savegameBytes, savegameBytes.length());
+    return SnapmaticPicture::parseTitleString(savegameBytes, savegameBytes.length());
 }
 
 bool SavegameData::readingSavegameFromFile(const QString &fileName)

SavegameData.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SavegameDialog.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2018 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SavegameDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2018 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SavegameWidget.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2017 Syping
+* gta5view Grand Theft Auto V Profile Viewer
+* Copyright (C) 2016-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
@@ -24,6 +24,7 @@
 #include "SavegameData.h"
 #include "SavegameCopy.h"
 #include "AppEnv.h"
+#include "config.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QSettings>
@@ -37,6 +38,13 @@
 #include <QMenu>
 #include <QUrl>
 
+#ifdef GTA5SYNC_TELEMETRY
+#include "TelemetryClass.h"
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QDateTime>
+#endif
+
 SavegameWidget::SavegameWidget(QWidget *parent) :
     ProfileWidget(parent),
     ui(new Ui::SavegameWidget)
@@ -50,9 +58,8 @@ SavegameWidget::SavegameWidget(QWidget *parent) :
     qreal screenRatio = AppEnv::screenRatio();
     ui->labSavegamePic->setFixedSize(48 * screenRatio, 27 * screenRatio);
 
-    QPixmap savegamePixmap(":/img/savegame.png");
-    if (screenRatio != 1) savegamePixmap = savegamePixmap.scaledToHeight(ui->labSavegamePic->height(), Qt::SmoothTransformation);
-    ui->labSavegamePic->setPixmap(savegamePixmap);
+    ui->labSavegamePic->setScaledContents(true);
+    ui->labSavegamePic->setPixmap(QPixmap(":/img/savegame.svgz"));
 
     QString exportSavegameStr = tr("Export Savegame...");
     Q_UNUSED(exportSavegameStr)
@@ -134,9 +141,41 @@ void SavegameWidget::on_cmdDelete_clicked()
         if (!QFile::exists(sgdPath))
         {
             emit savegameDeleted();
+#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"] = "DeleteSuccess";
+                jsonObject["ExtraFlags"] = "Savegame";
+                jsonObject["DeletedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
+#endif
         }
-        else if(QFile::remove(sgdPath))
+        else if (QFile::remove(sgdPath))
         {
+#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"] = "DeleteSuccess";
+                jsonObject["ExtraFlags"] = "Savegame";
+                jsonObject["DeletedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
+#endif
             emit savegameDeleted();
         }
         else

SavegameWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SidebarGenerator.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SidebarGenerator.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify

SnapmaticEditor.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5sync GRAND THEFT AUTO V SYNC
+* gta5view Grand Theft Auto V Profile Viewer
 * Copyright (C) 2016-2018 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #include "PlayerListDialog.h"
 #include "StringParser.h"
 #include "AppEnv.h"
-#include <QStringListIterator>
+#include "config.h"
 #include <QStringBuilder>
 #include <QTextDocument>
 #include <QInputDialog>
@@ -30,6 +30,12 @@
 #include <QDebug>
 #include <QFile>
 
+#ifdef GTA5SYNC_TELEMETRY
+#include "TelemetryClass.h"
+#include <QJsonDocument>
+#include <QJsonObject>
+#endif
+
 SnapmaticEditor::SnapmaticEditor(CrewDatabase *crewDB, ProfileDatabase *profileDB, QWidget *parent) :
     QDialog(parent), crewDB(crewDB), profileDB(profileDB),
     ui(new Ui::SnapmaticEditor)
@@ -38,6 +44,7 @@ SnapmaticEditor::SnapmaticEditor(CrewDatabase *crewDB, ProfileDatabase *profileD
     setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
 
     ui->setupUi(this);
+    ui->cmdCancel->setDefault(true);
     ui->cmdCancel->setFocus();
 
     // Set Icon for Apply Button
@@ -260,11 +267,11 @@ void SnapmaticEditor::setSnapmaticTitle(const QString &title)
     ui->labTitle->setText(titleStr);
     if (SnapmaticPicture::verifyTitle(snapmaticTitle))
     {
-        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: green\">%1</a>").arg(tr("Yes", "Yes, should work fine"))));
+        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: green\">%1</span>").arg(tr("Yes", "Yes, should work fine"))));
     }
     else
     {
-        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: red\">%1</a>").arg(tr("No", "No, could lead to issues"))));
+        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: red\">%1</span>").arg(tr("No", "No, could lead to issues"))));
     }
 #ifndef Q_OS_ANDROID
     ui->gbValues->resize(ui->gbValues->width(), ui->gbValues->heightForWidth(ui->gbValues->width()));
@@ -329,7 +336,24 @@ void SnapmaticEditor::on_cmdApply_clicked()
         }
         else
         {
+            smpic->updateStrings();
             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"] = "PropertyEdited";
+                jsonObject["EditedSize"] = QString::number(smpic->getContentMaxLength());
+                jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
+                jsonDocument.setObject(jsonObject);
+                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
+            }
+#endif
         }
     }
     close();
@@ -413,7 +437,7 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
         }
         if (crewList.contains(QString::number(crewID)))
         {
-            indexNum = crewList.indexOf(QRegExp(QString::number(crewID)));
+            indexNum = crewList.indexOf(QString::number(crewID));
         }
         QString newCrew = QInputDialog::getItem(this, tr("Snapmatic Crew"), tr("New Snapmatic crew:"), itemList, indexNum, true, &ok, windowFlags());
         if (ok && !newCrew.isEmpty())
@@ -427,6 +451,10 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
                     return;
                 }
             }
+            if (!crewList.contains(newCrew))
+            {
+                crewDB->addCrew(crewID);
+            }
             crewID = newCrew.toInt();
             setSnapmaticCrew(returnCrewName(crewID));
         }