From 8de1b2bcd26d6462bdc88c4523629ac38bf4b2cd Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 2 Mar 2017 06:54:48 +0100 Subject: [PATCH] update to development version 2 --- .travis.yml | 10 +++++----- SavegameWidget.cpp | 1 - config.h | 2 +- main.cpp | 1 - res/app.rc | 4 ++-- res/gta5sync_fr.qm | Bin 30633 -> 28625 bytes res/gta5sync_fr.ts | 18 ++++++++++-------- 7 files changed, 18 insertions(+), 18 deletions(-) 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 3c7a03a4bb168aa37f70ec0e0dbf0c3a0f054bc2..7b01f37b5d4135ae8ca8e8c3f0f2bdb2f5657e20 100644 GIT binary patch delta 2498 zcmYk7c~n&A8OEQPxifd}y)%r&K}02vD2Sj$D4QsTRZ#?$Mce=phB%QeESlt;cC^-0 ziEA=-In_i(Breo#M6DE4AU3t0IFT6A+9YPtMh-baZD_38*k`;sCV$-XoA2K5d)Mdv z=J0^#>J7~{t8+MjmjP*u%He5%b}gVB0EBCRuNKhH1?CO|LSq0E_l8deHJldOCBK1Yq&5TVP3<9l?eMF7${N@_RVB61>qgDfU&6v z_u5Mvp)&s?B*v!$u^mXaGqK{;n7RHMoR~fnvtzddfq}?8$`1uDlomRf;bu4s<^w}} zu<>{gGs(rlGGAs;jJS=x9!w=9hbl09%vh!^|Imgl5eh^GP7SRr7E**NE0GeUAqg zxV4q*S;A%OwT<;vfPblW-?B(x%&RI>%-Tb%r_kQ(+9TeC*vKa|oK!jdTb1E4DwF<7 zI=OM_QEh9&)PmiFW43I^pO1HK@{JWODv zjtOzjWFE}CBg~863(T4?Z1Byc$ijtM;$La;Iop`H$*rA<3aIAh(<*$He$EsYo&Z%E~rHh%n^_BZdf#*i(_e^AlIYIjU z5AuMh;riyai>TI*^(T&W0K;+(`ZzbByJ-l#$gwMIHsllrQzDX~R9g)^zr(O1pB2 zX2io9#p;j01ja{;wbwZf!FA%cy$!q{9*f(rY-fNFn>#7Wq7Lz7=C?rJ+hSW!G%)R~ z*wrE!o6 zOa7lG(a{7cxbQH~e=UXFA4{>$ktV!MJH|&(=){l+Y39x?jJ!@N6j@rUpR{}@BcEL_ zRb)_nOP5O(<)oofs{K9+NXd~lMZ|Di=c!zHUuy2m2Ff-{my$Tn>9W)t5eJMamIiv6 zShN>$`45V zO1|9RzaVnD@t4v+0GT$oqj?U)|nJEAL$UT<&ha7Gos0yvi2IseY4Y?XJt>v zA5r=Ic=Oo~&U?@;m2qx!_aZ+AHekNq;^M`z!+f)f4kqWA?`L0O&p-DOyjNN&-~^@tQp%@+1V?6fpJ&ZjyL zSdP9=2Se?a?sF_ay;`@Cinw(fjXY;A2Uysj025sdbdp z+Y@ZTk*=$SBVCT71dZv9N2`N^SLy`U-o3*WXaX z6Dw6ucWSe%-6h3ab;`5Id*aM%?qo=y#q!hfJRWzwUNXXUXL&;0&-VS4Hh+aO{U}U$ uYS_nn>PhOh(BP;EUguT=<}z@{(>=OH_Byw3sUW#)D*9w`1M8;MY5otr0-Wan delta 2893 zcmZ{mc~nz(7RSFYc_Df4Wl`Bg1tW^G35W)$A`&c{EJYSkSrn46XhIMI%AB!rJ$1#7 zZy2jGwOaAG&7gwSmcfo7yZcC*0zD6p5Zfn*sJ(X?+yClpCU&n-|Km0dvJO(n%i0GCyh#0>(P##WY&L1X=z`+E~ynv#rbq zN?*!WJ1PM0K-njA$5A?FN}P5@wtL|_WVleaw?8sU+#9MFN%T1^G2AIJxj~}YSGK?C z29W-)?C@cy0hm5T_F2bBAj2R#^#>g=Hc!^Qfad30W!Fxn07Fj5zTM>p6wi=zyDkEA zAIkM-&I4*+xxSZZIw?2Q^wIiPa^o%w5U@j@vwsyZe6)N+E(f@sli!S>1C7I27om&R zRjlE~L{ji68|gIC#_V=BBWfFv>BFuXm_^0+kX`%HE#gLYU;P81>@JZcEY}n1{qlO^ zPry77pAjbzUlYsNeH%!Jd5uJdc$O%qKv;Hva1%w`D6!C+-M_DZl)KD2o0sPT+Dx`h zD5l)!u*bGdAU8zXwL8N_;O;V&V5}_tE9_-g@@xwUxl=T=s{8HehfK z`|!KZsVJYbPkT<&m}g&pVW0rEDA;~GvDXzIyEg&BOB7>m?*o2}Q+k-QO)>jS2Pv>b zVf(}cMEs~|45mnDs}m6BC-YGa$LN-s0}ScT`~*& zfapsuCYc>bGP#uHkdpjLrSirgz$Z+}_cHo5ms=rt{XZ~Tz>7SJ4 zMyl=s|B@J2shoeE#^FbmwodYRSccMm`CB05ePz`Z>XzVk<%ip9sK5WFY&g?E?Y2<4 z^Eef2$pq!WlzTv4r}A*m1R#EevZEt_x}r(>O&Ybk+hUa>p$l*pD^=cIAwcADmHsv5 zY|=HA@%c_l$!b;H!|haDiK^7y-P8@EROyFE5l^$qw*6BorUxqfaSIjgVb!q?a%9#; zRo4khVT4?Dzl|Ij^nx4Eu$h`^Bj@?$aZ>Us=lPFVpeUa6E7$|XwQ{4Mj->vdTgC+} zB176viSB(|;--3%^fp(ZB#FJQa>bh{f-ECvO`>8nz0X-oh{8X)s-MEC|A%wyLJZW` zArj}haXXKv16CP#Dwf(i?J{>MBogpl#@)X}fmI|Bn}~~f=8lD4NWaW$+yyoOm=k55(im{PMXMR2NDkOr|;B|XRZ9#ag>T_ zD!#k670{$h^tmH3`74R30TT1W_)Eic=t`Z%|9$U6z;yxNd*~GK?i~KsX)400-}6tR zMgVr5z*6Z0TVmaLH>^@f_8P5(hL}U)YU1Z%;dZ3 z)l(a&OCGB?jis?xt8Qdis(}wA<_%Zx)RAL}4)quJtEpYv)NKrL;8@MjTU4~O<1~@0 zsXaX&Xd>6rO{Kf()WmA2IwKZo;+9^ZE--1b-6*Fak0mBP)*NZ4z7GtQ7`sH%Im?|K z>e5_{Z=&CVM$MI7BIVkl>8+pxqWm>a)6dX_bWF?kU$s%a+Sa+{RD7c)hQF4W_8Z-h zdE{tp!cbjO0!cG!g~T~}T}96!AU9Z7Sx>3ZtkUgxoddjAsoVE89pDwL>pV&l#yryX zZ4IIMGi2R9Q`C=(aZbjvS(`X>~XTP%{k zE9=C9z;P{)1J(#klK3FgOQ@t%?I@uwR?$1lQ>=^ga2sy4TJ@Dx_7d8t@BgaS`?t(A z+;m|!im}nZ6W1s5OssfrqQ}O`f#US>Lt3UpGhWPKF~ei9_-ZhxbeURH?XcU#%A6eW zS 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 :