From a33c97cd6fca4fa429f28e4b18d2003b24916617 Mon Sep 17 00:00:00 2001 From: Rafael Date: Fri, 14 Oct 2016 08:03:16 +0200 Subject: [PATCH] including Savegame number (Preview) --- SavegameWidget.cpp | 14 ++++++++- SavegameWidget.h | 1 + SavegameWidget.ui | 3 +- gta5sync.pro | 11 ++++++- lang/gta5sync_ru.ts | 70 +++++++++++++++++++++++-------------------- res/gta5sync_de.qm | Bin 23520 -> 23446 bytes res/gta5sync_de.ts | 71 ++++++++++++++++++++++++-------------------- 7 files changed, 103 insertions(+), 67 deletions(-) diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index 21b2e75..6343afa 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,7 @@ SavegameWidget::SavegameWidget(QWidget *parent) : highlightBackColor = palette.highlight().color(); highlightTextColor = palette.highlightedText().color(); + labelStr = tr("Savegame %1\n%2"); sgdPath = ""; sgdStr = ""; sgdata = 0; @@ -85,7 +87,17 @@ bool SavegameWidget::eventFilter(QObject *obj, QEvent *ev) void SavegameWidget::setSavegameData(SavegameData *savegame, QString savegamePath) { - ui->labSavegameStr->setText(savegame->getSavegameStr()); + bool validNumber; + QString fileName = QFileInfo(savegame->getSavegameFileName()).fileName(); + int savegameNumber = QString(fileName).remove(0,5).toInt(&validNumber) + 1; + if (!validNumber) + { + ui->labSavegameStr->setText(savegame->getSavegameStr()); + } + else + { + ui->labSavegameStr->setText(labelStr.arg(QString::number(savegameNumber), savegame->getSavegameStr())); + } sgdStr = savegame->getSavegameStr(); sgdPath = savegamePath; sgdata = savegame; diff --git a/SavegameWidget.h b/SavegameWidget.h index ca4571a..050b69a 100755 --- a/SavegameWidget.h +++ b/SavegameWidget.h @@ -66,6 +66,7 @@ private: SavegameData *sgdata; QColor highlightBackColor; QColor highlightTextColor; + QString labelStr; QString sgdPath; QString sgdStr; diff --git a/SavegameWidget.ui b/SavegameWidget.ui index 39d5f62..2ca5f84 100755 --- a/SavegameWidget.ui +++ b/SavegameWidget.ui @@ -64,7 +64,8 @@ - The Third Way (100%) - 00/00/00 00:00:00 + Savegame %1 +%2 true diff --git a/gta5sync.pro b/gta5sync.pro index 81897ae..3912b33 100755 --- a/gta5sync.pro +++ b/gta5sync.pro @@ -110,7 +110,14 @@ DISTFILES += res/app.rc \ lang/qtbase_ru.qm \ lang/README.txt \ lang/gta5sync_ru.ts \ - lang/qt_ru.qm + lang/qt_ru.qm \ + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat INCLUDEPATH += ./uimod @@ -148,3 +155,5 @@ unix: !macx: pixmaps.path = $$(INSTALL_PATH)/share/pixmaps unix: !macx: pixmaps.files = $$PWD/res/gta5sync.xpm unix: !macx: target.path = $$(INSTALL_PATH)/bin unix: !macx: INSTALLS += target pixmaps appfiles + +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/lang/gta5sync_ru.ts b/lang/gta5sync_ru.ts index 432c12d..cd19791 100755 --- a/lang/gta5sync_ru.ts +++ b/lang/gta5sync_ru.ts @@ -760,22 +760,28 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping Виджет сохранений - The Third Way (100%) - 00/00/00 00:00:00 - Третий путь (100%) - 00/00/00 00:00:00 + Третий путь (100%) - 00/00/00 00:00:00 - + + + Savegame %1 +%2 + + + + View savegame - + View Просмотр - + Export Экспорт @@ -784,72 +790,72 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping Копировать - + Delete Удалить - - - + + + Delete savegame Удалить сохранение - + Export Savegame... - + Are you sure to delete %1 from your savegames? Вы уверены, что хотите удалить сохранение %1? - + Failed at deleting %1 from your savegames Не удалось удалить сохранение %1 - + &View - + &Remove - - + + &Select - + &Deselect - - + + Select &All - + &Deselect All - + Copy savegame Копировать сохранение - + &Export @@ -964,44 +970,44 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping - + Export as &JPG picture... - + Export as &GTA Snapmatic... - + &View - + &Remove - - + + &Select - + &Deselect - - + + Select &All - + &Deselect All diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 28eac5b9f93a0713849c6fd0ad2a27f2b368948d..802a211e42f11d652babe3a0758cc078e30a046c 100755 GIT binary patch delta 697 zcmXBRZAepL6bJDCvwNqzcT1CuVFlZiyKug*<|`|f&iA*ujp&1f$_#^Blx7hW1WAOl zWlyD$5t4q%{L&(!AQF*YZAKA61-(o{sHDiuK2%5Uhv)fyIOp)3^PKln?9voF7m)Ts zjEO*tI@oIQoq|600H~dTVYCHUXMp1_1?$altR>Y4;Fwp)Z*Y9c2O4b1TFWmR)%5Ox zyVwilMc@s+1R8q>=XOdpOn#dU)IH`KnME4XseJ*UX#;n&Di-E_EHCY#V14!i&~w2W zC+j?d>&P;-vC8LI;r{a5Vsr6Tz|$}G4=)0eL!1bI2byi@P5s=SGMx*LUfh-YkWRC-Gw`S!BuIkLJgZJs|x~3SP)LB?MpQF2hqeQ|dZfcE zPN0-Y1Gz3>b6m6fqBJ($NG-*=BHGi-x5;IlBlH1QO@F@JuvkOo59QrUNr3+&SH-5x zVfmFM2vnuXudn|AH-zUSkFm%`vh;$o7pH2>5Eci(^zr|;F>qx zS?Z>JKjoA9Gwd37CD>9w#nP$cjO69ZxxkK&E+Cl0-KLyqB;k*TS$Si**`}ZXG88xs nv>znUN%FV#hW53oA*)g#E6(VlYK8G`pN+dbsnO2b<0=0E(@Mwn delta 738 zcmXBRT}YEr7zgnGyS>w$y)zT~60^N2GdFc^k-C%>YHNPG=_}I3E|xC*XkA!gc2O5K zx=^;{Kt_oo=|z|j>_SS4B*Kd@1uH`AON@{b3oo@tHLpL)8R3<<_R0kyJVV$7OssOB;NmT=|&YFR0C#+xXWIM7p^NWU5 z-FM(}x`Es%+`*SX&6D2gql^oNg={*!gYOhf?4u?WR)AVRcL^Th4G#;s$q%&hi#b5Y zwek{K*{#hxzebkwX(7Mu7(}mg5Gd{zyKgQ7%qosXz60KN@&`FcQo1jZTqiG+zsVT+ zkNhl-MnNT}kOEmtYRN0&z3dUdFvi2042?ILk7-Q8X+BNsE54%XWYzJ* zlV_;t4Ia`K2n&2fd*H-hmhmecD0eW+g&?3WR5d4lsXw4A`E}PWBxFO43=! z`az&jVBymHK&hSe*z$msCDpR`YpXn1XE06b0nk+@IOVB>E^Qy?t$9REaLV^(#WrO3u!YSx?-#S%58RO-*V zO8ZT!?q=z6=owx4j-+!+M4CBwiC!`#{hXKw;+?8es!_b Spielstand Widget - The Third Way (100%) - 00/00/00 00:00:00 - The Third Way (100%) - 00/00/00 00:00:00 + The Third Way (100%) - 00/00/00 00:00:00 - + + + Savegame %1 +%2 + Spielstand %1 +%2 + + + View Ansehen - + Export Exportieren @@ -990,61 +997,61 @@ Exportieren als: Kopieren - + Delete Löschen - - - + + + Delete savegame Savegame löschen - + Export Savegame... Spielstand exportieren... - + Are you sure to delete %1 from your savegames? Bist du sicher %1 von deinen Spielständen zu löschen? - + Failed at deleting %1 from your savegames Fehlgeschlagen beim Löschen %1 von deinen Spielständen - + &View A&nsehen - + &Remove Entfe&rnen - - + + &Select Au&swählen - + &Deselect A&bwählen - - + + Select &All &Alles auswählen - + &Deselect All Alles a&bwählen @@ -1073,18 +1080,18 @@ Exportieren als: Umschalt+S - + View savegame Spielstand ansehen - + Copy savegame Spielstand kopieren - + &Export &Exportieren @@ -1213,44 +1220,44 @@ Exportieren als: Exportiere als &GTA Snapmatic - + Export as &JPG picture... Exportiere als &JPG Bild... - + Export as &GTA Snapmatic... Exportiere als &GTA Snapmatic... - + &View A&nsehen - + &Remove Entfe&rnen - - + + &Select Au&swählen - + &Deselect A&bwählen - - + + Select &All Alles &auswählen - + &Deselect All Alles a&bwählen