diff --git a/.ci/app.rc b/.ci/app.rc index 92f6518..f247bab 100644 --- a/.ci/app.rc +++ b/.ci/app.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "gta5view" VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright © 2016-2021 Syping" + VALUE "LegalCopyright", "Copyright © 2016-2022 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" diff --git a/.ci/donate.txt b/.ci/donate.txt index ab58641..407130d 100644 --- a/.ci/donate.txt +++ b/.ci/donate.txt @@ -1 +1 @@ -btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz,zec:t1SpfDKj6qGZFwyRdzJBw9w2PTj8rUixZGh \ No newline at end of file +btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz \ No newline at end of file diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi index ee89b81..56ea8fa 100644 --- a/.ci/gta5view.nsi +++ b/.ci/gta5view.nsi @@ -4,8 +4,8 @@ !define APP_EXT ".g5e" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.10.1.0" -!define COPYRIGHT "Copyright © 2016-2021 Syping" +!define VERSION "1.10.1.1" +!define COPYRIGHT "Copyright © 2016-2022 Syping" !define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V" !define INSTALLER_NAME "gta5view_setup.exe" !define MAIN_APP_EXE "gta5view.exe" diff --git a/.flatpak/de.syping.gta5view.yaml b/.flatpak/de.syping.gta5view.yaml index 2e6fa1d..c9a9775 100644 --- a/.flatpak/de.syping.gta5view.yaml +++ b/.flatpak/de.syping.gta5view.yaml @@ -1,6 +1,6 @@ app-id: de.syping.gta5view runtime: org.kde.Platform -runtime-version: '5.15' +runtime-version: '5.15-21.08' sdk: org.kde.Sdk command: gta5view finish-args: diff --git a/.travis.yml b/.travis.yml index 2a04b89..8dee407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,22 +22,12 @@ matrix: - 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=windows_docker.sh - - QT_SELECT=qt5-x86_64-w64-mingw32 - - RELEASE_LABEL="Windows 64-Bit Portable for gtainside" - - PACKAGE_CODE=gtainside - env: - BUILD_SCRIPT=wininstall_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Installer" - os: osx - osx_image: xcode10.3 + osx_image: xcode12.2 env: - BUILD_SCRIPT=osx_ci.sh - RELEASE_LABEL="Mac OS X 64-Bit Disk Image" diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d748c3..cbb26a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ if(APPLE) res/gta5view.icns ) set(MACOSX_BUNDLE_BUNDLE_NAME gta5view) - set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.0) + set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.1) set(MACOSX_BUNDLE_ICON_FILE gta5view.icns) set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view) set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") diff --git a/ImportDialog.cpp b/ImportDialog.cpp index 61f3e50..594cbf8 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2017-2021 Syping +* Copyright (C) 2017-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -111,8 +111,12 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : ui->vlButtom->setSpacing(6 * screenRatio); #ifndef Q_OS_MAC ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio); +#else +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { #else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); } else { diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 375069e..ce87356 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2021 Syping +* Copyright (C) 2016-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -124,8 +124,12 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre #ifndef Q_OS_MAC ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); +#else +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { #else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio); } @@ -1554,7 +1558,11 @@ void ProfileInterface::settingsApplied(int _contentMode, bool languageChanged) #ifdef Q_OS_MAC // DPI calculation qreal screenRatio = AppEnv::screenRatio(); +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { +#else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio); } diff --git a/README.md b/README.md index 3713ce2..8831699 100644 --- a/README.md +++ b/README.md @@ -14,36 +14,32 @@ Open Source Snapmatic and Savegame viewer/editor for GTA V #### Build gta5view for Windows # Note: Install Docker Community Edition and Git before continuing - git clone https://gitlab.com/Syping/gta5view && cd gta5view docker pull sypingauto/gta5view-build:1.10-static - docker run --rm -v "$PWD:/gta5view" -it sypingauto/gta5view-build:1.10-static - cd /gta5view && mkdir -p build && cd build - mingw64-qt-cmake ../ - make -j $(nproc --all) + git clone https://gitlab.com/Syping/gta5view + docker run --rm -v "$PWD/gta5view:/gta5view" -it sypingauto/gta5view-build:1.10-static + mingw64-qt-cmake -B /gta5view/build /gta5view + cmake --build /gta5view/build #### Build gta5view for Debian/Ubuntu sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build #### Build gta5view for Arch/Manjaro sudo pacman -S cmake gcc git make qt5-base qt5-svg qt5-tools qt5-translations - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build -#### Build gta5view for Fedora +#### Build gta5view for Fedora/RHEL sudo dnf install cmake git gcc gcc-c++ make qt5-qtbase-devel qt5-qtsvg-devel qt5-qttranslations - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build diff --git a/RagePhoto.cpp b/RagePhoto.cpp index 5e2113a..293d4a8 100644 --- a/RagePhoto.cpp +++ b/RagePhoto.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2020-2021 Syping +* Copyright (C) 2020-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include #if QT_VERSION < 0x060000 #include +#else +#include +#include #endif #ifdef RAGEPHOTO_BENCHMARK #include diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index 3a0197b..c3664fd 100644 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -34,6 +34,8 @@ #if QT_VERSION < 0x060000 #include +#else +#include #endif #if QT_VERSION >= 0x050000 diff --git a/res/app.rc b/res/app.rc index a0fd25d..b1f5162 100644 --- a/res/app.rc +++ b/res/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 10, 1, 0 -PRODUCTVERSION 1, 10, 1, 0 +FILEVERSION 1, 10, 1, 1 +PRODUCTVERSION 1, 10, 1, 1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "gta5view" VALUE "FileVersion", "1.10.1" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright © 2016-2021 Syping" + VALUE "LegalCopyright", "Copyright © 2016-2022 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" VALUE "ProductVersion", "1.10.1" diff --git a/res/donate.qrc b/res/donate.qrc index fcad17d..e4a0005 100644 --- a/res/donate.qrc +++ b/res/donate.qrc @@ -8,8 +8,6 @@ ltc.svgz xmr.str xmr.svgz - zec.str - zec.svgz donate.svgz diff --git a/res/qt6/qtbase_de.qm b/res/qt6/qtbase_de.qm index a108050..301fa8f 100644 Binary files a/res/qt6/qtbase_de.qm and b/res/qt6/qtbase_de.qm differ diff --git a/res/zec.str b/res/zec.str deleted file mode 100644 index b7160ff..0000000 --- a/res/zec.str +++ /dev/null @@ -1 +0,0 @@ -Zcash \ No newline at end of file diff --git a/res/zec.svgz b/res/zec.svgz deleted file mode 100644 index a39853d..0000000 Binary files a/res/zec.svgz and /dev/null differ