diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp index b252916..f627921 100755 --- a/OptionsDialog.cpp +++ b/OptionsDialog.cpp @@ -240,9 +240,10 @@ void OptionsDialog::applySettings() settings->setValue("AspectRatio", aspectRatio); settings->endGroup(); + bool forceCustomFolder = ui->cbForceCustomFolder->isChecked(); settings->beginGroup("dir"); settings->setValue("dir", ui->txtFolder->text()); - settings->setValue("force", ui->cbForceCustomFolder->isChecked()); + settings->setValue("force", forceCustomFolder); settings->endGroup(); #if QT_VERSION >= 0x050000 @@ -256,6 +257,11 @@ void OptionsDialog::applySettings() #else bool languageChanged = ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentLanguage; #endif + + if (forceCustomFolder && ui->txtFolder->text() != currentCFolder || forceCustomFolder != currentFFolder && forceCustomFolder) + { + QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialize after you restart %1.").arg(GTA5SYNC_APPSTR)); + } if (languageChanged) { QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The language change will take effect after you restart %1.").arg(GTA5SYNC_APPSTR)); @@ -384,13 +390,14 @@ void OptionsDialog::setupCustomGTAFolder() bool ok; QString defaultGameFolder = AppEnv::getGameFolder(&ok); settings->beginGroup("dir"); - QString customGameFolder = settings->value("dir", "").toString(); - if (customGameFolder == "" && ok) + currentCFolder = settings->value("dir", "").toString(); + currentFFolder = settings->value("force", false).toBool(); + if (currentCFolder == "" && ok) { - customGameFolder = defaultGameFolder; + currentCFolder = defaultGameFolder; } - ui->txtFolder->setText(customGameFolder); - ui->cbForceCustomFolder->setChecked(settings->value("force", false).toBool()); + ui->txtFolder->setText(currentCFolder); + ui->cbForceCustomFolder->setChecked(currentFFolder); settings->endGroup(); } diff --git a/OptionsDialog.h b/OptionsDialog.h index 4fcdeaa..824fbac 100755 --- a/OptionsDialog.h +++ b/OptionsDialog.h @@ -56,9 +56,11 @@ private: QList playerItems; Qt::AspectRatioMode aspectRatio; QString currentLanguage; + QString currentCFolder; QString defaultProfile; QString percentString; QSettings *settings; + bool currentFFolder; int contentMode; int customQuality; int defaultQuality; diff --git a/lang/gta5sync_ru.ts b/lang/gta5sync_ru.ts index 1f45176..432c12d 100755 --- a/lang/gta5sync_ru.ts +++ b/lang/gta5sync_ru.ts @@ -264,26 +264,32 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping - + + %1 %1 - + + The new Custom Folder will initialize after you restart %1. + + + + The language change will take effect after you restart %1. - + No Profile No Profile, as default - - + + Profile: %1 @@ -1090,6 +1096,7 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping + Select &GTA V Folder... @@ -1187,17 +1194,12 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping - + Select GTA V Folder... - - - Select GTA V &Folder... - - Open File... diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index f7349b5..28eac5b 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 8904ee0..73b3c7d 100755 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -341,26 +341,36 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping %1 (%2 wenn verfügbar) - + + %1 %1 %1 - + + The new Custom Folder will initialize after you restart %1. + Der eigene Ordner wird initialisiert sobald du %1 neugestartet hast. + + + The new Custom Folder initialize after you restart %1. + Der eigene Ordner initialisiert sobald du %1 neugestartet hast. + + + The language change will take effect after you restart %1. Die Änderung der Sprache nimmt Effekt sobald du %1 neugestartet hast. - + No Profile No Profile, as default Kein Profil - - + + Profile: %1 Profil: %1 @@ -1449,6 +1459,7 @@ Exportieren als: + Select &GTA V Folder... Wähle &GTA V Ordner... @@ -1526,16 +1537,15 @@ Exportieren als: - + Select GTA V Folder... Wähle GTA V Ordner... - Select GTA V &Folder... - Wähle GTA V &Ordner... + Wähle GTA V &Ordner...