X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Operation.cxx;h=4a3ea441a9d99cadfc5d91a8cf751224f9b2a213;hb=d303154d91eb916a55ac93a372cbdb918aa18d14;hp=e6ba1303b962624c940b570555e4f68fae4d0b09;hpb=57b43b4d010e2d0a1529d3c131bbb9d416e63258;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Operation.cxx b/src/SMESHGUI/SMESHGUI_Operation.cxx
index e6ba1303b..4a3ea441a 100755
--- a/src/SMESHGUI/SMESHGUI_Operation.cxx
+++ b/src/SMESHGUI/SMESHGUI_Operation.cxx
@@ -1,25 +1,44 @@
-//  SALOME SMESHGUI
+// SMESH SMDS : implementaion of Salome mesh data structure
 //
-//  Copyright (C) 2005  CEA/DEN, EDF R&D
+// Copyright (C) 2003  OPEN CASCADE
 //
+// This library is free software; you can redistribute it and/or 
+// modify it under the terms of the GNU Lesser General Public 
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License. 
 //
+// This library is distributed in the hope that it will be useful, 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details. 
+//
+// You should have received a copy of the GNU Lesser General Public 
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File   : SMESHGUI_Operation.cxx
+// Author : Sergey LITONIN, Open CASCADE S.A.S.
 //
-//  File   : SMESHGUI_Operation.h
-//  Author : Sergey LITONIN
-//  Module : SALOME
 
+// SMESH includes
 #include "SMESHGUI_Operation.h"
-#include <SMESHGUI.h>
-#include <SMESHGUI_Dialog.h>
 
+#include "SMESHGUI.h"
+#include "SMESHGUI_Dialog.h"
+
+// SALOME GUI includes
 #include <SalomeApp_Study.h>
 #include <LightApp_Application.h>
 
 #include <SUIT_Session.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
 
-#include <qstringlist.h>
+// Qt includes
+#include <QStringList>
 
 /*
   Class       : SMESHGUI_Operation
@@ -99,8 +118,8 @@ bool SMESHGUI_Operation::isReadyToStart() const
     return false;
   else if ( getSMESHGUI() == 0 )
   {
-    SUIT_MessageBox::warn1( desktop(), tr( "SMESH_WRN_WARNING" ),
-      tr( "NO_MODULE" ), tr( "SMESH_BUT_OK" ) );
+    SUIT_MessageBox::warning( desktop(), tr( "SMESH_WRN_WARNING" ),
+			      tr( "NO_MODULE" ) );
     return false;
   }
   else if ( isStudyLocked() )
@@ -173,10 +192,17 @@ void SMESHGUI_Operation::onHelp()
   if (app) 
     app->onHelpContextModule(getSMESHGUI() ? app->moduleName(getSMESHGUI()->moduleName()) : QString(""), myHelpFileName);
   else {
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-			   QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-			   arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName),
-			   QObject::tr("BUT_OK"));
+    QString platform;
+#ifdef WIN32
+    platform = "winapplication";
+#else
+    platform = "application";
+#endif
+    SUIT_MessageBox::warning( desktop(), tr("WRN_WARNING"),
+			      tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+			      arg(app->resourceMgr()->stringValue("ExternalBrowser", 
+								  platform)).
+			      arg(myHelpFileName) );
   }
 }
 
@@ -203,8 +229,8 @@ bool SMESHGUI_Operation::isStudyLocked( const bool theMess ) const
     if ( studyDS()->GetProperties()->IsLocked() )
     {
       if ( theMess )
-        SUIT_MessageBox::warn1 ( SMESHGUI::desktop(), QObject::tr( "WRN_WARNING" ),
-          QObject::tr( "WRN_STUDY_LOCKED" ), QObject::tr( "BUT_OK" ) );
+        SUIT_MessageBox::warning( SMESHGUI::desktop(), tr( "WRN_WARNING" ),
+				  tr( "WRN_STUDY_LOCKED" ) );
       return true;
     }
   }
@@ -232,19 +258,8 @@ bool SMESHGUI_Operation::isValid( SUIT_Operation* theOtherOp ) const
   }
 
   return theOtherOp && theOtherOp->inherits( "SMESHGUI_Operation" ) &&
-         ( !anOps.contains( theOtherOp->className() ) || anOps.contains( className() ) );
+         ( !anOps.contains( theOtherOp->metaObject()->className() ) || 
+	   anOps.contains( metaObject()->className() ) );
 
   return true;
 }
-
-
-
-
-
-
-
-
-
-
-
-