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 802a211..6cbdc70 100755 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ 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