From cea28ac5e272fd46215964032a3ce2167e93f4d4 Mon Sep 17 00:00:00 2001 From: Rafael Date: Sun, 16 Oct 2016 12:35:57 +0200 Subject: [PATCH] Showing Savegame number preview updated --- SavegameWidget.cpp | 29 +++++++++++++++---- SavegameWidget.ui | 3 +- lang/gta5sync_ru.ts | 63 ++++++++++++++++++++++++++-------------- res/gta5sync_de.qm | Bin 23446 -> 23770 bytes res/gta5sync_de.ts | 68 ++++++++++++++++++++++++++++++-------------- 5 files changed, 111 insertions(+), 52 deletions(-) diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index 6343afa..b2350a8 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -54,7 +54,7 @@ SavegameWidget::SavegameWidget(QWidget *parent) : highlightBackColor = palette.highlight().color(); highlightTextColor = palette.highlightedText().color(); - labelStr = tr("Savegame %1\n%2"); + labelStr = tr("SAVE %3 - %1
%2"); sgdPath = ""; sgdStr = ""; sgdata = 0; @@ -87,18 +87,35 @@ bool SavegameWidget::eventFilter(QObject *obj, QEvent *ev) void SavegameWidget::setSavegameData(SavegameData *savegame, QString savegamePath) { + // BETA CODE bool validNumber; + QString savegameName = tr("WRONG FORMAT"); + QString savegameDate = tr("WRONG FORMAT"); + QString savegameString = savegame->getSavegameStr(); QString fileName = QFileInfo(savegame->getSavegameFileName()).fileName(); - int savegameNumber = QString(fileName).remove(0,5).toInt(&validNumber) + 1; - if (!validNumber) + QStringList savegameNDL = QString(savegameString).split(" - "); + if (savegameNDL.length() >= 2) { - ui->labSavegameStr->setText(savegame->getSavegameStr()); + savegameDate = savegameNDL.at(savegameNDL.length() - 1); + savegameName = QString(savegameString).remove(savegameString.length() - savegameDate.length() - 3, savegameDate.length() + 3); + } + int savegameNumber = QString(fileName).remove(0,5).toInt(&validNumber) + 1; + if (validNumber) + { + if (savegameNumber == 16) + { + ui->labSavegameStr->setText(labelStr.arg(savegameDate, savegameName, tr("AUTO"))); + } + else + { + ui->labSavegameStr->setText(labelStr.arg(savegameDate, savegameName, QString::number(savegameNumber))); + } } else { - ui->labSavegameStr->setText(labelStr.arg(QString::number(savegameNumber), savegame->getSavegameStr())); + ui->labSavegameStr->setText(labelStr.arg(savegameDate, savegameName, tr("UNKNOWN"))); } - sgdStr = savegame->getSavegameStr(); + sgdStr = savegameString; sgdPath = savegamePath; sgdata = savegame; } diff --git a/SavegameWidget.ui b/SavegameWidget.ui index 2ca5f84..d992cdb 100755 --- a/SavegameWidget.ui +++ b/SavegameWidget.ui @@ -64,8 +64,7 @@ - Savegame %1 -%2 + SAVE - %1<br>%2 true diff --git a/lang/gta5sync_ru.ts b/lang/gta5sync_ru.ts index cd19791..bfebb65 100755 --- a/lang/gta5sync_ru.ts +++ b/lang/gta5sync_ru.ts @@ -765,23 +765,21 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping - - Savegame %1 -%2 + SAVE - %1<br>%2 - + View savegame - + View Просмотр - + Export Экспорт @@ -790,14 +788,14 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping Копировать - + Delete Удалить - - - + + + Delete savegame Удалить сохранение @@ -807,55 +805,76 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping - + + SAVE %3 - %1<br>%2 + + + + + + WRONG FORMAT + + + + + AUTO + + + + + UNKNOWN + + + + 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 diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 802a211e42f11d652babe3a0758cc078e30a046c..6cbdc707e3be9d2e54bf840a0bc7acacb800b618 100755 GIT binary patch delta 1189 zcmaKqT}&KR6vzKFJG;!xE**;fvX*t#EDhU2p|C5m?3RU{VcCxvc9~^0mKZTxv60$P zHS|F-sf{MKAdYRdHZfS*2Pvs7=_hK6O+$!58f*M$tVToA5Vc?wD=)-Me+TaPZlHb-xCstu>g{cDroxZHIxz~wZh`Mh z0l7Rp!*rVP!?Tc;=!EC08&LD%`L&cNW5Ytezt5!d5(1Snu&D=f_A5X;+&dnulG_>a z`;9>SHnXjH7Fa&W>?;2g2>--fi`@mv=9rn>Q^fV`)=@gIA7OkYeMu1VG@zd;y zCvO6QRqUBFUZ5t+p8f10AUMa49h3l;At28uv>vJe>h2Lb?ra9C z7-3(D7r1ZIWWxoae?$dzUKp$CLKCVV7nxs3FmP1NUHKqTn-X0KD$M&(bidL-6Zk@$383KqO#%!a3Py-nhXz zTeTe6lYiRWJ? z_kH%ihOblqD^1!99Nb}<=5)nqvHJ4m5=X!E2;jZyxH!Fwp6ZNo%(_FX=B2gUDO|cv ziYTOVZ>7n|sI=AEN>@K8?d;Y8+b!vXdGa2tkOsz&0@CZ!%T8>3fgvk^IR+LG7uxX{j z7^|DvqJ(9A$f9N1rNG3>wkZms#nuUlA`9C5&~oa1xcuPWd(J)gaGqY~_Fm+64&vOq z2Iq#3tp%J5AVdXVRt1Ev05JIm)NT`yFdORAHlTk9>gY|twn5R`4o%Z6pq~cDR*EY~ zg7IH`K>)@F2J#b(A2Wf%(HQqH&eEjlm~HkkN$!#FH;~oGeeQRL9K+AMN&C)vzG4fNS2U0na!#)=%%3QG2TbkZ&!4Ai^UVB( z>#4xB+kEF<8PJ>gmz_RJH-vw4Y!KjGuF~Is1gM!xA0vG;RHoIG*4xLrIdjN%K`72S z1k9)rYWBScM5E9W{sI(_Ccl!UBwa7=Ab$WeO=KUrg#1G`3N5uDACeq3Q%$PKDZ+{L zqkz?_=zJ}l+B64n8#EmEy`D*+4EQ?igeV~NaN=aWx0g1;Y!+H;O{)J>&)IjqxQPHbcEXkA#-_v>iEon|~0#NdX zZ4vyEeV^1dsuXYyW!*wDABeGELh?etMZ3fKj)upeXn&>+{~kg8->$7ijO^1kjN44- z<%*7B+G`aZKwu9^aRIwFTDguMsn&jPeMue@6$=X`1X{{ln64Eg{7 diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 9618404..77e873e 100755 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -975,20 +975,23 @@ Exportieren als: The Third Way (100%) - 00/00/00 00:00:00 - - Savegame %1 %2 - Spielstand %1 + Spielstand %1 %2 - + + SAVE - %1<br>%2 + SPIELSTAND - %1<br>%2 + + + View Ansehen - + Export Exportieren @@ -997,14 +1000,14 @@ Exportieren als: Kopieren - + Delete Löschen - - - + + + Delete savegame Savegame löschen @@ -1014,44 +1017,65 @@ Exportieren als: Spielstand exportieren... - + + SAVE %3 - %1<br>%2 + SPIELSTAND %3 - %1<br>%2 + + + + + WRONG FORMAT + FALSCHES FORMAT + + + + AUTO + AUTO + + + + UNKNOWN + UNKNOWN + + + 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 @@ -1080,18 +1104,18 @@ Exportieren als: Umschalt+S - + View savegame Spielstand ansehen - + Copy savegame Spielstand kopieren - + &Export &Exportieren