diff --git a/config.h b/config.h index a7b3ba8..25c313c 100755 --- a/config.h +++ b/config.h @@ -50,7 +50,7 @@ #ifndef GTA5SYNC_APPVER #ifndef GTA5SYNC_DAILYB -#define GTA5SYNC_APPVER "1.4.3" +#define GTA5SYNC_APPVER "1.4.4" #else #define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB) #endif diff --git a/gta5view.pro b/gta5view.pro index 13e3a9e..58e2987 100755 --- a/gta5view.pro +++ b/gta5view.pro @@ -112,6 +112,7 @@ TRANSLATIONS += \ res/gta5sync_ru.ts RESOURCES += \ + res/tr_g5p.qrc \ res/app.qrc DISTFILES += res/app.rc \ @@ -119,8 +120,8 @@ DISTFILES += res/app.rc \ res/gta5sync_de.ts \ res/gta5sync_fr.ts \ res/gta5sync_ru.ts \ - res/gta5sync.exe.manifest \ - res/gta5sync.png \ + res/gta5view.exe.manifest \ + res/gta5view.png \ lang/README.txt INCLUDEPATH += ./uimod @@ -155,6 +156,12 @@ isEqual(QT_MAJOR_VERSION, 4): SOURCES += qjson4/QJsonArray.cpp \ qjson4/QJsonValueRef.cpp \ qjson4/QJsonParser.cpp +isEqual(QT_MAJOR_VERSION, 4): RESOURCES += res/tr_qt4.qrc + +# QT5 ONLY STUFF + +isEqual(QT_MAJOR_VERSION, 5): RESOURCES += res/tr_qt5.qrc + # UNIX SYSTEM STUFF unix: !macx: appfiles.path = $$(INSTALL_PATH)/share/applications diff --git a/res/app.qrc b/res/app.qrc index 8ae92ac..c41d920 100755 --- a/res/app.qrc +++ b/res/app.qrc @@ -1,43 +1,32 @@ - - - gta5sync_de.qm - qt_de.qm - qtbase_de.qm - gta5sync_fr.qm - qt_fr.qm - qtbase_fr.qm - gta5sync_ru.qm - qt_ru.qm - qtbase_ru.qm - - - savegame.png - 5sync-48.png - 5sync-16.png - 5sync-24.png - 5sync-32.png - 5sync-40.png - 5sync-64.png - 5sync-96.png - 5sync-128.png - 5sync-256.png - back.png - next.png - 960x536.png - empty1x16.png - avatararea.png - avatarareaimport.png - - - global.de.ini - global.en.ini - global.es.ini - global.fr.ini - global.ja.ini - global.ru.ini - global.zh.ini - - - template.g5e - - + + + savegame.png + 5sync-48.png + 5sync-16.png + 5sync-24.png + 5sync-32.png + 5sync-40.png + 5sync-64.png + 5sync-96.png + 5sync-128.png + 5sync-256.png + back.png + next.png + 960x536.png + empty1x16.png + avatararea.png + avatarareaimport.png + + + global.de.ini + global.en.ini + global.es.ini + global.fr.ini + global.ja.ini + global.ru.ini + global.zh.ini + + + template.g5e + + diff --git a/res/app.rc b/res/app.rc index 9b02d2d..4fbbc6e 100755 --- 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, 4, 2, 0 -PRODUCTVERSION 1, 4, 2, 0 +FILEVERSION 1, 4, 4, 0 +PRODUCTVERSION 1, 4, 4, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view\0" - VALUE "FileVersion", "1.4.2\0" + VALUE "FileVersion", "1.4.4\0" VALUE "InternalName", "gta5view\0" VALUE "LegalCopyright", "Copyright © 2016-2017 Syping\0" VALUE "OriginalFilename", "gta5view.exe\0" VALUE "ProductName", "gta5view\0" - VALUE "ProductVersion", "1.4.2\0" + VALUE "ProductVersion", "1.4.4\0" END END END diff --git a/res/qtbase_de.qm b/res/qtbase_de.qm index ed026f9..29e518e 100755 Binary files a/res/qtbase_de.qm and b/res/qtbase_de.qm differ diff --git a/res/qtbase_ru.qm b/res/qtbase_ru.qm index 8dba5ce..a11b7c7 100644 Binary files a/res/qtbase_ru.qm and b/res/qtbase_ru.qm differ diff --git a/res/tr_g5p.qrc b/res/tr_g5p.qrc new file mode 100644 index 0000000..393f585 --- /dev/null +++ b/res/tr_g5p.qrc @@ -0,0 +1,7 @@ + + + gta5sync_de.qm + gta5sync_fr.qm + gta5sync_ru.qm + + diff --git a/res/tr_qt4.qrc b/res/tr_qt4.qrc new file mode 100644 index 0000000..098d37c --- /dev/null +++ b/res/tr_qt4.qrc @@ -0,0 +1,7 @@ + + + qt_de.qm + qt_fr.qm + qt_ru.qm + + diff --git a/res/tr_qt5.qrc b/res/tr_qt5.qrc new file mode 100644 index 0000000..f34728d --- /dev/null +++ b/res/tr_qt5.qrc @@ -0,0 +1,7 @@ + + + qtbase_de.qm + qtbase_fr.qm + qtbase_ru.qm + +