diff --git a/.travis.yml b/.travis.yml index c6bd319..a4bbfb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: required language: cpp env: -- PACKAGE_VERSION="0.1.0" +- PACKAGE_VERSION="1.4.0" before_install: - test -n $CC && unset CC @@ -17,22 +17,22 @@ install: before_script: - export INSTALL_ROOT=/usr - if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION="$PACKAGE_VERSION.$TRAVIS_BUILD_NUMBER"; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi - - echo "gta5view build version is $APPLICATION_VERSION" + - echo "gta5view build version is $PACKAGE_VERSION" - mkdir build - mkdir package - cd build - echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak script: - - qmake -qt=5 "DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\"" "DEFINES+=GTA5SYNC_DAILYB=\\\\\\\"$APPLICATION_VERSION\\\\\\\"" ../gta5view.pro + - qmake -qt=5 "DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\"" "DEFINES+=GTA5SYNC_DAILYB=\\\\\\\"$PACKAGE_VERSION-dev2\\\\\\\"" ../gta5view.pro - make -j 4 - - sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$APPLICATION_VERSION --pkgrelease=travis1 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package + - sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$PACKAGE_VERSION --pkgrelease=dev2 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package deploy: provider: releases api_key: secure: "o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg=" - file: "../package/gta5view_$APPLICATION_VERSION-travis1_amd64.deb" + file: "../package/gta5view_$PACKAGE_VERSION-dev2_amd64.deb" skip_cleanup: true on: tags: true diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index fece230..e7940d3 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -149,7 +149,6 @@ void SavegameWidget::on_cmdDelete_clicked() void SavegameWidget::on_cmdView_clicked() { SavegameDialog *savegameDialog = new SavegameDialog(this); - savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint); savegameDialog->setSavegameData(sgdata, sgdPath, true); savegameDialog->setModal(true); savegameDialog->show(); diff --git a/config.h b/config.h index 8e0020f..4eba476 100755 --- a/config.h +++ b/config.h @@ -50,7 +50,7 @@ #ifndef GTA5SYNC_APPVER #ifndef GTA5SYNC_DAILYB -#define GTA5SYNC_APPVER "1.4.0-dev1" +#define GTA5SYNC_APPVER "1.4.0-dev2" #else #define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB) #endif diff --git a/main.cpp b/main.cpp index eeacd3d..c90f498 100755 --- a/main.cpp +++ b/main.cpp @@ -458,7 +458,6 @@ int main(int argc, char *argv[]) SavegameData savegame; bool readOk = savegame.readingSavegameFromFile(arg1); - savegameDialog.setWindowFlags(savegameDialog.windowFlags()^Qt::WindowContextHelpButtonHint); savegameDialog.setWindowIcon(IconLoader::loadingAppIcon()); savegameDialog.setSavegameData(&savegame, arg1, readOk); diff --git a/res/app.rc b/res/app.rc index 9195aef..9d25b64 100755 --- a/res/app.rc +++ b/res/app.rc @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view\0" - VALUE "FileVersion", "1.4.0-dev1\0" + VALUE "FileVersion", "1.4.0-dev2\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.0-dev1\0" + VALUE "ProductVersion", "1.4.0-dev2\0" END END END diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index 3c7a03a..7b01f37 100644 Binary files a/res/gta5sync_fr.qm and b/res/gta5sync_fr.qm differ diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index bf2ffa2..89f9aab 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -1080,7 +1080,7 @@ Appuyer sur 1 pour le mode par défaut Mugshot - Mugshot + Photo d'identité Custom @@ -1100,20 +1100,20 @@ Appuyer sur 1 pour le mode par défaut Snapmatic Title - + Titre Snapmatic Title: %1 (%2) - + Titre : %1 (%2) Appropriate: %1 - + Valide : %1 @@ -1143,19 +1143,21 @@ Appuyer sur 1 pour le mode par défaut Edit - + Éditer Yes Yes, should work fine - + Oui, devrait fonctionner + Oui No No, could lead to issues - + Non, pourrait causer des erreurs + Non @@ -1165,7 +1167,7 @@ Appuyer sur 1 pour le mode par défaut New Snapmatic title: - + Nouveau titre Snapmatic :