From 26c1bc072501f525a3d705998aaf72f7efc1630d Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sat, 15 Feb 2014 11:47:15 +0100 Subject: [PATCH] Added Finnish to menu languges --- companion/src/helpers.cpp | 4 ++-- companion/src/mainwindow.cpp | 4 ++++ companion/src/mainwindow.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index e3d98d9fa..9a9f2caf4 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -48,8 +48,8 @@ void populateGvSourceCB(QComboBox *b, int value) void populateVoiceLangCB(QComboBox *b, QString language) { - QString strings[] = { QObject::tr("English"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; - QString langcode[] = { "en", "fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; + QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; + QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; b->clear(); for (int i=0; strings[i]!=NULL; i++) { diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 80305289c..991861451 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1674,6 +1674,7 @@ void MainWindow::createActions() czechLangAct = addAct( langAlignGroup, tr("Czech"), tr("Use Czech in menus"), SLOT(setCZLanguage())); germanLangAct = addAct( langAlignGroup, tr("German"), tr("Use German in menus"), SLOT(setDELanguage())); englishLangAct = addAct( langAlignGroup, tr("English"), tr("Use English in menus"), SLOT(setENLanguage())); + finnishLangAct = addAct( langAlignGroup, tr("Finnish"), tr("Use Finnish in menus"), SLOT(setFILanguage())); frenchLangAct = addAct( langAlignGroup, tr("French"), tr("Use French in menus"), SLOT(setFRLanguage())); italianLangAct = addAct( langAlignGroup, tr("Italian"), tr("Use Italian in menus"), SLOT(setITLanguage())); hebrewLangAct = addAct( langAlignGroup, tr("Hebrew"), tr("Use Hebrew in menus"), SLOT(setHELanguage())); @@ -1751,6 +1752,7 @@ void MainWindow::createMenus() languageMenu->addAction(englishLangAct); languageMenu->addAction(czechLangAct); languageMenu->addAction(germanLangAct); + languageMenu->addAction(finnishLangAct); languageMenu->addAction(frenchLangAct); languageMenu->addAction(hebrewLangAct); languageMenu->addAction(italianLangAct); @@ -2000,6 +2002,8 @@ void MainWindow::updateLanguageActions() germanLangAct->setChecked(true); else if (langId=="en") englishLangAct->setChecked(true); + else if (langId=="fi_FI") + finnishLangAct->setChecked(true); else if (langId=="fr_FR") frenchLangAct->setChecked(true); else if (langId=="it_IT") diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 7a9e4d8c1..505878ef2 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -88,6 +88,7 @@ private slots: void setCZLanguage() {setLanguage("cs_CZ");}; void setDELanguage() {setLanguage("de_DE");}; void setENLanguage() {setLanguage("en");}; + void setFILanguage() {setLanguage("fi_FI");}; void setFRLanguage() {setLanguage("fr_FR");}; void setITLanguage() {setLanguage("it_IT");}; void setHELanguage() {setLanguage("he_IL");}; @@ -272,6 +273,7 @@ private: QAction *czechLangAct; QAction *germanLangAct; QAction *frenchLangAct; + QAction *finnishLangAct; QAction *italianLangAct; QAction *hebrewLangAct; QAction *polishLangAct;