fix loosing translation

OpenModelica · Dec 15, 2016 · 7d51e86 · 7d51e86
1 parent 95dc78d
commit 7d51e86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/OMNotebook/OMNotebookGUI/cellapplication.cpp b/OMNotebook/OMNotebookGUI/cellapplication.cpp
@@ -46,7 +46,6 @@
 #include "inputcell.h"
 #include "notebookcommands.h"
 #include <QSplashScreen>
-#include <QTranslator>
 
 #include <cstdlib>
 
@@ -130,15 +129,13 @@ namespace IAEX
   #endif
     QString translationDirectory = omhome + QString("/share/omnotebook/nls");
     // install Qt's default translations
-    QTranslator qtTranslator;
   #ifdef Q_OS_WIN
     qtTranslator.load("qt_" + QLocale::system().name(), translationDirectory);
   #else
     qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
   #endif
     app_->installTranslator(&qtTranslator);
     // install application translations
-    QTranslator translator;
     translator.load("OMNotebook_" + QLocale::system().name(), translationDirectory);
     app_->installTranslator(&translator);
 

diff --git a/OMNotebook/OMNotebookGUI/cellapplication.h b/OMNotebook/OMNotebookGUI/cellapplication.h
@@ -51,6 +51,7 @@
 #include <QtGui/QMessageBox>
 #include <QtCore/QDir>
 #endif
+#include <QTranslator>
 
 // IAEX Headers
 #include "application.h"
@@ -89,6 +90,8 @@ namespace IAEX
 
   private:
     void convertDrModelica();            // Added 2006-03-21 AF
+    QTranslator translator;
+    QTranslator qtTranslator;
 
   private:
     QApplication *app_;

diff --git a/OMNotebook/OMNotebookGUI/notebook.cpp b/OMNotebook/OMNotebookGUI/notebook.cpp
@@ -3438,7 +3438,8 @@ void NotebookWindow::changeWindow(QAction *action)
   if( !windows_[action]->isActiveWindow() )
   {
     windows_[action]->activateWindow();
-    windows_[action]->showNormal();
+    windows_[action]->raise();
+    //windows_[action]->showNormal();
   }
 }