- Some more fixes for the translations.

- Added the missing Q_OBJECT macro. - Removed stupid Qt default buttons as they are not translated. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11682 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 6, 2012 · a65ac59 · a65ac59
1 parent 06d9d9a
commit a65ac59
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 96 deletions.
diff --git a/OMEdit/OMEditGUI/Helper.h b/OMEdit/OMEditGUI/Helper.h
@@ -41,6 +41,7 @@
 
 class Helper : public QObject
 {
+  Q_OBJECT
 public:
   static void initHelperVariables();
   /* Global non-translated variables */
@@ -177,6 +178,7 @@ class Helper : public QObject
 
 class GUIMessages : public QObject
 {
+  Q_OBJECT
 public:
   enum MessagesTypes
   {

diff --git a/OMEdit/OMEditGUI/InteractiveSimulationTabWidget.cpp b/OMEdit/OMEditGUI/InteractiveSimulationTabWidget.cpp
@@ -692,7 +692,7 @@ bool InteractiveSimulationTab::checkVariablesSelected()
 
   QMessageBox::information(mpParentInteractiveSimulationTabWidget->getParentMainWindow(),
                            QString(Helper::applicationName).append(" - ").append(Helper::information),
-                           GUIMessages::getMessage(GUIMessages::SELECT_VARIABLE_FOR_OMI), "OK");
+                           GUIMessages::getMessage(GUIMessages::SELECT_VARIABLE_FOR_OMI), Helper::ok);
 
   return false;
 }
@@ -926,19 +926,22 @@ void InteractiveSimulationTabWidget::closeInetractiveSimulationTab(int index, bo
   msgBox->setIcon(QMessageBox::Information);
   msgBox->setText(QString(GUIMessages::getMessage(GUIMessages::CLOSE_INTERACTIVE_SIMULATION_TAB)).arg(pInteractiveSimualtion->getName()));
   msgBox->setInformativeText(QString(GUIMessages::getMessage(GUIMessages::INFO_CLOSE_INTERACTIVE_SIMULATION_TAB)));
-  msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-  msgBox->setDefaultButton(QMessageBox::Yes);
+  QPushButton *pOkButton = new QPushButton(Helper::ok);
+  QPushButton *pCancelButton = new QPushButton(Helper::cancel);
+  msgBox->addButton(pOkButton, QMessageBox::AcceptRole);
+  msgBox->addButton(pCancelButton, QMessageBox::RejectRole);
+  msgBox->setDefaultButton(pOkButton);
 
   int answer = msgBox->exec();
 
   switch (answer)
   {
-    case QMessageBox::Yes:
+    case QMessageBox::AcceptRole:
       // Yes was clicked
       removeTab(index);
       delete pInteractiveSimualtion;
       break;
-    case QMessageBox::No:
+    case QMessageBox::RejectRole:
       // No was clicked
       break;
     default:

diff --git a/OMEdit/OMEditGUI/LibraryWidget.cpp b/OMEdit/OMEditGUI/LibraryWidget.cpp
@@ -396,17 +396,20 @@ bool ModelicaTree::deleteNodeTriggered(ModelicaTreeNode *node, bool askQuestion,
     msgBox->setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::question));
     msgBox->setIcon(QMessageBox::Question);
     msgBox->setText(msg);
-    msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-    msgBox->setDefaultButton(QMessageBox::Yes);
+    QPushButton *pOkButton = new QPushButton(Helper::ok);
+    QPushButton *pCancelButton = new QPushButton(Helper::cancel);
+    msgBox->addButton(pOkButton, QMessageBox::AcceptRole);
+    msgBox->addButton(pCancelButton, QMessageBox::RejectRole);
+    msgBox->setDefaultButton(pOkButton);
 
     int answer = msgBox->exec();
 
     switch (answer)
     {
-      case QMessageBox::Yes:
+      case QMessageBox::AcceptRole:
         // Yes was clicked. Don't return.
         break;
-      case QMessageBox::No:
+      case QMessageBox::RejectRole:
         // No was clicked
         return false;
       default:

diff --git a/OMEdit/OMEditGUI/ModelicaEditor.cpp b/OMEdit/OMEditGUI/ModelicaEditor.cpp
@@ -184,8 +184,9 @@ void ModelicaEditor::findText(const QString &text, bool forward)
 
   if (!found)
   {
-    QMessageBox::information(mpParentProjectTab->mpParentProjectTabWidget->mpParentMainWindow, Helper::applicationName + " - Information",
-                             GUIMessages::getMessage(GUIMessages::SEARCH_STRING_NOT_FOUND).arg(text), "OK");
+    QMessageBox::information(mpParentProjectTab->mpParentProjectTabWidget->mpParentMainWindow,
+                             QString(Helper::applicationName).append(" - ").append(Helper::information),
+                             GUIMessages::getMessage(GUIMessages::SEARCH_STRING_NOT_FOUND).arg(text), Helper::ok);
   }
 }
 

diff --git a/OMEdit/OMEditGUI/OMEdit_de.ts b/OMEdit/OMEditGUI/OMEdit_de.ts
@@ -402,20 +402,20 @@ This is probably wrong because the component is decalred as %3.</oldsource>
 <context>
     <name>GotoLineWidget</name>
     <message>
-        <location filename="ModelicaEditor.cpp" line="626"/>
+        <location filename="ModelicaEditor.cpp" line="627"/>
         <source>Go to Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ModelicaEditor.cpp" line="647"/>
+        <location filename="ModelicaEditor.cpp" line="648"/>
         <source>Enter line number (1 to </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GraphicsView</name>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="937"/>
+        <location filename="ProjectTabWidget.cpp" line="933"/>
         <source>Cancel Connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -475,12 +475,12 @@ This is probably wrong because the component is decalred as %3.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="902"/>
+        <location filename="ProjectTabWidget.cpp" line="901"/>
         <source>The class needs to be saved before you can insert a bitmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="1399"/>
+        <location filename="ProjectTabWidget.cpp" line="1395"/>
         <source>Error in class annotation </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1149,35 +1149,35 @@ This is probably wrong because the component is decalred as %3.</oldsource>
 <context>
     <name>LibraryTree</name>
     <message>
-        <location filename="LibraryWidget.cpp" line="583"/>
+        <location filename="LibraryWidget.cpp" line="586"/>
         <source>Modelica Standard Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="606"/>
+        <location filename="LibraryWidget.cpp" line="609"/>
         <source>Show Component</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="607"/>
+        <location filename="LibraryWidget.cpp" line="610"/>
         <source>Shows the component</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="610"/>
+        <location filename="LibraryWidget.cpp" line="613"/>
         <source>View Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="611"/>
+        <location filename="LibraryWidget.cpp" line="614"/>
         <source>View component documentation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LibraryWidget</name>
     <message>
-        <location filename="LibraryWidget.cpp" line="1346"/>
+        <location filename="LibraryWidget.cpp" line="1349"/>
         <source>Modelica Library</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1734,7 +1734,7 @@ This is probably wrong because the component is decalred as %3.</oldsource>
 <context>
     <name>ModelBrowserTree</name>
     <message>
-        <location filename="LibraryWidget.cpp" line="1611"/>
+        <location filename="LibraryWidget.cpp" line="1614"/>
         <source>Outline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,12 +1795,12 @@ This is probably wrong because the component is decalred as %3.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ModelicaEditor.cpp" line="207"/>
+        <location filename="ModelicaEditor.cpp" line="208"/>
         <source>Undo changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ModelicaEditor.cpp" line="208"/>
+        <location filename="ModelicaEditor.cpp" line="209"/>
         <source>Let me fix errors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1866,7 +1866,7 @@ This is probably wrong because the component is decalred as %3.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="430"/>
+        <location filename="LibraryWidget.cpp" line="433"/>
         <source>while deleting </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2114,17 +2114,17 @@ This is probably wrong because the component is decalred as %3.</oldsource>
 <context>
     <name>ProjectTabWidget</name>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="3076"/>
+        <location filename="ProjectTabWidget.cpp" line="3072"/>
         <source>Save File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="3076"/>
+        <location filename="ProjectTabWidget.cpp" line="3072"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="3195"/>
+        <location filename="ProjectTabWidget.cpp" line="3191"/>
         <source>There are unsaved models opened. Do you still want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2140,12 +2140,12 @@ This is probably wrong because the component is decalred as %3.</oldsource>
 <context>
     <name>SearchMSLWidget</name>
     <message>
-        <location filename="LibraryWidget.cpp" line="1256"/>
+        <location filename="LibraryWidget.cpp" line="1259"/>
         <source>Searched Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="LibraryWidget.cpp" line="1314"/>
+        <location filename="LibraryWidget.cpp" line="1317"/>
         <source>Sorry, no items found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2486,22 +2486,22 @@ Please wait for a while.</source>
 <context>
     <name>WelcomePageWidget</name>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="2649"/>
+        <location filename="ProjectTabWidget.cpp" line="2645"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="2651"/>
+        <location filename="ProjectTabWidget.cpp" line="2647"/>
         <source>No recent files found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="2674"/>
+        <location filename="ProjectTabWidget.cpp" line="2670"/>
         <source>Create Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ProjectTabWidget.cpp" line="2677"/>
+        <location filename="ProjectTabWidget.cpp" line="2673"/>
         <source>Open Model</source>
         <translation type="unfinished"></translation>
     </message>