Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Fixes #2815: some languages were not completelly disabled and caused Companion crash

Browse source
This commit is contained in:
Damjan Adamic 2015-09-03 12:50:35 +02:00
parent bd206cbbd2
commit 4acebc3186
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
companion/src/mainwindow.cpp
View file

@ -1118,8 +1118,8 @@ void MainWindow::createMenus()
languageMenu->addAction(germanLangAct); languageMenu->addAction(germanLangAct);
languageMenu->addAction(finnishLangAct); languageMenu->addAction(finnishLangAct);
languageMenu->addAction(frenchLangAct); languageMenu->addAction(frenchLangAct);
// languageMenu->addAction(hebrewLangAct);
languageMenu->addAction(italianLangAct); languageMenu->addAction(italianLangAct);
// languageMenu->addAction(hebrewLangAct);
languageMenu->addAction(polishLangAct); languageMenu->addAction(polishLangAct);
// languageMenu->addAction(portugueseLangAct); // languageMenu->addAction(portugueseLangAct);
languageMenu->addAction(spanishLangAct); languageMenu->addAction(spanishLangAct);
@ -1366,20 +1366,20 @@ void MainWindow::updateLanguageActions()
frenchLangAct->setChecked(true); frenchLangAct->setChecked(true);
else if (langId=="it_IT") else if (langId=="it_IT")
italianLangAct->setChecked(true); italianLangAct->setChecked(true);
else if (langId=="he_IL") // else if (langId=="he_IL")
hebrewLangAct->setChecked(true); // hebrewLangAct->setChecked(true);
else if (langId=="pl_PL") else if (langId=="pl_PL")
polishLangAct->setChecked(true); polishLangAct->setChecked(true);
else if (langId=="pt_PT") // else if (langId=="pt_PT")
portugueseLangAct->setChecked(true); // portugueseLangAct->setChecked(true);
else if (langId=="ru_RU")
russianLangAct->setChecked(true);
else if (langId=="es_ES") else if (langId=="es_ES")
spanishLangAct->setChecked(true); spanishLangAct->setChecked(true);
else if (langId=="sv_SE") else if (langId=="sv_SE")
swedishLangAct->setChecked(true); swedishLangAct->setChecked(true);
else if (langId=="nl_NL") // else if (langId=="ru_RU")
dutchLangAct->setChecked(true); // russianLangAct->setChecked(true);
// else if (langId=="nl_NL")
// dutchLangAct->setChecked(true);
} }
void MainWindow::updateIconThemeActions() void MainWindow::updateIconThemeActions()

14
companion/src/mainwindow.h
View file

@ -262,20 +262,22 @@ class MainWindow : public QMainWindow
QAction *normalIconAct; QAction *normalIconAct;
QAction *bigIconAct; QAction *bigIconAct;
QAction *hugeIconAct; QAction *hugeIconAct;
QAction *sysLangAct; QAction *sysLangAct;
QAction *englishLangAct;
QAction *czechLangAct; QAction *czechLangAct;
QAction *germanLangAct; QAction *germanLangAct;
QAction *frenchLangAct; QAction *englishLangAct;
QAction *finnishLangAct; QAction *finnishLangAct;
QAction *frenchLangAct;
QAction *italianLangAct; QAction *italianLangAct;
QAction *hebrewLangAct; // QAction *hebrewLangAct;
QAction *polishLangAct; QAction *polishLangAct;
// QAction *portugueseLangAct;
QAction *spanishLangAct; QAction *spanishLangAct;
QAction *portugueseLangAct;
QAction *swedishLangAct; QAction *swedishLangAct;
QAction *russianLangAct; // QAction *russianLangAct;
QAction *dutchLangAct; // QAction *dutchLangAct;
QAction *openDocURLAct; QAction *openDocURLAct;
}; };