From 4acebc31860646277f236cf7a1af588d326da87b Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Thu, 3 Sep 2015 12:50:35 +0200
Subject: [PATCH] Fixes #2815: some languages were not completelly disabled and
 caused Companion crash

---
 companion/src/mainwindow.cpp | 18 +++++++++---------
 companion/src/mainwindow.h   | 14 ++++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index c165d69a0..1fa723f5f 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1118,8 +1118,8 @@ void MainWindow::createMenus()
       languageMenu->addAction(germanLangAct);
       languageMenu->addAction(finnishLangAct);
       languageMenu->addAction(frenchLangAct);
-//      languageMenu->addAction(hebrewLangAct);
       languageMenu->addAction(italianLangAct);
+//      languageMenu->addAction(hebrewLangAct);
       languageMenu->addAction(polishLangAct);
 //      languageMenu->addAction(portugueseLangAct);
       languageMenu->addAction(spanishLangAct);
@@ -1366,20 +1366,20 @@ void MainWindow::updateLanguageActions()
     frenchLangAct->setChecked(true);
   else if (langId=="it_IT") 
     italianLangAct->setChecked(true);
-  else if (langId=="he_IL") 
-    hebrewLangAct->setChecked(true);
+  // else if (langId=="he_IL") 
+  //   hebrewLangAct->setChecked(true);
   else if (langId=="pl_PL") 
     polishLangAct->setChecked(true);
-  else if (langId=="pt_PT") 
-    portugueseLangAct->setChecked(true);
-  else if (langId=="ru_RU") 
-    russianLangAct->setChecked(true);
+  // else if (langId=="pt_PT") 
+  //   portugueseLangAct->setChecked(true);
   else if (langId=="es_ES")
     spanishLangAct->setChecked(true);
   else if (langId=="sv_SE") 
     swedishLangAct->setChecked(true);
-  else if (langId=="nl_NL") 
-    dutchLangAct->setChecked(true);
+  // else if (langId=="ru_RU") 
+  //   russianLangAct->setChecked(true);
+  // else if (langId=="nl_NL") 
+  //   dutchLangAct->setChecked(true);
 }
 
 void MainWindow::updateIconThemeActions()
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 759375bc0..ba4b7c760 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -262,20 +262,22 @@ class MainWindow : public QMainWindow
     QAction *normalIconAct;
     QAction *bigIconAct;
     QAction *hugeIconAct;
+
     QAction *sysLangAct;
-    QAction *englishLangAct;
     QAction *czechLangAct;
     QAction *germanLangAct;
-    QAction *frenchLangAct;
+    QAction *englishLangAct;
     QAction *finnishLangAct;
+    QAction *frenchLangAct;
     QAction *italianLangAct;
-    QAction *hebrewLangAct;
+    // QAction *hebrewLangAct;
     QAction *polishLangAct;
+    // QAction *portugueseLangAct;
     QAction *spanishLangAct;
-    QAction *portugueseLangAct;
     QAction *swedishLangAct;
-    QAction *russianLangAct;
-    QAction *dutchLangAct;
+    // QAction *russianLangAct;
+    // QAction *dutchLangAct;
+
     QAction *openDocURLAct;
 };