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

update to development version 2

Browse source
This commit is contained in:
Syping 2017-03-02 06:54:48 +01:00
parent 24b1f32bbe
commit 8de1b2bcd2
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -4,7 +4,7 @@ sudo: required
language: cpp language: cpp
env: env:
- PACKAGE_VERSION="0.1.0" - PACKAGE_VERSION="1.4.0"
before_install: before_install:
- test -n $CC && unset CC - test -n $CC && unset CC
@ -17,22 +17,22 @@ install:
before_script: before_script:
- export INSTALL_ROOT=/usr - 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 - 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 build
- mkdir package - mkdir package
- cd build - cd build
- echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak - echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak
script: 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 - make -j 4
- sudo checkinstall -D --default --nodoc --pkgname=gta5view --pkgversion=$APPLICATION_VERSION --pkgrelease=travis1 --pkggroup=utility --maintainer="Syping on Travis \<travisci@syping.de\>" --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 \<travisci@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5 --pakdir=../package
deploy: deploy:
provider: releases provider: releases
api_key: api_key:
secure: "o7VneEz1aHfdVwZvOZLfopf6uJWNrFsZaBvunTmXFzpmNFhlNS1qwqgMUkIA2yBRbZ3wIzVs4vfwIHv7W9yE/PqK+AYL+R8+AwKGrwlgT4HqJNuk6VM/LNJ6GwT/qkQuaoOVw29bUjmzzgIRdHmw53SlJv6Hh1VE8HphlTT//aex6nCfcFhUZ0BETdZDWz5FSHwL3NalUoqfKfQrJeky5RXzCyCANQC2tKt0bV46GaWIgWrDo2KCTNqPtRWWf5GDmnkXE5IYRMQ3mXvO9iYh0v5Y2jo4PiXGUiFUU6Z3aAWFAiPdGclrBO697cf3lCTzDMhuCETR153qFYsLShUlFf61ITAmCeHAWETjZDri0lmPONo3GoNB6alGfYEA51qw14kXakrTpICtTJj7gw/gtUYOabW6hrzmieNzMBIy62RikDPjyakFnuwW2qNHRlD65e0jYv+6nCpb6E+OV16Ysh1zhV2vTfpfzVmSuyu2J+ELqXD3OZCXRSPpDIih9UQ8335p8FBji6jHORcgym/TRgdgRmENibh8tLzWp+UjpWHuWfcpvZgOskjfwU0iDMCayMJ7tDpOhXHcAhDRnd6XRIiOJ5YZCzflj2nEwmt3YUd7DwXS/AU+WHOmcNQBjXBxF/FJa35XXcy3HKJM5TTKqtph3medo30us5yXHeG6NNg=" 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 skip_cleanup: true
on: on:
tags: true tags: true

1
SavegameWidget.cpp
View file

@ -149,7 +149,6 @@ void SavegameWidget::on_cmdDelete_clicked()
void SavegameWidget::on_cmdView_clicked() void SavegameWidget::on_cmdView_clicked()
{ {
SavegameDialog *savegameDialog = new SavegameDialog(this); SavegameDialog *savegameDialog = new SavegameDialog(this);
savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
savegameDialog->setSavegameData(sgdata, sgdPath, true); savegameDialog->setSavegameData(sgdata, sgdPath, true);
savegameDialog->setModal(true); savegameDialog->setModal(true);
savegameDialog->show(); savegameDialog->show();

2
config.h
View file

@ -50,7 +50,7 @@
#ifndef GTA5SYNC_APPVER #ifndef GTA5SYNC_APPVER
#ifndef GTA5SYNC_DAILYB #ifndef GTA5SYNC_DAILYB
#define GTA5SYNC_APPVER "1.4.0-dev1" #define GTA5SYNC_APPVER "1.4.0-dev2"
#else #else
#define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB) #define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB)
#endif #endif

1
main.cpp
View file

@ -458,7 +458,6 @@ int main(int argc, char *argv[])
SavegameData savegame; SavegameData savegame;
bool readOk = savegame.readingSavegameFromFile(arg1); bool readOk = savegame.readingSavegameFromFile(arg1);
savegameDialog.setWindowFlags(savegameDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
savegameDialog.setWindowIcon(IconLoader::loadingAppIcon()); savegameDialog.setWindowIcon(IconLoader::loadingAppIcon());
savegameDialog.setSavegameData(&savegame, arg1, readOk); savegameDialog.setSavegameData(&savegame, arg1, readOk);

4
res/app.rc
View file

@ -25,12 +25,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Syping" VALUE "CompanyName", "Syping"
VALUE "FileDescription", "gta5view\0" VALUE "FileDescription", "gta5view\0"
VALUE "FileVersion", "1.4.0-dev1\0" VALUE "FileVersion", "1.4.0-dev2\0"
VALUE "InternalName", "gta5view\0" VALUE "InternalName", "gta5view\0"
VALUE "LegalCopyright", "Copyright © 2016-2017 Syping\0" VALUE "LegalCopyright", "Copyright © 2016-2017 Syping\0"
VALUE "OriginalFilename", "gta5view.exe\0" VALUE "OriginalFilename", "gta5view.exe\0"
VALUE "ProductName", "gta5view\0" VALUE "ProductName", "gta5view\0"
VALUE "ProductVersion", "1.4.0-dev1\0" VALUE "ProductVersion", "1.4.0-dev2\0"
END END
END END
END END

BIN
res/gta5sync_fr.qm
View file

Binary file not shown.

18
res/gta5sync_fr.ts
View file

@ -1080,7 +1080,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
<location filename="../SnapmaticEditor.ui" line="71"/> <location filename="../SnapmaticEditor.ui" line="71"/>
<location filename="../SnapmaticEditor.ui" line="115"/> <location filename="../SnapmaticEditor.ui" line="115"/>
<source>Mugshot</source> <source>Mugshot</source>
<translation>Mugshot</translation> <translation>Photo d&apos;identité</translation>
</message> </message>
<message> <message>
<source>Custom</source> <source>Custom</source>
@ -1100,20 +1100,20 @@ Appuyer sur 1 pour le mode par défaut</translation>
<location filename="../SnapmaticEditor.ui" line="125"/> <location filename="../SnapmaticEditor.ui" line="125"/>
<location filename="../SnapmaticEditor.cpp" line="297"/> <location filename="../SnapmaticEditor.cpp" line="297"/>
<source>Snapmatic Title</source> <source>Snapmatic Title</source>
<translation type="unfinished"></translation> <translation>Titre Snapmatic</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.ui" line="140"/> <location filename="../SnapmaticEditor.ui" line="140"/>
<location filename="../SnapmaticEditor.cpp" line="200"/> <location filename="../SnapmaticEditor.cpp" line="200"/>
<source>Title: %1 (%2)</source> <source>Title: %1 (%2)</source>
<translation type="unfinished"></translation> <translation>Titre : %1 (%2)</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.ui" line="156"/> <location filename="../SnapmaticEditor.ui" line="156"/>
<location filename="../SnapmaticEditor.cpp" line="204"/> <location filename="../SnapmaticEditor.cpp" line="204"/>
<location filename="../SnapmaticEditor.cpp" line="208"/> <location filename="../SnapmaticEditor.cpp" line="208"/>
<source>Appropriate: %1</source> <source>Appropriate: %1</source>
<translation type="unfinished"></translation> <translation>Valide : %1</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.ui" line="169"/> <location filename="../SnapmaticEditor.ui" line="169"/>
@ -1143,19 +1143,21 @@ Appuyer sur 1 pour le mode par défaut</translation>
<message> <message>
<location filename="../SnapmaticEditor.cpp" line="199"/> <location filename="../SnapmaticEditor.cpp" line="199"/>
<source>Edit</source> <source>Edit</source>
<translation type="unfinished"></translation> <translation>Éditer</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.cpp" line="204"/> <location filename="../SnapmaticEditor.cpp" line="204"/>
<source>Yes</source> <source>Yes</source>
<comment>Yes, should work fine</comment> <comment>Yes, should work fine</comment>
<translation type="unfinished"></translation> <translatorcomment>Oui, devrait fonctionner</translatorcomment>
<translation>Oui</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.cpp" line="208"/> <location filename="../SnapmaticEditor.cpp" line="208"/>
<source>No</source> <source>No</source>
<comment>No, could lead to issues</comment> <comment>No, could lead to issues</comment>
<translation type="unfinished"></translation> <translatorcomment>Non, pourrait causer des erreurs</translatorcomment>
<translation>Non</translation>
</message> </message>
<message> <message>
<location filename="../SnapmaticEditor.cpp" line="247"/> <location filename="../SnapmaticEditor.cpp" line="247"/>
@ -1165,7 +1167,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
<message> <message>
<location filename="../SnapmaticEditor.cpp" line="297"/> <location filename="../SnapmaticEditor.cpp" line="297"/>
<source>New Snapmatic title:</source> <source>New Snapmatic title:</source>
<translation type="unfinished"></translation> <translation>Nouveau titre Snapmatic :</translation>
</message> </message>
</context> </context>
<context> <context>