gta5view 1.10.1 release

Author: Syping

.ci/gta5view.nsi

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

PictureDialog.cpp

@@ -839,7 +839,7 @@ void PictureDialog::editSnapmaticImage()
     importDialog->exec();
     if (importDialog->isImportAgreed()) {
         const QByteArray previousPicture = smpic->getPictureStream();
-        bool success = smpic->setImage(importDialog->image());
+        bool success = smpic->setImage(importDialog->image(), importDialog->isUnlimitedBuffer());
         if (success) {
             QString currentFilePath = smpic->getPictureFilePath();
             QString originalFilePath = smpic->getOriginalPictureFilePath();

ProfileInterface.cpp

@@ -1792,12 +1792,11 @@ void ProfileInterface::on_saProfileContent_dropped(const QMimeData *mimeData)
 void ProfileInterface::retranslateUi()
 {
     ui->retranslateUi(this);
-    QString appVersion = GTA5SYNC_APPVER;
-#ifndef GTA5SYNC_BUILDTYPE_REL
+    QString appVersion = QApplication::applicationVersion();
+    const char* literalBuildType = GTA5SYNC_BUILDTYPE;
 #ifdef GTA5SYNC_COMMIT
-    if (!appVersion.contains("-"))
+    if ((strcmp(literalBuildType, REL_BUILDTYPE) != 0) && !appVersion.contains("-"))
         appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
-#endif
 #endif
     ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
 }

README.md

@@ -16,7 +16,7 @@ Open Source Snapmatic and Savegame viewer/editor for GTA V
     # 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
+    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)

SnapmaticPicture.cpp

@@ -199,6 +199,7 @@ bool SnapmaticPicture::setImage(const QImage &picture, bool eXtendMode)
             else {
 #ifndef GTA5SYNC_DYNAMIC_PHOTOBUFFER
                 if (p_ragePhoto.photoBuffer() != jpegPicStreamLength)
+                    p_ragePhoto.setPhotoData(QByteArray()); // avoid buffer set fail
                     p_ragePhoto.setPhotoBuffer(jpegPicStreamLength, true);
 #endif
                 picByteArray = picByteArrayT;

SnapmaticWidget.cpp

@@ -357,7 +357,7 @@ void SnapmaticWidget::editSnapmaticImage()
     importDialog->exec();
     if (importDialog->isImportAgreed()) {
         const QByteArray previousPicture = smpic->getPictureStream();
-        bool success = smpic->setImage(importDialog->image());
+        bool success = smpic->setImage(importDialog->image(), importDialog->isUnlimitedBuffer());
         if (success) {
             QString currentFilePath = smpic->getPictureFilePath();
             QString originalFilePath = smpic->getOriginalPictureFilePath();

UserInterface.cpp

@@ -73,7 +73,12 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
     ui->menuProfile->setEnabled(false);
     ui->actionSelect_profile->setEnabled(false);
     ui->actionAbout_gta5sync->setIcon(IconLoader::loadingAppIcon());
+#ifdef Q_OS_MAC
+    ui->actionAbout_gta5sync->setText(QApplication::translate("MAC_APPLICATION_MENU", "About %1").arg(GTA5SYNC_APPSTR));
+    ui->actionOptions->setText(QApplication::translate("MAC_APPLICATION_MENU", "Preferences..."));
+#else
     ui->actionAbout_gta5sync->setText(tr("&About %1").arg(GTA5SYNC_APPSTR));
+#endif
     ui->cmdClose->setToolTip(ui->cmdClose->toolTip().arg(GTA5SYNC_APPSTR));
     defaultWindowTitle = tr("%2 - %1").arg("%1", GTA5SYNC_APPSTR);
 
@@ -873,13 +878,17 @@ void UserInterface::retranslateUi()
     donateAction->setText(tr("&Donate"));
 #endif
 #endif
+#ifdef Q_OS_MAC
+    ui->actionAbout_gta5sync->setText(QApplication::translate("MAC_APPLICATION_MENU", "About %1").arg(GTA5SYNC_APPSTR));
+    ui->actionOptions->setText(QApplication::translate("MAC_APPLICATION_MENU", "Preferences..."));
+#else
     ui->actionAbout_gta5sync->setText(tr("&About %1").arg(GTA5SYNC_APPSTR));
-    QString appVersion = GTA5SYNC_APPVER;
-#ifndef GTA5SYNC_BUILDTYPE_REL
+#endif
+    QString appVersion = QApplication::applicationVersion();
+    const char* literalBuildType = GTA5SYNC_BUILDTYPE;
 #ifdef GTA5SYNC_COMMIT
-    if (!appVersion.contains("-"))
+    if ((strcmp(literalBuildType, REL_BUILDTYPE) != 0) && !appVersion.contains("-"))
         appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
-#endif
 #endif
     ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
     if (profileOpen) {

config.h

@@ -51,7 +51,7 @@
 #endif
 
 #ifndef GTA5SYNC_APPVER
-#define GTA5SYNC_APPVER "1.10.0"
+#define GTA5SYNC_APPVER "1.10.1"
 #endif
 
 #if __cplusplus

res/app.rc

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

res/de.syping.gta5view.metainfo.xml

@@ -34,6 +34,7 @@
     <developer_name>Syping</developer_name>
 
     <releases>
+        <release date="2021-06-17" version="1.10.1"/>
         <release date="2021-05-27" version="1.10.0"/>
         <release date="2021-03-22" version="1.9.2"/>
         <release date="2020-12-16" version="1.9.1"/>