From 9143eebba95ed072fc88e7b096bcd0591ecbefd4 Mon Sep 17 00:00:00 2001
From: akl <alexander.kovalev@opencascade.com>
Date: Mon, 22 Sep 2014 17:47:13 +0400
Subject: [PATCH] Correct error message that study is already active.

---
 src/SalomeApp/SalomeApp_Application.cxx     | 6 +-----
 src/SalomeApp/resources/SalomeApp_msg_en.ts | 6 ++----
 src/SalomeApp/resources/SalomeApp_msg_fr.ts | 4 ++++
 src/SalomeApp/resources/SalomeApp_msg_ja.ts | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 8b73674bd..18ec97033 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -2119,11 +2119,7 @@ bool SalomeApp_Application::checkExistingDoc() {
     if( aMgr ) {
       std::vector<std::string> List = studyMgr()->GetOpenStudies();
       if( List.size() > 0 ) {
-        int answer = SUIT_MessageBox::question( desktop(), tr( "WRN_WARNING" ), tr( "QUE_ACTIVEDOC_LOAD" ),
-                                                SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::No );
-        if ( answer == SUIT_MessageBox::Yes ) {
-	  onLoadDoc();
-	}
+        SUIT_MessageBox::critical( desktop(), tr( "WRN_WARNING" ), tr( "ERR_ACTIVEDOC_LOAD" ));
 	result = false;
       }
     }
diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts
index ec7ce6a2f..04c84b1d3 100644
--- a/src/SalomeApp/resources/SalomeApp_msg_en.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts
@@ -13,10 +13,8 @@ Python file must include only letters, digits and underscores and start from let
         <translation>The file %1 does not exist.</translation>
     </message>
     <message>
-        <source>QUE_ACTIVEDOC_LOAD</source>
-        <translation>There is an active study in the session.
-Do you want to load it?
-</translation>
+        <source>ERR_ACTIVEDOC_LOAD</source>
+        <translation>A study is already active in your session, but you are not connected to it. Use the Connect button to load it in the interface.</translation>
     </message>
     <message>
         <source>STUDYCLOSE_DESCRIPTION</source>
diff --git a/src/SalomeApp/resources/SalomeApp_msg_fr.ts b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
index 5aee00d36..009e0f428 100755
--- a/src/SalomeApp/resources/SalomeApp_msg_fr.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
@@ -12,6 +12,10 @@ Un fichier Python ne doit être composé que de lettres, chiffres et tirets bas
         <source>WRN_FILE_NOT_EXIST</source>
         <translation>Le fichier %1 n&apos;existe pas.</translation>
     </message>
+    <message>
+        <source>ERR_ACTIVEDOC_LOAD</source>
+        <translation type="unfinished">A study is already active in your session, but you are not connected to it. Use the Connect button to load it in the interface.</translation>
+    </message>
     <message>
         <source>STUDYCLOSE_DESCRIPTION</source>
         <translation type="unfinished">You already have an active study in your session. It has to be closed before working with another study.</translation>
diff --git a/src/SalomeApp/resources/SalomeApp_msg_ja.ts b/src/SalomeApp/resources/SalomeApp_msg_ja.ts
index f2084990d..770bc7f8a 100644
--- a/src/SalomeApp/resources/SalomeApp_msg_ja.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_ja.ts
@@ -12,8 +12,8 @@
       <translation>ファイル %1 は存在しません。</translation>
     </message>
     <message>
-      <source>QUE_ACTIVEDOC_LOAD</source>
-      <translation>セッションにスタディがあります。読み込みますか？</translation>
+      <source>ERR_ACTIVEDOC_LOAD</source>
+      <translation type="unfinished">A study is already active in your session, but you are not connected to it. Use the Connect button to load it in the interface.</translation>
     </message>
     <message>
       <source>STUDYCLOSE_DESCRIPTION</source>
-- 
2.39.2