From fdf07dd6817785294021085f5bb4f16677634b7f Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 24 May 2018 22:32:00 +0200 Subject: [PATCH] SnapmaticPicture now stay alone, gta5sync references reduced --- .travis/gta5view.nsi | 2 +- AboutDialog.cpp | 6 +-- AboutDialog.h | 2 +- AppEnv.cpp | 2 +- AppEnv.h | 2 +- CrewDatabase.cpp | 2 +- CrewDatabase.h | 2 +- DatabaseThread.cpp | 2 +- DatabaseThread.h | 2 +- ExportDialog.cpp | 2 +- ExportDialog.h | 2 +- ExportThread.cpp | 2 +- ExportThread.h | 2 +- GlobalString.cpp | 2 +- GlobalString.h | 2 +- IconLoader.cpp | 2 +- IconLoader.h | 2 +- ImageEditorDialog.cpp | 2 +- ImageEditorDialog.h | 2 +- ImportDialog.cpp | 2 +- ImportDialog.h | 2 +- JsonEditorDialog.cpp | 2 +- JsonEditorDialog.h | 2 +- MapLocationDialog.cpp | 2 +- MapLocationDialog.h | 2 +- OptionsDialog.cpp | 6 +-- OptionsDialog.h | 2 +- OptionsDialog.ui | 22 +------- PictureDialog.cpp | 2 +- PictureDialog.h | 2 +- PictureExport.cpp | 2 +- PictureExport.h | 2 +- PictureWidget.cpp | 2 +- PictureWidget.h | 2 +- PlayerListDialog.cpp | 2 +- PlayerListDialog.h | 2 +- ProfileDatabase.cpp | 2 +- ProfileDatabase.h | 2 +- ProfileInterface.cpp | 2 +- ProfileInterface.h | 2 +- ProfileLoader.cpp | 2 +- ProfileLoader.h | 2 +- ProfileWidget.cpp | 2 +- ProfileWidget.h | 2 +- SavegameCopy.cpp | 2 +- SavegameCopy.h | 2 +- SavegameData.cpp | 9 ++-- SavegameData.h | 2 +- SavegameDialog.cpp | 2 +- SavegameDialog.h | 2 +- SavegameWidget.cpp | 2 +- SavegameWidget.h | 2 +- SidebarGenerator.cpp | 2 +- SidebarGenerator.h | 2 +- SnapmaticEditor.cpp | 2 +- SnapmaticEditor.h | 2 +- SnapmaticPicture.cpp | 76 +++++++++++++++++---------- SnapmaticPicture.h | 9 +++- SnapmaticWidget.cpp | 2 +- SnapmaticWidget.h | 2 +- StandardPaths.cpp | 2 +- StandardPaths.h | 2 +- StringParser.cpp | 22 +------- StringParser.h | 5 +- TelemetryClass.cpp | 2 +- TelemetryClass.h | 2 +- TranslationClass.cpp | 2 +- TranslationClass.h | 2 +- UserInterface.cpp | 2 +- UserInterface.h | 2 +- anpro/JSHighlighter.cpp | 2 +- anpro/JSHighlighter.h | 2 +- config.h | 12 +---- gta5view.pro | 3 +- main.cpp | 2 +- qjson4/QJsonArray.cpp | 2 +- qjson4/QJsonArray.h | 2 +- qjson4/QJsonDocument.cpp | 2 +- qjson4/QJsonDocument.h | 2 +- qjson4/QJsonObject.cpp | 2 +- qjson4/QJsonObject.h | 2 +- qjson4/QJsonParseError.cpp | 2 +- qjson4/QJsonParseError.h | 2 +- qjson4/QJsonParser.cpp | 2 +- qjson4/QJsonParser.h | 2 +- qjson4/QJsonRoot.h | 2 +- qjson4/QJsonValue.cpp | 2 +- qjson4/QJsonValue.h | 2 +- qjson4/QJsonValueRef.cpp | 2 +- qjson4/QJsonValueRef.h | 2 +- res/app.rc | 8 +-- tmext/TelemetryClassAuthenticator.cpp | 2 +- tmext/TelemetryClassAuthenticator.h | 2 +- uimod/UiModLabel.cpp | 2 +- uimod/UiModLabel.h | 2 +- uimod/UiModWidget.cpp | 2 +- uimod/UiModWidget.h | 2 +- 97 files changed, 159 insertions(+), 191 deletions(-) diff --git a/.travis/gta5view.nsi b/.travis/gta5view.nsi index becda49..1b1e7f1 100644 --- a/.travis/gta5view.nsi +++ b/.travis/gta5view.nsi @@ -3,7 +3,7 @@ !define APP_NAME "gta5view" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.5.4.0" +!define VERSION "1.6.0.0" !define COPYRIGHT "Copyright © 2016-2018 Syping" !define DESCRIPTION "Grand Theft Auto V Savegame and Snapmatic Viewer/Editor" !define INSTALLER_NAME "gta5view_setup.exe" diff --git a/AboutDialog.cpp b/AboutDialog.cpp index e9fe88e..31ef78d 100644 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify @@ -65,11 +65,7 @@ AboutDialog::AboutDialog(QWidget *parent) : } // Project Description -#ifdef GTA5SYNC_ENABLED - QString projectDes = tr("A project for viewing and sync Grand Theft Auto V Snapmatic
\nPictures and Savegames"); -#else QString projectDes = tr("A project for viewing Grand Theft Auto V Snapmatic
\nPictures and Savegames"); -#endif // Copyright Description QString copyrightDes1 = tr("Copyright © %2 %3"); diff --git a/AboutDialog.h b/AboutDialog.h index c9eecdf..1a0a7d9 100644 --- a/AboutDialog.h +++ b/AboutDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/AppEnv.cpp b/AppEnv.cpp index 6180e5b..56e0b08 100644 --- a/AppEnv.cpp +++ b/AppEnv.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/AppEnv.h b/AppEnv.h index 2d911be..1fca998 100644 --- a/AppEnv.h +++ b/AppEnv.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/CrewDatabase.cpp b/CrewDatabase.cpp index 73d9bed..0fa96c6 100644 --- a/CrewDatabase.cpp +++ b/CrewDatabase.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/CrewDatabase.h b/CrewDatabase.h index 0bb9933..692ea79 100644 --- a/CrewDatabase.h +++ b/CrewDatabase.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/DatabaseThread.cpp b/DatabaseThread.cpp index 2344dca..4d12e74 100644 --- a/DatabaseThread.cpp +++ b/DatabaseThread.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/DatabaseThread.h b/DatabaseThread.h index 8d8bbfa..37c6f76 100644 --- a/DatabaseThread.h +++ b/DatabaseThread.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ExportDialog.cpp b/ExportDialog.cpp index 9a93c58..43d8d97 100644 --- a/ExportDialog.cpp +++ b/ExportDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ExportDialog.h b/ExportDialog.h index 65354f0..5da4b91 100644 --- a/ExportDialog.h +++ b/ExportDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ExportThread.cpp b/ExportThread.cpp index b795824..f3401f1 100644 --- a/ExportThread.cpp +++ b/ExportThread.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ExportThread.h b/ExportThread.h index f5837a7..99ad28b 100644 --- a/ExportThread.h +++ b/ExportThread.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/GlobalString.cpp b/GlobalString.cpp index 4aa7aad..2bb9690 100644 --- a/GlobalString.cpp +++ b/GlobalString.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/GlobalString.h b/GlobalString.h index 2d1f4ba..711afa9 100644 --- a/GlobalString.h +++ b/GlobalString.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/IconLoader.cpp b/IconLoader.cpp index 4de091d..d275718 100644 --- a/IconLoader.cpp +++ b/IconLoader.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/IconLoader.h b/IconLoader.h index fe8669b..8456688 100644 --- a/IconLoader.h +++ b/IconLoader.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ImageEditorDialog.cpp b/ImageEditorDialog.cpp index 749e412..a4ab3eb 100644 --- a/ImageEditorDialog.cpp +++ b/ImageEditorDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ImageEditorDialog.h b/ImageEditorDialog.h index a9417cd..06a3c02 100644 --- a/ImageEditorDialog.h +++ b/ImageEditorDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ImportDialog.cpp b/ImportDialog.cpp index 0d0f6d4..d40c701 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ImportDialog.h b/ImportDialog.h index e095ff2..70e0648 100644 --- a/ImportDialog.h +++ b/ImportDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/JsonEditorDialog.cpp b/JsonEditorDialog.cpp index 9aaa392..62c1636 100644 --- a/JsonEditorDialog.cpp +++ b/JsonEditorDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/JsonEditorDialog.h b/JsonEditorDialog.h index b881088..4e618bb 100644 --- a/JsonEditorDialog.h +++ b/JsonEditorDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/MapLocationDialog.cpp b/MapLocationDialog.cpp index 9ebb53f..759e331 100644 --- a/MapLocationDialog.cpp +++ b/MapLocationDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/MapLocationDialog.h b/MapLocationDialog.h index 1abfa93..f0fdffa 100644 --- a/MapLocationDialog.h +++ b/MapLocationDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp index 0528709..be952e9 100644 --- a/OptionsDialog.cpp +++ b/OptionsDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify @@ -109,10 +109,6 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) : resize(435 * screenRatio, 405 * screenRatio); #endif -#ifdef GTA5SYNC_DISABLED - ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabSync)); -#endif - this->setWindowTitle(windowTitle().arg(GTA5SYNC_APPSTR)); } diff --git a/OptionsDialog.h b/OptionsDialog.h index ae086ba..4d35ca7 100644 --- a/OptionsDialog.h +++ b/OptionsDialog.h @@ -1,5 +1,5 @@ /****************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/OptionsDialog.ui b/OptionsDialog.ui index 40d8caa..9f1b0fb 100644 --- a/OptionsDialog.ui +++ b/OptionsDialog.ui @@ -20,7 +20,7 @@ - 3 + 0 @@ -683,26 +683,6 @@ - - - Sync - - - - - - Sync is not implemented at current time - - - Qt::AlignCenter - - - true - - - - - diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 0ba79e9..97d8f65 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PictureDialog.h b/PictureDialog.h index 0c3155c..ef351b8 100644 --- a/PictureDialog.h +++ b/PictureDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PictureExport.cpp b/PictureExport.cpp index 41d0f0c..34ae2ae 100644 --- a/PictureExport.cpp +++ b/PictureExport.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PictureExport.h b/PictureExport.h index 6ee84a0..623f093 100644 --- a/PictureExport.h +++ b/PictureExport.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PictureWidget.cpp b/PictureWidget.cpp index 95d51a1..ffadd18 100644 --- a/PictureWidget.cpp +++ b/PictureWidget.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PictureWidget.h b/PictureWidget.h index 2ebd21c..f622614 100644 --- a/PictureWidget.h +++ b/PictureWidget.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PlayerListDialog.cpp b/PlayerListDialog.cpp index f828715..337d61b 100644 --- a/PlayerListDialog.cpp +++ b/PlayerListDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/PlayerListDialog.h b/PlayerListDialog.h index fb779d7..8c99fb0 100644 --- a/PlayerListDialog.h +++ b/PlayerListDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileDatabase.cpp b/ProfileDatabase.cpp index b04a4fd..09ff581 100644 --- a/ProfileDatabase.cpp +++ b/ProfileDatabase.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileDatabase.h b/ProfileDatabase.h index 89ae497..99bfc80 100644 --- a/ProfileDatabase.h +++ b/ProfileDatabase.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 4f39530..d58d428 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileInterface.h b/ProfileInterface.h index cba5d88..667d1f1 100644 --- a/ProfileInterface.h +++ b/ProfileInterface.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileLoader.cpp b/ProfileLoader.cpp index 3874140..2653338 100644 --- a/ProfileLoader.cpp +++ b/ProfileLoader.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileLoader.h b/ProfileLoader.h index 472c27d..0396e27 100644 --- a/ProfileLoader.h +++ b/ProfileLoader.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileWidget.cpp b/ProfileWidget.cpp index 09b7a0f..a325d92 100644 --- a/ProfileWidget.cpp +++ b/ProfileWidget.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/ProfileWidget.h b/ProfileWidget.h index 8de7cda..b7d2f77 100644 --- a/ProfileWidget.h +++ b/ProfileWidget.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameCopy.cpp b/SavegameCopy.cpp index b0f8064..9ebbe66 100644 --- a/SavegameCopy.cpp +++ b/SavegameCopy.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameCopy.h b/SavegameCopy.h index 6447497..f5550ba 100644 --- a/SavegameCopy.h +++ b/SavegameCopy.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameData.cpp b/SavegameData.cpp index 826746a..6345f29 100644 --- a/SavegameData.cpp +++ b/SavegameData.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify @@ -16,6 +16,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include "SnapmaticPicture.h" #include "StringParser.h" #include "SavegameData.h" #include @@ -42,7 +43,7 @@ bool SavegameData::readingSavegame() QFile *saveFile = new QFile(savegameFileName); if (!saveFile->open(QFile::ReadOnly)) { - lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(savegameFileName); + lastStep = "1;/1,OpenFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName); saveFile->deleteLater(); delete saveFile; return false; @@ -51,7 +52,7 @@ bool SavegameData::readingSavegame() // Reading Savegame Header if (!saveFile->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER"; + lastStep = "2;/3,ReadingFile," % SnapmaticPicture::convertDrawStringForLog(savegameFileName) % ",1,NOHEADER"; saveFile->close(); saveFile->deleteLater(); delete saveFile; @@ -78,7 +79,7 @@ QString SavegameData::getSavegameDataString(const QByteArray &savegameHeader) QList savegameBytesList = savegameBytes.split(char(0x01)); savegameBytes = savegameBytesList.at(1); savegameBytesList.clear(); - return StringParser::parseTitleString(savegameBytes, savegameBytes.length()); + return SnapmaticPicture::parseTitleString(savegameBytes, savegameBytes.length()); } bool SavegameData::readingSavegameFromFile(const QString &fileName) diff --git a/SavegameData.h b/SavegameData.h index bc5cf2f..bedb57c 100644 --- a/SavegameData.h +++ b/SavegameData.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameDialog.cpp b/SavegameDialog.cpp index 5182e3f..c13d82b 100644 --- a/SavegameDialog.cpp +++ b/SavegameDialog.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameDialog.h b/SavegameDialog.h index cce13cc..4abbba4 100644 --- a/SavegameDialog.h +++ b/SavegameDialog.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index 7d81d92..3c1c667 100644 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SavegameWidget.h b/SavegameWidget.h index 0db69af..103fa55 100644 --- a/SavegameWidget.h +++ b/SavegameWidget.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SidebarGenerator.cpp b/SidebarGenerator.cpp index 1d57e5d..e93474c 100644 --- a/SidebarGenerator.cpp +++ b/SidebarGenerator.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SidebarGenerator.h b/SidebarGenerator.h index 5e906a3..446f73c 100644 --- a/SidebarGenerator.h +++ b/SidebarGenerator.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SnapmaticEditor.cpp b/SnapmaticEditor.cpp index 954571c..18f481f 100644 --- a/SnapmaticEditor.cpp +++ b/SnapmaticEditor.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SnapmaticEditor.h b/SnapmaticEditor.h index 1e57294..98ed2d6 100644 --- a/SnapmaticEditor.h +++ b/SnapmaticEditor.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index d5414f7..c22d2e7 100644 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -1,6 +1,6 @@ /***************************************************************************** -* gta5sync-spv Grand Theft Auto Snapmatic Picture Viewer -* Copyright (C) 2016-2017 Syping +* gta5spv Grand Theft Auto Snapmatic Picture 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 @@ -17,12 +17,12 @@ *****************************************************************************/ #include "SnapmaticPicture.h" -#include "StringParser.h" #include #include #include #include #include +#include #include #include #include @@ -101,7 +101,7 @@ void SnapmaticPicture::reset() jsonStr = QString(); // SNAPMATIC DEFAULTS -#ifdef GTA5SYNC_CSDF +#ifdef GTA5SYNC_NOASSIST careSnapDefault = false; #else careSnapDefault = true; @@ -121,7 +121,7 @@ bool SnapmaticPicture::preloadFile() if (!picFile->open(QFile::ReadOnly)) { - lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(picFilePath); + lastStep = "1;/1,OpenFile," % convertDrawStringForLog(picFilePath); delete picFile; return false; } @@ -191,31 +191,31 @@ bool SnapmaticPicture::preloadFile() } else { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",4,G5E_FORMATERROR"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",4,G5E_FORMATERROR"; return false; } } else { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,G5E_FORMATERROR"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,G5E_FORMATERROR"; return false; } } else { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",2,G5E_FORMATERROR"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",2,G5E_FORMATERROR"; return false; } } else { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",1,G5E_NOTCOMPATIBLE"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",1,G5E_NOTCOMPATIBLE"; return false; } } else { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",1,G5E_FORMATERROR"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",1,G5E_FORMATERROR"; return false; } } @@ -244,7 +244,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo // Reading Snapmatic Header if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",1,NOHEADER"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",1,NOHEADER"; picStream->close(); delete picStream; return false; @@ -253,7 +253,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo pictureHead = getSnapmaticHeaderString(snapmaticHeaderLine); if (pictureHead == QLatin1String("MALFORMED")) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",1,MALFORMEDHEADER"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",1,MALFORMEDHEADER"; picStream->close(); delete picStream; return false; @@ -262,7 +262,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo // Reading JPEG Header Line if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",2,NOHEADER"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",2,NOHEADER"; picStream->close(); delete picStream; return false; @@ -273,7 +273,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo jpegHeaderLine.remove(0, jpegHeaderLineDifStr); if (jpegHeaderLine.left(4) != QByteArray("JPEG")) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",2,NOJPEG"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",2,NOJPEG"; picStream->close(); delete picStream; return false; @@ -282,7 +282,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo // Read JPEG Stream if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",2,NOPIC"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",2,NOPIC"; picStream->close(); delete picStream; return false; @@ -336,14 +336,14 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo // Read JSON Stream if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,NOJSON"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,NOJSON"; picStream->close(); delete picStream; return false; } else if (picStream->read(4) != QByteArray("JSON")) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,CTJSON"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,CTJSON"; picStream->close(); delete picStream; return false; @@ -354,14 +354,14 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",4,NOTITL"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",4,NOTITL"; picStream->close(); delete picStream; return false; } else if (picStream->read(4) != QByteArray("TITL")) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",4,CTTITL"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",4,CTTITL"; picStream->close(); delete picStream; return false; @@ -371,14 +371,14 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo if (!picStream->isReadable()) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",5,NODESC"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",5,NODESC"; picStream->close(); delete picStream; return picOk; } else if (picStream->read(4) != QByteArray("DESC")) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",5,CTDESC"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",5,CTDESC"; picStream->close(); delete picStream; return false; @@ -403,7 +403,7 @@ QString SnapmaticPicture::getSnapmaticHeaderString(const QByteArray &snapmaticHe QList snapmaticBytesList = snapmaticHeader.left(snapmaticUsefulLength).split('\x01'); if (snapmaticBytesList.length() < 2) { return QLatin1String("MALFORMED"); } QByteArray snapmaticBytes = snapmaticBytesList.at(1); - return StringParser::parseTitleString(snapmaticBytes, snapmaticBytes.length()); + return parseTitleString(snapmaticBytes, snapmaticBytes.length()); } QString SnapmaticPicture::getSnapmaticJSONString(const QByteArray &jsonBytes) @@ -792,7 +792,7 @@ QImage SnapmaticPicture::getImage(bool fastLoad) QFile *picFile = new QFile(picFilePath); if (!picFile->open(QFile::ReadOnly)) { - lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(picFilePath); + lastStep = "1;/1,OpenFile," % convertDrawStringForLog(picFilePath); delete picFile; return QImage(); } @@ -1014,15 +1014,15 @@ void SnapmaticPicture::parseJsonContent() { if (jsonIncomplete && jsonError) { - lastStep = "2;/4,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,JSONINCOMPLETE,JSONERROR"; + lastStep = "2;/4,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,JSONINCOMPLETE,JSONERROR"; } else if (jsonIncomplete) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,JSONINCOMPLETE"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,JSONINCOMPLETE"; } else if (jsonError) { - lastStep = "2;/3,ReadingFile," % StringParser::convertDrawStringForLog(picFilePath) % ",3,JSONERROR"; + lastStep = "2;/3,ReadingFile," % convertDrawStringForLog(picFilePath) % ",3,JSONERROR"; } jsonOk = false; } @@ -1377,7 +1377,7 @@ bool SnapmaticPicture::verifyTitle(const QString &title) // VERIFY TITLE FOR BE A VALID SNAPMATIC TITLE if (title.length() <= titlStreamCharacterMax && title.length() > 0) { - for (QChar titleChar : title) + for (const QChar &titleChar : title) { if (!verifyTitleChar(titleChar)) return false; } @@ -1396,3 +1396,25 @@ bool SnapmaticPicture::verifyTitleChar(const QChar &titleChar) } return false; } + +// STRING OPERATIONS + +QString SnapmaticPicture::parseTitleString(const QByteArray &commitBytes, int maxLength) +{ + Q_UNUSED(maxLength) + QString retStr = QTextCodec::codecForName("UTF-16LE")->toUnicode(commitBytes).trimmed(); + retStr.remove(QChar('\x00')); + return retStr; +} + +QString SnapmaticPicture::convertDrawStringForLog(const QString &inputStr) +{ + QString outputStr = inputStr; + return outputStr.replace("&","&u;").replace(",", "&c;"); +} + +QString SnapmaticPicture::convertLogStringForDraw(const QString &inputStr) +{ + QString outputStr = inputStr; + return outputStr.replace("&c;",",").replace("&u;", "&"); +} diff --git a/SnapmaticPicture.h b/SnapmaticPicture.h index 71046df..71b7c9d 100644 --- a/SnapmaticPicture.h +++ b/SnapmaticPicture.h @@ -1,6 +1,6 @@ /***************************************************************************** -* gta5sync-spv Grand Theft Auto Snapmatic Picture Viewer -* Copyright (C) 2016-2017 Syping +* gta5spv Grand Theft Auto Snapmatic Picture 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 @@ -134,6 +134,11 @@ public: // 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); diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp index 16cbc6d..d18c006 100644 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/SnapmaticWidget.h b/SnapmaticWidget.h index 289dbf6..8c28f12 100644 --- a/SnapmaticWidget.h +++ b/SnapmaticWidget.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/StandardPaths.cpp b/StandardPaths.cpp index fa5ed24..af0176d 100644 --- a/StandardPaths.cpp +++ b/StandardPaths.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/StandardPaths.h b/StandardPaths.h index 619bdeb..d03df33 100644 --- a/StandardPaths.h +++ b/StandardPaths.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/StringParser.cpp b/StringParser.cpp index b93fda5..584a6ac 100644 --- a/StringParser.cpp +++ b/StringParser.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify @@ -36,26 +36,6 @@ StringParser::StringParser() } -QString StringParser::parseTitleString(const QByteArray &commitBytes, int maxLength) -{ - Q_UNUSED(maxLength) - QString retStr = QTextCodec::codecForName("UTF-16LE")->toUnicode(commitBytes).trimmed(); - retStr.remove(QChar('\x00')); - return retStr; -} - -QString StringParser::convertDrawStringForLog(const QString &inputStr) -{ - QString outputStr = inputStr; - return outputStr.replace("&","&u;").replace(",", "&c;"); -} - -QString StringParser::convertLogStringForDraw(const QString &inputStr) -{ - QString outputStr = inputStr; - return outputStr.replace("&c;",",").replace("&u;", "&"); -} - QString StringParser::escapeString(const QString &toEscape) { #if QT_VERSION >= 0x050000 diff --git a/StringParser.h b/StringParser.h index f15b537..59b6460 100644 --- a/StringParser.h +++ b/StringParser.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify @@ -26,9 +26,6 @@ class StringParser { public: StringParser(); - static QString parseTitleString(const QByteArray &commitBytes, int maxLength); - static QString convertDrawStringForLog(const QString &inputStr); - static QString convertLogStringForDraw(const QString &inputStr); static QString escapeString(const QString &toEscape); #ifdef GTA5SYNC_PROJECT static QString convertBuildedString(const QString &buildedStr); diff --git a/TelemetryClass.cpp b/TelemetryClass.cpp index 6db570c..521734f 100644 --- a/TelemetryClass.cpp +++ b/TelemetryClass.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/TelemetryClass.h b/TelemetryClass.h index 1e06ff5..475ce6e 100644 --- a/TelemetryClass.h +++ b/TelemetryClass.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/TranslationClass.cpp b/TranslationClass.cpp index 611d1f2..9afbf13 100644 --- a/TranslationClass.cpp +++ b/TranslationClass.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/TranslationClass.h b/TranslationClass.h index 138216d..963eaff 100644 --- a/TranslationClass.h +++ b/TranslationClass.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/UserInterface.cpp b/UserInterface.cpp index 7d63257..03b5a7c 100644 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/UserInterface.h b/UserInterface.h index 05ef444..c6f9ed2 100644 --- a/UserInterface.h +++ b/UserInterface.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/anpro/JSHighlighter.cpp b/anpro/JSHighlighter.cpp index 6d3b93c..7b3aec0 100644 --- a/anpro/JSHighlighter.cpp +++ b/anpro/JSHighlighter.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/anpro/JSHighlighter.h b/anpro/JSHighlighter.h index 08a0eb5..cad6453 100644 --- a/anpro/JSHighlighter.h +++ b/anpro/JSHighlighter.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/config.h b/config.h index 1ebab69..23a6a09 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify @@ -28,17 +28,9 @@ #define GTA5SYNC_APPVENDORLINK "https://github.com/Syping/" #endif -#ifndef GTA5SYNC_DISABLED -#define GTA5SYNC_ENABLED -#endif - #ifndef GTA5SYNC_APPSTR -#ifdef GTA5SYNC_ENABLED -#define GTA5SYNC_APPSTR "gta5sync" -#else #define GTA5SYNC_APPSTR "gta5view" #endif -#endif #ifndef GTA5SYNC_APPDES #define GTA5SYNC_APPDES "INSERT YOUR APPLICATION DESCRIPTION HERE" @@ -49,7 +41,7 @@ #endif #ifndef GTA5SYNC_APPVER -#define GTA5SYNC_APPVER "1.5.4" +#define GTA5SYNC_APPVER "1.6.0" #endif #ifdef GTA5SYNC_BUILDTYPE_REL diff --git a/gta5view.pro b/gta5view.pro index 09a47f8..ee6ae7d 100644 --- a/gta5view.pro +++ b/gta5view.pro @@ -154,9 +154,8 @@ INCLUDEPATH += ./anpro ./tmext ./uimod # GTA5SYNC/GTA5VIEW ONLY -DEFINES += GTA5SYNC_DISABLED DEFINES += GTA5SYNC_PROJECT # Enable exclusive gta5sync/gta5view functions -DEFINES += GTA5SYNC_CSDF # Not assisting at proper usage of SnapmaticPicture class +DEFINES += GTA5SYNC_NOASSIST # Not assisting at proper usage of SnapmaticPicture class # WINDOWS ONLY diff --git a/main.cpp b/main.cpp index f02fea5..5ab285a 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonArray.cpp b/qjson4/QJsonArray.cpp index 531941f..ad8a82b 100644 --- a/qjson4/QJsonArray.cpp +++ b/qjson4/QJsonArray.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonArray.h b/qjson4/QJsonArray.h index 94aab1b..dc4fc69 100644 --- a/qjson4/QJsonArray.h +++ b/qjson4/QJsonArray.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonDocument.cpp b/qjson4/QJsonDocument.cpp index 59adf32..9d503c3 100644 --- a/qjson4/QJsonDocument.cpp +++ b/qjson4/QJsonDocument.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonDocument.h b/qjson4/QJsonDocument.h index 12e8fc7..5b1e17a 100644 --- a/qjson4/QJsonDocument.h +++ b/qjson4/QJsonDocument.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonObject.cpp b/qjson4/QJsonObject.cpp index 55f8cf1..ac36bb0 100644 --- a/qjson4/QJsonObject.cpp +++ b/qjson4/QJsonObject.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonObject.h b/qjson4/QJsonObject.h index ad657bc..6ee3a97 100644 --- a/qjson4/QJsonObject.h +++ b/qjson4/QJsonObject.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonParseError.cpp b/qjson4/QJsonParseError.cpp index 6bcfd98..598c67c 100644 --- a/qjson4/QJsonParseError.cpp +++ b/qjson4/QJsonParseError.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonParseError.h b/qjson4/QJsonParseError.h index b87d7aa..eddf04d 100644 --- a/qjson4/QJsonParseError.h +++ b/qjson4/QJsonParseError.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonParser.cpp b/qjson4/QJsonParser.cpp index 9b084f7..052c9a8 100644 --- a/qjson4/QJsonParser.cpp +++ b/qjson4/QJsonParser.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonParser.h b/qjson4/QJsonParser.h index d54a0d9..f11f5a0 100644 --- a/qjson4/QJsonParser.h +++ b/qjson4/QJsonParser.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonRoot.h b/qjson4/QJsonRoot.h index 77b9751..d249465 100644 --- a/qjson4/QJsonRoot.h +++ b/qjson4/QJsonRoot.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonValue.cpp b/qjson4/QJsonValue.cpp index 68bf87f..8ac4770 100644 --- a/qjson4/QJsonValue.cpp +++ b/qjson4/QJsonValue.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonValue.h b/qjson4/QJsonValue.h index bf32898..d902352 100644 --- a/qjson4/QJsonValue.h +++ b/qjson4/QJsonValue.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonValueRef.cpp b/qjson4/QJsonValueRef.cpp index 7d67ef4..dade257 100644 --- a/qjson4/QJsonValueRef.cpp +++ b/qjson4/QJsonValueRef.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/qjson4/QJsonValueRef.h b/qjson4/QJsonValueRef.h index 567c68a..478b657 100644 --- a/qjson4/QJsonValueRef.h +++ b/qjson4/QJsonValueRef.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/res/app.rc b/res/app.rc index 1b2196a..5f4ece2 100644 --- a/res/app.rc +++ b/res/app.rc @@ -7,8 +7,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 5, 4, 0 -PRODUCTVERSION 1, 5, 4, 0 +FILEVERSION 1, 6, 0, 0 +PRODUCTVERSION 1, 6, 0, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view" - VALUE "FileVersion", "1.5.4" + VALUE "FileVersion", "1.6.0" VALUE "InternalName", "gta5view" VALUE "LegalCopyright", "Copyright © 2016-2018 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" - VALUE "ProductVersion", "1.5.4" + VALUE "ProductVersion", "1.6.0" END END END diff --git a/tmext/TelemetryClassAuthenticator.cpp b/tmext/TelemetryClassAuthenticator.cpp index 6fb5375..fc523f7 100644 --- a/tmext/TelemetryClassAuthenticator.cpp +++ b/tmext/TelemetryClassAuthenticator.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/tmext/TelemetryClassAuthenticator.h b/tmext/TelemetryClassAuthenticator.h index d2dd840..4180029 100644 --- a/tmext/TelemetryClassAuthenticator.h +++ b/tmext/TelemetryClassAuthenticator.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2018 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/uimod/UiModLabel.cpp b/uimod/UiModLabel.cpp index 27c6a7d..4a2c2d4 100644 --- a/uimod/UiModLabel.cpp +++ b/uimod/UiModLabel.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/uimod/UiModLabel.h b/uimod/UiModLabel.h index 7d35e87..0988a4e 100644 --- a/uimod/UiModLabel.h +++ b/uimod/UiModLabel.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2016-2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/uimod/UiModWidget.cpp b/uimod/UiModWidget.cpp index b517463..75cddf7 100644 --- a/uimod/UiModWidget.cpp +++ b/uimod/UiModWidget.cpp @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify diff --git a/uimod/UiModWidget.h b/uimod/UiModWidget.h index d30637d..db3ae04 100644 --- a/uimod/UiModWidget.h +++ b/uimod/UiModWidget.h @@ -1,5 +1,5 @@ /***************************************************************************** -* gta5sync GRAND THEFT AUTO V SYNC +* gta5view Grand Theft Auto V Profile Viewer * Copyright (C) 2017 Syping * * This program is free software: you can redistribute it and/or modify