From: ouv <ouv@opencascade.com>
Date: Thu, 3 Dec 2009 12:02:37 +0000 (+0000)
Subject: To correct order of buttons in question message boxes.
X-Git-Tag: PHASE_17_Part1_V2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b58637458db62d17b42d9180ca76e6dacb358cbf;p=modules%2Fgui.git

To correct order of buttons in question message boxes.
---

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 4776a7395..07ce76db3 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -1508,8 +1508,7 @@ bool SalomeApp_Application::defineAbsentParameters( const QStringList& theParame
   if( SUIT_MessageBox::question( desktop(),
                                  QObject::tr( "WRN_WARNING" ),
                                  QObject::tr( "ERR_NO_VARIABLE" ).arg( aParametersString ),
-                                 SUIT_MessageBox::Yes | SUIT_MessageBox::No,
-                                 SUIT_MessageBox::No ) == SUIT_MessageBox::Yes )
+                                 QObject::tr( "YES" ), QObject::tr( "NO" ), 0, 1 ) == 0 )
   {
     showNoteBook( aParameters, true );
     return true;
diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index 3be752564..51565bdbd 100644
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -946,8 +946,7 @@ void SalomeApp_NoteBookDlg::onClose()
   bool isTableValid = myTable->isValid();
   if( !isTableValid &&
       SUIT_MessageBox::question( this, tr( "CLOSE_CAPTION" ), tr( "INCORRECT_DATA_ON_CLOSE" ),
-                                 QMessageBox::Ok | QMessageBox::Cancel,
-                                 QMessageBox::Cancel ) == QMessageBox::Cancel )
+                                 tr( "OK" ), tr( "CANCEL" ), 0, 1 ) == 1 )
     return;
 
   // update only variables
diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts
index 88c110be7..87c31c973 100644
--- a/src/SalomeApp/resources/SalomeApp_msg_en.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts
@@ -24,6 +24,14 @@
 -->
 <context>
     <name>@default</name>
+    <message>
+        <source>YES</source>
+        <translation>Yes</translation>
+    </message>
+    <message>
+        <source>NO</source>
+        <translation>No</translation>
+    </message>
     <message>
         <source>WRN_FILE_NAME_BAD</source>
         <translation>Please enter correct file name.