From: mkr <mkr@opencascade.com>
Date: Thu, 12 Jul 2007 08:25:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: qt4_porting_delivery_220807~92
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6093a3247049db653718f774d5de3044d5cbfe7d;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 3bbb36abc..ac6572fbf 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -900,14 +900,14 @@ int SalomeApp_Application::closeChoice( const QString& docName )
 {
   int answer = SUIT_MessageBox::question( desktop(), tr( "APPCLOSE_CAPTION" ), tr( "APPCLOSE_DESCRIPTION" ).arg( docName ),
                                           tr ("APPCLOSE_SAVE"), tr ("APPCLOSE_CLOSE"),
-					  tr ("APPCLOSE_UNLOAD"), tr ("APPCLOSE_CANCEL"), 1 );
+					  tr ("APPCLOSE_UNLOAD"), tr ("APPCLOSE_CANCEL"), 0 );
 
   int res = CloseCancel;
-  if ( answer == 1 )
+  if ( answer == 0 )
     res = CloseSave;
-  else if ( answer == 2 )
+  else if ( answer == 1 )
     res = CloseDiscard;
-  else if ( answer == 3 )
+  else if ( answer == 2 )
     res = CloseUnload;
 
   return res;
diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.po b/src/SalomeApp/resources/SalomeApp_msg_en.po
index 445306db7..c5c5fe7bd 100644
--- a/src/SalomeApp/resources/SalomeApp_msg_en.po
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.po
@@ -249,21 +249,21 @@ msgstr "Delete"
 
 //=======================================================================================
 
-msgid "APPCLOSE_SAVE"
+msgid "SalomeApp_Application::APPCLOSE_SAVE"
 msgstr "&Save&&Close"
 
-msgid "APPCLOSE_CLOSE"
+msgid "SalomeApp_Application::APPCLOSE_CLOSE"
 msgstr "&Close w/o saving"
 
-msgid "APPCLOSE_UNLOAD"
+msgid "SalomeApp_Application::APPCLOSE_UNLOAD"
 msgstr "&Unload"
 
-msgid "APPCLOSE_CANCEL"
+msgid "SalomeApp_Application::APPCLOSE_CANCEL"
 msgstr "&Cancel"
 
-msgid "APPCLOSE_CAPTION"
+msgid "SalomeApp_Application::APPCLOSE_CAPTION"
 msgstr "Close active study"
 
-msgid "APPCLOSE_DESCRIPTION"
+msgid "SalomeApp_Application::APPCLOSE_DESCRIPTION"
 msgstr "Do you want to close or only unload the study"
 
diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts
index 9439392b0..18d079edb 100644
--- a/src/SalomeApp/resources/SalomeApp_msg_en.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts
@@ -48,6 +48,14 @@
         <source>ALL_FILES_FILTER</source>
         <translation>All files (*.*)</translation>
     </message>
+    <message>
+        <source>APPCLOSE_UNLOAD</source>
+        <translation>&amp;Unload</translation>
+    </message>
+    <message>
+        <source>APPCLOSE_CLOSE</source>
+        <translation>&amp;Close w/o saving</translation>
+    </message>
     <message>
         <source>MEN_WINDOWS_NEW</source>
         <translation>New window</translation>
@@ -72,6 +80,10 @@
         <source>MEN_DESK_REGISTRY_DISPLAY</source>
         <translation>Registry &amp;display</translation>
     </message>
+    <message>
+        <source>APPCLOSE_SAVE</source>
+        <translation>&amp;Save&amp;&amp;Close</translation>
+    </message>
     <message>
         <source>TOT_DESK_FILE_LOAD_SCRIPT</source>
         <translation>Load python script</translation>
@@ -133,6 +145,10 @@ Do you want to reload it ?</translation>
         <source>PYTHON_FILES_FILTER</source>
         <translation>PYTHON Files (*.py)</translation>
     </message>
+    <message>
+        <source>APPCLOSE_DESCRIPTION</source>
+        <translation>Do you want to close or only unload the study</translation>
+    </message>
     <message>
         <source>PRP_DESK_PROPERTIES</source>
         <translation>Edits study properties</translation>
@@ -145,6 +161,10 @@ Do you want to reload it ?</translation>
         <source>STUDY_LOCKED</source>
         <translation>LOCKED</translation>
     </message>
+    <message>
+        <source>APPCLOSE_CANCEL</source>
+        <translation>&amp;Cancel</translation>
+    </message>
     <message>
         <source>OBJ_BROWSER_NAME</source>
         <translation>Object</translation>
@@ -221,6 +241,10 @@ Do you want to reload it ?</translation>
         <source>MEN_DESK_CATALOG_GENERATOR</source>
         <translation>Catalog &amp;generator</translation>
     </message>
+    <message>
+        <source>APPCLOSE_CAPTION</source>
+        <translation>Close active study</translation>
+    </message>
     <message>
         <source>MEN_DESK_MRU</source>
         <translation>Most recently used</translation>
@@ -229,10 +253,6 @@ Do you want to reload it ?</translation>
         <source>TOT_DESK_MRU</source>
         <translation>Most recently used</translation>
     </message>
-    <message>
-        <source>ACTIVATE_MODULE_OP_LOAD</source>
-        <translation>Load...</translation>
-    </message>
 </context>
 <context>
     <name>SalomeApp_StudyPropertiesDlg</name>