From: mkr <mkr@opencascade.com>
Date: Thu, 12 Jul 2007 08:52:35 +0000 (+0000)
Subject: Porting to Qt4.
X-Git-Tag: qt4_porting_delivery_220807~91
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb8b4712b7e26309ad1f53b1634839e805449287;p=modules%2Fgui.git

Porting to Qt4.
---

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index f0561eb6f..c7fc077e1 100755
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -199,11 +199,11 @@ void STD_Application::createActions()
                 Qt::SHIFT+Qt::Key_A, desk, false, this, SLOT( onHelpAbout() ) );
 
 
-  QtxDockAction* dwa = new QtxDockAction( tr( "TOT_DOCKWINDOWS" ), tr( "MEN_DOCKWINDOWS" ), desk );
+  QtxDockAction* dwa = new QtxDockAction( tr( "TOT_DOCKWINDOWS" ), tr( "MEN_DESK_VIEW_DOCKWINDOWS" ), desk );
   dwa->setDockType( QtxDockAction::DockWidget );
   registerAction( ViewWindowsId, dwa );
 
-  QtxDockAction* tba = new QtxDockAction( tr( "TOT_TOOLBARS" ), tr( "MEN_TOOLBARS" ), desk );
+  QtxDockAction* tba = new QtxDockAction( tr( "TOT_TOOLBARS" ), tr( "MEN_DESK_VIEW_TOOLBARS" ), desk );
   tba->setDockType( QtxDockAction::ToolBar );
   registerAction( ViewToolBarsId, tba );
 
diff --git a/src/STD/resources/STD_msg_en.po b/src/STD/resources/STD_msg_en.po
index 7956e4586..4dceccd1f 100755
--- a/src/STD/resources/STD_msg_en.po
+++ b/src/STD/resources/STD_msg_en.po
@@ -140,6 +140,9 @@ msgstr "&View"
 msgid "MEN_DESK_VIEW_TOOLBARS"
 msgstr "T&oolbars"
 
+msgid "MEN_DESK_VIEW_DOCKWINDOWS"
+msgstr "W&indows"
+
 msgid "MEN_DESK_VIEW_STATUSBAR"
 msgstr "&Status Bar"
 
diff --git a/src/STD/resources/STD_msg_en.ts b/src/STD/resources/STD_msg_en.ts
index 83316ceae..f26fb27d5 100644
--- a/src/STD/resources/STD_msg_en.ts
+++ b/src/STD/resources/STD_msg_en.ts
@@ -160,6 +160,10 @@ Directory with this name exist on disc. Try to use another name</translation>
         <source>TOT_DESK_EDIT_PASTE</source>
         <translation>Paste</translation>
     </message>
+    <message>
+        <source>MEN_DESK_VIEW_DOCKWINDOWS</source>
+        <translation>W&amp;indows</translation>
+    </message>
     <message>
         <source>BUT_YES</source>
         <translation>&amp;Yes</translation>
@@ -257,10 +261,6 @@ Do you want to reload it ?</translation>
         <source>DLG_LOAD_STUDY_CAPTION</source>
         <translation>Load Study</translation>
     </message>
-    <message>
-        <source>CLOSE_STUDY</source>
-        <translation>Close study</translation>
-    </message>
     <message>
         <source>PRP_DESK_HELP_SEARCH</source>
         <translation>Searches help for a topic</translation>
@@ -369,10 +369,6 @@ Do you want to overwrite it ?</translation>
         <source>TOT_DESK_FILE_OPEN</source>
         <translation>Open document</translation>
     </message>
-    <message>
-        <source>CLOSE_QUESTION</source>
-        <translation>Document %1 modified. Do you want to save or discard the modification and close the document?</translation>
-    </message>
     <message>
         <source>PRP_DESK_FILE_EXIT</source>
         <translation>Exits the application</translation>