aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed translators order persistence

Browse Source 
fixes #91
This commit is contained in:
Gres 2022-03-24 20:39:39 +03:00
parent a4e09d88c6
commit 7d84bd2f7b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/settingseditor.cpp
View File

@ -323,7 +323,9 @@ void SettingsEditor::setSettings(const Settings &settings)
ui->proxySaveCheck->setChecked(settings.proxySavePassword); ui->proxySaveCheck->setChecked(settings.proxySavePassword);
ui->tessdataPath->setText(settings.tessdataPath); ui->tessdataPath->setText(settings.tessdataPath);
ui->translatorsPath->setText(settings.translatorsPath);
updateModels(); updateModels();
ui->tesseractLangCombo->setCurrentText( ui->tesseractLangCombo->setCurrentText(
LanguageCodes::name(settings.sourceLanguage)); LanguageCodes::name(settings.sourceLanguage));
ui->tesseractVersion->setCurrentIndex(int(settings.tesseractVersion)); ui->tesseractVersion->setCurrentIndex(int(settings.tesseractVersion));
@ -336,7 +338,6 @@ void SettingsEditor::setSettings(const Settings &settings)
ui->doTranslationCheck->setChecked(settings.doTranslation); ui->doTranslationCheck->setChecked(settings.doTranslation);
ui->ignoreSslCheck->setChecked(settings.ignoreSslErrors); ui->ignoreSslCheck->setChecked(settings.ignoreSslErrors);
ui->translateTimeoutSpin->setValue(settings.translationTimeout.count()); ui->translateTimeoutSpin->setValue(settings.translationTimeout.count());
ui->translatorsPath->setText(settings.translatorsPath);
ui->translateLangCombo->setCurrentText( ui->translateLangCombo->setCurrentText(
LanguageCodes::name(settings.targetLanguage)); LanguageCodes::name(settings.targetLanguage));
updateTranslators(settings.translators); updateTranslators(settings.translators);
@ -408,7 +409,14 @@ void SettingsEditor::updateTranslators(const QStringList &translators)
if (models_.translators().isEmpty()) if (models_.translators().isEmpty())
return; return;
ui->translatorList->addItems(models_.translators()); QStringList all;
for (const auto &i : translators) {
if (models_.translators().contains(i))
all.append(i);
}
all += models_.translators();
all.removeDuplicates();
ui->translatorList->addItems(all);
for (auto i = 0, end = ui->translatorList->count(); i < end; ++i) { for (auto i = 0, end = ui->translatorList->count(); i < end; ++i) {
auto item = ui->translatorList->item(i); auto item = ui->translatorList->item(i);