Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

fix Qt 6.4 build and few other changes
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
- include QStringEncoder and QStringDecoder for Qt 6.4
- update integrated qtbase_de.qm from Qt 6.3
- fix macOS theme detection on Qt 6
- bump copyright year and some version numbers
- remove ZEC donation
- rework README.md
This commit is contained in:
Syping 2022-08-21 21:39:19 +02:00
parent 3cd6cc903d
commit 5e6c4e6ad1
16 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/app.rc
View file

@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "gta5view" VALUE "FileDescription", "gta5view"
VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER"
VALUE "InternalName", "gta5view" VALUE "InternalName", "gta5view"
VALUE "LegalCopyright", "Copyright © 2016-2021 Syping" VALUE "LegalCopyright", "Copyright © 2016-2022 Syping"
VALUE "OriginalFilename", "gta5view.exe" VALUE "OriginalFilename", "gta5view.exe"
VALUE "ProductName", "gta5view" VALUE "ProductName", "gta5view"
VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER"

2
.ci/donate.txt
View file

@ -1 +1 @@
btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz,zec:t1SpfDKj6qGZFwyRdzJBw9w2PTj8rUixZGh btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz

4
.ci/gta5view.nsi
View file

@ -4,8 +4,8 @@
!define APP_EXT ".g5e" !define APP_EXT ".g5e"
!define COMP_NAME "Syping" !define COMP_NAME "Syping"
!define WEB_SITE "https://gta5view.syping.de/" !define WEB_SITE "https://gta5view.syping.de/"
!define VERSION "1.10.1.0" !define VERSION "1.10.1.1"
!define COPYRIGHT "Copyright © 2016-2021 Syping" !define COPYRIGHT "Copyright © 2016-2022 Syping"
!define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V" !define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V"
!define INSTALLER_NAME "gta5view_setup.exe" !define INSTALLER_NAME "gta5view_setup.exe"
!define MAIN_APP_EXE "gta5view.exe" !define MAIN_APP_EXE "gta5view.exe"

2
.flatpak/de.syping.gta5view.yaml
View file

@ -1,6 +1,6 @@
app-id: de.syping.gta5view app-id: de.syping.gta5view
runtime: org.kde.Platform runtime: org.kde.Platform
runtime-version: '5.15' runtime-version: '5.15-21.08'
sdk: org.kde.Sdk sdk: org.kde.Sdk
command: gta5view command: gta5view
finish-args: finish-args:

12
.travis.yml
View file

@ -22,22 +22,12 @@ matrix:
- BUILD_SCRIPT=windows_docker.sh - BUILD_SCRIPT=windows_docker.sh
- QT_SELECT=qt5-x86_64-w64-mingw32 - QT_SELECT=qt5-x86_64-w64-mingw32
- RELEASE_LABEL="Windows 64-Bit Portable" - 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: - env:
- BUILD_SCRIPT=wininstall_docker.sh - BUILD_SCRIPT=wininstall_docker.sh
- QT_SELECT=qt5-x86_64-w64-mingw32 - QT_SELECT=qt5-x86_64-w64-mingw32
- RELEASE_LABEL="Windows 64-Bit Installer" - RELEASE_LABEL="Windows 64-Bit Installer"
- os: osx - os: osx
osx_image: xcode10.3 osx_image: xcode12.2
env: env:
- BUILD_SCRIPT=osx_ci.sh - BUILD_SCRIPT=osx_ci.sh
- RELEASE_LABEL="Mac OS X 64-Bit Disk Image" - RELEASE_LABEL="Mac OS X 64-Bit Disk Image"

2
CMakeLists.txt
View file

@ -38,7 +38,7 @@ if(APPLE)
res/gta5view.icns res/gta5view.icns
) )
set(MACOSX_BUNDLE_BUNDLE_NAME gta5view) 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_ICON_FILE gta5view.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view) set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view)
set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")

6
ImportDialog.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* gta5view Grand Theft Auto V Profile Viewer * 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 * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -111,8 +111,12 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
ui->vlButtom->setSpacing(6 * screenRatio); ui->vlButtom->setSpacing(6 * screenRatio);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio); ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio);
#else
#if QT_VERSION >= 0x060000
if (QApplication::style()->objectName() == "macos") {
#else #else
if (QApplication::style()->objectName() == "macintosh") { if (QApplication::style()->objectName() == "macintosh") {
#endif
ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
} }
else { else {

10
ProfileInterface.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* gta5view Grand Theft Auto V Profile Viewer * 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 * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -124,8 +124,12 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setSpacing(6 * screenRatio);
ui->hlButtons->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
#else
#if QT_VERSION >= 0x060000
if (QApplication::style()->objectName() == "macos") {
#else #else
if (QApplication::style()->objectName() == "macintosh") { if (QApplication::style()->objectName() == "macintosh") {
#endif
ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setSpacing(6 * screenRatio);
ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * 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 #ifdef Q_OS_MAC
// DPI calculation // DPI calculation
qreal screenRatio = AppEnv::screenRatio(); qreal screenRatio = AppEnv::screenRatio();
#if QT_VERSION >= 0x060000
if (QApplication::style()->objectName() == "macos") {
#else
if (QApplication::style()->objectName() == "macintosh") { if (QApplication::style()->objectName() == "macintosh") {
#endif
ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setSpacing(6 * screenRatio);
ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio);
} }

38
README.md
View file

@ -14,36 +14,32 @@ Open Source Snapmatic and Savegame viewer/editor for GTA V
#### Build gta5view for Windows #### Build gta5view for Windows
# Note: Install Docker Community Edition and Git before continuing # 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 pull sypingauto/gta5view-build:1.10-static
docker run --rm -v "$PWD:/gta5view" -it sypingauto/gta5view-build:1.10-static git clone https://gitlab.com/Syping/gta5view
cd /gta5view && mkdir -p build && cd build docker run --rm -v "$PWD/gta5view:/gta5view" -it sypingauto/gta5view-build:1.10-static
mingw64-qt-cmake ../ mingw64-qt-cmake -B /gta5view/build /gta5view
make -j $(nproc --all) cmake --build /gta5view/build
#### Build gta5view for Debian/Ubuntu #### Build gta5view for Debian/Ubuntu
sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n
git clone https://gitlab.com/Syping/gta5view && cd gta5view git clone https://gitlab.com/Syping/gta5view
mkdir -p build && cd build cmake -B gta5view-build gta5view
cmake ../ cmake --build gta5view-build
make -j $(nproc --all) sudo cmake --install gta5view-build
sudo make install
#### Build gta5view for Arch/Manjaro #### Build gta5view for Arch/Manjaro
sudo pacman -S cmake gcc git make qt5-base qt5-svg qt5-tools qt5-translations sudo pacman -S cmake gcc git make qt5-base qt5-svg qt5-tools qt5-translations
git clone https://gitlab.com/Syping/gta5view && cd gta5view git clone https://gitlab.com/Syping/gta5view
mkdir -p build && cd build cmake -B gta5view-build gta5view
cmake ../ cmake --build gta5view-build
make -j $(nproc --all) sudo cmake --install gta5view-build
sudo make install
#### 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 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 git clone https://gitlab.com/Syping/gta5view
mkdir -p build && cd build cmake -B gta5view-build gta5view
cmake ../ cmake --build gta5view-build
make -j $(nproc --all) sudo cmake --install gta5view-build
sudo make install

5
RagePhoto.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* gta5view Grand Theft Auto V Profile Viewer * 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 * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,6 +22,9 @@
#include <QFile> #include <QFile>
#if QT_VERSION < 0x060000 #if QT_VERSION < 0x060000
#include <QTextCodec> #include <QTextCodec>
#else
#include <QStringEncoder>
#include <QStringDecoder>
#endif #endif
#ifdef RAGEPHOTO_BENCHMARK #ifdef RAGEPHOTO_BENCHMARK
#include <QFileInfo> #include <QFileInfo>

2
SnapmaticPicture.cpp
View file

@ -34,6 +34,8 @@
#if QT_VERSION < 0x060000 #if QT_VERSION < 0x060000
#include <QTextCodec> #include <QTextCodec>
#else
#include <QStringDecoder>
#endif #endif
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000

6
res/app.rc
View file

@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest"
#include <windows.h> #include <windows.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1, 10, 1, 0 FILEVERSION 1, 10, 1, 1
PRODUCTVERSION 1, 10, 1, 0 PRODUCTVERSION 1, 10, 1, 1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "gta5view" VALUE "FileDescription", "gta5view"
VALUE "FileVersion", "1.10.1" VALUE "FileVersion", "1.10.1"
VALUE "InternalName", "gta5view" VALUE "InternalName", "gta5view"
VALUE "LegalCopyright", "Copyright © 2016-2021 Syping" VALUE "LegalCopyright", "Copyright © 2016-2022 Syping"
VALUE "OriginalFilename", "gta5view.exe" VALUE "OriginalFilename", "gta5view.exe"
VALUE "ProductName", "gta5view" VALUE "ProductName", "gta5view"
VALUE "ProductVersion", "1.10.1" VALUE "ProductVersion", "1.10.1"

2
res/donate.qrc
View file

@ -8,8 +8,6 @@
<file>ltc.svgz</file> <file>ltc.svgz</file>
<file>xmr.str</file> <file>xmr.str</file>
<file>xmr.svgz</file> <file>xmr.svgz</file>
<file>zec.str</file>
<file>zec.svgz</file>
</qresource> </qresource>
<qresource prefix="/img"> <qresource prefix="/img">
<file>donate.svgz</file> <file>donate.svgz</file>

BIN
res/qt6/qtbase_de.qm
View file

Binary file not shown.

1
res/zec.str
View file

@ -1 +0,0 @@
Zcash

BIN
res/zec.svgz
View file

Binary file not shown.