.ci/ci.sh

@@ -1,44 +0,0 @@
-#!/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}
-
-if [ "${PACKAGE_BUILD}" == "" ]; then
-   export PACKAGE_BUILD=1;
-fi
-
-if [ "${BUILD_TYPE}" == "ALPHA" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA"
-elif [ "${BUILD_TYPE}" == "Alpha" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA"
-elif [ "${BUILD_TYPE}" == "BETA" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA"
-elif [ "${BUILD_TYPE}" == "Beta" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA"
-elif [ "${BUILD_TYPE}" == "DEV" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV"
-elif [ "${BUILD_TYPE}" == "Development" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV"
-elif [ "${BUILD_TYPE}" == "DAILY" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY"
-elif [ "${BUILD_TYPE}" == "Daily" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY"
-elif [ "${BUILD_TYPE}" == "RC" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC"
-elif [ "${BUILD_TYPE}" == "Release Candidate" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC"
-elif [ "${BUILD_TYPE}" == "REL" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL"
-elif [ "${BUILD_TYPE}" == "Release" ]; then
-   export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL"
-fi
-
-export PROJECT_DIR=$(pwd)
-
-.ci/${BUILD_SCRIPT}

.ci/debian_build.sh

@@ -1,33 +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/editor" > ./description-pak && \
-cd .. && \
-mkdir -p qt5 && \
-cd qt5 && \
-echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./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} ${QMAKE_BUILD_TYPE} "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" DEFINES+=GTA5SYNC_DONATION "DEFINES+=GTA5SYNC_DONATION_EMAIL=\\\\\\\"paypal/at/syping.de\\\\\\\"" ../../gta5view.pro && \
-make depend && \
-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 depend && \
-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 +0,0 @@
-#!/bin/bash
-
-# Install packages
-.ci/debian_install.sh && \
-
-# Build gta5view
-.ci/debian_build.sh && \
-cd ${PROJECT_DIR}

.ci/debian_docker.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 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 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

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

.ci/gta5view.nsi

@@ -1,278 +0,0 @@
-######################################################################
-
-!define APP_NAME "gta5view"
-!define COMP_NAME "Syping"
-!define WEB_SITE "https://gta5view.syping.de/"
-!define VERSION "1.7.1.0"
-!define COPYRIGHT "Copyright © 2016-2019 Syping"
-!define DESCRIPTION "Grand Theft Auto V Savegame and Snapmatic Viewer/Editor"
-!define INSTALLER_NAME "gta5view_setup.exe"
-!define MAIN_APP_EXE "gta5view.exe"
-!define INSTALL_TYPE "SetShellVarContext all"
-!define REG_ROOT "HKLM"
-!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
-!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
-!define LICENSE_TXT "../LICENSE"
-
-######################################################################
-
-VIProductVersion  "${VERSION}"
-VIAddVersionKey "ProductName"  "${APP_NAME}"
-VIAddVersionKey "ProductVersion"  "${VERSION}"
-VIAddVersionKey "CompanyName"  "${COMP_NAME}"
-VIAddVersionKey "LegalCopyright"  "${COPYRIGHT}"
-VIAddVersionKey "FileDescription"  "${DESCRIPTION}"
-VIAddVersionKey "FileVersion"  "${VERSION}"
-
-######################################################################
-
-!include "x64.nsh"
-SetCompressor LZMA
-Name "${APP_NAME}"
-Caption "${APP_NAME}"
-OutFile "${INSTALLER_NAME}"
-#BrandingText "${APP_NAME}"
-XPStyle on
-Unicode true
-InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
-InstallDir "$PROGRAMFILES64\Syping\gta5view"
-
-######################################################################
-
-!include "MUI2.nsh"
-
-!define MUI_ABORTWARNING
-!define MUI_UNABORTWARNING
-
-!define MUI_LANGDLL_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_LANGDLL_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-!insertmacro MUI_PAGE_WELCOME
-
-!ifdef LICENSE_TXT
-!insertmacro MUI_PAGE_LICENSE "${LICENSE_TXT}"
-!endif
-
-!insertmacro MUI_PAGE_DIRECTORY
-
-!ifdef REG_START_MENU
-!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "gta5view"
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
-!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder
-!endif
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAIN_APP_EXE}"
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_FINISH
-
-!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
-
-######################################################################
-
-Function .onInit
-!insertmacro MUI_LANGDLL_DISPLAY
-!ifdef WIN32
-	MessageBox MB_OK|MB_ICONSTOP "Windows 32-Bit is not supported anymore!"
-	Quit
-!endif
-SetRegView 64
-FunctionEnd
-
-######################################################################
-
-Section -MainProgram
-${INSTALL_TYPE}
-SetOverwrite ifnewer
-SetOutPath "$INSTDIR"
-File "../build/release/gta5view.exe"
-File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libgcc_s_seh-1.dll"
-File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libstdc++-6.dll"
-File "/opt/windev/openssl-latest_qt64d/bin/libcrypto-1_1-x64.dll"
-File "/opt/windev/openssl-latest_qt64d/bin/libssl-1_1-x64.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"
-SetOutPath "$INSTDIR\lang"
-File "../res/gta5sync_en_US.qm"
-File "../res/gta5sync_de.qm"
-File "../res/gta5sync_fr.qm"
-File "../res/gta5sync_ko.qm"
-File "../res/gta5sync_ru.qm"
-File "../res/gta5sync_uk.qm"
-File "../res/gta5sync_zh_TW.qm"
-File "../res/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\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"
-SetOutPath "$INSTDIR\platforms"
-File "/opt/windev/qt64d-latest/plugins/platforms/qwindows.dll"
-SetOutPath "$INSTDIR\styles"
-File "/opt/windev/qt64d-latest/plugins/styles/qcleanlooksstyle.dll"
-File "/opt/windev/qt64d-latest/plugins/styles/qplastiquestyle.dll"
-File "/opt/windev/qt64d-latest/plugins/styles/qwindowsvistastyle.dll"
-SectionEnd
-
-######################################################################
-
-Section -Icons_Reg
-SetOutPath "$INSTDIR"
-WriteUninstaller "$INSTDIR\uninstall.exe"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-CreateDirectory "$SMPROGRAMS\$SM_Folder"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\gta5view Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!insertmacro MUI_STARTMENU_WRITE_END
-!endif
-
-!ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\gta5view"
-CreateShortCut "$SMPROGRAMS\gta5view\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\gta5view\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\gta5view\gta5view Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!endif
-
-WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayName" "${APP_NAME}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "UninstallString" "$INSTDIR\uninstall.exe"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayVersion" "${VERSION}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "Publisher" "${COMP_NAME}"
-
-!ifdef WEB_SITE
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "URLInfoAbout" "${WEB_SITE}"
-!endif
-SectionEnd
-
-######################################################################
-
-Section Uninstall
-${INSTALL_TYPE}
-Delete "$INSTDIR\gta5view.exe"
-Delete "$INSTDIR\libgcc_s_seh-1.dll"
-Delete "$INSTDIR\libstdc++-6.dll"
-Delete "$INSTDIR\libcrypto-1_1-x64.dll"
-Delete "$INSTDIR\libssl-1_1-x64.dll"
-Delete "$INSTDIR\libjpeg-62.dll"
-Delete "$INSTDIR\Qt5Core.dll"
-Delete "$INSTDIR\Qt5Gui.dll"
-Delete "$INSTDIR\Qt5Network.dll"
-Delete "$INSTDIR\Qt5Svg.dll"
-Delete "$INSTDIR\Qt5Widgets.dll"
-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\imageformats\qgif.dll"
-Delete "$INSTDIR\imageformats\qicns.dll"
-Delete "$INSTDIR\imageformats\qico.dll"
-Delete "$INSTDIR\imageformats\qjpeg.dll"
-Delete "$INSTDIR\imageformats\qsvg.dll"
-Delete "$INSTDIR\imageformats\qtga.dll"
-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\imageformats"
-RmDir "$INSTDIR\platforms"
-RmDir "$INSTDIR\styles"
- 
-Delete "$INSTDIR\uninstall.exe"
-!ifdef WEB_SITE
-Delete "$INSTDIR\${APP_NAME} website.url"
-!endif
-
-RmDir "$INSTDIR"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\gta5view Website.lnk"
-!endif
-RmDir "$SMPROGRAMS\$SM_Folder"
-!endif
-
-!ifndef REG_START_MENU
-Delete "$SMPROGRAMS\gta5view\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\gta5view\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\gta5view\gta5view Website.lnk"
-!endif
-RmDir "$SMPROGRAMS\gta5view"
-!endif
-
-DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
-DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
-SectionEnd
-
-######################################################################
-
-Function un.onInit
-!insertmacro MUI_UNGETLANGUAGE
-SetRegView 64
-FunctionEnd
-
-######################################################################

.ci/osx_build.sh

@@ -1,15 +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} ${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 depend && \
-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

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

.ci/osx_install.sh

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

.ci/windows_build.sh

@@ -1,19 +0,0 @@
-#!/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 && \
-qmake-static ${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/\\\\\\\"" DEFINES+=GTA5SYNC_DONATION "DEFINES+=GTA5SYNC_DONATION_EMAIL=\\\\\\\"paypal/at/syping.de\\\\\\\"" ../gta5view.pro && \
-make depend && \
-make -j 4 && \
-cp -Rf release/*.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \
-cd ${PROJECT_DIR}/assets

.ci/windows_docker.sh

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

.ci/wininstall_build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Install nsis
-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_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/\\\\\\\"" DEFINES+=GTA5SYNC_DONATION "DEFINES+=GTA5SYNC_DONATION_EMAIL=\\\\\\\"paypal/at/syping.de\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' "LIBS+=-ljpeg" ../gta5view.pro && \
-make depend && \
-make -j 4 && \
-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

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

.gitattributes

@@ -1,28 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto eol=lf
-
-# Development files
-*.cpp text eol=lf
-*.h text eol=lf
-*.ui text eol=lf
-*.qrc text eol=lf
-
-# Development resources
-*.ini text eol=lf
-
-# Linux development files
-*.desktop text eol=lf
-
-# Windows development files
-*.rc text eol=crlf
-*.nsi text eol=crlf
-*.exe.manifest text eol=crlf
-
-# Binary files
-*.png binary
-*.jpg binary
-*.qm binary
-*.ico binary
-*.icns binary
-*.xcf binary
-*.g5e binary

.gitignore

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

.gitlab-ci.yml

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

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

@@ -3,52 +3,36 @@ sudo: required
 
 language: cpp
 
-service:
-  - docker
-  
 env:
-  global:
+- PACKAGE_VERSION="1.4.0"
-    - BUILD_TYPE=REL
-
-matrix:
-  include:
-  - env:
-    - BUILD_SCRIPT=debian_docker.sh
-    - RELEASE_LABEL="Debian 64-Bit Package"
-    - DEBIAN_VERSION=stretch
-    - DOCKER_USER=amd64
-    - APT_INSTALL=clang
-  - env:
-    - BUILD_SCRIPT=windows_docker.sh
-    - QT_SELECT=qt5-x86_64-w64-mingw32
-    - RELEASE_LABEL="Windows 64-Bit Portable"
-  - env:
-    - 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=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"
+  - test -n $CC  && unset CC
+  - test -n $CXX && unset CXX
+
+install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq checkinstall dpkg-dev g++ gcc qtbase5-dev qt5-qmake
+  
+before_script:
+  - export INSTALL_ROOT=/usr
+  - if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION="$PACKAGE_VERSION.$TRAVIS_BUILD_NUMBER"; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi
+  - echo "gta5view build version is $APPLICATION_VERSION"
+  - mkdir build
+  - mkdir package
+  - cd build
+  - echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak
 
 script:
-  - ".travis/travis.sh"
+  - qmake -qt=5 "DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\"" "DEFINES+=GTA5SYNC_DAILYB=\\\\\\\"$APPLICATION_VERSION\\\\\\\"" ../gta5view.pro
+  - make -j 4
+  - sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$APPLICATION_VERSION --pkgrelease=travis1 --pkggroup=utility --maintainer="Syping on Travis \<travisci@syping.de\>"  --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package
 
 deploy:
   provider: releases
   api_key:
-    secure: o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg=
+    secure: "o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg="
-  label: ${RELEASE_LABEL}
+  file: "../package/gta5view_$APPLICATION_VERSION-travis1_amd64.deb"
-  file_glob: true
-  file: assets/*
   skip_cleanup: true
   on:
     tags: true

.travis/dropbox_uploader.enc

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

.travis/source.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-rm -rf tmext/TelemetryClassAuthenticator.cpp && \
-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,27 +0,0 @@
-#!/bin/bash
-
-# Install lua
-if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-	brew install lua
-else
-	sudo apt-get update -qq && \
-	sudo apt-get install -qq lua5.2
-fi
-
-# Check if build is not tagged
-if [ "${TRAVIS_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=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 +0,0 @@
-#!/bin/bash
-
-# Install packages
-sudo .ci/debian_install.sh && \
-
-# Build gta5view
-sudo .ci/debian_build.sh && \
-cd ${PROJECT_DIR}

AboutDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2019 Syping
+* Copyright (C) 2016-2017 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,9 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <QDesktopServices>
 #include <QStringBuilder>
-#include <QMessageBox>
 #include "AboutDialog.h"
 #include "ui_AboutDialog.h"
 #include "AppEnv.h"
@@ -33,44 +31,50 @@ AboutDialog::AboutDialog(QWidget *parent) :
 
     // Build Strings
     QString appVersion = qApp->applicationVersion();
-    QString buildType = tr(GTA5SYNC_BUILDTYPE);
+    QString buildType = GTA5SYNC_BUILDTYPE;
     buildType.replace("_", " ");
-    QString projectBuild = AppEnv::getBuildDateTime();
+    QString projectBuild = GTA5SYNC_BUILDDATETIME;
     QString buildStr = GTA5SYNC_BUILDSTRING;
-#ifndef GTA5SYNC_BUILDTYPE_REL
-#ifdef GTA5SYNC_COMMIT
-    if (!appVersion.contains("-")) { appVersion = appVersion % "-" % GTA5SYNC_COMMIT; }
-#endif
-#endif
 
-    // Translator Comments
+    // Additional Content
-    //: Translated by translator, example Translated by Syping
+    QString usingStr = tr("Using %1 %2", "Exp. Using libmyfuck");
-    QString translatedByStr = tr("Translated by %1");
+    QString translatedByStr = tr("Translated by %1", "Exp. Translated by Syping");
-    //: Insert your name here and profile here in following scheme, First Translator,First Profile\\nSecond Translator\\nThird Translator,Second Profile
+    QString translatedByVal = tr("NAME_OF_TRANSLATOR", "Your Name (The person behind your screen looking at this text!)");
-    QString translatorVal = tr("TRANSLATOR");
+    QString translatorProfile = tr("TRANSLATOR_PROFILE", "mailto: http:// https:// Exp. https://github.com/Syping/");
-    QStringList translatorContent;
+    QString additionalContent = "";
-    if (translatorVal != "TRANSLATOR")
+    if (translatedByVal != "NAME_OF_TRANSLATOR")
     {
-        const QStringList translatorList = translatorVal.split('\n');
+        if (translatorProfile != "TRANSLATOR_PROFILE")
-        for (const QString &translatorStr : translatorList)
         {
-            QStringList translatorStrList = translatorStr.split(',');
+            additionalContent.append(translatedByStr.arg(QString("<a href=\"%1\">%2</a>").arg(translatorProfile, translatedByVal)));
-            QString translatorName = translatorStrList.at(0);
-            translatorStrList.removeFirst();
-            QString translatorProfile = translatorStrList.join(QString());
-            if (!translatorProfile.isEmpty())
-            {
-                translatorContent += QString("<a href=\"%1\">%2</a>").arg(translatorProfile, translatorName);
         }
         else
         {
-                translatorContent += translatorName;
+            additionalContent.append(translatedByStr.arg(translatedByVal));
         }
     }
+#ifdef WITH_LIBJPEGTURBO // DONT USE IT FOR NOW
+    bool additionalContentClip = false;
+    if (!additionalContent.isEmpty())
+    {
+        additionalContentClip = true;
+        additionalContent.append(" (");
     }
+    additionalContent.append(usingStr.arg("libjpegturbo", WITH_LIBJPEGTURBO));
+    if (additionalContentClip)
+    {
+        additionalContent.append(")");
+    }
+#else
+    Q_UNUSED(usingStr)
+#endif
 
     // 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");
@@ -78,9 +82,9 @@ AboutDialog::AboutDialog(QWidget *parent) :
     QString copyrightDes2 = tr("%1 is licensed under <a href=\"https://www.gnu.org/licenses/gpl-3.0.html#content\">GNU GPLv3</a>");
     copyrightDes2 = copyrightDes2.arg(GTA5SYNC_APPSTR);
     QString copyrightDesA;
-    if (!translatorContent.isEmpty())
+    if (!additionalContent.isEmpty())
     {
-        copyrightDesA = copyrightDes1 % "<br/>" % translatedByStr.arg(translatorContent.join(", ")) % "<br/>" % copyrightDes2;
+        copyrightDesA = copyrightDes1 % "<br/>" % additionalContent % "<br/>" % copyrightDes2;
     }
     else
     {
@@ -94,19 +98,14 @@ AboutDialog::AboutDialog(QWidget *parent) :
     ui->labAbout->setText(aboutStr.arg(GTA5SYNC_APPSTR, projectDes, appVersion % " (" % buildType % ")", projectBuild, buildStr, qVersion(), copyrightDesA));
     this->setWindowTitle(titleStr.arg(GTA5SYNC_APPSTR));
 
-    // 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"));
-    }
 
     // DPI calculation
     qreal screenRatio = AppEnv::screenRatio();
-    if (!translatorContent.isEmpty())
+    if (!additionalContent.isEmpty())
     {
         resize(375 * screenRatio, 270 * screenRatio);
     }
@@ -120,16 +119,3 @@ AboutDialog::~AboutDialog()
 {
     delete ui;
 }
-
-void AboutDialog::on_labAbout_linkActivated(const QString &link)
-{
-    if (link.left(12) == "g5e://about?")
-    {
-        QStringList aboutStrList = QString(link).remove(0, 12).split(":");
-        QMessageBox::information(this, QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(0).toUtf8())), QString::fromUtf8(QByteArray::fromBase64(aboutStrList.at(1).toUtf8())));
-    }
-    else
-    {
-        QDesktopServices::openUrl(QUrl(link));
-    }
-}

AboutDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,6 @@ public:
     ~AboutDialog();
 
 private slots:
-    void on_labAbout_linkActivated(const QString &link);
 
 private:
     Ui::AboutDialog *ui;

AboutDialog.ui

@@ -43,8 +43,8 @@ Running with Qt %6<br/>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
-     <property name="textInteractionFlags">
+     <property name="openExternalLinks">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+      <bool>true</bool>
      </property>
     </widget>
    </item>

AppEnv.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include "StringParser.h"
 #include "StandardPaths.h"
 #include <QtGlobal>
-#include <QStringBuilder>
 #include <QDesktopWidget>
 #include <QApplication>
 #include <QSettings>
@@ -37,18 +36,6 @@ AppEnv::AppEnv()
 
 }
 
-// Build Stuff
-
-QString AppEnv::getBuildDateTime()
-{
-    return GTA5SYNC_BUILDDATETIME;
-}
-
-QString AppEnv::getBuildCode()
-{
-    return GTA5SYNC_BUILDCODE;
-}
-
 // Folder Stuff
 
 QString AppEnv::getGameFolder(bool *ok)
@@ -66,7 +53,7 @@ QString AppEnv::getGameFolder(bool *ok)
         }
     }
 
-    QString GTAV_defaultFolder = StandardPaths::documentsLocation() % QDir::separator() % "Rockstar Games" % QDir::separator() % "GTA V";
+    QString GTAV_defaultFolder = StandardPaths::documentsLocation() + QDir::separator() + "Rockstar Games" + QDir::separator() + "GTA V";
     QString GTAV_returnFolder = GTAV_defaultFolder;
 
     QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
@@ -121,69 +108,21 @@ bool AppEnv::setGameFolder(QString gameFolder)
     return false;
 }
 
-QString AppEnv::getExLangFolder()
+QString AppEnv::getLangFolder()
 {
-    return StringParser::convertBuildedString(GTA5SYNC_LANG);
+    return StringParser::convertBuildedString(QString::fromUtf8(GTA5SYNC_LANG));
-}
-
-QString AppEnv::getInLangFolder()
-{
-#ifdef GTA5SYNC_QCONF
-#ifdef GTA5SYNC_INLANG
-    return StringParser::convertBuildedString(GTA5SYNC_INLANG);
-#else
-    return StringParser::convertBuildedString(GTA5SYNC_SHARE % QLatin1String("SEPARATOR:APPNAME:SEPARATOR:translations"));
-#endif
-#else
-#ifdef GTA5SYNC_INLANG
-    return StringParser::convertBuildedString(GTA5SYNC_INLANG);
-#else
-    return QString(":/tr");
-#endif
-#endif
 }
 
 QString AppEnv::getPluginsFolder()
 {
-    return StringParser::convertBuildedString(GTA5SYNC_PLUG);
+    return StringParser::convertBuildedString(QString::fromUtf8(GTA5SYNC_PLUG));
 }
 
 // Web Stuff
 
 QByteArray AppEnv::getUserAgent()
 {
-#if QT_VERSION >= 0x050400
+    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();
-#ifdef GTA5SYNC_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)
@@ -198,304 +137,9 @@ 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&pageSize=5000").arg(crewID, pageNumber));
+    return QUrl(QString("https://socialclub.rockstargames.com/crewsapi/GetMembersList?crewId=%1&pageNumber=%2").arg(crewID, pageNumber));
 }
 
-QUrl AppEnv::getPlayerFetchingUrl(QString crewID, int pageNumber)
-{
-    return getPlayerFetchingUrl(crewID, QString::number(pageNumber));
-}
-
-// Game Stuff
-
-GameVersion AppEnv::getGameVersion()
-{
-#ifdef GTA5SYNC_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 GTA5SYNC_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 GTA5SYNC_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 GTA5SYNC_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 GTA5SYNC_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
@@ -509,12 +153,3 @@ qreal AppEnv::screenRatio()
     return (dpi / 96);
 #endif
 }
-
-qreal AppEnv::screenRatioPR()
-{
-#if QT_VERSION >= 0x050600
-    return QGuiApplication::primaryScreen()->devicePixelRatio();
-#else
-    return 1;
-#endif
-}

AppEnv.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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,41 +22,24 @@
 #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:
     AppEnv();
 
-    // Build Stuff
-    static QString getBuildDateTime();
-    static QString getBuildCode();
-
     // Folder Stuff
     static QString getGameFolder(bool *ok = 0);
     static bool setGameFolder(QString gameFolder);
-    static QString getExLangFolder();
+    static QString getLangFolder();
-    static QString getInLangFolder();
     static QString getPluginsFolder();
 
     // Web Stuff
     static QByteArray getUserAgent();
     static QUrl getCrewFetchingUrl(QString crewID);
     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

CrewDatabase.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 #include "StandardPaths.h"
 #include "CrewDatabase.h"
 #include "config.h"
-#include <QStringBuilder>
-#include <QMutexLocker>
-#include <QDebug>
 #include <QFile>
 #include <QDir>
 
@@ -31,7 +28,7 @@ CrewDatabase::CrewDatabase(QObject *parent) : QObject(parent)
     dir.mkpath(StandardPaths::dataLocation());
     dir.setPath(StandardPaths::dataLocation());
     QString dirPath = dir.absolutePath();
-    QString defaultConfPath = dirPath % "/crews.ini";
+    QString defaultConfPath = dirPath + QDir::separator() + "crews.ini";
 
     QSettings confPathSettings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
     confPathSettings.beginGroup("Database");
@@ -40,8 +37,6 @@ CrewDatabase::CrewDatabase(QObject *parent) : QObject(parent)
 
     crewDB = new QSettings(confPathFile, QSettings::IniFormat);
     crewDB->beginGroup("Crews");
-
-    addProcess = false;
 }
 
 CrewDatabase::~CrewDatabase()
@@ -52,63 +47,19 @@ CrewDatabase::~CrewDatabase()
 
 QStringList CrewDatabase::getCrews()
 {
-    QMutexLocker locker(&mutex);
+    QStringList compatibleCrewList = crewDB->childKeys();
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCrews";
-#endif
-    return getCrews_p();
-}
-
-QStringList CrewDatabase::getCrews_p()
-{
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCrews_p";
-#endif
-    QStringList compatibleCrewList = getCompatibleCrews_p();
     crewDB->endGroup();
     crewDB->beginGroup("CrewList");
     QStringList crewIDs = crewDB->value("IDs", QStringList()).toStringList();
-    crewIDs += compatibleCrewList;
+    crewIDs.append(compatibleCrewList);
     crewIDs.removeDuplicates();
     crewDB->endGroup();
     crewDB->beginGroup("Crews");
     return crewIDs;
 }
 
-QStringList CrewDatabase::getCompatibleCrews()
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCompatibleCrews";
-#endif
-    return getCompatibleCrews_p();
-}
-
-QStringList CrewDatabase::getCompatibleCrews_p()
-{
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCompatibleCrews_p";
-#endif
-    return crewDB->childKeys();
-}
-
-QString CrewDatabase::getCrewName(QString crewID)
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCrewName" << crewID;
-#endif
-    QString crewStr = crewDB->value(crewID, crewID).toString();
-    if (crewID == "0") crewStr = tr("No Crew", "");
-    return crewStr;
-}
-
 QString CrewDatabase::getCrewName(int crewID)
 {
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getCrewName" << crewID;
-#endif
     QString crewStr = crewDB->value(QString::number(crewID), crewID).toString();
     if (crewID == 0) crewStr = tr("No Crew", "");
     return crewStr;
@@ -116,21 +67,13 @@ QString CrewDatabase::getCrewName(int crewID)
 
 void CrewDatabase::setCrewName(int crewID, QString crewName)
 {
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "setCrewName" << crewID << crewName;
-#endif
     crewDB->setValue(QString::number(crewID), crewName);
 }
 
 void CrewDatabase::addCrew(int crewID)
 {
-    QMutexLocker locker(&mutex);
+    QStringList crews = getCrews();
-#ifdef GTA5SYNC_DEBUG
+    crews.append(QString::number(crewID));
-    qDebug() << "addCrew" << crewID;
-#endif
-    QStringList crews = getCrews_p();
-    crews += QString::number(crewID);
     crews.removeDuplicates();
     crewDB->endGroup();
     crewDB->beginGroup("CrewList");
@@ -138,39 +81,3 @@ void CrewDatabase::addCrew(int crewID)
     crewDB->endGroup();
     crewDB->beginGroup("Crews");
 }
-
-bool CrewDatabase::isCompatibleCrew(QString crewNID)
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "isCompatibleCrew" << crewNID;
-#endif
-    return crewDB->contains(crewNID);
-}
-
-bool CrewDatabase::isCompatibleCrew(int crewID)
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "isCompatibleCrew" << crewID;
-#endif
-    return crewDB->contains(QString::number(crewID));
-}
-
-void CrewDatabase::setAddingCrews(bool addingCrews)
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "setAddingCrews" << addingCrews;
-#endif
-    addProcess = addingCrews;
-}
-
-bool CrewDatabase::isAddingCrews()
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "isAddingCrews";
-#endif
-    return addProcess;
-}

CrewDatabase.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include <QSettings>
 #include <QObject>
-#include <QMutex>
 #include <QMap>
 
 class CrewDatabase : public QObject
@@ -29,25 +28,15 @@ class CrewDatabase : public QObject
     Q_OBJECT
 public:
     explicit CrewDatabase(QObject *parent = 0);
-    QString getCrewName(QString crewID);
+    void setCrewName(int crewID, QString crewName);
     QString getCrewName(int crewID);
-    QStringList getCompatibleCrews();
     QStringList getCrews();
-    void setAddingCrews(bool addingCrews);
-    bool isCompatibleCrew(QString crewNID);
-    bool isCompatibleCrew(int crewID);
-    bool isAddingCrews();
     ~CrewDatabase();
 
 private:
-    mutable QMutex mutex;
-    bool addProcess;
     QSettings *crewDB;
-    QStringList getCrews_p();
-    QStringList getCompatibleCrews_p();
 
 public slots:
-    void setCrewName(int crewID, QString crewName);
     void addCrew(int crewID);
 };
 

DatabaseThread.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -31,23 +31,49 @@
 #include <QDebug>
 #include <QUrl>
 
-#define crewMaxPages 83
-#define maxLoadFails 3
-
 DatabaseThread::DatabaseThread(CrewDatabase *crewDB, QObject *parent) : QThread(parent), crewDB(crewDB)
 {
-    continueLastCrew = true;
+    crewMaxPages = 83;
     threadRunning = true;
 }
 
 void DatabaseThread::run()
 {
     QEventLoop threadLoop;
+    QStringList crewList;
 
-    QObject::connect(this, SIGNAL(threadTerminated()), &threadLoop, SLOT(quit()));
+    // Register thread loop end signal
+    QObject::connect(this, SIGNAL(threadEndCommited()), &threadLoop, SLOT(quit()));
+
+    // Quick time scan
+    if (crewList.length() <= 3)
+    {
+        scanCrewReference(crewList, 2500);
+        scanCrewMembersList(crewList, 3, 2500);
+        emit playerNameUpdated();
+    }
+    else if (crewList.length() <= 5)
+    {
+        scanCrewReference(crewList, 2500);
+        scanCrewMembersList(crewList, 2, 2500);
+        emit playerNameUpdated();
+    }
+
+    QEventLoop *waitingLoop = new QEventLoop();
+    QTimer::singleShot(10000, waitingLoop, SLOT(quit()));
+    QObject::connect(this, SIGNAL(threadEndCommited()), waitingLoop, SLOT(quit()));
+    waitingLoop->exec();
+    delete waitingLoop;
 
     while (threadRunning)
     {
+        crewList = crewDB->getCrews();
+
+        // Long time scan
+        scanCrewReference(crewList, 10000);
+        scanCrewMembersList(crewList, crewMaxPages, 10000);
+        emit playerNameUpdated();
+
         if (threadRunning)
         {
             QTimer::singleShot(300000, &threadLoop, SLOT(quit()));
@@ -56,31 +82,104 @@ void DatabaseThread::run()
     }
 }
 
-void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &requestDelay)
+// void DatabaseThread::scanCrewReference(QStringList crewList, int requestDelay)
+// {
+//     foreach (const QString &crewID, crewList)
+//     {
+//         if (threadRunning && crewID != "0")
+//         {
+//             QNetworkAccessManager *netManager = new QNetworkAccessManager();
+
+//             QNetworkRequest netRequest(AppEnv::getCrewFetchingUrl(crewID));
+//             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("Connection", "keep-alive");
+
+//             QNetworkReply *netReply = netManager->get(netRequest);
+
+//             QEventLoop *downloadLoop = new QEventLoop();
+//             QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
+//             QObject::connect(this, SIGNAL(threadEndCommited()), downloadLoop, SLOT(quit()));
+//             QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
+//             downloadLoop->exec();
+//             delete downloadLoop;
+
+//             if (netReply->isFinished())
+//             {
+//                 QByteArray crewJson = netReply->readAll();
+//                 QJsonDocument crewDocument = QJsonDocument::fromJson(crewJson);
+//                 QJsonObject crewObject = crewDocument.object();
+//                 QVariantMap crewMap = crewObject.toVariantMap();
+//                 QString crewName;
+//                 bool isFound = false;
+
+//                 if (crewMap.contains("activities"))
+//                 {
+//                     QList<QVariant> activitiesList = crewMap["activities"].toList();
+//                     foreach (const QVariant &activitiesVariant, activitiesList)
+//                     {
+//                         QMap<QString, QVariant> activityRootMap = activitiesVariant.toMap();
+//                         foreach(const QVariant &activityRootVariant, activityRootMap)
+//                         {
+//                             QMap<QString, QVariant> activityMap = activityRootVariant.toMap();
+//                             foreach(const QVariant &activityVariant, activityMap)
+//                             {
+//                                 QMap<QString, QVariant> activityFinalMap = activityVariant.toMap();
+//                                 if (activityFinalMap.contains("id") && activityFinalMap["id"] == crewID)
+//                                 {
+//                                     if (activityFinalMap.contains("name") && isFound == false)
+//                                     {
+//                                         isFound = true;
+//                                         crewName = activityFinalMap["name"].toString();
+//                                     }
+//                                 }
+//                             }
+//                         }
+//                     }
+//                 }
+//                 if (!crewName.isNull())
+//                 {
+//                     crewDB->setCrewName(crewID.toInt(), crewName);
+//                 }
+//             }
+
+//             QEventLoop *waitingLoop = new QEventLoop();
+//             QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
+//             QObject::connect(this, SIGNAL(threadEndCommited()), waitingLoop, SLOT(quit()));
+//             waitingLoop->exec();
+//             delete waitingLoop;
+
+//             delete netReply;
+//             delete netManager;
+//         }
+//     }
+// }
+
+void DatabaseThread::scanCrewReference(QStringList crewList, int requestDelay)
 {
-    for (QString crewID : crewList)
+    foreach (const QString &crewID, crewList)
     {
-        if (threadRunning && crewID != QLatin1String("0"))
+        if (threadRunning && crewID != "0")
         {
             QNetworkAccessManager *netManager = new QNetworkAccessManager();
+
             QNetworkRequest netRequest(AppEnv::getCrewFetchingUrl(crewID));
 #if QT_VERSION >= 0x050600
             netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
 #endif
             netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
-            netRequest.setRawHeader("Accept", "text/html");
+            netRequest.setRawHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-            netRequest.setRawHeader("Accept-Charset", "utf-8");
+            netRequest.setRawHeader("Accept-Language", "en-US;q=0.5,en;q=0.3");
-            netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
             netRequest.setRawHeader("Connection", "keep-alive");
 
             QNetworkReply *netReply = netManager->get(netRequest);
 
             QEventLoop *downloadLoop = new QEventLoop();
             QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
-            if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit())); }
+            QObject::connect(this, SIGNAL(threadEndCommited()), downloadLoop, SLOT(quit()));
             QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
             downloadLoop->exec();
-            downloadLoop->disconnect();
             delete downloadLoop;
 
             if (netReply->isFinished())
@@ -98,23 +197,15 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r
                 }
                 if (!crewName.isEmpty())
                 {
-                    emit crewNameFound(crewID.toInt(), crewName);
+                    crewDB->setCrewName(crewID.toInt(), crewName);
                 }
             }
-            else
-            {
-                netReply->abort();
-            }
 
-            if (threadRunning)
-            {
             QEventLoop *waitingLoop = new QEventLoop();
             QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
-                if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit())); }
+            QObject::connect(this, SIGNAL(threadEndCommited()), waitingLoop, SLOT(quit()));
             waitingLoop->exec();
-                waitingLoop->disconnect();
             delete waitingLoop;
-            }
 
             delete netReply;
             delete netManager;
@@ -122,38 +213,36 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r
     }
 }
 
-void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay)
+void DatabaseThread::scanCrewMembersList(QStringList crewList, int maxPages, int requestDelay)
 {
-    for (QString crewID : crewList)
+    foreach (const QString &crewID, crewList)
     {
-        if (threadRunning && crewID != QLatin1String("0"))
+        if (threadRunning && crewID != "0")
         {
-            int currentFail = 0;
             int currentPage = 0;
             int foundPlayers = 0;
             int totalPlayers = 1000;
 
-            while(foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning))
+            while(foundPlayers < totalPlayers && currentPage < maxPages)
             {
                 QNetworkAccessManager *netManager = new QNetworkAccessManager();
-                QNetworkRequest netRequest(AppEnv::getPlayerFetchingUrl(crewID, currentPage));
+
+                QNetworkRequest netRequest(AppEnv::getPlayerFetchingUrl(crewID, QString::number(currentPage)));
 #if QT_VERSION >= 0x050600
                 netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
 #endif
                 netRequest.setRawHeader("User-Agent", AppEnv::getUserAgent());
-                netRequest.setRawHeader("Accept", "application/json");
+                netRequest.setRawHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-                netRequest.setRawHeader("Accept-Charset", "utf-8");
+                netRequest.setRawHeader("Accept-Language", "en-US;q=0.5,en;q=0.3");
-                netRequest.setRawHeader("Accept-Language", "en-US,en;q=0.9");
                 netRequest.setRawHeader("Connection", "keep-alive");
 
                 QNetworkReply *netReply = netManager->get(netRequest);
 
                 QEventLoop *downloadLoop = new QEventLoop();
                 QObject::connect(netReply, SIGNAL(finished()), downloadLoop, SLOT(quit()));
-                if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), downloadLoop, SLOT(quit())); }
+                QObject::connect(this, SIGNAL(threadEndCommited()), downloadLoop, SLOT(quit()));
                 QTimer::singleShot(30000, downloadLoop, SLOT(quit()));
                 downloadLoop->exec();
-                downloadLoop->disconnect();
                 delete downloadLoop;
 
                 if (netReply->isFinished())
@@ -167,78 +256,41 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
 
                     if (crewMap.contains("Members"))
                     {
-                        const QList<QVariant> memberList = crewMap["Members"].toList();
+                        QList<QVariant> memberList = crewMap["Members"].toList();
-                        for (QVariant memberVariant : memberList)
+                        foreach (const QVariant &memberVariant, memberList)
                         {
                             QMap<QString, QVariant> memberMap = memberVariant.toMap();
+                            foundPlayers++;
                             if (memberMap.contains("RockstarId") && memberMap.contains("Name"))
                             {
                                 int RockstarId = memberMap["RockstarId"].toInt();
                                 QString memberName = memberMap["Name"].toString();
-                                if (!memberName.isEmpty() && RockstarId != 0)
+                                if (memberName != "" && RockstarId != 0)
                                 {
-                                    foundPlayers++;
                                     emit playerNameFound(RockstarId, memberName);
                                 }
                             }
                         }
                     }
 
+                    QEventLoop *waitingLoop = new QEventLoop();
+                    QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
+                    QObject::connect(this, SIGNAL(threadEndCommited()), waitingLoop, SLOT(quit()));
+                    waitingLoop->exec();
+                    delete waitingLoop;
+
                     currentPage++;
                 }
-                else
-                {
-                    currentFail++;
-                    if (currentFail == maxLoadFails)
-                    {
-                        currentFail = 0;
-                        currentPage++;
-                    }
-                }
 
                 delete netReply;
                 delete netManager;
-
-                if (foundPlayers < totalPlayers && currentPage < maxPages && (continueLastCrew ? true : threadRunning))
-                {
-                    QEventLoop *waitingLoop = new QEventLoop();
-                    QTimer::singleShot(requestDelay, waitingLoop, SLOT(quit()));
-                    if (!continueLastCrew) { QObject::connect(this, SIGNAL(threadTerminated()), waitingLoop, SLOT(quit())); }
-                    waitingLoop->exec();
-                    waitingLoop->disconnect();
-                    delete waitingLoop;
-                }
             }
         }
     }
 }
 
-void DatabaseThread::deleteCompatibleCrews(QStringList *crewList)
+void DatabaseThread::doEndThread()
-{
-    for (QString crewNID : *crewList)
-    {
-        if (crewDB->isCompatibleCrew(crewNID))
-        {
-            crewList->removeAll(crewNID);
-        }
-    }
-}
-
-QStringList DatabaseThread::deleteCompatibleCrews(const QStringList &crewList)
-{
-    QStringList crewListR = crewList;
-    for (QString crewNID : crewListR)
-    {
-        if (crewDB->isCompatibleCrew(crewNID))
-        {
-            crewListR.removeAll(crewNID);
-        }
-    }
-    return crewListR;
-}
-
-void DatabaseThread::terminateThread()
 {
     threadRunning = false;
-    emit threadTerminated();
+    emit threadEndCommited();
 }

DatabaseThread.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -30,27 +30,23 @@ public:
     explicit DatabaseThread(CrewDatabase *crewDB, QObject *parent = 0);
 
 public slots:
-    void terminateThread();
+    void doEndThread();
 
 private:
     CrewDatabase *crewDB;
-    void scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay);
+    void scanCrewMembersList(QStringList crewList, int maxPages, int requestDelay);
-    void scanCrewReference(const QStringList &crewList, const int &requestDelay);
+    void scanCrewReference(QStringList crewList, int requestDelay);
-    void deleteCompatibleCrews(QStringList *crewList);
-    QStringList deleteCompatibleCrews(const QStringList &crewList);
-    bool continueLastCrew;
     bool threadRunning;
+    int crewMaxPages;
     int plyrPerReq;
 
 protected:
     void run();
 
 signals:
-    void crewNameFound(int crewID, QString crewName);
-    void crewNameUpdated();
     void playerNameFound(int playerID, QString playerName);
     void playerNameUpdated();
-    void threadTerminated();
+    void threadEndCommited();
 };
 
 #endif // DATABASETHREAD_H

ExportDialog.cpp

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

ExportDialog.h

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

ExportThread.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include "ExportThread.h"
 #include "SavegameData.h"
 #include "config.h"
-#include <QStringBuilder>
 #include <QDesktopWidget>
 #include <QApplication>
 #include <QFileInfo>
@@ -76,13 +75,13 @@ void ExportThread::run()
     // End Picture Settings
 
     int intExportProgress = 0;
-    for (ProfileWidget *widget : profileMap.keys())
+    foreach(ProfileWidget *widget, profileMap.keys())
     {
         if (widget->isSelected())
         {
             if (widget->getWidgetType() == "SnapmaticWidget")
             {
-                SnapmaticWidget *picWidget = qobject_cast<SnapmaticWidget*>(widget);
+                SnapmaticWidget *picWidget = (SnapmaticWidget*)widget;
                 SnapmaticPicture *picture = picWidget->getPicture();
 
                 if (pictureExportEnabled)
@@ -90,7 +89,7 @@ void ExportThread::run()
                     QString exportFileName = PictureExport::getPictureFileName(picture);
                     if (exportFileName.right(4) != ".jpg" && exportFileName.right(4) != ".png")
                     {
-                        exportFileName += ".jpg";
+                        exportFileName.append(".jpg");
                     }
 
                     intExportProgress++;
@@ -101,7 +100,7 @@ void ExportThread::run()
                     QImage exportPicture = picture->getImage();
                     if (sizeMode == "Desktop")
                     {
-                        QRect desktopResolution = qApp->desktop()->screenGeometry();
+                        QRect desktopResolution = QApplication::desktop()->screenGeometry();
                         exportPicture = exportPicture.scaled(desktopResolution.width(), desktopResolution.height(), aspectRatio, Qt::SmoothTransformation);
                     }
                     else if (sizeMode == "Custom")
@@ -112,16 +111,16 @@ void ExportThread::run()
                     bool isSaved;
                     if (useCustomQuality)
                     {
-                        isSaved = exportPicture.save(exportDirectory % "/" % exportFileName, "JPEG", customQuality);
+                        isSaved = exportPicture.save(exportDirectory + "/" + exportFileName, "JPEG", customQuality);
                     }
                     else
                     {
-                        isSaved = exportPicture.save(exportDirectory % "/" % exportFileName, "JPEG", 100);
+                        isSaved = exportPicture.save(exportDirectory + "/" + exportFileName, "JPEG", 100);
                     }
 
                     if (!isSaved)
                     {
-                        failedExportPictures += exportFileName;
+                        failedExportPictures.append(exportFileName);
                     }
                 }
                 if (pictureCopyEnabled)
@@ -129,24 +128,24 @@ void ExportThread::run()
                     QString exportFileName = PictureExport::getPictureFileName(picture);
                     if (exportFileName.right(4) != ".g5e")
                     {
-                        exportFileName += ".g5e";
+                        exportFileName.append(".g5e");
                     }
 
                     intExportProgress++;
                     emit exportStringUpdate(ProfileInterface::tr("Export file %1 of %2 files").arg(QString::number(intExportProgress), QString::number(exportCount)));
                     emit exportProgressUpdate(intExportProgress);
 
-                    QString exportFilePath = exportDirectory % "/" % exportFileName;
+                    QString exportFilePath = exportDirectory + "/" + exportFileName;
                     if (QFile::exists(exportFilePath)) {QFile::remove(exportFilePath);}
-                    if (!picture->exportPicture(exportDirectory % "/" % exportFileName, SnapmaticFormat::G5E_Format))
+                    if (!picture->exportPicture(exportDirectory + "/" + exportFileName, "G5E"))
                     {
-                        failedCopyPictures += exportFileName;
+                        failedCopyPictures.append(exportFileName);
                     }
                 }
             }
             else if (widget->getWidgetType() == "SavegameWidget")
             {
-                SavegameWidget *sgdWidget = qobject_cast<SavegameWidget*>(widget);
+                SavegameWidget *sgdWidget = (SavegameWidget*)widget;
                 SavegameData *savegame = sgdWidget->getSavegame();
 
                 QString originalFileName = savegame->getSavegameFileName();
@@ -157,11 +156,11 @@ void ExportThread::run()
                 emit exportStringUpdate(ProfileInterface::tr("Export file %1 of %2 files").arg(QString::number(intExportProgress), QString::number(exportCount)));
                 emit exportProgressUpdate(intExportProgress);
 
-                QString exportFilePath = exportDirectory % "/" % exportFileName;
+                QString exportFilePath = exportDirectory + "/" + exportFileName;
                 if (QFile::exists(exportFilePath)) {QFile::remove(exportFilePath);}
                 if (!QFile::copy(originalFileName, exportFilePath))
                 {
-                    failedSavegames += exportFileName;
+                    failedSavegames.append(exportFileName);
                 }
             }
         }

ExportThread.h

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

GlobalString.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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,15 +16,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include "TranslationClass.h"
+#include <QLocale>
+#include <QSettings>
+#include <QFileInfo>
+#include <QStringList>
 #include "GlobalString.h"
 #include "config.h"
-#include <QStringBuilder>
-#include <QStringList>
-#include <QFileInfo>
-#include <QSettings>
-#include <QLocale>
-#include <QDebug>
 
 GlobalString::GlobalString()
 {
@@ -37,7 +34,8 @@ QMap<QString, QString> GlobalString::getGlobalMap()
     QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
     globalFile.setIniCodec("UTF-8");
     globalFile.beginGroup("Global");
-    for (QString globalStr : globalFile.childKeys())
+    QStringList globalStrList = globalFile.childKeys();
+    foreach(const QString &globalStr, globalStrList)
     {
         globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString();
     }
@@ -54,7 +52,7 @@ QString GlobalString::getString(QString valueStr, bool *ok)
     QStringList globalStrList = globalFile.childKeys();
     if (globalStrList.contains(valueStr))
     {
-        if (ok != nullptr) *ok = true;
+        if (ok != 0) *ok = true;
         globalString = globalFile.value(valueStr, valueStr).toString();
     }
     globalFile.endGroup();
@@ -64,7 +62,7 @@ QString GlobalString::getString(QString valueStr, bool *ok)
 QString GlobalString::getLanguageFile()
 {
     QString language = getLanguage();
-    QString languageFile = ":/global/global." % language % ".ini";
+    QString languageFile = ":/global/global." + language + ".ini";
     if (!QFileInfo(languageFile).exists())
     {
         languageFile = ":/global/global.en.ini";
@@ -74,5 +72,18 @@ QString GlobalString::getLanguageFile()
 
 QString GlobalString::getLanguage()
 {
-    return Translator->getCurrentAreaLanguage();
+    QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
+    settings.beginGroup("Interface");
+    QString language = settings.value("Language","System").toString();
+    settings.endGroup();
+    if (language == "System" || language.trimmed() == "")
+    {
+        QString languageName = QLocale::system().name();
+        QStringList langList = languageName.split("_");
+        if (langList.length() >= 1)
+        {
+            language = langList.at(0);
+        }
+    }
+    return language;
 }

GlobalString.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ class GlobalString
 {
 public:
     GlobalString();
-    static QString getString(QString valueStr, bool *ok = nullptr);
+    static QString getString(QString valueStr, bool *ok = 0);
     static QString getLanguageFile();
     static QString getLanguage();
     static QMap<QString, QString> getGlobalMap();

IconLoader.cpp

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

IconLoader.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,6 @@ class IconLoader
 public:
     IconLoader();
     static QIcon loadingAppIcon();
-    static QIcon loadingPointmakerIcon();
 };
 
 #endif // ICONLOADER_H

ImageEditorDialog.cpp

@@ -1,205 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* 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->setDefault(true);
-    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);
-
-    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(profileName, 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();
-}

ImageEditorDialog.h

@@ -1,52 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2016-2017 Syping
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*****************************************************************************/
-
-#ifndef IMAGEEDITORDIALOG_H
-#define IMAGEEDITORDIALOG_H
-
-#include "SnapmaticPicture.h"
-#include <QDialog>
-
-namespace Ui {
-class ImageEditorDialog;
-}
-
-class ImageEditorDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit ImageEditorDialog(SnapmaticPicture *picture, QString profileName, QWidget *parent = 0);
-    ~ImageEditorDialog();
-
-private slots:
-    void on_cmdClose_clicked();
-    void on_cmdReplace_clicked();
-    void on_cmdSave_clicked();
-
-private:
-    SnapmaticPicture *smpic;
-    QString profileName;
-    Ui::ImageEditorDialog *ui;
-    int snapmaticResolutionLW;
-    int snapmaticResolutionLH;
-    bool imageIsChanged;
-    QImage pictureCache;
-};
-
-#endif // IMAGEEDITORDIALOG_H

ImageEditorDialog.ui

@@ -1,108 +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>337</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="hlButtons">
-        <item>
-         <widget class="QPushButton" name="cmdReplace">
-          <property name="toolTip">
-           <string>Import picture</string>
-          </property>
-          <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="toolTip">
-           <string>Apply changes</string>
-          </property>
-          <property name="text">
-           <string>&amp;Overwrite</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="cmdClose">
-          <property name="toolTip">
-           <string>Discard changes</string>
-          </property>
-          <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 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2017-2019 Syping
+* Copyright (C) 2017 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
@@ -18,25 +18,11 @@
 
 #include "ImportDialog.h"
 #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>
-#include <QMessageBox>
-#include <QSettings>
 #include <QPainter>
 #include <QPixmap>
 #include <QImage>
 #include <QDebug>
-#include <QStyle>
-#include <QFile>
-#include <QRgb>
 
 // IMAGES VALUES
 #define snapmaticResolutionW 960
@@ -45,137 +31,52 @@
 #define snapmaticAvatarPlacementW 145
 #define snapmaticAvatarPlacementH 66
 
-ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
+ImportDialog::ImportDialog(QWidget *parent) :
-    QDialog(parent), profileName(profileName),
+    QDialog(parent),
     ui(new Ui::ImportDialog)
 {
-    // Set Window Flags
-    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
-
     ui->setupUi(this);
-    ui->cmdOK->setDefault(true);
+    doImport = false;
-    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);
 
-    // Set Icon for OK Button
     if (QIcon::hasThemeIcon("dialog-ok"))
     {
         ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
     }
-    else if (QIcon::hasThemeIcon("gtk-ok"))
-    {
-        ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
-    }
-
-    // Set Icon for Cancel Button
     if (QIcon::hasThemeIcon("dialog-cancel"))
     {
         ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
     }
-    else if (QIcon::hasThemeIcon("gtk-cancel"))
-    {
-        ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
-    }
 
-    ui->cbIgnore->setChecked(false);
+    ui->rbKeep->setChecked(true);
-    ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name()));
-    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
+    snapmaticResolutionLW = 430 * screenRatio;
-    snapmaticResolutionLH = 288 * screenRatio; // 240
+    snapmaticResolutionLH = 240 * screenRatio;
-    ui->labPicture->setMinimumSize(snapmaticResolutionLW, snapmaticResolutionLH);
+    setMinimumSize(430 * screenRatio, 380 * screenRatio);
-
+    setMaximumSize(430 * screenRatio, 380 * screenRatio);
+    setFixedSize(430 * screenRatio, 380 * screenRatio);
     ui->vlButtom->setSpacing(6 * screenRatio);
-#ifndef Q_OS_MAC
     ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
-#else
-    if (QApplication::style()->objectName() == "macintosh")
-    {
-        ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
-    }
-    else
-    {
-        ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
-    }
-#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());
 }
 
 ImportDialog::~ImportDialog()
 {
-    delete optionsMenu;
     delete ui;
 }
 
 void ImportDialog::processImage()
 {
-    if (workImage.isNull()) return;
     QImage snapmaticImage = workImage;
     QPixmap snapmaticPixmap(snapmaticResolutionW, snapmaticResolutionH);
-    snapmaticPixmap.fill(selectedColour);
+    snapmaticPixmap.fill(Qt::black);
     QPainter snapmaticPainter(&snapmaticPixmap);
-    qreal screenRatioPR = AppEnv::screenRatioPR();
+    if (ui->cbAvatar->isChecked())
-    if (!backImage.isNull())
-    {
-        if (!ui->cbStretch->isChecked())
-        {
-            int diffWidth = 0;
-            int diffHeight = 0;
-            if (backImage.width() != snapmaticResolutionW)
-            {
-                diffWidth = snapmaticResolutionW - backImage.width();
-                diffWidth = diffWidth / 2;
-            }
-            else if (backImage.height() != snapmaticResolutionH)
-            {
-                diffHeight = snapmaticResolutionH - backImage.height();
-                diffHeight = diffHeight / 2;
-            }
-            snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, backImage);
-        }
-        else
-        {
-            snapmaticPainter.drawImage(0, 0, QImage(backImage).scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-        }
-        if (ui->cbAvatar->isChecked() && ui->cbForceAvatarColour->isChecked())
-        {
-            snapmaticPainter.fillRect(snapmaticAvatarPlacementW, snapmaticAvatarPlacementH, snapmaticAvatarResolution, snapmaticAvatarResolution, selectedColour);
-        }
-    }
-    if (insideAvatarZone)
     {
         // Avatar mode
         int diffWidth = 0;
         int diffHeight = 0;
-        if (!ui->cbIgnore->isChecked())
+        if (ui->rbKeep->isChecked())
         {
             snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::KeepAspectRatio, Qt::SmoothTransformation);
             if (snapmaticImage.width() > snapmaticImage.height())
@@ -194,15 +95,14 @@ 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 = "Custom Avatar";
-        imageTitle = tr("Custom Avatar", "Custom Avatar Description in SC, don't use Special Character!");
     }
     else
     {
         // Picture mode
         int diffWidth = 0;
         int diffHeight = 0;
-        if (!ui->cbIgnore->isChecked())
+        if (ui->rbKeep->isChecked())
         {
             snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation);
             if (snapmaticImage.width() != snapmaticResolutionW)
@@ -221,351 +121,11 @@ 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 = "Custom Picture";
-        imageTitle = tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!");
     }
     snapmaticPainter.end();
     newImage = snapmaticPixmap.toImage();
-#if QT_VERSION >= 0x050600
+    ui->labPicture->setPixmap(snapmaticPixmap.scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-    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(workImage, 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()
@@ -573,87 +133,19 @@ QImage ImportDialog::image()
     return newImage;
 }
 
-void ImportDialog::setImage(QImage *image_)
+void ImportDialog::setImage(const QImage &image_)
 {
-    workImage = QImage();
+    workImage = image_;
-    if (image_->width() == image_->height())
+    if (workImage.width() == workImage.height())
     {
-        insideAvatarZone = true;
         ui->cbAvatar->setChecked(true);
-        if (image_->height() > snapmaticResolutionH)
-        {
-            workImage = image_->scaled(snapmaticResolutionH, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-            delete image_;
-        }
-        else
-        {
-            workImage = *image_;
-            delete 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)
+bool ImportDialog::isDoImport()
 {
-    ui->cbAvatar->setDisabled(lock);
+    return doImport;
-    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()
-{
-    return importAgreed;
-}
-
-bool ImportDialog::areSettingsLocked()
-{
-    return settingsLocked;
 }
 
 QString ImportDialog::getImageTitle()
@@ -661,34 +153,18 @@ QString ImportDialog::getImageTitle()
     return imageTitle;
 }
 
-void ImportDialog::on_cbIgnore_toggled(bool checked)
+void ImportDialog::on_rbIgnore_clicked()
 {
-    Q_UNUSED(checked)
     processImage();
 }
 
-void ImportDialog::on_cbAvatar_toggled(bool checked)
+void ImportDialog::on_rbKeep_clicked()
+{
+    processImage();
+}
+
+void ImportDialog::on_cbAvatar_clicked()
 {
-    if (!workImage.isNull() && workImage.width() == workImage.height() && !checked)
-    {
-        if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No))
-        {
-            ui->cbAvatar->setChecked(true);
-            insideAvatarZone = true;
-            return;
-        }
-    }
-    insideAvatarZone = ui->cbAvatar->isChecked();
-    watermarkBlock = true;
-    if (insideAvatarZone)
-    {
-        ui->cbWatermark->setChecked(watermarkAvatar);
-    }
-    else
-    {
-        ui->cbWatermark->setChecked(watermarkPicture);
-    }
-    watermarkBlock = false;
     processImage();
 }
 
@@ -699,140 +175,16 @@ void ImportDialog::on_cmdCancel_clicked()
 
 void ImportDialog::on_cmdOK_clicked()
 {
-    importAgreed = true;
+    doImport = true;
     close();
 }
 
 void ImportDialog::on_labPicture_labelPainted()
 {
-    if (insideAvatarZone)
+    if (ui->cbAvatar->isChecked())
     {
-        QImage avatarAreaFinalImage(avatarAreaImage);
-        if (selectedColour.lightness() > 127)
-        {
-            avatarAreaFinalImage.setColor(1, qRgb(0, 0, 0));
-        }
         QPainter labelPainter(ui->labPicture);
-        labelPainter.drawImage(0, 0, avatarAreaFinalImage.scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+        labelPainter.drawImage(0, 0, avatarAreaImage.scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
         labelPainter.end();
     }
 }
-
-void ImportDialog::on_cmdColourChange_clicked()
-{
-    QColor newSelectedColour = QColorDialog::getColor(selectedColour, this, tr("Select Colour..."));
-    if (newSelectedColour.isValid())
-    {
-        selectedColour = newSelectedColour;
-        ui->labColour->setText(tr("Background Colour: <span style=\"color: %1\">%1</span>").arg(selectedColour.name()));
-        processImage();
-    }
-}
-
-void ImportDialog::on_cmdBackgroundChange_clicked()
-{
-    QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
-    settings.beginGroup("FileDialogs");
-    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
-    settings.beginGroup("ImportBackground");
-
-fileDialogPreOpen:
-    QFileDialog fileDialog(this);
-    fileDialog.setFileMode(QFileDialog::ExistingFiles);
-    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("Directory", StandardPaths::documentsLocation()).toString());
-    fileDialog.restoreGeometry(settings.value("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;
-            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+"\""));
-                goto fileDialogPreOpen;
-            }
-            backImage = importImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            backgroundPath = selectedFile;
-            ui->labBackgroundImage->setText(tr("Background Image: %1").arg(tr("File", "Background Image: File")));
-            ui->cmdBackgroundWipe->setVisible(true);
-            processImage();
-        }
-    }
-
-    settings.setValue("Geometry", fileDialog.saveGeometry());
-    settings.setValue("Directory", fileDialog.directory().absolutePath());
-    settings.endGroup();
-    settings.endGroup();
-}
-
-void ImportDialog::on_cmdBackgroundWipe_clicked()
-{
-    backImage = QImage();
-    ui->labBackgroundImage->setText(tr("Background Image:"));
-    ui->cmdBackgroundWipe->setVisible(false);
-    processImage();
-}
-
-void ImportDialog::on_cbStretch_toggled(bool checked)
-{
-    Q_UNUSED(checked)
-    processImage();
-}
-
-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,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #define IMPORTDIALOG_H
 
 #include <QDialog>
-#include <QMenu>
 
 namespace Ui {
 class ImportDialog;
@@ -31,56 +30,31 @@ class ImportDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ImportDialog(QString profileName, QWidget *parent = 0);
+    explicit ImportDialog(QWidget *parent = 0);
     ~ImportDialog();
     QImage image();
     QString getImageTitle();
-    void setImage(QImage *image);
+    void setImage(const QImage &image);
-    void lockSettings(bool lock);
+    bool isDoImport();
-    void enableOverwriteMode();
-    bool isImportAgreed();
-    bool areSettingsLocked();
 
 private slots:
     void processImage();
-    void cropPicture();
+    void on_rbIgnore_clicked();
-    void importNewPicture();
+    void on_rbKeep_clicked();
-    void loadImportSettings();
+    void on_cbAvatar_clicked();
-    void saveImportSettings();
-    void on_cbIgnore_toggled(bool checked);
-    void on_cbAvatar_toggled(bool checked);
     void on_cmdCancel_clicked();
     void on_cmdOK_clicked();
     void on_labPicture_labelPainted();
-    void on_cmdColourChange_clicked();
-    void on_cmdBackgroundChange_clicked();
-    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 newImage;
-    QColor selectedColour;
+    bool doImport;
-    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

@@ -6,14 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>516</width>
+    <width>430</width>
-    <height>512</height>
+    <height>380</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>516</width>
+    <width>430</width>
-    <height>512</height>
+    <height>380</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>430</width>
+    <height>380</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -39,8 +45,8 @@
     <widget class="UiModLabel" name="labPicture">
      <property name="minimumSize">
       <size>
-       <width>516</width>
+       <width>430</width>
-       <height>288</height>
+       <height>240</height>
       </size>
      </property>
      <property name="text">
@@ -81,211 +87,35 @@
       <item>
        <widget class="QGroupBox" name="gbSettings">
         <property name="title">
-         <string>Picture</string>
+         <string>Settings</string>
         </property>
-        <layout class="QVBoxLayout" name="vlSettings">
+        <layout class="QGridLayout" name="gdSettings">
-         <item>
+         <item row="1" column="0">
-          <layout class="QHBoxLayout" name="hlCheckboxesTop">
+          <widget class="QRadioButton" name="rbKeep">
-           <item>
+           <property name="text">
+            <string>&amp;Keep Aspect Ratio</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QRadioButton" name="rbIgnore">
+           <property name="text">
+            <string>&amp;Ignore Aspect Ratio</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
           <widget class="QCheckBox" name="cbAvatar">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
            <property name="text">
-              <string>Avatar</string>
+            <string>&amp;Avatar</string>
            </property>
           </widget>
          </item>
-           <item>
-            <widget class="QCheckBox" name="cbIgnore">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Ignore Aspect Ratio</string>
-             </property>
-            </widget>
-           </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>
       <item>
-       <widget class="QGroupBox" name="gbBackground">
+       <spacer name="vsDialog">
-        <property name="title">
-         <string>Background</string>
-        </property>
-        <layout class="QVBoxLayout" name="vlBackground">
-         <item>
-          <layout class="QHBoxLayout" name="hlColour">
-           <item>
-            <layout class="QHBoxLayout" name="hlColourManage">
-             <item>
-              <widget class="QLabel" name="labColour">
-               <property name="text">
-                <string>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="hlColourButton">
-               <property name="spacing">
-                <number>0</number>
-               </property>
-               <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="QToolButton" name="cmdColourChange">
-                 <property name="toolTip">
-                  <string>Select background colour</string>
-                 </property>
-                 <property name="text">
-                  <string>...</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <spacer name="hsColour">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="hlBackgroundManage">
-             <item>
-              <widget class="QLabel" name="labBackgroundImage">
-               <property name="text">
-                <string>Background Image:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="hlBackgroundButton">
-               <property name="spacing">
-                <number>0</number>
-               </property>
-               <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="QToolButton" name="cmdBackgroundChange">
-                 <property name="toolTip">
-                  <string>Select background image</string>
-                 </property>
-                 <property name="text">
-                  <string>...</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QToolButton" name="cmdBackgroundWipe">
-                 <property name="toolTip">
-                  <string>Remove background image</string>
-                 </property>
-                 <property name="text">
-                  <string>X</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <spacer name="hsBackgroundImage">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="hlBackground">
-           <item>
-            <widget class="QCheckBox" name="cbForceAvatarColour">
-             <property name="text">
-              <string>Force Colour in Avatar Zone</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="cbStretch">
-             <property name="enabled">
-              <bool>true</bool>
-             </property>
-             <property name="text">
-              <string>Ignore Aspect Ratio</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="vsInterface">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
@@ -299,19 +129,6 @@
       </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">
@@ -333,9 +150,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="toolTip">
-           <string>Import picture</string>
-          </property>
           <property name="text">
            <string>&amp;OK</string>
           </property>
@@ -349,9 +163,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="toolTip">
-           <string>Discard picture</string>
-          </property>
           <property name="text">
            <string>&amp;Cancel</string>
           </property>
@@ -368,13 +179,7 @@
   <customwidget>
    <class>UiModLabel</class>
    <extends>QLabel</extends>
-   <header>uimod/UiModLabel.h</header>
+   <header>UiModLabel.h</header>
-   <slots>
-    <signal>mouseMoved()</signal>
-    <signal>mouseReleased()</signal>
-    <signal>mousePressed()</signal>
-    <signal>mouseDoubleClicked()</signal>
-   </slots>
   </customwidget>
  </customwidgets>
  <resources/>

JsonEditorDialog.cpp

@@ -1,233 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* 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 "JsonEditorDialog.h"
-#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
-#include <QFontDatabase>
-#include <QDebug>
-#endif
-
-#ifdef GTA5SYNC_TELEMETRY
-#include "TelemetryClass.h"
-#endif
-
-JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
-    QDialog(parent), smpic(picture),
-    ui(new Ui::JsonEditorDialog)
-{
-    // Set Window Flags
-    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint^Qt::WindowMinMaxButtonsHint);
-
-    ui->setupUi(this);
-    ui->cmdClose->setDefault(true);
-    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 Save 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"));
-    }
-
-    jsonCode = picture->getJsonStr();
-
-#if QT_VERSION >= 0x050200
-    ui->txtJSON->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
-#endif
-    QFontMetrics fontMetrics(ui->txtJSON->font());
-    ui->txtJSON->setTabStopWidth(fontMetrics.width("    "));
-
-    QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonCode.toUtf8());
-    ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color: rgb(46, 47, 48); color: rgb(238, 231, 172);}");
-    ui->txtJSON->setPlainText(QString::fromUtf8(jsonDocument.toJson(QJsonDocument::Indented)).trimmed());
-    jsonHl = new JSHighlighter(ui->txtJSON->document());
-
-    // DPI calculation
-    qreal screenRatio = AppEnv::screenRatio();
-#ifndef Q_OS_MAC
-    ui->hlButtons->setSpacing(6 * screenRatio);
-    ui->hlButtons->setContentsMargins(9 * screenRatio, 0, 9 * screenRatio, 0);
-    ui->vlInterface->setContentsMargins(0, 0, 0, 9 * screenRatio);
-#else
-    ui->hlButtons->setSpacing(6 * screenRatio);
-    ui->hlButtons->setContentsMargins(9 * screenRatio, 0, 9 * screenRatio, 0);
-    ui->vlInterface->setContentsMargins(0, 0, 0, 9 * screenRatio);
-#endif
-    if (screenRatio > 1)
-    {
-        ui->lineJSON->setMinimumHeight(qRound(1 * screenRatio));
-        ui->lineJSON->setMaximumHeight(qRound(1 * screenRatio));
-        ui->lineJSON->setLineWidth(qRound(1 * screenRatio));
-    }
-    resize(450 * screenRatio, 550 * screenRatio);
-}
-
-JsonEditorDialog::~JsonEditorDialog()
-{
-    delete jsonHl;
-    delete ui;
-}
-
-void JsonEditorDialog::closeEvent(QCloseEvent *ev)
-{
-    QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", "    ");
-    QJsonDocument jsonNew = QJsonDocument::fromJson(jsonPatched.toUtf8());
-    QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
-    QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
-    QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
-    if (newCode != originalCode)
-    {
-        QMessageBox::StandardButton button = QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("<h4>Unsaved changes detected</h4>You want to save the JSON content before you quit?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Cancel);
-        if (button == QMessageBox::Yes)
-        {
-            if (saveJsonContent())
-            {
-                ev->accept();
-            }
-            else
-            {
-                ev->ignore();
-            }
-            return;
-        }
-        else if (button == QMessageBox::No)
-        {
-            ev->accept();
-            return;
-        }
-        else
-        {
-            ev->ignore();
-            return;
-        }
-    }
-}
-
-bool JsonEditorDialog::saveJsonContent()
-{
-    QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", "    ");
-    QJsonDocument jsonNew = QJsonDocument::fromJson(jsonPatched.toUtf8());
-    if (!jsonNew.isEmpty())
-    {
-        QJsonDocument jsonOriginal = QJsonDocument::fromJson(jsonCode.toUtf8());
-        QString originalCode = QString::fromUtf8(jsonOriginal.toJson(QJsonDocument::Compact));
-        QString newCode = QString::fromUtf8(jsonNew.toJson(QJsonDocument::Compact));
-        if (newCode != originalCode)
-        {
-            QString currentFilePath = smpic->getPictureFilePath();
-            QString originalFilePath = smpic->getOriginalPictureFilePath();
-            QString backupFileName = originalFilePath % ".bak";
-            if (!QFile::exists(backupFileName))
-            {
-                QFile::copy(currentFilePath, backupFileName);
-            }
-            smpic->setJsonStr(newCode, true);
-            if (!smpic->isJsonOk())
-            {
-                QString lastStep = smpic->getLastStep(false);
-                QString readableError;
-                if (lastStep.contains("JSONINCOMPLETE") && lastStep.contains("JSONERROR"))
-                {
-                    readableError = SnapmaticPicture::tr("JSON is incomplete and malformed");
-                }
-                else if (lastStep.contains("JSONINCOMPLETE"))
-                {
-                    readableError = SnapmaticPicture::tr("JSON is incomplete");
-                }
-                else if (lastStep.contains("JSONERROR"))
-                {
-                    readableError = SnapmaticPicture::tr("JSON is malformed");
-                }
-                else
-                {
-                    readableError = tr("JSON Error");
-                }
-                QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of %1").arg(readableError));
-                smpic->setJsonStr(originalCode, true);
-                return false;
-            }
-            if (!smpic->exportPicture(currentFilePath))
-            {
-                QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of I/O Error"));
-                smpic->setJsonStr(originalCode, true);
-                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;
-    }
-    else
-    {
-        QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of JSON Error"));
-        return false;
-    }
-}
-
-void JsonEditorDialog::on_cmdClose_clicked()
-{
-    close();
-}
-
-void JsonEditorDialog::on_cmdSave_clicked()
-{
-    if (saveJsonContent())
-    {
-        close();
-    }
-}

JsonEditorDialog.h

@@ -1,56 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2017 Syping
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*****************************************************************************/
-
-#ifndef JSONEDITORDIALOG_H
-#define JSONEDITORDIALOG_H
-
-#include "SnapmaticPicture.h"
-#include "JSHighlighter.h"
-#include <QDialog>
-
-namespace Ui {
-class JsonEditorDialog;
-}
-
-class JsonEditorDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent = 0);
-    bool saveJsonContent();
-    ~JsonEditorDialog();
-
-protected:
-    void closeEvent(QCloseEvent *ev);
-
-private slots:
-    void on_cmdClose_clicked();
-    void on_cmdSave_clicked();
-
-signals:
-    void codeUpdated(QString jsonCode);
-
-private:
-    QString jsonCode;
-    JSHighlighter *jsonHl;
-    SnapmaticPicture *smpic;
-    Ui::JsonEditorDialog *ui;
-};
-
-#endif // JSONEDITORDIALOG_H

JsonEditorDialog.ui

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>JsonEditorDialog</class>
- <widget class="QDialog" name="JsonEditorDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>450</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Snapmatic JSON Editor</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>9</number>
-   </property>
-   <item>
-    <layout class="QVBoxLayout" name="vlJSON">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <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="QPlainTextEdit" name="txtJSON">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Plain</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="Line" name="lineJSON">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>1</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>1</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QFrame[frameShape=&quot;4&quot;]
-{
-    color: black;
-}</string>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Plain</enum>
-       </property>
-       <property name="lineWidth">
-        <number>1</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="hlButtons">
-     <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="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Apply changes</string>
-       </property>
-       <property name="text">
-        <string>&amp;Save</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cmdClose">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Discard changes</string>
-       </property>
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
+    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) <year>  <name of author>
+    Copyright (C) {year}  {name of author}
 
     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
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     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 <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSE.GPL

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -620,55 +620,3 @@ copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.LGPL

@@ -1,165 +1,459 @@
                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2.1, February 1999
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
 
-  This version of the GNU Lesser General Public License incorporates
+                            Preamble
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
+  This license, the Lesser General Public License, applies to some
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
+specially designated software packages--typically libraries--of the
-General Public License.
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
 
-  "The Library" refers to a covered work governed by this License,
+  When we speak of free software, we are referring to freedom of use,
-other than an Application or a Combined Work as defined below.
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
 
-  An "Application" is any work that makes use of an interface provided
+  To protect your rights, we need to make restrictions that forbid
-by the Library, but which is not otherwise based on the Library.
+distributors to deny you these rights or to ask you to surrender these
-Defining a subclass of a class defined by the Library is deemed a mode
+rights.  These restrictions translate to certain responsibilities for
-of using an interface provided by the Library.
+you if you distribute copies of the library or if you modify it.
 
-  A "Combined Work" is a work produced by combining or linking an
+  For example, if you distribute copies of the library, whether gratis
-Application with the Library.  The particular version of the Library
+or for a fee, you must give the recipients all the rights that we gave
-with which the Combined Work was made is also called the "Linked
+you.  You must make sure that they, too, receive or can get the source
-Version".
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
 
-  The "Minimal Corresponding Source" for a Combined Work means the
+  We protect your rights with a two-step method: (1) we copyright the
-Corresponding Source for the Combined Work, excluding any source code
+library, and (2) we offer you this license, which gives you legal
-for portions of the Combined Work that, considered in isolation, are
+permission to copy, distribute and/or modify the library.
-based on the Application, and not on the Linked Version.
 
-  The "Corresponding Application Code" for a Combined Work means the
+  To protect each distributor, we want to make it very clear that
-object code and/or source code for the Application, including any data
+there is no warranty for the free library.  Also, if the library is
-and utility programs needed for reproducing the Combined Work from the
+modified by someone else and passed on, the recipients should know
-Application, but excluding the System Libraries of the Combined Work.
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
 
-  1. Exception to Section 3 of the GNU GPL.
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
 
-  You may convey a covered work under sections 3 and 4 of this License
+  Most GNU software, including some libraries, is covered by the
-without being bound by section 3 of the GNU GPL.
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
 
-  2. Conveying Modified Versions.
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
 
-  If you modify a copy of the Library, and, in your modifications, a
+  We call this license the "Lesser" General Public License because it
-facility refers to a function or data to be supplied by an Application
+does Less to protect the user's freedom than the ordinary General
-that uses the facility (other than as an argument passed when the
+Public License.  It also provides other free software developers Less
-facility is invoked), then you may convey a copy of the modified
+of an advantage over competing non-free programs.  These disadvantages
-version:
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
 
-   a) under this License, provided that you make a good faith effort to
+  For example, on rare occasions, there may be a special need to
-   ensure that, in the event an Application does not supply the
+encourage the widest possible use of a certain library, so that it becomes
-   function or data, the facility still operates, and performs
+a de-facto standard.  To achieve this, non-free programs must be
-   whatever part of its purpose remains meaningful, or
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
 
-   b) under the GNU GPL, with none of the additional permissions of
+  In other cases, permission to use a particular library in non-free
-   this License applicable to that copy.
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
 
-  3. Object Code Incorporating Material from Library Header Files.
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
 
-  The object code form of an Application may incorporate material from
+  The precise terms and conditions for copying, distribution and
-a header file that is part of the Library.  You may convey such object
+modification follow.  Pay close attention to the difference between a
-code under terms of your choice, provided that, if the incorporated
+"work based on the library" and a "work that uses the library".  The
-material is not limited to numerical parameters, data structure
+former contains code derived from the library, whereas the latter must
-layouts and accessors, or small macros, inline functions and templates
+be combined with the library in order to run.
-(ten or fewer lines in length), you do both of the following:
 
-   a) Give prominent notice with each copy of the object code that the
+                  GNU LESSER GENERAL PUBLIC LICENSE
-   Library is used in it and that the Library and its use are
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-   covered by this License.
 
-   b) Accompany the object code with a copy of the GNU GPL and this license
+  0. This License Agreement applies to any software library or other
-   document.
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
 
-  4. Combined Works.
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
 
-  You may convey a Combined Work under terms of your choice that,
+  The "Library", below, refers to any such software library or work
-taken together, effectively do not restrict modification of the
+which has been distributed under these terms.  A "work based on the
-portions of the Library contained in the Combined Work and reverse
+Library" means either the Library or any derivative work under
-engineering for debugging such modifications, if you also do each of
+copyright law: that is to say, a work containing the Library or a
-the following:
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
 
-   a) Give prominent notice with each copy of the Combined Work that
+  "Source code" for a work means the preferred form of the work for
-   the Library is used in it and that the Library and its use are
+making modifications to it.  For a library, complete source code means
-   covered by this License.
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
 
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+  Activities other than copying, distribution and modification are not
-   document.
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
 
-   c) For a Combined Work that displays copyright notices during
+  1. You may copy and distribute verbatim copies of the Library's
-   execution, include the copyright notice for the Library among
+complete source code as you receive it, in any medium, provided that
-   these notices, as well as a reference directing the user to the
+you conspicuously and appropriately publish on each copy an
-   copies of the GNU GPL and this license document.
+appropriate copyright notice and disclaimer of warranty; keep intact
-
+all the notices that refer to this License and to the absence of any
-   d) Do one of the following:
+warranty; and distribute a copy of this License along with the
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
 Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

MapLocationDialog.cpp

@@ -1,204 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2017-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
-* 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 "MapLocationDialog.h"
-#include "ui_MapLocationDialog.h"
-#include "IconLoader.h"
-#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),
-    ui(new Ui::MapLocationDialog)
-{
-    // Set Window Flags
-    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
-
-    ui->setupUi(this);
-    ui->cmdDone->setVisible(false);
-    ui->cmdApply->setVisible(false);
-    ui->cmdRevert->setVisible(false);
-    ui->cmdDone->setCursor(Qt::ArrowCursor);
-    ui->cmdClose->setCursor(Qt::ArrowCursor);
-
-    // DPI calculation
-    qreal screenRatio = AppEnv::screenRatio();
-    int widgetMargin = qRound(3 * screenRatio);
-    ui->hlMapDialog->setContentsMargins(widgetMargin, widgetMargin, widgetMargin, widgetMargin);
-    ui->vlMapDialog->setSpacing(widgetMargin);
-    setMinimumSize(500 * screenRatio, 600 * screenRatio);
-    setMaximumSize(500 * screenRatio, 600 * screenRatio);
-    setFixedSize(500 * screenRatio, 600 * screenRatio);
-    setMouseTracking(true);
-
-    changeMode = false;
-    propUpdate = false;
-    drawPointOnMap(xpos_old, ypos_old);
-}
-
-MapLocationDialog::~MapLocationDialog()
-{
-    delete ui;
-}
-
-void MapLocationDialog::drawPointOnMap(double xpos_d, double ypos_d)
-{
-    qreal screenRatio = AppEnv::screenRatio();
-    qreal screenRatioPR = AppEnv::screenRatioPR();
-    int pointMakerSize = 8 * screenRatio * screenRatioPR;
-    QPixmap pointMakerPixmap = IconLoader::loadingPointmakerIcon().pixmap(QSize(pointMakerSize, pointMakerSize));
-    QSize mapPixelSize = QSize(width() * screenRatioPR, height() * screenRatioPR);
-
-    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();
-#if QT_VERSION >= 0x050600
-    mapPixmap.setDevicePixelRatio(screenRatioPR);
-#endif
-
-    QPalette backgroundPalette;
-    backgroundPalette.setBrush(backgroundRole(), QBrush(mapPixmap));
-    setPalette(backgroundPalette);
-
-    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)));
-}
-
-void MapLocationDialog::on_cmdChange_clicked()
-{
-    qreal screenRatio = AppEnv::screenRatio();
-    int pointMakerSize = 8 * screenRatio;
-    QPixmap pointMakerPixmap = IconLoader::loadingPointmakerIcon().pixmap(QSize(pointMakerSize, pointMakerSize));
-    QCursor pointMakerCursor(pointMakerPixmap);
-    ui->cmdDone->setVisible(true);
-    ui->cmdApply->setVisible(false);
-    ui->cmdChange->setVisible(false);
-    ui->cmdRevert->setVisible(false);
-
-    setCursor(pointMakerCursor);
-    changeMode = true;
-}
-
-void MapLocationDialog::on_cmdDone_clicked()
-{
-    ui->cmdDone->setVisible(false);
-    ui->cmdChange->setVisible(true);
-    if (xpos_new != xpos_old || ypos_new != ypos_old)
-    {
-        ui->cmdApply->setVisible(true);
-        ui->cmdRevert->setVisible(true);
-    }
-
-    setCursor(Qt::ArrowCursor);
-    changeMode = false;
-}
-
-void MapLocationDialog::updatePosFromEvent(int x, int y)
-{
-    QSize mapPixelSize = size();
-    int xpos_ad = x;
-    int ypos_ad = mapPixelSize.height() - y;
-    double xrat = 10000 / (double)mapPixelSize.width();
-    double yrat = 12000 / (double)mapPixelSize.height();
-    double xpos_rv = xrat * xpos_ad;
-    double ypos_rv = yrat * ypos_ad;
-    double xpos_fp = xpos_rv - 4000;
-    double ypos_fp = ypos_rv - 4000;
-    drawPointOnMap(xpos_fp, ypos_fp);
-}
-
-void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
-{
-    if (!changeMode) { ev->ignore(); }
-    else if (ev->buttons() & Qt::LeftButton)
-    {
-        updatePosFromEvent(ev->x(), ev->y());
-        ev->accept();
-    }
-    else
-    {
-        ev->ignore();
-    }
-}
-
-void MapLocationDialog::mouseReleaseEvent(QMouseEvent *ev)
-{
-    if (!changeMode) { ev->ignore(); }
-    else if (ev->button() == Qt::LeftButton)
-    {
-        updatePosFromEvent(ev->x(), ev->y());
-        ev->accept();
-    }
-    else
-    {
-        ev->ignore();
-    }
-}
-
-void MapLocationDialog::on_cmdApply_clicked()
-{
-    propUpdate = true;
-    xpos_old = xpos_new;
-    ypos_old = ypos_new;
-    ui->cmdApply->setVisible(false);
-    ui->cmdRevert->setVisible(false);
-}
-
-void MapLocationDialog::on_cmdRevert_clicked()
-{
-    drawPointOnMap(xpos_old, ypos_old);
-    ui->cmdApply->setVisible(false);
-    ui->cmdRevert->setVisible(false);
-}
-
-bool MapLocationDialog::propUpdated()
-{
-    return propUpdate;
-}
-
-double MapLocationDialog::getXpos()
-{
-    return xpos_old;
-}
-
-double MapLocationDialog::getYpos()
-{
-    return ypos_old;
-}
-
-void MapLocationDialog::on_cmdClose_clicked()
-{
-    close();
-}

MapLocationDialog.h

@@ -1,63 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2017 Syping
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*****************************************************************************/
-
-#ifndef MAPLOCATIONDIALOG_H
-#define MAPLOCATIONDIALOG_H
-
-#include <QDialog>
-#include <QMouseEvent>
-
-namespace Ui {
-class MapLocationDialog;
-}
-
-class MapLocationDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit MapLocationDialog(double x, double y, QWidget *parent = 0);
-    void drawPointOnMap(double x, double y);
-    bool propUpdated();
-    double getXpos();
-    double getYpos();
-    ~MapLocationDialog();
-
-protected:
-    void mouseMoveEvent(QMouseEvent *ev);
-    void mouseReleaseEvent(QMouseEvent *ev);
-
-private slots:
-    void on_cmdDone_clicked();
-    void on_cmdApply_clicked();
-    void on_cmdChange_clicked();
-    void on_cmdRevert_clicked();
-    void updatePosFromEvent(int x, int y);
-    void on_cmdClose_clicked();
-
-private:
-    double xpos_old;
-    double ypos_old;
-    double xpos_new;
-    double ypos_new;
-    bool propUpdate;
-    bool changeMode;
-    Ui::MapLocationDialog *ui;
-};
-
-#endif // MAPLOCATIONDIALOG_H

MapLocationDialog.ui

@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MapLocationDialog</class>
- <widget class="QDialog" name="MapLocationDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>500</width>
-    <height>600</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>500</width>
-    <height>600</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Snapmatic Map Viewer</string>
-  </property>
-  <layout class="QVBoxLayout" name="vlMapPreview">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <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>
-    <layout class="QHBoxLayout" name="hlMapDialog">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>3</number>
-     </property>
-     <property name="topMargin">
-      <number>3</number>
-     </property>
-     <property name="rightMargin">
-      <number>3</number>
-     </property>
-     <property name="bottomMargin">
-      <number>3</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout" name="vlPosLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <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="labPos">
-         <property name="styleSheet">
-          <string notr="true">QLabel{
-color: rgb(255, 255, 255);
-}</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="vsPosSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="hsMapDialog">
-       <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>
-      <layout class="QVBoxLayout" name="vlMapDialog">
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <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="QPushButton" name="cmdClose">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="toolTip">
-          <string>Close viewer</string>
-         </property>
-         <property name="text">
-          <string>&amp;Close</string>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="vsMapDialog">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdApply">
-         <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>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdRevert">
-         <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>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdChange">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="toolTip">
-          <string>Select new position</string>
-         </property>
-         <property name="text">
-          <string>&amp;Select</string>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdDone">
-         <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>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

OptionsDialog.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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
@@ -18,32 +18,21 @@
 
 #include "OptionsDialog.h"
 #include "ui_OptionsDialog.h"
-#include "TranslationClass.h"
 #include "StandardPaths.h"
 #include "UserInterface.h"
 #include "AppEnv.h"
 #include "config.h"
-#include <QStringBuilder>
 #include <QDesktopWidget>
-#include <QJsonDocument>
-#include <QStyleFactory>
 #include <QApplication>
-#include <QJsonObject>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QStringList>
-#include <QClipboard>
 #include <QLocale>
 #include <QString>
-#include <QTimer>
 #include <QDebug>
 #include <QList>
 #include <QDir>
 
-#ifdef GTA5SYNC_TELEMETRY
-#include "TelemetryClass.h"
-#endif
-
 OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     QDialog(parent), profileDB(profileDB),
     ui(new Ui::OptionsDialog)
@@ -55,10 +44,8 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     ui->setupUi(this);
     ui->tabWidget->setCurrentIndex(0);
     ui->labPicCustomRes->setVisible(false);
-    ui->cmdCancel->setDefault(true);
-    ui->cmdCancel->setFocus();
 
-    QRect desktopResolution = QApplication::desktop()->screenGeometry(this);
+    QRect desktopResolution = QApplication::desktop()->screenGeometry(parent);
     int desktopSizeWidth = desktopResolution.width();
     int desktopSizeHeight = desktopResolution.height();
     aspectRatio = Qt::KeepAspectRatio;
@@ -74,25 +61,18 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     ui->rbPicDesktopRes->setText(ui->rbPicDesktopRes->text().arg(QString::number(desktopSizeWidth), QString::number(desktopSizeHeight)));
     ui->rbPicDefaultRes->setText(ui->rbPicDefaultRes->text().arg(QString::number(defExportSize.width()), QString::number(defExportSize.height())));
 
-    // Set Icon for OK Button
     if (QIcon::hasThemeIcon("dialog-ok"))
     {
         ui->cmdOK->setIcon(QIcon::fromTheme("dialog-ok"));
     }
-    else if (QIcon::hasThemeIcon("gtk-ok"))
-    {
-        ui->cmdOK->setIcon(QIcon::fromTheme("gtk-ok"));
-    }
-
-    // Set Icon for Cancel Button
     if (QIcon::hasThemeIcon("dialog-cancel"))
     {
         ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
     }
-    else if (QIcon::hasThemeIcon("gtk-cancel"))
+
-    {
+    // DPI calculation
-        ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
+    qreal screenRatio = AppEnv::screenRatio();
-    }
+    resize(435 * screenRatio, 405 * screenRatio);
 
     setupTreeWidget();
     setupLanguageBox();
@@ -100,31 +80,28 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     setupDefaultProfile();
     setupPictureSettings();
     setupCustomGTAFolder();
-    setupInterfaceSettings();
-    setupStatisticsSettings();
     setupSnapmaticPictureViewer();
-    setupWindowsGameSettings();
 
-#ifndef Q_QS_ANDROID
+#ifdef GTA5SYNC_DISABLED
-    // DPI calculation
+    ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabSync));
-    qreal screenRatio = AppEnv::screenRatio();
-    resize(435 * screenRatio, 405 * screenRatio);
 #endif
 
-    setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
+    this->setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR));
 }
 
 OptionsDialog::~OptionsDialog()
 {
     delete settings;
-    qDeleteAll(playerItems.begin(), playerItems.end());
+    foreach(QTreeWidgetItem *playerItem, playerItems)
-    playerItems.clear();
+    {
+        delete playerItem;
+    }
     delete ui;
 }
 
 void OptionsDialog::setupTreeWidget()
 {
-    for (QString playerIDStr : profileDB->getPlayers())
+    foreach(const QString &playerIDStr, profileDB->getPlayers())
     {
         bool ok;
         int playerID = playerIDStr.toInt(&ok);
@@ -133,12 +110,12 @@ void OptionsDialog::setupTreeWidget()
             QString playerName = profileDB->getPlayerName(playerID);
 
             QStringList playerTreeViewList;
-            playerTreeViewList += playerIDStr;
+            playerTreeViewList << playerIDStr;
-            playerTreeViewList += playerName;
+            playerTreeViewList << playerName;
 
             QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
             ui->twPlayers->addTopLevelItem(playerItem);
-            playerItems += playerItem;
+            playerItems.append(playerItem);
         }
     }
     ui->twPlayers->sortItems(1, Qt::AscendingOrder);
@@ -147,42 +124,50 @@ void OptionsDialog::setupTreeWidget()
 void OptionsDialog::setupLanguageBox()
 {
     settings->beginGroup("Interface");
-    currentLanguage = settings->value("Language", "System").toString();
+    currentLanguage = settings->value("Language","System").toString();
-    currentAreaLanguage = settings->value("AreaLanguage", "Auto").toString();
     settings->endGroup();
 
-    QString cbSysStr = tr("%1 (Language priority)", "First language a person can talk with a different person/application. \"Native\" or \"Not Native\".").arg(tr("System",
+    QStringList langList = QLocale::system().name().split("_");
-                                                                                                                                                                  "System in context of System default"));
+    if (langList.length() > 0)
-#ifdef GTA5SYNC_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."));
+        QString cbSysStr = tr("%1 (%2 if available)", "System like PC System = %1, System Language like Deutsch = %2").arg(tr("System",
-    }
+                                                                                                                              "System like PC System"), QLocale::languageToString(QLocale(langList.at(0)).language()));
-    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");
+    }
 
-    QStringList availableLanguages;
+    QString cbEngStr = "English (English) [en]";
-    availableLanguages << QString("en_GB");
+    ui->cbLanguage->addItem(QIcon::fromTheme("flag-us"), cbEngStr, "en");
-#ifndef GTA5SYNC_QCONF
+    if (currentLanguage == "en")
-    availableLanguages << TranslationClass::listTranslations(AppEnv::getExLangFolder());
-#endif
-    availableLanguages << TranslationClass::listTranslations(AppEnv::getInLangFolder());
-    availableLanguages.removeDuplicates();
-    availableLanguages.sort();
-
-    for (QString lang : availableLanguages)
     {
+#if QT_VERSION >= 0x050000
+        ui->cbLanguage->setCurrentText(cbEngStr);
+#else
+        int indexOfEnglish = ui->cbLanguage->findText(cbEngStr);
+        ui->cbLanguage->setCurrentIndex(indexOfEnglish);
+#endif
+    }
+
+    QDir langDir;
+    langDir.setNameFilters(QStringList("gta5sync_*.qm"));
+    langDir.setPath(AppEnv::getLangFolder());
+    QStringList langFiles;
+    langFiles << langDir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort);
+    langDir.setPath(":/tr");
+    langFiles << langDir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort);
+    langFiles.removeDuplicates();
+
+    foreach(const QString &langFile, langFiles)
+    {
+        QString lang = langFile;
+        lang.remove("gta5sync_");
+        lang.remove(".qm");
+
         QLocale langLocale(lang);
-        QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % lang % "]";
+        QString languageNameInternational = QLocale::languageToString(langLocale.language());
-        QString langIconStr = "flag-" % TranslationClass::getCountryCode(langLocale);
+        QString languageNameNative = langLocale.nativeLanguageName();
+
+        QString cbLangStr = languageNameNative + " (" + languageNameInternational + ") [" + lang + "]";
+        QString langIconStr = "flag-" + lang;
 
         ui->cbLanguage->addItem(QIcon::fromTheme(langIconStr), cbLangStr, lang);
         if (currentLanguage == lang)
@@ -195,60 +180,6 @@ void OptionsDialog::setupLanguageBox()
 #endif
         }
     }
-
-    QString aCurrentLanguage = QString("en_GB");
-    if (Translator->isLanguageLoaded()) { aCurrentLanguage = Translator->getCurrentLanguage(); }
-    QLocale currentLocale = QLocale(aCurrentLanguage);
-    ui->labCurrentLanguage->setText(tr("Current: %1").arg(currentLocale.nativeLanguageName() % " (" % currentLocale.nativeCountryName() % ") [" % aCurrentLanguage % "]"));
-
-    availableLanguages.clear();
-    availableLanguages << TranslationClass::listAreaTranslations();
-    availableLanguages.removeDuplicates();
-    availableLanguages.sort();
-
-    for (QString lang : availableLanguages)
-    {
-        // correcting Language Location if possible
-        QString aLang = lang;
-        if (QFile::exists(":/global/global." % lang % ".loc"))
-        {
-            QFile locFile(":/global/global." % lang % ".loc");
-            if (locFile.open(QFile::ReadOnly))
-            {
-                aLang = QString::fromUtf8(locFile.readLine()).trimmed();
-                locFile.close();
-            }
-        }
-
-        QLocale langLocale(aLang);
-        QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % aLang % "]";
-        QString langIconStr = "flag-" % TranslationClass::getCountryCode(langLocale);
-
-        ui->cbAreaLanguage->addItem(QIcon::fromTheme(langIconStr), cbLangStr, lang);
-        if (currentAreaLanguage == lang)
-        {
-#if QT_VERSION >= 0x050000
-            ui->cbAreaLanguage->setCurrentText(cbLangStr);
-#else
-            int indexOfLang = ui->cbAreaLanguage->findText(cbLangStr);
-            ui->cbAreaLanguage->setCurrentIndex(indexOfLang);
-#endif
-        }
-    }
-
-    QString aCurrentAreaLanguage = Translator->getCurrentAreaLanguage();
-    if (QFile::exists(":/global/global." % aCurrentAreaLanguage % ".loc"))
-    {
-        qDebug() << "locFile found";
-        QFile locFile(":/global/global." % aCurrentAreaLanguage % ".loc");
-        if (locFile.open(QFile::ReadOnly))
-        {
-            aCurrentAreaLanguage = QString::fromUtf8(locFile.readLine()).trimmed();
-            locFile.close();
-        }
-    }
-    currentLocale = QLocale(aCurrentAreaLanguage);
-    ui->labCurrentAreaLanguage->setText(tr("Current: %1").arg(currentLocale.nativeLanguageName() % " (" % currentLocale.nativeCountryName() % ") [" % aCurrentAreaLanguage % "]"));
 }
 
 void OptionsDialog::setupRadioButtons()
@@ -260,76 +191,21 @@ void OptionsDialog::setupRadioButtons()
 
     if (contentModeOk)
     {
-        switch (contentMode)
+        if (contentMode == 0)
         {
-        case 0:
             ui->rbOpenWithSC->setChecked(true);
-            break;
+        }
-        case 1:
+        else if (contentMode == 1)
+        {
             ui->rbOpenWithDC->setChecked(true);
-            break;
+        }
-        case 2:
+        else if (contentMode == 2)
+        {
             ui->rbSelectWithSC->setChecked(true);
-            break;
         }
     }
 }
 
-void OptionsDialog::setupInterfaceSettings()
-{
-    settings->beginGroup("Startup");
-    bool alwaysUseMessageFont = settings->value("AlwaysUseMessageFont", false).toBool();
-    ui->cbAlwaysUseMessageFont->setChecked(alwaysUseMessageFont);
-#ifdef GTA5SYNC_WIN
-    if (QSysInfo::windowsVersion() >= 0x0080)
-    {
-        ui->gbFont->setVisible(false);
-        ui->cbAlwaysUseMessageFont->setVisible(false);
-    }
-#else
-    ui->gbFont->setVisible(false);
-    ui->cbAlwaysUseMessageFont->setVisible(false);
-#endif
-    QString currentStyle = QApplication::style()->objectName();
-    QString appStyle = settings->value("AppStyle", currentStyle).toString();
-    bool customStyle = settings->value("CustomStyle", false).toBool();
-    const QStringList availableStyles = QStyleFactory::keys();
-    ui->cbStyleList->addItems(availableStyles);
-    if (availableStyles.contains(appStyle, Qt::CaseInsensitive))
-    {
-        // use 'for' for select to be sure it's case insensitive
-        int currentIndex = 0;
-        for (QString currentStyleFF : availableStyles)
-        {
-            if (currentStyleFF.toLower() == appStyle.toLower())
-            {
-                ui->cbStyleList->setCurrentIndex(currentIndex);
-            }
-            currentIndex++;
-        }
-    }
-    else
-    {
-        if (availableStyles.contains(currentStyle, Qt::CaseInsensitive))
-        {
-            int currentIndex = 0;
-            for (QString currentStyleFF : availableStyles)
-            {
-                if (currentStyleFF.toLower() == currentStyle.toLower())
-                {
-                    ui->cbStyleList->setCurrentIndex(currentIndex);
-                }
-                currentIndex++;
-            }
-        }
-    }
-    if (customStyle)
-    {
-        ui->cbDefaultStyle->setChecked(false);
-    }
-    settings->endGroup();
-}
-
 void OptionsDialog::on_cmdOK_clicked()
 {
     applySettings();
@@ -341,10 +217,8 @@ void OptionsDialog::applySettings()
     settings->beginGroup("Interface");
 #if QT_VERSION >= 0x050000
     settings->setValue("Language", ui->cbLanguage->currentData());
-    settings->setValue("AreaLanguage", ui->cbAreaLanguage->currentData());
 #else
     settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()));
-    settings->setValue("AreaLanguage", ui->cbAreaLanguage->itemData(ui->cbAreaLanguage->currentIndex()));
 #endif
 #ifdef GTA5SYNC_WIN
 #if QT_VERSION >= 0x050200
@@ -401,65 +275,25 @@ void OptionsDialog::applySettings()
     settings->setValue("force", forceCustomFolder);
     settings->endGroup();
 
-    bool defaultStyle = ui->cbDefaultStyle->isChecked();
+#if QT_VERSION >= 0x050000
-    settings->beginGroup("Startup");
+    emit settingsApplied(newContentMode, ui->cbLanguage->currentData().toString());
-    if (!defaultStyle)
+#else
-    {
+    emit settingsApplied(newContentMode, ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString());
-        QString newStyle = ui->cbStyleList->currentText();
-        settings->setValue("CustomStyle", true);
-        settings->setValue("AppStyle", newStyle);
-        QApplication::setStyle(QStyleFactory::create(newStyle));
-    }
-    else
-    {
-        settings->setValue("CustomStyle", false);
-    }
-    settings->setValue("AlwaysUseMessageFont", ui->cbAlwaysUseMessageFont->isChecked());
-    settings->endGroup();
-
-#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
     bool languageChanged = ui->cbLanguage->currentData().toString() != currentLanguage;
-    bool languageAreaChanged = ui->cbAreaLanguage->currentData().toString() != currentAreaLanguage;
 #else
     bool languageChanged = ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentLanguage;
-    bool languageAreaChanged = ui->cbAreaLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentAreaLanguage;
 #endif
-    if (languageChanged)
-    {
-        Translator->unloadTranslation(qApp);
-        Translator->initUserLanguage();
-        Translator->loadTranslation(qApp);
-    }
-    else if (languageAreaChanged)
-    {
-        Translator->initUserLanguage();
-    }
-
-    settings->sync();
-    emit settingsApplied(newContentMode, languageChanged);
 
     if ((forceCustomFolder && ui->txtFolder->text() != currentCFolder) || (forceCustomFolder != currentFFolder && forceCustomFolder))
     {
-        QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialise after you restart %1.").arg(GTA5SYNC_APPSTR));
+        QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialize after you restart %1.").arg(GTA5SYNC_APPSTR));
+    }
+    if (languageChanged)
+    {
+        QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The language change will take effect after you restart %1.").arg(GTA5SYNC_APPSTR));
     }
 }
 
@@ -473,9 +307,9 @@ void OptionsDialog::setupDefaultProfile()
     ui->cbProfiles->addItem(cbNoneStr, "");
 }
 
-void OptionsDialog::commitProfiles(const QStringList &profiles)
+void OptionsDialog::commitProfiles(QStringList profiles)
 {
-    for (QString profile : profiles)
+    foreach(const QString &profile, profiles)
     {
         ui->cbProfiles->addItem(tr("Profile: %1").arg(profile), profile);
         if (defaultProfile == profile)
@@ -568,108 +402,6 @@ void OptionsDialog::setupPictureSettings()
     settings->endGroup();
 }
 
-void OptionsDialog::setupStatisticsSettings()
-{
-#ifdef GTA5SYNC_TELEMETRY
-    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()));
-
-    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())
-    {
-        ui->cbParticipateStats->setEnabled(false);
-    }
-
-    if (Telemetry->isRegistered())
-    {
-        ui->labParticipationID->setText(tr("Participation ID: %1").arg(Telemetry->getRegisteredID()));
-    }
-    else
-    {
-        ui->labParticipationID->setText(tr("Participation ID: %1").arg(tr("Not registered")));
-        ui->cmdCopyStatsID->setVisible(false);
-    }
-#else
-    ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabStats));
-#endif
-}
-
-void OptionsDialog::setupWindowsGameSettings()
-{
-#ifdef GTA5SYNC_GAME
-    GameVersion gameVersion = AppEnv::getGameVersion();
-#ifdef GTA5SYNC_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)
@@ -703,7 +435,7 @@ void OptionsDialog::setupSnapmaticPictureViewer()
 #ifdef GTA5SYNC_WIN
 #if QT_VERSION >= 0x050200
     settings->beginGroup("Interface");
-    ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool());
+    ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", false).toBool());
     settings->endGroup();
 #else
     ui->cbSnapmaticNavigationBar->setVisible(false);
@@ -723,15 +455,3 @@ void OptionsDialog::on_cmdExploreFolder_clicked()
         ui->txtFolder->setText(GTAV_Folder);
     }
 }
-
-void OptionsDialog::on_cbDefaultStyle_toggled(bool checked)
-{
-    ui->cbStyleList->setDisabled(checked);
-}
-
-void OptionsDialog::on_cmdCopyStatsID_clicked()
-{
-#ifdef GTA5SYNC_TELEMETRY
-    QApplication::clipboard()->setText(Telemetry->getRegisteredID());
-#endif
-}

OptionsDialog.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ class OptionsDialog : public QDialog
 
 public:
     explicit OptionsDialog(ProfileDatabase *profileDB, QWidget *parent = 0);
-    void commitProfiles(const QStringList &profiles);
+    void commitProfiles(QStringList profiles);
     ~OptionsDialog();
 
 private slots:
@@ -46,24 +46,20 @@ private slots:
     void on_hsPicQuality_valueChanged(int value);
     void on_cbIgnoreAspectRatio_toggled(bool checked);
     void on_cmdExploreFolder_clicked();
-    void on_cbDefaultStyle_toggled(bool checked);
-    void on_cmdCopyStatsID_clicked();
 
 signals:
-    void settingsApplied(int contentMode, bool languageChanged);
+    void settingsApplied(int contentMode, QString language);
 
 private:
     ProfileDatabase *profileDB;
     Ui::OptionsDialog *ui;
     QList<QTreeWidgetItem*> playerItems;
     Qt::AspectRatioMode aspectRatio;
-    QString currentAreaLanguage;
     QString currentLanguage;
     QString currentCFolder;
     QString defaultProfile;
     QString percentString;
     QSettings *settings;
-    bool withoutPlayers;
     bool currentFFolder;
     int contentMode;
     int customQuality;
@@ -76,10 +72,7 @@ private:
     void setupDefaultProfile();
     void setupPictureSettings();
     void setupCustomGTAFolder();
-    void setupInterfaceSettings();
-    void setupStatisticsSettings();
     void setupSnapmaticPictureViewer();
-    void setupWindowsGameSettings();
     void applySettings();
 };
 

OptionsDialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>435</width>
-    <height>474</height>
+    <height>405</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -314,7 +314,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="vsPictures">
+        <spacer name="vsTabPictures">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -382,320 +382,20 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabGame">
+     <widget class="QWidget" name="tabLocalization">
       <attribute name="title">
-       <string>Game</string>
+       <string>Language</string>
       </attribute>
-      <layout class="QVBoxLayout" name="vlGame">
+      <layout class="QVBoxLayout" name="vlLocalization">
-       <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>
-      </attribute>
-      <layout class="QVBoxLayout" name="vlStats">
-       <item>
-        <widget class="QGroupBox" name="gbUserStats">
-         <property name="title">
-          <string>Participation</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlUserStats">
-          <item>
-           <widget class="QCheckBox" name="cbParticipateStats">
-            <property name="text">
-             <string>Participate in %1 User Statistics</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="labUserStats">
-            <property name="text">
-             <string notr="true">&lt;a href=&quot;%2&quot;&gt;%1&lt;/a&gt;</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gbCategories">
-         <property name="title">
-          <string>Categories</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlCategories">
-          <item>
-           <widget class="QCheckBox" name="cbGeneralStats">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Hardware, Application and OS Specification</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbOSLangStats">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>System Language Configuration</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbAppConfigStats">
-            <property name="text">
-             <string>Application Configuration</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="cbUsageData">
-            <property name="text">
-             <string>Personal Usage Data</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gbOther">
-         <property name="title">
-          <string>Other</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlFeedbackOther">
-          <item>
-           <layout class="QHBoxLayout" name="hlParticipation">
-            <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>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="vsUserStats">
-         <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="tabInterface">
-      <attribute name="title">
-       <string>Interface</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="vlInterface">
        <item>
         <widget class="QGroupBox" name="gbLanguage">
          <property name="title">
-          <string>Language for Interface</string>
+          <string>Language</string>
          </property>
          <layout class="QVBoxLayout" name="vlLanguage">
           <item>
            <widget class="QComboBox" name="cbLanguage"/>
           </item>
-          <item>
-           <widget class="QLabel" name="labCurrentLanguage">
-            <property name="text">
-             <string>Current: %1</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gbAreas">
-         <property name="title">
-          <string>Language for Areas</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlAreas">
-          <item>
-           <widget class="QComboBox" name="cbAreaLanguage"/>
-          </item>
-          <item>
-           <widget class="QLabel" name="labCurrentAreaLanguage">
-            <property name="text">
-             <string>Current: %1</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gbStyle">
-         <property name="title">
-          <string>Style</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlStyle">
-          <item>
-           <widget class="QCheckBox" name="cbDefaultStyle">
-            <property name="text">
-             <string>Use Default Style (Restart)</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="hlStyle">
-            <item>
-             <widget class="QLabel" name="labStyle">
-              <property name="text">
-               <string>Style:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="cbStyleList">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="gbFont">
-         <property name="title">
-          <string>Font</string>
-         </property>
-         <layout class="QVBoxLayout" name="vlFont">
-          <item>
-           <widget class="QCheckBox" name="cbAlwaysUseMessageFont">
-            <property name="text">
-             <string>Always use Message Font (Windows 2003 and earlier)</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -714,6 +414,26 @@
        </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>
@@ -739,9 +459,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip">
-        <string>Apply changes</string>
-       </property>
        <property name="text">
         <string extracomment="OK, Cancel, Apply">&amp;OK</string>
        </property>
@@ -755,9 +472,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip">
-        <string>Discard changes</string>
-       </property>
        <property name="text">
         <string extracomment="OK, Cancel, Apply">&amp;Cancel</string>
        </property>

PictureDialog.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,21 +22,11 @@
 #include "SnapmaticPicture.h"
 #include "ProfileDatabase.h"
 #include "CrewDatabase.h"
-#include <QResizeEvent>
 #include <QMouseEvent>
-#include <QToolBar>
 #include <QDialog>
 #include <QEvent>
 #include <QMenu>
 
-#ifdef GTA5SYNC_WIN
-#if QT_VERSION >= 0x050200
-#ifdef GTA5SYNC_APV
-#include <dwmapi.h>
-#endif
-#endif
-#endif
-
 namespace Ui {
 class PictureDialog;
 }
@@ -46,23 +36,22 @@ class PictureDialog : public QDialog
     Q_OBJECT
 public:
     explicit PictureDialog(ProfileDatabase *profileDB, CrewDatabase *crewDB, QWidget *parent = 0);
-    explicit PictureDialog(ProfileDatabase *profileDB, CrewDatabase *crewDB, QString profileName, QWidget *parent = 0);
+    explicit PictureDialog(QWidget *parent = 0);
     explicit PictureDialog(bool primaryWindow, ProfileDatabase *profileDB, CrewDatabase *crewDB, QWidget *parent = 0);
-    explicit PictureDialog(bool primaryWindow, ProfileDatabase *profileDB, CrewDatabase *crewDB, QString profileName, QWidget *parent = 0);
+    explicit PictureDialog(bool primaryWindow, QWidget *parent = 0);
-    void setupPictureDialog();
+    void setupPictureDialog(bool withDatabase);
     void setSnapmaticPicture(SnapmaticPicture *picture, bool readOk, bool indexed, int index);
     void setSnapmaticPicture(SnapmaticPicture *picture, bool readOk, int index);
     void setSnapmaticPicture(SnapmaticPicture *picture, bool readOk);
     void setSnapmaticPicture(SnapmaticPicture *picture, int index);
     void setSnapmaticPicture(SnapmaticPicture *picture);
     void addPreviousNextButtons();
-    void styliseDialog();
+    void stylizeDialog();
     bool isIndexed();
     int getIndex();
     ~PictureDialog();
 
 public slots:
-    void crewNameUpdated();
     void playerNameUpdated();
     void dialogNextPictureRequested();
     void dialogPreviousPictureRequested();
@@ -78,14 +67,8 @@ private slots:
     void exportCustomContextMenuRequestedPrivate(const QPoint &pos, bool fullscreen);
     void nextPictureRequestedSlot();
     void previousPictureRequestedSlot();
-    void editSnapmaticProperties();
-    void editSnapmaticRawJson();
-    void editSnapmaticImage();
     void renderOverlayPicture();
     void renderPicture();
-    void openPreviewMap();
-    void updated();
-    void customSignal(QString signal);
 
 signals:
     void nextPictureRequested();
@@ -98,35 +81,34 @@ 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();
-    QString generatePlayersString();
     bool primaryWindow;
     ProfileDatabase *profileDB;
     CrewDatabase *crewDB;
-    QString profileName;
     Ui::PictureDialog *ui;
     QMap<QString, QString> globalMap;
     SnapmaticPicture *smpic;
     QWidget *fullscreenWidget;
+    QAction *jpegExportAction;
+    QAction *pgtaExportAction;
     QImage avatarAreaPicture;
     QImage snapmaticPicture;
     QImage overlayTempImage;
     QString jsonDrawString;
     QString windowTitleStr;
+    QStringList plyrsList;
     QString picAreaStr;
-    QString crewStr;
+    QString picArea;
+    QString picTitl;
+    QString picPath;
+    QString created;
+    QString crewID;
+    QString locX;
+    QString locY;
+    QString locZ;
     bool overlayEnabled;
+    bool withDatabase;
     bool rqFullscreen;
     bool naviEnabled;
     bool previewMode;
@@ -135,13 +117,7 @@ private:
     int avatarLocX;
     int avatarLocY;
     int avatarSize;
-    QMenu *manageMenu;
+    QMenu *exportMenu;
-#ifdef GTA5SYNC_WIN
-#if QT_VERSION >= 0x050200
-    QPoint dragPosition;
-    bool dragStart;
-#endif
-#endif
 };
 
 #endif // PICTUREDIALOG_H

PictureDialog.ui

@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>960</width>
-    <height>618</height>
+    <height>602</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Snapmatic Picture Viewer - %1</string>
+   <string>%1 - Snapmatic Picture Viewer</string>
   </property>
   <layout class="QVBoxLayout" name="vlPictureLayout">
    <property name="spacing">
@@ -43,6 +43,9 @@
      <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>
@@ -160,7 +163,7 @@
              <number>6</number>
             </property>
             <item>
-             <widget class="QPushButton" name="cmdManage">
+             <widget class="QPushButton" name="cmdExport">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                 <horstretch>0</horstretch>
@@ -171,10 +174,10 @@
                <enum>Qt::NoFocus</enum>
               </property>
               <property name="toolTip">
-               <string>Manage picture</string>
+               <string>Export picture</string>
               </property>
               <property name="text">
-               <string>&amp;Manage</string>
+               <string>&amp;Export</string>
               </property>
               <property name="autoDefault">
                <bool>false</bool>
@@ -193,7 +196,7 @@
                <enum>Qt::NoFocus</enum>
               </property>
               <property name="toolTip">
-               <string>Close viewer</string>
+               <string>Close</string>
               </property>
               <property name="text">
                <string>&amp;Close</string>
@@ -227,7 +230,9 @@
    </slots>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="res/app.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>cmdClose</sender>

PictureExport.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -21,19 +21,13 @@
 #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 <QSaveFile>
-#endif
-
 PictureExport::PictureExport()
 {
 
@@ -80,7 +74,6 @@ void PictureExport::exportAsPicture(QWidget *parent, SnapmaticPicture *picture)
     // End Picture Settings
 
     settings.beginGroup("FileDialogs");
-    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
     settings.beginGroup("ExportAsPicture");
 
 fileDialogPreSave: //Work?
@@ -88,15 +81,15 @@ fileDialogPreSave: //Work?
     fileDialog.setFileMode(QFileDialog::AnyFile);
     fileDialog.setViewMode(QFileDialog::Detail);
     fileDialog.setAcceptMode(QFileDialog::AcceptSave);
-    fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
+    fileDialog.setOption(QFileDialog::DontUseNativeDialog, false);
     fileDialog.setOption(QFileDialog::DontConfirmOverwrite, true);
     fileDialog.setDefaultSuffix("suffix");
     fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
-    fileDialog.setWindowTitle(PictureDialog::tr("Export as Picture..."));
+    fileDialog.setWindowTitle(PictureDialog::tr("Export as JPG picture..."));
     fileDialog.setLabelText(QFileDialog::Accept, PictureDialog::tr("Export"));
 
     QStringList filters;
-    filters << PictureDialog::tr("JPEG Graphics (*.jpg *.jpeg)");
+    filters << PictureDialog::tr("JPEG picture (*.jpg)");
     filters << PictureDialog::tr("Portable Network Graphics (*.png)");
     fileDialog.setNameFilters(filters);
 
@@ -104,9 +97,9 @@ fileDialogPreSave: //Work?
 
     fileDialog.setSidebarUrls(sidebarUrls);
     fileDialog.setDirectory(settings.value("Directory", StandardPaths::picturesLocation()).toString());
-    fileDialog.restoreGeometry(settings.value(parent->objectName() % "+Geometry", "").toByteArray());
+    fileDialog.restoreGeometry(settings.value(parent->objectName() + "+Geomtery", "").toByteArray());
 
-    QString newPictureFileName = getPictureFileName(picture) % defaultExportFormat;
+    QString newPictureFileName = getPictureFileName(picture) + defaultExportFormat;
     fileDialog.selectFile(newPictureFileName);
 
     if (fileDialog.exec())
@@ -147,7 +140,15 @@ fileDialogPreSave: //Work?
 
             if (QFile::exists(selectedFile))
             {
-                if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
+                if (QMessageBox::Yes == QMessageBox::warning(parent, PictureDialog::tr("Export as JPG picture"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
+                {
+                    if (!QFile::remove(selectedFile))
+                    {
+                        QMessageBox::warning(parent, PictureDialog::tr("Export as JPG picture"), PictureDialog::tr("Failed to overwrite %1 with current Snapmatic picture").arg("\""+selectedFile+"\""));
+                        goto fileDialogPreSave; //Work?
+                    }
+                }
+                else
                 {
                     goto fileDialogPreSave; //Work?
                 }
@@ -165,62 +166,30 @@ fileDialogPreSave: //Work?
                 exportPicture = exportPicture.scaled(cusExportSize, aspectRatio, Qt::SmoothTransformation);
             }
 
-            int errorId = 0;
+            bool isSaved;
-            bool isSaved = false;
+            if (useCustomQuality)
-#if QT_VERSION >= 0x050000
-            QSaveFile *picFile = new QSaveFile(selectedFile);
-#else
-            QFile *picFile = new QFile(selectedFile);
-#endif
-            if (picFile->open(QIODevice::WriteOnly))
             {
-                isSaved = exportPicture.save(picFile, saveFileFormat.toStdString().c_str(), useCustomQuality ? customQuality : defaultQuality);
+                isSaved = exportPicture.save(selectedFile, saveFileFormat.toStdString().c_str(), customQuality);
-#if QT_VERSION >= 0x050000
-                if (isSaved)
-                {
-                    isSaved = picFile->commit();
             }
             else
             {
-                    errorId = 1;
+                isSaved = exportPicture.save(selectedFile, saveFileFormat.toStdString().c_str(), 100);
             }
-#else
-                picFile->close();
-#endif
-            }
-            else
-            {
-                errorId = 2;
-            }
-            delete picFile;
 
             if (!isSaved)
             {
-                switch (errorId)
+                QMessageBox::warning(parent, PictureDialog::tr("Export as JPG picture"), PictureDialog::tr("Failed to export current Snapmatic picture"));
-                {
-                case 0:
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because the system occurred a write failure"));
-                    break;
-                case 1:
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because the format detection failures"));
-                    break;
-                case 2:
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because the file can't be written"));
-                    break;
-                default:
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("Failed to export the picture because of an unknown reason"));
-                }
                 goto fileDialogPreSave; //Work?
             }
         }
         else
         {
-            QMessageBox::warning(parent, PictureDialog::tr("Export as Picture"), PictureDialog::tr("No valid file is selected"));
+            QMessageBox::warning(parent, PictureDialog::tr("Export as JPG picture"), PictureDialog::tr("No valid file is selected"));
             goto fileDialogPreSave; //Work?
         }
     }
 
-    settings.setValue(parent->objectName() % "+Geometry", fileDialog.saveGeometry());
+    settings.setValue(parent->objectName() + "+Geometry", fileDialog.saveGeometry());
     settings.setValue("Directory", fileDialog.directory().absolutePath());
     settings.endGroup();
     settings.endGroup();
@@ -230,10 +199,13 @@ void PictureExport::exportAsSnapmatic(QWidget *parent, SnapmaticPicture *picture
 {
     QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
     settings.beginGroup("FileDialogs");
-    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
     settings.beginGroup("ExportAsSnapmatic");
 
-    QString adjustedPicPath = picture->getOriginalPictureFileName();
+    QString adjustedPicPath = picture->getPictureFileName();
+    if (adjustedPicPath.right(7) == ".hidden") // for the hidden file system
+    {
+        adjustedPicPath.remove(adjustedPicPath.length() - 7, 7);
+    }
 
 fileDialogPreSave: //Work?
     QFileInfo sgdFileInfo(adjustedPicPath);
@@ -241,11 +213,11 @@ fileDialogPreSave: //Work?
     fileDialog.setFileMode(QFileDialog::AnyFile);
     fileDialog.setViewMode(QFileDialog::Detail);
     fileDialog.setAcceptMode(QFileDialog::AcceptSave);
-    fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
+    fileDialog.setOption(QFileDialog::DontUseNativeDialog, false);
     fileDialog.setOption(QFileDialog::DontConfirmOverwrite, true);
     fileDialog.setDefaultSuffix(".rem");
     fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
-    fileDialog.setWindowTitle(PictureDialog::tr("Export as Snapmatic..."));
+    fileDialog.setWindowTitle(PictureDialog::tr("Export as GTA Snapmatic..."));
     fileDialog.setLabelText(QFileDialog::Accept, PictureDialog::tr("Export"));
 
     QStringList filters;
@@ -258,8 +230,9 @@ fileDialogPreSave: //Work?
 
     fileDialog.setSidebarUrls(sidebarUrls);
     fileDialog.setDirectory(settings.value("Directory", StandardPaths::documentsLocation()).toString());
-    fileDialog.restoreGeometry(settings.value(parent->objectName() % "+Geometry", "").toByteArray());
+    fileDialog.selectFile(QString(picture->getExportPictureFileName() + ".g5e"));
-    fileDialog.selectFile(QString(picture->getExportPictureFileName() % ".g5e"));
+    fileDialog.restoreGeometry(settings.value(parent->objectName() + "+Geomtery", "").toByteArray());
+
 
     if (fileDialog.exec())
     {
@@ -267,22 +240,18 @@ fileDialogPreSave: //Work?
         if (selectedFiles.length() == 1)
         {
             QString selectedFile = selectedFiles.at(0);
-            bool isAutoExt = false;
-            if (selectedFile.right(5) == ".auto")
-            {
-                isAutoExt = true;
-                QString dirPath = QFileInfo(selectedFile).dir().path();
-                QString stockFileName = sgdFileInfo.fileName();
-                selectedFile = dirPath % "/" % stockFileName;
-            }
-            else if (selectedFile.right(4) == ".rem")
-            {
-                selectedFile.remove(selectedFile.length() - 4, 4);
-            }
 
             if (QFile::exists(selectedFile))
             {
-                if (QMessageBox::No == QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
+                if (QMessageBox::Yes == QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Overwrite %1 with current Snapmatic picture?").arg("\""+selectedFile+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))
+                {
+                    if (!QFile::remove(selectedFile))
+                    {
+                        QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Failed to overwrite %1 with current Snapmatic picture").arg("\""+selectedFile+"\""));
+                        goto fileDialogPreSave; //Work?
+                    }
+                }
+                else
                 {
                     goto fileDialogPreSave; //Work?
                 }
@@ -290,35 +259,47 @@ fileDialogPreSave: //Work?
 
             if (selectedFile.right(4) == ".g5e")
             {
-                bool isExported = picture->exportPicture(selectedFile, SnapmaticFormat::G5E_Format);
+                bool isExported = picture->exportPicture(selectedFile, "G5E");
                 if (!isExported)
                 {
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
+                    QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
                     goto fileDialogPreSave; //Work?
                 }
             }
             else
             {
-                bool isCopied = picture->exportPicture(selectedFile, SnapmaticFormat::PGTA_Format);
+                bool isAutoExt = false;
+                if (selectedFile.right(5) == ".auto")
+                {
+                    isAutoExt = true;
+                    QString dirPath = QFileInfo(selectedFile).dir().path();
+                    QString stockFileName = sgdFileInfo.fileName();
+                    selectedFile = dirPath + "/" + stockFileName;
+                }
+                else if (selectedFile.right(4) == ".rem")
+                {
+                    selectedFile.remove(".rem");
+                }
+                bool isCopied = picture->exportPicture(selectedFile, "PGTA");
                 if (!isCopied)
                 {
-                    QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
+                    QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture"));
                     goto fileDialogPreSave; //Work?
                 }
                 else
                 {
-                    if (isAutoExt) QMessageBox::information(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("Exported Snapmatic to \"%1\" because of using the .auto extension.").arg(selectedFile));
+                    if (isAutoExt) QMessageBox::information(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Exported Snapmatic to \"%1\" because of using the .auto extension.").arg(selectedFile));
                 }
             }
         }
         else
         {
-            QMessageBox::warning(parent, PictureDialog::tr("Export as Snapmatic"), PictureDialog::tr("No valid file is selected"));
+            QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("No valid file is selected"));
             goto fileDialogPreSave; //Work?
         }
     }
 
-    settings.setValue(parent->objectName() % "+Geometry", fileDialog.saveGeometry());
+    settings.setValue(parent->objectName() + "+Geometry", fileDialog.saveGeometry());
     settings.setValue("Directory", fileDialog.directory().absolutePath());
     settings.endGroup();
 }

PictureExport.h

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

PictureWidget.cpp

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

PictureWidget.h

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

PlayerListDialog.cpp

@@ -1,221 +0,0 @@
-/*****************************************************************************
-* 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
-* 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 "PlayerListDialog.h"
-#include "ui_PlayerListDialog.h"
-#include "AppEnv.h"
-#include <QFontMetrics>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QPainter>
-#include <QPixmap>
-#include <QDebug>
-
-PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profileDB, QWidget *parent) :
-    QDialog(parent), players(players), profileDB(profileDB),
-    ui(new Ui::PlayerListDialog)
-{
-    // Set Window Flags
-    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
-
-    listUpdated = false;
-    ui->setupUi(this);
-    ui->cmdCancel->setDefault(true);
-    ui->cmdCancel->setFocus();
-
-    // Set Icon for Apply Button
-    if (QIcon::hasThemeIcon("dialog-ok-apply"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok-apply"));
-    }
-    else if (QIcon::hasThemeIcon("dialog-apply"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-apply"));
-    }
-    else if (QIcon::hasThemeIcon("gtk-apply"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("gtk-apply"));
-    }
-    else if (QIcon::hasThemeIcon("dialog-ok"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
-    }
-    else if (QIcon::hasThemeIcon("gtk-ok"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
-    }
-
-    // Set Icon for Cancel Button
-    if (QIcon::hasThemeIcon("dialog-cancel"))
-    {
-        ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
-    }
-    else if (QIcon::hasThemeIcon("gtk-cancel"))
-    {
-        ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
-    }
-
-    // Set Icon for Manage Buttons
-    if (QIcon::hasThemeIcon("go-previous") && QIcon::hasThemeIcon("go-next") && QIcon::hasThemeIcon("list-add"))
-    {
-        ui->cmdMakeAv->setIcon(QIcon::fromTheme("go-previous"));
-        ui->cmdMakeSe->setIcon(QIcon::fromTheme("go-next"));
-        ui->cmdMakeAd->setIcon(QIcon::fromTheme("list-add"));
-    }
-    else
-    {
-        ui->cmdMakeAv->setIcon(QIcon(":/img/back.svgz"));
-        ui->cmdMakeSe->setIcon(QIcon(":/img/next.svgz"));
-        ui->cmdMakeAd->setIcon(QIcon(":/img/add.svgz"));
-    }
-    buildInterface();
-
-    // DPI calculation
-    qreal screenRatio = AppEnv::screenRatio();
-    resize(500 * screenRatio, 350 * screenRatio);
-}
-
-PlayerListDialog::~PlayerListDialog()
-{
-    for (QObject *object : ui->listAvPlayers->children())
-    {
-        delete object;
-    }
-    for (QObject *object : ui->listSePlayers->children())
-    {
-        delete object;
-    }
-    delete ui;
-}
-
-void PlayerListDialog::on_cmdCancel_clicked()
-{
-    close();
-}
-
-void PlayerListDialog::buildInterface()
-{
-    const QStringList dbPlayers = profileDB->getPlayers();
-    for (QString sePlayer : players)
-    {
-        QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(sePlayer));
-        playerItem->setData(Qt::UserRole, sePlayer);
-        ui->listSePlayers->addItem(playerItem);
-    }
-    for (QString dbPlayer : dbPlayers)
-    {
-        if (!players.contains(dbPlayer))
-        {
-            QListWidgetItem *playerItem = new QListWidgetItem(profileDB->getPlayerName(dbPlayer));
-            playerItem->setData(Qt::UserRole, dbPlayer);
-            ui->listAvPlayers->addItem(playerItem);
-        }
-    }
-    ui->listAvPlayers->sortItems(Qt::AscendingOrder);
-}
-
-void PlayerListDialog::on_cmdMakeAv_clicked()
-{
-    for (QListWidgetItem *item : ui->listSePlayers->selectedItems())
-    {
-        QString playerName = item->text();
-        int playerID = item->data(Qt::UserRole).toInt();
-        delete item;
-        QListWidgetItem *playerItem = new QListWidgetItem(playerName);
-        playerItem->setData(Qt::UserRole, playerID);
-        ui->listAvPlayers->addItem(playerItem);
-        ui->listAvPlayers->sortItems(Qt::AscendingOrder);
-    }
-}
-
-void PlayerListDialog::on_cmdMakeSe_clicked()
-{
-    int maxPlayers = 30;
-    if (maxPlayers < ui->listSePlayers->count() + ui->listAvPlayers->selectedItems().count())
-    {
-        QMessageBox::warning(this, tr("Add Players..."), tr("Failed to add more Players because the limit of Players are %1!").arg(QString::number(maxPlayers)));
-        return;
-    }
-    for (QListWidgetItem *item : ui->listAvPlayers->selectedItems())
-    {
-        QString playerName = item->text();
-        int playerID = item->data(Qt::UserRole).toInt();
-        delete item;
-        QListWidgetItem *playerItem = new QListWidgetItem(playerName);
-        playerItem->setData(Qt::UserRole, playerID);
-        ui->listSePlayers->addItem(playerItem);
-    }
-}
-
-void PlayerListDialog::on_cmdMakeAd_clicked()
-{
-    bool playerOk;
-    int playerID = QInputDialog::getInt(this, tr("Add Player..."), tr("Enter Social Club Player ID"), 1, 1, 214783647, 1, &playerOk, windowFlags());
-    if (playerOk)
-    {
-        for (int i = 0; i < ui->listAvPlayers->count(); ++i)
-        {
-            QListWidgetItem *item = ui->listAvPlayers->item(i);
-            QString itemPlayerName = item->text();
-            int itemPlayerID = item->data(Qt::UserRole).toInt();
-            if (itemPlayerID == playerID)
-            {
-                delete item;
-                QListWidgetItem *playerItem = new QListWidgetItem(itemPlayerName);
-                playerItem->setData(Qt::UserRole, playerID);
-                ui->listSePlayers->addItem(playerItem);
-                return;
-            }
-        }
-        for (int i = 0; i < ui->listSePlayers->count(); ++i)
-        {
-            QListWidgetItem *item = ui->listSePlayers->item(i);
-            int itemPlayerID = item->data(Qt::UserRole).toInt();
-            if (itemPlayerID == playerID)
-            {
-                QMessageBox::warning(this, tr("Add Player..."), tr("Failed to add Player %1 because Player %1 is already added!").arg(QString::number(playerID)));
-                return;
-            }
-        }
-        QListWidgetItem *playerItem = new QListWidgetItem(QString::number(playerID));
-        playerItem->setData(Qt::UserRole, playerID);
-        ui->listSePlayers->addItem(playerItem);
-    }
-}
-
-void PlayerListDialog::on_cmdApply_clicked()
-{
-    players.clear();
-    for (int i = 0; i < ui->listSePlayers->count(); ++i)
-    {
-        players += ui->listSePlayers->item(i)->data(Qt::UserRole).toString();
-    }
-    emit playerListUpdated(players);
-    listUpdated = true;
-    close();
-}
-
-QStringList PlayerListDialog::getPlayerList() const
-{
-    return players;
-}
-
-bool PlayerListDialog::isListUpdated()
-{
-    return listUpdated;
-}

PlayerListDialog.h

@@ -1,57 +0,0 @@
-/*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
-* Copyright (C) 2016-2017 Syping
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*****************************************************************************/
-
-#ifndef PLAYERLISTDIALOG_H
-#define PLAYERLISTDIALOG_H
-
-#include "ProfileDatabase.h"
-#include <QDialog>
-
-namespace Ui {
-class PlayerListDialog;
-}
-
-class PlayerListDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit PlayerListDialog(QStringList players, ProfileDatabase *profileDB, QWidget *parent = 0);
-    QStringList getPlayerList() const;
-    bool isListUpdated();
-    ~PlayerListDialog();
-
-private slots:
-    void on_cmdCancel_clicked();
-    void on_cmdMakeAv_clicked();
-    void on_cmdMakeSe_clicked();
-    void on_cmdMakeAd_clicked();
-    void on_cmdApply_clicked();
-
-private:
-    QStringList players;
-    ProfileDatabase *profileDB;
-    Ui::PlayerListDialog *ui;
-    bool listUpdated;
-    void buildInterface();
-
-signals:
-    void playerListUpdated(QStringList playerList);
-};
-
-#endif // PLAYERLISTDIALOG_H

PlayerListDialog.ui

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PlayerListDialog</class>
- <widget class="QDialog" name="PlayerListDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>350</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Edit Players...</string>
-  </property>
-  <layout class="QVBoxLayout" name="vlInterface">
-   <item>
-    <layout class="QHBoxLayout" name="hlPlayers">
-     <item>
-      <layout class="QVBoxLayout" name="vlAvPlayers">
-       <item>
-        <widget class="QLabel" name="labAvPlayers">
-         <property name="text">
-          <string>Available Players:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QListWidget" name="listAvPlayers">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="vlButtons">
-       <item>
-        <spacer name="vsButtons1">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdMakeSe">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdMakeAv">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cmdMakeAd">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="vsButtons2">
-         <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>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="vlSePlayers">
-       <item>
-        <widget class="QLabel" name="labSePlayers">
-         <property name="text">
-          <string>Selected Players:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QListWidget" name="listSePlayers">
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::InternalMove</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="hlButtons">
-     <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="cmdApply">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&amp;Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cmdCancel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&amp;Cancel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

ProfileDatabase.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 #include "ProfileDatabase.h"
 #include "StandardPaths.h"
 #include "config.h"
-#include <QStringBuilder>
-#include <QMutexLocker>
-#include <QDebug>
 #include <QFile>
 #include <QDir>
 
@@ -31,7 +28,7 @@ ProfileDatabase::ProfileDatabase(QObject *parent) : QObject(parent)
     dir.mkpath(StandardPaths::dataLocation());
     dir.setPath(StandardPaths::dataLocation());
     QString dirPath = dir.absolutePath();
-    QString defaultConfPath = dirPath % "/players.ini";
+    QString defaultConfPath = dirPath + QDir::separator() + "players.ini";
 
     QSettings confPathSettings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
     confPathSettings.beginGroup("Database");
@@ -50,36 +47,15 @@ ProfileDatabase::~ProfileDatabase()
 
 QStringList ProfileDatabase::getPlayers()
 {
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getPlayers";
-#endif
     return profileDB->childKeys();
 }
 
-QString ProfileDatabase::getPlayerName(QString playerID)
-{
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getPlayerName" << playerID;
-#endif
-    return profileDB->value(playerID, playerID).toString();
-}
-
 QString ProfileDatabase::getPlayerName(int playerID)
 {
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "getPlayerName" << playerID;
-#endif
     return profileDB->value(QString::number(playerID), playerID).toString();
 }
 
 void ProfileDatabase::setPlayerName(int playerID, QString playerName)
 {
-    QMutexLocker locker(&mutex);
-#ifdef GTA5SYNC_DEBUG
-    qDebug() << "setPlayerName" << playerID << playerName;
-#endif
     profileDB->setValue(QString::number(playerID), playerName);
 }

ProfileDatabase.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include <QSettings>
 #include <QObject>
-#include <QMutex>
 #include <QMap>
 
 class ProfileDatabase : public QObject
@@ -29,13 +28,11 @@ class ProfileDatabase : public QObject
     Q_OBJECT
 public:
     explicit ProfileDatabase(QObject *parent = 0);
-    QString getPlayerName(QString playerID);
     QString getPlayerName(int playerID);
     QStringList getPlayers();
     ~ProfileDatabase();
 
 private:
-    mutable QMutex mutex;
     QSettings *profileDB;
 
 public slots:

ProfileInterface.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -29,10 +29,8 @@
 #include "ExportThread.h"
 #include "SavegameData.h"
 #include "CrewDatabase.h"
-#include "pcg_basic.h"
 #include <QProgressDialog>
 #include <QSpacerItem>
-#include <QDateTime>
 #include <QWidget>
 #include <QList>
 #include <QMap>
@@ -41,39 +39,32 @@ namespace Ui {
 class ProfileInterface;
 }
 
-enum class MassTool : int { Qualify = 0, Players = 1, Crew = 2, Title = 3 };
-
 class ProfileInterface : public QWidget
 {
     Q_OBJECT
 public:
     explicit ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent = 0);
     void setProfileFolder(QString folder, QString profile);
-    void settingsApplied(int contentMode, bool languageChanged);
+    void settingsApplied(int contentMode, QString language);
     void setupProfileInterface();
-    void massTool(MassTool tool);
     void disableSelected();
     void enableSelected();
     int selectedWidgets();
-    void retranslateUi();
     ~ProfileInterface();
 
 public slots:
     void contextMenuTriggeredPIC(QContextMenuEvent* ev);
     void contextMenuTriggeredSGD(QContextMenuEvent* ev);
-    void hoverProfileWidgetCheck();
     void selectAllWidgets();
     void deselectAllWidgets();
     void exportSelected();
     void deleteSelected();
-    void updatePalette();
     void importFiles();
 
 private slots:
     void on_cmdCloseProfile_clicked();
     void on_cmdImport_clicked();
     void pictureLoaded_event(SnapmaticPicture *picture);
-    void pictureFixed_event(SnapmaticPicture *picture);
     void savegameLoaded_event(SavegameData *savegame, QString savegamePath);
     void loadingProgress(int value, int maximum);
     void pictureDeleted_event();
@@ -85,9 +76,6 @@ private slots:
     void dialogPreviousPictureRequested(QWidget *dialog);
     void on_saProfileContent_dropped(const QMimeData *mimeData);
 
-protected:
-    bool eventFilter(QObject *watched, QEvent *event);
-
 private:
     ProfileDatabase *profileDB;
     CrewDatabase *crewDB;
@@ -95,29 +83,19 @@ private:
     Ui::ProfileInterface *ui;
 
     ProfileLoader *profileLoader;
-    ProfileWidget *previousWidget;
     QList<SavegameData*> savegames;
     QList<SnapmaticPicture*> pictures;
     QMap<ProfileWidget*,QString> widgets;
     QSpacerItem *saSpacerItem;
-    QStringList fixedPictures;
     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, bool notMultiple);
-    bool importFile(QString selectedFile, QDateTime importDateTime, bool notMultiple);
+    void importFilesProgress(QStringList selectedFiles);
-    bool importUrls(const QMimeData *mimeData);
-    bool importRemote(QUrl remoteUrl);
-    bool importImage(QImage *snapmaticImage, QDateTime importDateTime);
-    bool importFilesProgress(QStringList selectedFiles);
     bool importSnapmaticPicture(SnapmaticPicture *picture, bool warn = true);
     bool importSavegameData(SavegameData *savegame, QString sgdPath, bool warn = true);
     void pictureLoaded(SnapmaticPicture *picture, bool inserted);
@@ -127,7 +105,6 @@ private:
     void insertSnapmaticIPI(QWidget *widget);
     void insertSavegameIPI(QWidget *widget);
     void sortingProfileInterface();
-    int getRandomUid();
 
 signals:
     void profileLoaded();

ProfileInterface.ui

@@ -195,7 +195,7 @@
         </sizepolicy>
        </property>
        <property name="toolTip">
-        <string>Import file</string>
+        <string>Import exported file</string>
        </property>
        <property name="text">
         <string>&amp;Import...</string>

ProfileLoader.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,11 +20,8 @@
 #include "SnapmaticPicture.h"
 #include "SavegameData.h"
 #include "CrewDatabase.h"
-#include <QStringBuilder>
 #include <QStringList>
 #include <QString>
-#include <QThread>
-#include <QList>
 #include <QFile>
 #include <QDir>
 
@@ -46,11 +43,11 @@ void ProfileLoader::run()
     QStringList BackupFiles = SavegameFiles.filter(".bak", Qt::CaseInsensitive);
     profileDir.setNameFilters(QStringList("PGTA*"));
     QStringList SnapmaticPics = profileDir.entryList(QDir::Files | QDir::NoDot, QDir::NoSort);
-    BackupFiles += SnapmaticPics.filter(".bak", Qt::CaseInsensitive);
+    BackupFiles.append(SnapmaticPics.filter(".bak", Qt::CaseInsensitive));
 
     SavegameFiles.removeDuplicates();
     SnapmaticPics.removeDuplicates();
-    for (QString BackupFile : BackupFiles)
+    foreach(const QString &BackupFile, BackupFiles)
     {
         SavegameFiles.removeAll(BackupFile);
         SnapmaticPics.removeAll(BackupFile);
@@ -60,10 +57,10 @@ void ProfileLoader::run()
 
     // Loading pictures and savegames
     emit loadingProgress(curFile, maximumV);
-    for (QString SavegameFile : SavegameFiles)
+    foreach(const QString &SavegameFile, SavegameFiles)
     {
         emit loadingProgress(curFile, maximumV);
-        QString sgdPath = profileFolder % "/" % SavegameFile;
+        QString sgdPath = profileFolder + QDir::separator() + SavegameFile;
         SavegameData *savegame = new SavegameData(sgdPath);
         if (savegame->readingSavegame())
         {
@@ -71,38 +68,28 @@ void ProfileLoader::run()
         }
         curFile++;
     }
-    for (QString SnapmaticPic : SnapmaticPics)
+    foreach(const QString &SnapmaticPic, SnapmaticPics)
     {
         emit loadingProgress(curFile, maximumV);
-        QString picturePath = profileFolder % "/" % SnapmaticPic;
+        QString picturePath = profileFolder + QDir::separator() + SnapmaticPic;
         SnapmaticPicture *picture = new SnapmaticPicture(picturePath);
         if (picture->readingPicture(true, true, true))
         {
-            if (picture->isFormatSwitched())
-            {
-                picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format);
-                if (picture->exportPicture(picturePath, SnapmaticFormat::PGTA_Format))
-                {
-                    emit pictureFixed(picture);
-                }
-            }
             emit pictureLoaded(picture);
             int crewNumber = picture->getSnapmaticProperties().crewID;
             if (!crewList.contains(crewNumber))
             {
-                crewList += crewNumber;
+                crewList.append(crewNumber);
             }
         }
         curFile++;
     }
 
     // adding found crews
-    crewDB->setAddingCrews(true);
+    foreach(int crewID, crewList)
-    for (int crewID : crewList)
     {
         crewDB->addCrew(crewID);
     }
-    crewDB->setAddingCrews(false);
 }
 
 void ProfileLoader::preloaded()

ProfileLoader.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,6 @@ private slots:
 
 signals:
     void pictureLoaded(SnapmaticPicture *picture);
-    void pictureFixed(SnapmaticPicture *picture);
     void savegameLoaded(SavegameData *savegame, QString savegamePath);
     void loadingProgress(int value, int maximum);
 };

ProfileWidget.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -28,11 +28,6 @@ ProfileWidget::~ProfileWidget()
 {
 }
 
-void ProfileWidget::retranslate()
-{
-    qDebug() << "ProfileWidget::retranslate got used without overwrite";
-}
-
 bool ProfileWidget::isSelected()
 {
     qDebug() << "ProfileWidget::isSelected got used without overwrite";

ProfileWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,6 @@ public:
     virtual bool isSelected();
     virtual QString getWidgetType();
     virtual int getContentMode();
-    virtual void retranslate();
     ~ProfileWidget();
 
 private:

README.md

@@ -1,53 +1,31 @@
 ## gta5view
-Grand Theft Auto V Savegame and Snapmatic viewer/editor
+Grand Theft Auto V Savegame and Snapmatic viewer
 
-- View Snapmatics with the ability to disable them in-game
+- Viewing Snapmatics and giving the ability to disable them in-game
-- Edit Snapmatic pictures and properties in multiple ways
+- Import/Export Snapmatics and Savegames
-- Import/Export Snapmatics, Savegames and pictures
+- Choosing between multiple Social Club accounts as GTA V profiles IDs
-- Let choose between multiple Social Club accounts as GTA V profiles IDs
 
 #### Screenshots
-![Snapmatic Picture Viewer](res/src/picture.png)  
+<img src="https://i.imgur.com/ncMtWjR.png"/>
-![User Interface](res/src/mainui.png)  
+<img src="https://i.imgur.com/4THtwb1.png"/>
-![Snapmatic Properties](res/src/prop.png)
+<img src="https://i.imgur.com/STkRl6j.png"/>
 
-#### Build gta5view for Windows
+#### Build gta5view Debian/Ubuntu
 
-    # Note: Install Docker Community Edition and Git before continuing
+	apt-get install git gcc g++ qtbase5-dev qt5-qmake make checkinstall
-    git clone https://gitlab.com/Syping/gta5view && cd gta5view
+	git clone https://github.com/SyDevTeam/gta5view
-    docker pull syping/qt5-static-mingw
+	mkdir build && cd build
-    docker run --rm -v ${PWD}:/gta5view -it syping/qt5-static-mingw
+	qmake -qt=5 ../gta5view.pro # or just qmake ../gta5view.pro
-    cd /gta5view && mkdir -p build && cd build
+	make
-    qmake-static ../gta5view.pro
+	INSTALL_ROOT=/usr checkinstall --pkgname=gta5view --pkggroup=utility --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5
-    make depend
-    make -j $(nproc --all)
 
-#### Build gta5view for Debian/Ubuntu
+#### Build gta5view Windows
 
-    sudo apt-get install git gcc g++ qtbase5-dev qttranslations5-l10n qt5-qmake make
+Downloading <a href="https://www.qt.io/">Qt Framework</a> and install it.<br>
-    git clone https://gitlab.com/Syping/gta5view && cd gta5view
+Take the Online Installer and choose the MinGW version or install Microsoft Visual Studio 2013/2015 Community<br>
-    mkdir -p build && cd build
+Downloading Source Code over GitHub or with your Git client.<br>
-    ../configure --prefix=/opt/gta5view
+Open the gta5view.pro file with Qt Creator and build it over Qt Creator.<br>
-    make depend
-    make -j $(nproc --all)
-    sudo make install
-
-#### Build gta5view for Fedora
-
-    sudo dnf install git gcc gcc-c++ qt5-qtbase-devel qt5-qttranslations make
-    git clone https://gitlab.com/Syping/gta5view && cd gta5view
-    mkdir -p build && cd build
-    ../configure --prefix=/opt/gta5view
-    make depend
-    make -j $(nproc --all)
-    sudo make install
-
-#### Build gta5view for Windows (Beginner)
-
-Download the [Qt Framework](https://www.qt.io/) and install the MinGW version.  
-Download the Source Code over the Repository or with your Git client.  
-Open the gta5view.pro Project file with Qt Creator and build it over Qt Creator.
 
 #### Download Binary Releases
 
-Go to [gta5view release](https://github.com/SyDevTeam/gta5view/releases) and download the .exe file for Windows, .deb file for Debian/Ubuntu and .dmg file for OS X.
+Go to <a href="https://github.com/SyDevTeam/gta5view/releases">gta5view release</a> and download the .exe file for Windows, .deb file for Debian/Ubuntu and .dmg file for OS X

SavegameCopy.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -18,10 +18,8 @@
 
 #include "SidebarGenerator.h"
 #include "SavegameWidget.h"
-#include "StandardPaths.h"
 #include "SavegameCopy.h"
 #include "config.h"
-#include <QStringBuilder>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QSettings>
@@ -34,10 +32,7 @@ SavegameCopy::SavegameCopy()
 void SavegameCopy::copySavegame(QWidget *parent, QString sgdPath)
 {
     QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
-
     settings.beginGroup("FileDialogs");
-    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
-    settings.beginGroup("SavegameCopy");
 
 fileDialogPreSave: //Work?
     QFileInfo sgdFileInfo(sgdPath);
@@ -45,7 +40,7 @@ fileDialogPreSave: //Work?
     fileDialog.setFileMode(QFileDialog::AnyFile);
     fileDialog.setViewMode(QFileDialog::Detail);
     fileDialog.setAcceptMode(QFileDialog::AcceptSave);
-    fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
+    fileDialog.setOption(QFileDialog::DontUseNativeDialog, false);
     fileDialog.setOption(QFileDialog::DontConfirmOverwrite, true);
     fileDialog.setDefaultSuffix("");
     fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
@@ -60,8 +55,7 @@ fileDialogPreSave: //Work?
     QList<QUrl> sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls());
 
     fileDialog.setSidebarUrls(sidebarUrls);
-    fileDialog.setDirectory(settings.value("Directory", StandardPaths::picturesLocation()).toString());
+    fileDialog.restoreState(settings.value("CopySavegame","").toByteArray());
-    fileDialog.restoreGeometry(settings.value(parent->objectName() % "+Geometry", "").toByteArray());
     fileDialog.selectFile(sgdFileInfo.fileName());
 
     if (fileDialog.exec())
@@ -101,8 +95,6 @@ fileDialogPreSave: //Work?
         }
     }
 
-    settings.setValue(parent->objectName() % "+Geometry", fileDialog.saveGeometry());
+    settings.setValue("CopySavegame", fileDialog.saveState());
-    settings.setValue("Directory", fileDialog.directory().absolutePath());
-    settings.endGroup();
     settings.endGroup();
 }

SavegameCopy.h

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

SavegameData.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -16,10 +16,8 @@
 * 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>
@@ -43,7 +41,7 @@ bool SavegameData::readingSavegame()
     QFile *saveFile = new QFile(savegameFileName);
     if (!saveFile->open(QFile::ReadOnly))
     {
-        lastStep = "1;/1,OpenFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName);
+        lastStep = "1;/1,OpenFile," + StringParser::convertDrawStringForLog(savegameFileName);
         saveFile->deleteLater();
         delete saveFile;
         return false;
@@ -52,7 +50,7 @@ bool SavegameData::readingSavegame()
     // Reading Savegame Header
     if (!saveFile->isReadable())
     {
-        lastStep = "2;/3,ReadingFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER";
+        lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(savegameFileName) + ",1,NOHEADER";
         saveFile->close();
         saveFile->deleteLater();
         delete saveFile;
@@ -79,7 +77,7 @@ QString SavegameData::getSavegameDataString(const QByteArray &savegameHeader)
     QList<QByteArray> savegameBytesList = savegameBytes.split(char(0x01));
     savegameBytes = savegameBytesList.at(1);
     savegameBytesList.clear();
-    return SnapmaticPicture::parseTitleString(savegameBytes, savegameBytes.length());
+    return StringParser::parseTitleString(savegameBytes, savegameBytes.length());
 }
 
 bool SavegameData::readingSavegameFromFile(const QString &fileName)

SavegameData.h

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

SavegameDialog.cpp

@@ -1,27 +1,8 @@
-/*****************************************************************************
-* 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
-* 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 "SavegameDialog.h"
 #include "ui_SavegameDialog.h"
 #include "SavegameCopy.h"
 #include "AppEnv.h"
 #include <QMessageBox>
-#include <QDebug>
 
 SavegameDialog::SavegameDialog(QWidget *parent) :
     QDialog(parent),
@@ -32,30 +13,16 @@ SavegameDialog::SavegameDialog(QWidget *parent) :
 
     // Setup User Interface
     ui->setupUi(this);
-    ui->cmdClose->setFocus();
     savegameLabStr = ui->labSavegameText->text();
 
-    // 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 Export Button
+    // DPI calculation
-    if (QIcon::hasThemeIcon("document-export"))
+    qreal screenRatio = AppEnv::screenRatio();
-    {
+    resize(400 * screenRatio, 105 * screenRatio);
-        ui->cmdCopy->setIcon(QIcon::fromTheme("document-export"));
-    }
-    else if (QIcon::hasThemeIcon("document-save"))
-    {
-        ui->cmdCopy->setIcon(QIcon::fromTheme("document-save"));
-    }
-
-    refreshWindowSize();
 }
 
 SavegameDialog::~SavegameDialog()
@@ -63,19 +30,6 @@ SavegameDialog::~SavegameDialog()
     delete ui;
 }
 
-void SavegameDialog::refreshWindowSize()
-{
-    // DPI calculation
-    qreal screenRatio = AppEnv::screenRatio();
-    int dpiWindowWidth = 400 * screenRatio;
-    int dpiWindowHeight = 105 * screenRatio;
-    if (dpiWindowHeight < heightForWidth(dpiWindowWidth))
-    {
-        dpiWindowHeight = heightForWidth(dpiWindowWidth);
-    }
-    resize(dpiWindowWidth, dpiWindowHeight);
-}
-
 void SavegameDialog::setSavegameData(SavegameData *savegame, QString savegamePath, bool readOk)
 {
     // Showing error if reading error
@@ -86,7 +40,6 @@ void SavegameDialog::setSavegameData(SavegameData *savegame, QString savegamePat
     }
     sgdPath = savegamePath;
     ui->labSavegameText->setText(savegameLabStr.arg(savegame->getSavegameStr()));
-    refreshWindowSize();
 }
 
 void SavegameDialog::on_cmdClose_clicked()

SavegameDialog.h

@@ -1,21 +1,3 @@
-/*****************************************************************************
-* 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
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*****************************************************************************/
-
 #ifndef SAVEGAMEDIALOG_H
 #define SAVEGAMEDIALOG_H
 
@@ -37,7 +19,6 @@ public:
 private slots:
     void on_cmdClose_clicked();
     void on_cmdCopy_clicked();
-    void refreshWindowSize();
 
 private:
     Ui::SavegameDialog *ui;

SavegameDialog.ui

@@ -19,6 +19,12 @@
   <layout class="QVBoxLayout" name="vlSavegameDialog">
    <item>
     <widget class="QLabel" name="labSavegameText">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>&lt;span style=&quot; font-weight:600;&quot;&gt;Savegame&lt;/span&gt;&lt;br&gt;&lt;br&gt;%1</string>
      </property>
@@ -30,19 +36,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <spacer name="vsSavegame">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="hlButtons">
      <item>

SavegameWidget.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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 "SavegameData.h"
 #include "SavegameCopy.h"
 #include "AppEnv.h"
-#include "config.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QSettings>
@@ -38,13 +37,6 @@
 #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)
@@ -58,20 +50,25 @@ SavegameWidget::SavegameWidget(QWidget *parent) :
     qreal screenRatio = AppEnv::screenRatio();
     ui->labSavegamePic->setFixedSize(48 * screenRatio, 27 * screenRatio);
 
-    ui->labSavegamePic->setScaledContents(true);
+    QPixmap savegamePixmap(":/img/savegame.png");
-    ui->labSavegamePic->setPixmap(QPixmap(":/img/savegame.svgz"));
+    if (screenRatio != 1) savegamePixmap = savegamePixmap.scaledToHeight(ui->labSavegamePic->height(), Qt::SmoothTransformation);
+    ui->labSavegamePic->setPixmap(savegamePixmap);
 
     QString exportSavegameStr = tr("Export Savegame...");
     Q_UNUSED(exportSavegameStr)
 
+    QPalette palette;
+    highlightBackColor = palette.highlight().color();
+    highlightTextColor = palette.highlightedText().color();
+
     labelAutosaveStr = tr("AUTOSAVE - %1\n%2");
     labelSaveStr = tr("SAVE %3 - %1\n%2");
+    snwgt = parent;
+    sgdPath = "";
+    sgdStr = "";
+    sgdata = 0;
 
-    ui->SavegameFrame->setMouseTracking(true);
+    installEventFilter(this);
-    ui->labSavegamePic->setMouseTracking(true);
-    ui->labSavegameStr->setMouseTracking(true);
-    ui->cbSelected->setMouseTracking(true);
-    sgdata = nullptr;
 }
 
 SavegameWidget::~SavegameWidget()
@@ -79,22 +76,32 @@ SavegameWidget::~SavegameWidget()
     delete ui;
 }
 
+bool SavegameWidget::eventFilter(QObject *obj, QEvent *ev)
+{
+    if (obj == this)
+    {
+        if (ev->type() == QEvent::Enter)
+        {
+            setStyleSheet(QString("QFrame#SavegameFrame{background-color: rgb(%1, %2, %3)}QLabel#labSavegameStr{color: rgb(%4, %5, %6)}").arg(QString::number(highlightBackColor.red()), QString::number(highlightBackColor.green()), QString::number(highlightBackColor.blue()), QString::number(highlightTextColor.red()), QString::number(highlightTextColor.green()), QString::number(highlightTextColor.blue())));
+            return true;
+        }
+        else if(ev->type() == QEvent::Leave)
+        {
+            setStyleSheet("");
+            return true;
+        }
+    }
+    return false;
+}
+
 void SavegameWidget::setSavegameData(SavegameData *savegame, QString savegamePath)
 {
     // BETA CODE
-    QString savegameString = savegame->getSavegameStr();
-    QString fileName = QFileInfo(savegame->getSavegameFileName()).fileName();
-    renderString(savegameString, fileName);
-    sgdStr = savegameString;
-    sgdPath = savegamePath;
-    sgdata = savegame;
-}
-
-void SavegameWidget::renderString(const QString &savegameString, const QString &fileName)
-{
     bool validNumber;
     QString savegameName = tr("WRONG FORMAT");
     QString savegameDate = tr("WRONG FORMAT");
+    QString savegameString = savegame->getSavegameStr();
+    QString fileName = QFileInfo(savegame->getSavegameFileName()).fileName();
     QStringList savegameNDL = QString(savegameString).split(" - ");
     if (savegameNDL.length() >= 2)
     {
@@ -117,15 +124,9 @@ void SavegameWidget::renderString(const QString &savegameString, const QString &
     {
         ui->labSavegameStr->setText(labelSaveStr.arg(savegameDate, savegameName, tr("UNKNOWN")));
     }
-}
+    sgdStr = savegameString;
-
+    sgdPath = savegamePath;
-void SavegameWidget::retranslate()
+    sgdata = savegame;
-{
-    labelAutosaveStr = tr("AUTOSAVE - %1\n%2");
-    labelSaveStr = tr("SAVE %3 - %1\n%2");
-
-    QString fileName = QFileInfo(sgdata->getSavegameFileName()).fileName();
-    renderString(sgdStr, fileName);
 }
 
 void SavegameWidget::on_cmdCopy_clicked()
@@ -135,52 +136,20 @@ void SavegameWidget::on_cmdCopy_clicked()
 
 void SavegameWidget::on_cmdDelete_clicked()
 {
-    int uchoice = QMessageBox::question(this, tr("Delete Savegame"), tr("Are you sure to delete %1 from your savegames?").arg("\""+sgdStr+"\""), QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
+    int uchoice = QMessageBox::question(this, tr("Delete savegame"), tr("Are you sure to delete %1 from your savegames?").arg("\""+sgdStr+"\""), QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
     if (uchoice == QMessageBox::Yes)
     {
         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
         {
-            QMessageBox::warning(this, tr("Delete Savegame"), tr("Failed at deleting %1 from your savegames").arg("\""+sgdStr+"\""));
+            QMessageBox::warning(this, tr("Delete savegame"), tr("Failed at deleting %1 from your savegames").arg("\""+sgdStr+"\""));
         }
     }
 }
@@ -218,21 +187,10 @@ void SavegameWidget::mouseReleaseEvent(QMouseEvent *ev)
     else
     {
         if (getContentMode() == 0 && rect().contains(ev->pos()) && ev->button() == Qt::LeftButton)
-        {
-            if (ev->modifiers().testFlag(Qt::ShiftModifier))
-            {
-                ui->cbSelected->setChecked(!ui->cbSelected->isChecked());
-            }
-            else
         {
             on_cmdView_clicked();
         }
     }
-        else if (!ui->cbSelected->isVisible() && getContentMode() == 1 && ev->button() == Qt::LeftButton && ev->modifiers().testFlag(Qt::ShiftModifier))
-        {
-            ui->cbSelected->setChecked(!ui->cbSelected->isChecked());
-        }
-    }
 }
 
 void SavegameWidget::mouseDoubleClickEvent(QMouseEvent *ev)

SavegameWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -41,7 +41,6 @@ public:
     SavegameData* getSavegame();
     QString getWidgetType();
     bool isSelected();
-    void retranslate();
     ~SavegameWidget();
 
 private slots:
@@ -54,6 +53,7 @@ private slots:
     void deselectAllWidgets();
 
 protected:
+    bool eventFilter(QObject *obj, QEvent *ev);
     void mouseDoubleClickEvent(QMouseEvent *ev);
     void mouseReleaseEvent(QMouseEvent *ev);
     void mousePressEvent(QMouseEvent *ev);
@@ -62,11 +62,13 @@ protected:
 private:
     Ui::SavegameWidget *ui;
     SavegameData *sgdata;
+    QColor highlightBackColor;
+    QColor highlightTextColor;
     QString labelAutosaveStr;
     QString labelSaveStr;
     QString sgdPath;
     QString sgdStr;
-    void renderString(const QString &savegameString, const QString &fileName);
+    QWidget *snwgt;
 
 signals:
     void savegameDeleted();

SidebarGenerator.cpp

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -35,26 +35,26 @@ QList<QUrl> SidebarGenerator::generateSidebarUrls(QList<QUrl> sidebarUrls)
     dir.setPath(StandardPaths::picturesLocation());
     if (dir.exists())
     {
-        sidebarUrls += QUrl::fromLocalFile(dir.absolutePath());
+        sidebarUrls << QUrl::fromLocalFile(dir.absolutePath());
     }
 
     dir.setPath(StandardPaths::documentsLocation());
     if (dir.exists())
     {
-        sidebarUrls += QUrl::fromLocalFile(dir.absolutePath());
+        sidebarUrls << QUrl::fromLocalFile(dir.absolutePath());
     }
 
     bool gameFolderExists;
     QString gameFolder = AppEnv::getGameFolder(&gameFolderExists);
     if (gameFolderExists)
     {
-        sidebarUrls += QUrl::fromLocalFile(gameFolder);
+        sidebarUrls << QUrl::fromLocalFile(gameFolder);
     }
 
     dir.setPath(StandardPaths::desktopLocation());
     if (dir.exists())
     {
-        sidebarUrls += QUrl::fromLocalFile(dir.absolutePath());
+        sidebarUrls << QUrl::fromLocalFile(dir.absolutePath());
     }
 
     return sidebarUrls;

SidebarGenerator.h

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

SnapmaticEditor.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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
@@ -19,11 +19,8 @@
 #include "SnapmaticEditor.h"
 #include "ui_SnapmaticEditor.h"
 #include "SnapmaticPicture.h"
-#include "PlayerListDialog.h"
 #include "StringParser.h"
 #include "AppEnv.h"
-#include "config.h"
-#include <QStringListIterator>
 #include <QStringBuilder>
 #include <QTextDocument>
 #include <QInputDialog>
@@ -31,63 +28,28 @@
 #include <QDebug>
 #include <QFile>
 
-#ifdef GTA5SYNC_TELEMETRY
+SnapmaticEditor::SnapmaticEditor(CrewDatabase *crewDB, QWidget *parent) :
-#include "TelemetryClass.h"
+    QDialog(parent), crewDB(crewDB),
-#include <QJsonDocument>
-#include <QJsonObject>
-#endif
-
-SnapmaticEditor::SnapmaticEditor(CrewDatabase *crewDB, ProfileDatabase *profileDB, QWidget *parent) :
-    QDialog(parent), crewDB(crewDB), profileDB(profileDB),
     ui(new Ui::SnapmaticEditor)
 {
-    // Set Window Flags
-    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);
-
     ui->setupUi(this);
-    ui->cmdCancel->setDefault(true);
+    ui->cmdApply->setDefault(true);
-    ui->cmdCancel->setFocus();
 
-    // Set Icon for Apply Button
+    if (QIcon::hasThemeIcon("dialog-apply"))
-    if (QIcon::hasThemeIcon("dialog-ok-apply"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok-apply"));
-    }
-    else if (QIcon::hasThemeIcon("dialog-apply"))
     {
         ui->cmdApply->setIcon(QIcon::fromTheme("dialog-apply"));
     }
-    else if (QIcon::hasThemeIcon("gtk-apply"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("gtk-apply"));
-    }
-    else if (QIcon::hasThemeIcon("dialog-ok"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
-    }
-    else if (QIcon::hasThemeIcon("gtk-ok"))
-    {
-        ui->cmdApply->setIcon(QIcon::fromTheme("dialog-ok"));
-    }
-
-    // Set Icon for Cancel Button
     if (QIcon::hasThemeIcon("dialog-cancel"))
     {
         ui->cmdCancel->setIcon(QIcon::fromTheme("dialog-cancel"));
     }
-    else if (QIcon::hasThemeIcon("gtk-cancel"))
-    {
-        ui->cmdCancel->setIcon(QIcon::fromTheme("gtk-cancel"));
-    }
 
-    snapmaticTitle = QString();
+    snapmaticTitle = "";
     smpic = 0;
 
-#ifndef Q_OS_ANDROID
     // DPI calculation
     qreal screenRatio = AppEnv::screenRatio();
     resize(400 * screenRatio, 360 * screenRatio);
-#endif
 }
 
 SnapmaticEditor::~SnapmaticEditor()
@@ -181,15 +143,14 @@ void SnapmaticEditor::on_rbCustom_toggled(bool checked)
 void SnapmaticEditor::setSnapmaticPicture(SnapmaticPicture *picture)
 {
     smpic = picture;
-    snapmaticProperties = smpic->getSnapmaticProperties();
+    localSpJson = smpic->getSnapmaticProperties();
     ui->rbCustom->setChecked(true);
-    crewID = snapmaticProperties.crewID;
+    crewID = localSpJson.crewID;
-    isSelfie = snapmaticProperties.isSelfie;
+    isSelfie = localSpJson.isSelfie;
-    isMugshot = snapmaticProperties.isMug;
+    isMugshot = localSpJson.isMug;
-    isEditor = snapmaticProperties.isFromRSEditor;
+    isEditor = localSpJson.isFromRSEditor;
-    playersList = snapmaticProperties.playersList;
+    ui->cbDirector->setChecked(localSpJson.isFromDirector);
-    ui->cbDirector->setChecked(snapmaticProperties.isFromDirector);
+    ui->cbMeme->setChecked(localSpJson.isMeme);
-    ui->cbMeme->setChecked(snapmaticProperties.isMeme);
     if (isSelfie)
     {
         ui->rbSelfie->setChecked(true);
@@ -208,49 +169,6 @@ void SnapmaticEditor::setSnapmaticPicture(SnapmaticPicture *picture)
     }
     setSnapmaticCrew(returnCrewName(crewID));
     setSnapmaticTitle(picture->getPictureTitle());
-    setSnapmaticPlayers(insertPlayerNames(playersList));
-}
-
-void SnapmaticEditor::insertPlayerNames(QStringList *players)
-{
-    for (int i = 0; i < players->size(); ++i)
-    {
-        players->replace(i, profileDB->getPlayerName(players->at(i)));
-    }
-}
-
-QStringList SnapmaticEditor::insertPlayerNames(const QStringList &players)
-{
-    QStringList playersWI = players;
-    insertPlayerNames(&playersWI);
-    return playersWI;
-}
-
-void SnapmaticEditor::setSnapmaticPlayers(const QStringList &players)
-{
-    QString editStr = QString("<a href=\"g5e://editplayers\" style=\"text-decoration: none;\">%1</a>").arg(tr("Edit"));
-    QString playersStr;
-    if (players.length() != 1)
-    {
-        playersStr = tr("Players: %1 (%2)", "Multiple Player are inserted here");
-    }
-    else
-    {
-        playersStr = tr("Player: %1 (%2)", "One Player is inserted here");
-    }
-    if (players.length() != 0)
-    {
-        ui->labPlayers->setText(playersStr.arg(players.join(", "), editStr));
-    }
-    else
-    {
-        ui->labPlayers->setText(playersStr.arg(QApplication::translate("PictureDialog", "No Players"), editStr));
-    }
-#ifndef Q_OS_ANDROID
-    ui->gbValues->resize(ui->gbValues->width(), ui->gbValues->heightForWidth(ui->gbValues->width()));
-    ui->frameWidget->resize(ui->gbValues->width(), ui->frameWidget->heightForWidth(ui->frameWidget->width()));
-    if (heightForWidth(width()) > height()) { resize(width(), heightForWidth(width())); }
-#endif
 }
 
 void SnapmaticEditor::setSnapmaticTitle(const QString &title)
@@ -268,17 +186,12 @@ 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</span>").arg(tr("Yes", "Yes, should work fine"))));
+        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: green\">%1</a>").arg(tr("Yes", "Yes, should work fine"))));
     }
     else
     {
-        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: red\">%1</span>").arg(tr("No", "No, could lead to issues"))));
+        ui->labAppropriate->setText(tr("Appropriate: %1").arg(QString("<span style=\"color: red\">%1</a>").arg(tr("No", "No, could lead to issues"))));
     }
-#ifndef Q_OS_ANDROID
-    ui->gbValues->resize(ui->gbValues->width(), ui->gbValues->heightForWidth(ui->gbValues->width()));
-    ui->frameWidget->resize(ui->gbValues->width(), ui->frameWidget->heightForWidth(ui->frameWidget->width()));
-    if (heightForWidth(width()) > height()) { resize(width(), heightForWidth(width())); }
-#endif
 }
 
 void SnapmaticEditor::setSnapmaticCrew(const QString &crew)
@@ -286,11 +199,6 @@ void SnapmaticEditor::setSnapmaticCrew(const QString &crew)
     QString editStr = QString("<a href=\"g5e://editcrew\" style=\"text-decoration: none;\">%1</a>").arg(tr("Edit"));
     QString crewStr = tr("Crew: %1 (%2)").arg(StringParser::escapeString(crew), editStr);
     ui->labCrew->setText(crewStr);
-#ifndef Q_OS_ANDROID
-    ui->gbValues->resize(ui->gbValues->width(), ui->gbValues->heightForWidth(ui->gbValues->width()));
-    ui->frameWidget->resize(ui->gbValues->width(), ui->frameWidget->heightForWidth(ui->frameWidget->width()));
-    if (heightForWidth(width()) > height()) { resize(width(), heightForWidth(width())); }
-#endif
 }
 
 QString SnapmaticEditor::returnCrewName(int crewID_)
@@ -309,27 +217,30 @@ void SnapmaticEditor::on_cmdApply_clicked()
     {
         qualifyAvatar();
     }
-    snapmaticProperties.crewID = crewID;
+    localSpJson.crewID = crewID;
-    snapmaticProperties.isSelfie = isSelfie;
+    localSpJson.isSelfie = isSelfie;
-    snapmaticProperties.isMug = isMugshot;
+    localSpJson.isMug = isMugshot;
-    snapmaticProperties.isFromRSEditor = isEditor;
+    localSpJson.isFromRSEditor = isEditor;
-    snapmaticProperties.isFromDirector = ui->cbDirector->isChecked();
+    localSpJson.isFromDirector = ui->cbDirector->isChecked();
-    snapmaticProperties.isMeme = ui->cbMeme->isChecked();
+    localSpJson.isMeme = ui->cbMeme->isChecked();
-    snapmaticProperties.playersList = playersList;
     if (smpic)
     {
-        QString currentFilePath = smpic->getPictureFilePath();
+        QString originalFileName = smpic->getPictureFilePath();
-        QString originalFilePath = smpic->getOriginalPictureFilePath();
+        QString adjustedFileName = originalFileName;
-        QString backupFileName = originalFilePath % ".bak";
+        if (adjustedFileName.right(7) == ".hidden") // for the hidden file system
+        {
+            adjustedFileName.remove(adjustedFileName.length() - 7, 7);
+        }
+        QString backupFileName = adjustedFileName % ".bak";
         if (!QFile::exists(backupFileName))
         {
-            QFile::copy(currentFilePath, backupFileName);
+            QFile::copy(adjustedFileName, backupFileName);
         }
         SnapmaticProperties fallbackProperties = smpic->getSnapmaticProperties();
         QString fallbackTitle = smpic->getPictureTitle();
-        smpic->setSnapmaticProperties(snapmaticProperties);
+        smpic->setSnapmaticProperties(localSpJson);
         smpic->setPictureTitle(snapmaticTitle);
-        if (!smpic->exportPicture(currentFilePath))
+        if (!smpic->exportPicture(originalFileName))
         {
             QMessageBox::warning(this, tr("Snapmatic Properties"), tr("Patching of Snapmatic Properties failed because of I/O Error"));
             smpic->setSnapmaticProperties(fallbackProperties);
@@ -337,24 +248,7 @@ 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();
@@ -393,19 +287,6 @@ void SnapmaticEditor::on_cbQualify_toggled(bool checked)
     }
 }
 
-void SnapmaticEditor::on_labPlayers_linkActivated(const QString &link)
-{
-    if (link == "g5e://editplayers")
-    {
-        PlayerListDialog *playerListDialog = new PlayerListDialog(playersList, profileDB, this);
-        connect(playerListDialog, SIGNAL(playerListUpdated(QStringList)), this, SLOT(playerListUpdated(QStringList)));
-        playerListDialog->setModal(true);
-        playerListDialog->show();
-        playerListDialog->exec();
-        delete playerListDialog;
-    }
-}
-
 void SnapmaticEditor::on_labTitle_linkActivated(const QString &link)
 {
     if (link == "g5e://edittitle")
@@ -429,12 +310,12 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
         QStringList crewList = crewDB->getCrews();
         if (!crewList.contains(QLatin1String("0")))
         {
-            crewList += QLatin1String("0");
+            crewList.append(QLatin1String("0"));
         }
         crewList.sort();
-        for (QString crew : crewList)
+        foreach(const QString &crew, crewList)
         {
-            itemList += QString("%1 (%2)").arg(crew, returnCrewName(crew.toInt()));
+            itemList.append(QString("%1 (%2)").arg(crew, returnCrewName(crew.toInt())));
         }
         if (crewList.contains(QString::number(crewID)))
         {
@@ -445,25 +326,15 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
         {
             if (newCrew.contains(" ")) newCrew = newCrew.split(" ").at(0);
             if (newCrew.length() > 10) return;
-            for (QChar crewChar : newCrew)
+            foreach (const QChar &crewChar, newCrew)
             {
                 if (!crewChar.isNumber())
                 {
                     return;
                 }
             }
-            if (!crewList.contains(newCrew))
-            {
-                crewDB->addCrew(crewID);
-            }
             crewID = newCrew.toInt();
             setSnapmaticCrew(returnCrewName(crewID));
         }
     }
 }
-
-void SnapmaticEditor::playerListUpdated(QStringList playerList)
-{
-    playersList = playerList;
-    setSnapmaticPlayers(insertPlayerNames(playerList));
-}

SnapmaticEditor.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include <QDialog>
 #include "CrewDatabase.h"
-#include "ProfileDatabase.h"
 #include "SnapmaticPicture.h"
 
 namespace Ui {
@@ -33,9 +32,8 @@ class SnapmaticEditor : public QDialog
     Q_OBJECT
 
 public:
-    explicit SnapmaticEditor(CrewDatabase *crewDB, ProfileDatabase *profileDB, QWidget *parent = 0);
+    explicit SnapmaticEditor(CrewDatabase *crewDB, QWidget *parent = 0);
     void setSnapmaticPicture(SnapmaticPicture *picture);
-    void setSnapmaticPlayers(const QStringList &players);
     void setSnapmaticTitle(const QString &title);
     void setSnapmaticCrew(const QString &crew = "");
     QString returnCrewName(int crewID);
@@ -49,18 +47,14 @@ private slots:
     void on_cmdCancel_clicked();
     void on_cmdApply_clicked();
     void on_cbQualify_toggled(bool checked);
-    void on_labPlayers_linkActivated(const QString &link);
     void on_labTitle_linkActivated(const QString &link);
     void on_labCrew_linkActivated(const QString &link);
-    void playerListUpdated(QStringList playerList);
 
 private:
     CrewDatabase *crewDB;
-    ProfileDatabase *profileDB;
     Ui::SnapmaticEditor *ui;
-    SnapmaticProperties snapmaticProperties;
+    SnapmaticProperties localSpJson;
     SnapmaticPicture *smpic;
-    QStringList playersList;
     QString snapmaticTitle;
     int crewID;
     bool isSelfie;
@@ -70,8 +64,6 @@ private:
     void mugshot_toggled(bool checked);
     void editor_toggled(bool checked);
     void qualifyAvatar();
-    void insertPlayerNames(QStringList *players);
-    QStringList insertPlayerNames(const QStringList &players);
 };
 
 #endif // SNAPMATICEDITOR_H

SnapmaticEditor.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>381</height>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -104,36 +104,17 @@
          <string>Snapmatic Values</string>
         </property>
         <layout class="QVBoxLayout" name="vlTitle">
-         <item>
-          <widget class="UiModLabel" name="labPlayers">
-           <property name="contextMenuPolicy">
-            <enum>Qt::NoContextMenu</enum>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="UiModLabel" name="labCrew">
            <property name="contextMenuPolicy">
             <enum>Qt::NoContextMenu</enum>
            </property>
            <property name="text">
-            <string/>
+            <string>Crew: %1 (%2)</string>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-           </property>
           </widget>
          </item>
          <item>
@@ -142,20 +123,17 @@
             <enum>Qt::NoContextMenu</enum>
            </property>
            <property name="text">
-            <string/>
+            <string>Title: %1 (%2)</string>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
-           </property>
           </widget>
          </item>
          <item>
           <widget class="UiModLabel" name="labAppropriate">
            <property name="text">
-            <string/>
+            <string>Appropriate: %1</string>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
@@ -236,9 +214,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip">
-        <string>Apply changes</string>
-       </property>
        <property name="text">
         <string>&amp;Apply</string>
        </property>
@@ -252,9 +227,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip">
-        <string>Discard changes</string>
-       </property>
        <property name="text">
         <string>&amp;Cancel</string>
        </property>

SnapmaticPicture.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5spv Grand Theft Auto Snapmatic Picture Viewer
+* gta5sync-spv Grand Theft Auto Snapmatic Picture Viewer
-* Copyright (C) 2016-2018 Syping
+* Copyright (C) 2016-2017 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
@@ -26,8 +26,6 @@
 #include <QImage>
 #include <QFile>
 
-enum class SnapmaticFormat : int { Auto_Format = 0, PGTA_Format = 1, JPEG_Format = 2, G5E_Format = 3 };
-
 struct SnapmaticProperties {
     struct SnapmaticLocation {
         QString area;
@@ -37,7 +35,6 @@ struct SnapmaticProperties {
     };
     int uid;
     int crewID;
-    int streetID;
     QStringList playersList;
     uint createdTimestamp;
     QDateTime createdDateTime;
@@ -59,11 +56,10 @@ public:
     bool preloadFile();
     bool readingPictureFromFile(const QString &fileName, bool writeEnabled = true, bool cacheEnabled = false, bool fastLoad = true, bool lowRamMode = false);
     bool readingPicture(bool writeEnabled = true, bool cacheEnabled = false, bool fastLoad = true, bool lowRamMode = false);
-    bool isPicOk(); // Please use isPictureOk instead
+    bool isPicOk();
     void clearCache();
-    QImage getImage(bool fastLoad = false);
+    QImage getImage();
-    QByteArray getPictureStream();
+    QString getLastStep();
-    QString getLastStep(bool readable = true);
     QString getPictureStr();
     QString getPictureHead();
     QString getPictureTitl();
@@ -72,73 +68,42 @@ public:
     QString getPictureFileName();
     QString getPictureFilePath();
     QString getExportPictureFileName();
-    QString getOriginalPictureFileName();
-    QString getOriginalPictureFilePath();
     int getContentMaxLength();
     bool setImage(const QImage &picture);
-    bool setPictureTitl(const QString &newTitle); // Please use setPictureTitle instead
+    bool setPictureTitl(const QString &newTitle);
-    bool setPictureStream(const QByteArray &streamArray);
+    bool setPictureStream(const QByteArray &picByteArray);
     void updateStrings();
     void emitUpdate();
-    void emitCustomSignal(const QString &signal);
 
     // FILE MANAGEMENT
-    bool exportPicture(const QString &fileName, SnapmaticFormat format = SnapmaticFormat::Auto_Format);
+    bool exportPicture(const QString &fileName, const QString format = "PGTA");
-    void setPicFileName(const QString &picFileName); // Please use setPictureFileName instead
+    void setPicFileName(const QString &picFileName);
-    void setPicFilePath(const QString &picFilePath); // Please use setPictureFilePath instead
+    void setPicFilePath(const QString &picFilePath);
-    bool deletePicFile(); // Please use deletePictureFile instead
+    bool deletePicFile();
 
-    // JSON
+    // ALTERNATIVES
-    bool isJsonOk();
-    QString getJsonStr(); // Please use getPictureJson instead
-    SnapmaticProperties getSnapmaticProperties();
-    bool setSnapmaticProperties(SnapmaticProperties properties);
-    bool setJsonStr(const QString &jsonStr, bool updateProperties = false); // Please use setPictureJson instead
-
-    // VISIBILITY
-    bool isHidden(); // Please use isPictureHidden instead
-    bool isVisible(); // Please use isPictureVisible instead
-    bool setPictureHidden();
-    bool setPictureVisible();
-
-    // ALTERNATIVES (MORE DEVELOPER FRIENDLY FUNCTION CALLS)
-    QString getJsonString() { return getJsonStr(); } // Please use getPictureJson instead
-    QString getPictureJson() { return getJsonStr(); }
     QString getPictureTitle() { return getPictureTitl(); }
     QString getPictureString() { return getPictureStr(); }
     QString getPictureDescription() { return getPictureDesc(); }
-    bool setJsonString(const QString &jsonString, bool updateProperties = false) { return setJsonStr(jsonString, updateProperties); } // Please use setPictureJson instead
+    bool setPictureTitle(const QString &newTitle) { return setPictureTitl(newTitle); }
-    bool setPictureJson(const QString &json, bool updateProperties = false) { return setJsonStr(json, updateProperties); }
+
-    bool setPictureTitle(const QString &title) { return setPictureTitl(title); }
+    // JSON
-    void setPictureFileName(const QString &fileName) { return setPicFileName(fileName); }
+    bool isJsonOk();
-    void setPictureFilePath(const QString &filePath) { return setPicFilePath(filePath); }
+    QString getJsonStr();
-    bool deletePictureFile() { return deletePicFile(); }
+    SnapmaticProperties getSnapmaticProperties();
-    bool isPictureOk() { return isPicOk(); }
+    bool setSnapmaticProperties(SnapmaticProperties newSpJson);
-    bool isPictureHidden() { return isHidden(); }
+
-    bool isPictureVisible() { return isVisible(); }
+    // VISIBILITY
-    bool setHidden() { return setPictureHidden(); } // Please use setPictureHidden instead
+    bool isHidden();
-    bool setVisible() { return setPictureVisible(); } // Please use setPictureVisible instead
+    bool setPictureHidden();
+    bool setPictureVisible();
 
     // PREDEFINED PROPERTIES
     QSize getSnapmaticResolution();
 
-    // SNAPMATIC DEFAULTS
-    bool isSnapmaticDefaultsEnforced();
-    void setSnapmaticDefaultsEnforced(bool enforced);
-
-    // SNAPMATIC FORMAT
-    SnapmaticFormat getSnapmaticFormat();
-    void setSnapmaticFormat(SnapmaticFormat format);
-    bool isFormatSwitched();
-
     // VERIFY CONTENT
     static bool verifyTitle(const QString &title);
 
-    // STRING OPERATIONS
-    static QString parseTitleString(const QByteArray &commitBytes, int maxLength);
-    static QString convertDrawStringForLog(const QString &inputStr);
-    static QString convertLogStringForDraw(const QString &inputStr);
-
 private:
     QString getSnapmaticHeaderString(const QByteArray &snapmaticHeader);
     QString getSnapmaticJSONString(const QByteArray &jsonBytes);
@@ -159,9 +124,6 @@ private:
     bool cacheEnabled;
     bool isLoadedInRAM;
     bool isCustomFormat;
-    bool isFormatSwitch;
-    bool isModernFormat;
-    bool careSnapDefault;
     int jpegRawContentSize;
     int jpegRawContentSizeE;
 
@@ -172,13 +134,12 @@ private:
     void parseJsonContent();
     bool jsonOk;
     QString jsonStr;
-    SnapmaticProperties localProperties;
+    SnapmaticProperties localSpJson;
 
     // VERIFY CONTENT
     static bool verifyTitleChar(const QChar &titleChar);
 
 signals:
-    void customSignal(QString signal);
     void preloaded();
     void updated();
     void loaded();

SnapmaticWidget.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
-* Copyright (C) 2016-2019 Syping
+* Copyright (C) 2016-2017 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
@@ -18,19 +18,14 @@
 
 #include "SnapmaticWidget.h"
 #include "ui_SnapmaticWidget.h"
-#include "ImageEditorDialog.h"
-#include "MapLocationDialog.h"
-#include "JsonEditorDialog.h"
 #include "SnapmaticPicture.h"
 #include "SnapmaticEditor.h"
 #include "DatabaseThread.h"
 #include "PictureDialog.h"
 #include "PictureExport.h"
 #include "StringParser.h"
-#include "ImportDialog.h"
 #include "AppEnv.h"
 #include "config.h"
-#include <QStringBuilder>
 #include <QMessageBox>
 #include <QPixmap>
 #include <QTimer>
@@ -38,14 +33,8 @@
 #include <QMenu>
 #include <QFile>
 
-#ifdef GTA5SYNC_TELEMETRY
+SnapmaticWidget::SnapmaticWidget(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent) :
-#include "TelemetryClass.h"
+    ProfileWidget(parent), profileDB(profileDB), crewDB(crewDB), threadDB(threadDB),
-#include <QJsonDocument>
-#include <QJsonObject>
-#endif
-
-SnapmaticWidget::SnapmaticWidget(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QString profileName, QWidget *parent) :
-    ProfileWidget(parent), profileDB(profileDB), crewDB(crewDB), threadDB(threadDB), profileName(profileName),
     ui(new Ui::SnapmaticWidget)
 {
     ui->setupUi(this);
@@ -56,14 +45,16 @@ SnapmaticWidget::SnapmaticWidget(ProfileDatabase *profileDB, CrewDatabase *crewD
     ui->cbSelected->setVisible(false);
 
     QPalette palette;
+    highlightBackColor = palette.highlight().color();
+    highlightTextColor = palette.highlightedText().color();
     palette.setCurrentColorGroup(QPalette::Disabled);
     highlightHiddenColor = palette.text().color();
 
-    ui->SnapmaticFrame->setMouseTracking(true);
+    picPath = "";
-    ui->labPicture->setMouseTracking(true);
+    picStr = "";
-    ui->labPicStr->setMouseTracking(true);
+    smpic = 0;
-    ui->cbSelected->setMouseTracking(true);
+
-    smpic = nullptr;
+    installEventFilter(this);
 }
 
 SnapmaticWidget::~SnapmaticWidget()
@@ -71,24 +62,37 @@ SnapmaticWidget::~SnapmaticWidget()
     delete ui;
 }
 
+bool SnapmaticWidget::eventFilter(QObject *obj, QEvent *ev)
+{
+    if (obj == this)
+    {
+        if (ev->type() == QEvent::Enter)
+        {
+            setStyleSheet(QString("QFrame#SnapmaticFrame{background-color: rgb(%1, %2, %3)}QLabel#labPicStr{color: rgb(%4, %5, %6)}").arg(QString::number(highlightBackColor.red()), QString::number(highlightBackColor.green()), QString::number(highlightBackColor.blue()), QString::number(highlightTextColor.red()), QString::number(highlightTextColor.green()), QString::number(highlightTextColor.blue())));
+            return true;
+        }
+        else if(ev->type() == QEvent::Leave)
+        {
+            setStyleSheet("");
+            return true;
+        }
+    }
+    return false;
+}
+
 void SnapmaticWidget::setSnapmaticPicture(SnapmaticPicture *picture)
 {
     smpic = picture;
+    picPath = picture->getPictureFilePath();
+    picTitl = picture->getPictureTitl();
+    picStr = picture->getPictureStr();
     QObject::connect(picture, SIGNAL(updated()), this, SLOT(snapmaticUpdated()));
-    QObject::connect(picture, SIGNAL(customSignal(QString)), this, SLOT(customSignal(QString)));
 
     qreal screenRatio = AppEnv::screenRatio();
-    qreal screenRatioPR = AppEnv::screenRatioPR();
     ui->labPicture->setFixedSize(48 * screenRatio, 27 * screenRatio);
 
-    ui->labPicture->setScaledContents(true);
+    QPixmap SnapmaticPixmap = QPixmap::fromImage(picture->getImage().scaled(ui->labPicture->width(), ui->labPicture->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::AutoColor);
-
+    ui->labPicStr->setText(picStr + "\n" + picTitl + "");
-    QPixmap SnapmaticPixmap = QPixmap::fromImage(picture->getImage().scaled(ui->labPicture->width() * screenRatioPR, ui->labPicture->height() * screenRatioPR, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::AutoColor);
-#if QT_VERSION >= 0x050600
-    SnapmaticPixmap.setDevicePixelRatio(screenRatioPR);
-#endif
-
-    ui->labPicStr->setText(smpic->getPictureStr() % "\n" % smpic->getPictureTitl());
     ui->labPicture->setPixmap(SnapmaticPixmap);
 
     picture->clearCache();
@@ -98,37 +102,25 @@ void SnapmaticWidget::setSnapmaticPicture(SnapmaticPicture *picture)
 
 void SnapmaticWidget::snapmaticUpdated()
 {
-    ui->labPicStr->setText(smpic->getPictureStr() % "\n" % smpic->getPictureTitl());
+    // Current only strings get updated
-}
+    picPath = smpic->getPictureFilePath();
-
+    picTitl = smpic->getPictureTitl();
-void SnapmaticWidget::customSignal(QString signal)
+    picStr = smpic->getPictureStr();
-{
+    ui->labPicStr->setText(picStr + "\n" + picTitl + "");
-    if (signal == "PictureUpdated")
-    {
-        QPixmap SnapmaticPixmap = QPixmap::fromImage(smpic->getImage().scaled(ui->labPicture->width(), ui->labPicture->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::AutoColor);
-        ui->labPicture->setPixmap(SnapmaticPixmap);
-    }
-}
-
-void SnapmaticWidget::retranslate()
-{
-    smpic->updateStrings();
-    ui->labPicStr->setText(smpic->getPictureStr() % "\n" % smpic->getPictureTitl());
 }
 
 void SnapmaticWidget::on_cmdView_clicked()
 {
     QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
     settings.beginGroup("Interface");
-    bool navigationBar = settings.value("NavigationBar", true).toBool();
+    bool navigationBar = settings.value("NavigationBar", false).toBool();
     settings.endGroup();
 
-    PictureDialog *picDialog = new PictureDialog(profileDB, crewDB, profileName, this);
+    PictureDialog *picDialog = new PictureDialog(profileDB, crewDB, this);
     picDialog->setSnapmaticPicture(smpic, true);
     picDialog->setModal(true);
 
-    // be ready for crewName and playerName updated
+    // be ready for playerName updated
-    QObject::connect(threadDB, SIGNAL(crewNameUpdated()), picDialog, SLOT(crewNameUpdated()));
     QObject::connect(threadDB, SIGNAL(playerNameUpdated()), picDialog, SLOT(playerNameUpdated()));
     QObject::connect(picDialog, SIGNAL(nextPictureRequested()), this, SLOT(dialogNextPictureRequested()));
     QObject::connect(picDialog, SIGNAL(previousPictureRequested()), this, SLOT(dialogPreviousPictureRequested()));
@@ -142,7 +134,7 @@ void SnapmaticWidget::on_cmdView_clicked()
     picDialog->showMaximized();
 #else
     picDialog->show();
-    if (navigationBar) picDialog->styliseDialog();
+    if (navigationBar) picDialog->stylizeDialog();
     //picDialog->adaptNewDialogSize();
     picDialog->setMinimumSize(picDialog->size());
     picDialog->setMaximumSize(picDialog->size());
@@ -168,33 +160,16 @@ void SnapmaticWidget::on_cmdDelete_clicked()
 
 bool SnapmaticWidget::deletePicture()
 {
-    int uchoice = QMessageBox::question(this, tr("Delete picture"), tr("Are you sure to delete %1 from your Snapmatic pictures?").arg("\""+smpic->getPictureTitle()+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    int uchoice = QMessageBox::question(this, tr("Delete picture"), tr("Are you sure to delete %1 from your Snapmatic pictures?").arg("\""+picStr+"\""), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     if (uchoice == QMessageBox::Yes)
     {
-        if (smpic->deletePictureFile())
+        if (smpic->deletePicFile())
         {
-#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"] = "Snapmatic";
-                jsonObject["DeletedSize"] = QString::number(smpic->getContentMaxLength());
-                jsonObject["DeletedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
-                jsonDocument.setObject(jsonObject);
-                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
-            }
-#endif
             return true;
         }
         else
         {
-            QMessageBox::warning(this, tr("Delete picture"), tr("Failed at deleting %1 from your Snapmatic pictures").arg("\""+smpic->getPictureTitle()+"\""));
+            QMessageBox::warning(this, tr("Delete picture"), tr("Failed at deleting %1 from your Snapmatic pictures").arg("\""+picStr+"\""));
         }
     }
     return false;
@@ -218,21 +193,10 @@ void SnapmaticWidget::mouseReleaseEvent(QMouseEvent *ev)
     else
     {
         if (getContentMode() == 0 && rect().contains(ev->pos()) && ev->button() == Qt::LeftButton)
-        {
-            if (ev->modifiers().testFlag(Qt::ShiftModifier))
-            {
-                ui->cbSelected->setChecked(!ui->cbSelected->isChecked());
-            }
-            else
         {
             on_cmdView_clicked();
         }
     }
-        else if (!ui->cbSelected->isVisible() && getContentMode() == 1 && ev->button() == Qt::LeftButton && ev->modifiers().testFlag(Qt::ShiftModifier))
-        {
-            ui->cbSelected->setChecked(!ui->cbSelected->isChecked());
-        }
-    }
 }
 
 void SnapmaticWidget::mouseDoubleClickEvent(QMouseEvent *ev)
@@ -298,6 +262,7 @@ bool SnapmaticWidget::makePictureHidden()
 {
     if (smpic->setPictureHidden())
     {
+        picPath = smpic->getPictureFilePath();
         adjustTextColor();
         return true;
     }
@@ -308,6 +273,7 @@ bool SnapmaticWidget::makePictureVisible()
 {
     if (smpic->setPictureVisible())
     {
+        picPath = smpic->getPictureFilePath();
         adjustTextColor();
         return true;
     }
@@ -316,148 +282,24 @@ bool SnapmaticWidget::makePictureVisible()
 
 void SnapmaticWidget::makePictureHiddenSlot()
 {
-    if (!makePictureHidden())
+    makePictureHidden();
-    {
-        QMessageBox::warning(this, QApplication::translate("UserInterface", "Hide In-game"), QApplication::translate("SnapmaticWidget", "Failed to hide %1 In-game from your Snapmatic pictures").arg("\""+smpic->getPictureTitle()+"\""));
-    }
 }
 
 void SnapmaticWidget::makePictureVisibleSlot()
 {
-    if (!makePictureVisible())
+    makePictureVisible();
-    {
-        QMessageBox::warning(this, QApplication::translate("UserInterface", "Show In-game"), QApplication::translate("SnapmaticWidget", "Failed to show %1 In-game from your Snapmatic pictures").arg("\""+smpic->getPictureTitle()+"\""));
-    }
 }
 
 void SnapmaticWidget::editSnapmaticProperties()
 {
-    SnapmaticEditor *snapmaticEditor = new SnapmaticEditor(crewDB, profileDB, this);
+    SnapmaticEditor *snapmaticEditor = new SnapmaticEditor(crewDB, this);
+    snapmaticEditor->setWindowFlags(snapmaticEditor->windowFlags()^Qt::WindowContextHelpButtonHint);
     snapmaticEditor->setSnapmaticPicture(smpic);
     snapmaticEditor->setModal(true);
-    snapmaticEditor->show();
     snapmaticEditor->exec();
     delete snapmaticEditor;
 }
 
-void SnapmaticWidget::editSnapmaticRawJson()
-{
-    JsonEditorDialog *jsonEditor = new JsonEditorDialog(smpic, this);
-    jsonEditor->setModal(true);
-    jsonEditor->show();
-    jsonEditor->exec();
-    delete jsonEditor;
-}
-
-void SnapmaticWidget::editSnapmaticImage()
-{
-    QImage *currentImage = new QImage(smpic->getImage());
-    ImportDialog *importDialog = new ImportDialog(profileName, this);
-    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"] = "Interface";
-                jsonObject["EditedSize"] = QString::number(smpic->getContentMaxLength());
-                jsonObject["EditedTime"] = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
-                jsonDocument.setObject(jsonObject);
-                Telemetry->push(TelemetryCategory::PersonalData, jsonDocument);
-            }
-#endif
-        }
-        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 SnapmaticWidget::openMapViewer()
-{
-    SnapmaticPicture *picture = smpic;
-    MapLocationDialog *mapLocDialog = new MapLocationDialog(picture->getSnapmaticProperties().location.x, picture->getSnapmaticProperties().location.y, this);
-    mapLocDialog->setModal(true);
-    mapLocDialog->show();
-    mapLocDialog->exec();
-    if (mapLocDialog->propUpdated())
-    {
-        // Update Snapmatic Properties
-        SnapmaticProperties localSpJson = picture->getSnapmaticProperties();
-        localSpJson.location.x = mapLocDialog->getXpos();
-        localSpJson.location.y = mapLocDialog->getYpos();
-        localSpJson.location.z = 0;
-
-        // Update Snapmatic Picture
-        QString currentFilePath = picture->getPictureFilePath();
-        QString originalFilePath = picture->getOriginalPictureFilePath();
-        QString backupFileName = originalFilePath % ".bak";
-        if (!QFile::exists(backupFileName))
-        {
-            QFile::copy(currentFilePath, backupFileName);
-        }
-        SnapmaticProperties fallbackProperties = picture->getSnapmaticProperties();
-        picture->setSnapmaticProperties(localSpJson);
-        if (!picture->exportPicture(currentFilePath))
-        {
-            QMessageBox::warning(this, SnapmaticEditor::tr("Snapmatic Properties"), SnapmaticEditor::tr("Patching of Snapmatic Properties failed because of I/O Error"));
-            picture->setSnapmaticProperties(fallbackProperties);
-        }
-#ifdef GTA5SYNC_TELEMETRY
-        else
-        {
-            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"] = "Interface";
-                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;
-}
-
 bool SnapmaticWidget::isSelected()
 {
     return ui->cbSelected->isChecked();
@@ -465,7 +307,11 @@ bool SnapmaticWidget::isSelected()
 
 bool SnapmaticWidget::isHidden()
 {
-    return smpic->isHidden();
+    if (picPath.right(7) == ".hidden")
+    {
+        return true;
+    }
+    return false;
 }
 
 void SnapmaticWidget::setSelectionMode(bool selectionMode)
@@ -490,7 +336,7 @@ SnapmaticPicture* SnapmaticWidget::getPicture()
 
 QString SnapmaticWidget::getPicturePath()
 {
-    return smpic->getPictureFilePath();
+    return picPath;
 }
 
 QString SnapmaticWidget::getWidgetType()

SnapmaticWidget.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* gta5view Grand Theft Auto V Profile Viewer
+* gta5sync GRAND THEFT AUTO V SYNC
 * Copyright (C) 2016-2017 Syping
 *
 * This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ class SnapmaticWidget : public ProfileWidget
     Q_OBJECT
 
 public:
-    SnapmaticWidget(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QString profileName, QWidget *parent = 0);
+    SnapmaticWidget(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent = 0);
     void setSnapmaticPicture(SnapmaticPicture *picture);
     void setSelectionMode(bool selectionMode);
     void setSelected(bool isSelected);
@@ -50,7 +50,6 @@ public:
     QString getWidgetType();
     bool isSelected();
     bool isHidden();
-    void retranslate();
     ~SnapmaticWidget();
 
 private slots:
@@ -68,13 +67,10 @@ private slots:
     void makePictureVisibleSlot();
     void makePictureHiddenSlot();
     void editSnapmaticProperties();
-    void editSnapmaticRawJson();
-    void editSnapmaticImage();
-    void openMapViewer();
     void snapmaticUpdated();
-    void customSignal(QString signal);
 
 protected:
+    bool eventFilter(QObject *obj, QEvent *ev);
     void mouseDoubleClickEvent(QMouseEvent *ev);
     void mouseReleaseEvent(QMouseEvent *ev);
     void mousePressEvent(QMouseEvent *ev);
@@ -84,10 +80,15 @@ private:
     ProfileDatabase *profileDB;
     CrewDatabase *crewDB;
     DatabaseThread *threadDB;
-    QString profileName;
     Ui::SnapmaticWidget *ui;
     SnapmaticPicture *smpic;
+    QColor highlightBackColor;
+    QColor highlightTextColor;
     QColor highlightHiddenColor;
+    QString picPath;
+    QString picTitl;
+    QString picStr;
+    QWidget *snwgt;
 
 signals:
     void pictureDeleted();