Join modifications from V3_2_0_maintainance branch

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index 903d7141ab8876b4b931abd8aa1b998301d150fd..4210140564d2290a8efd1fb52130c8b937f8cf34 100755 (executable)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -38,8 +38,7 @@ SUIT_Application::SUIT_Application()
   : QObject( 0 ),
     myStudy( 0 ),
     myDesktop( 0 ),
-    myStatusLabel( 0 ),
-    myIsInitiallyRegistered( false )
+    myStatusLabel( 0 )
 {
 }
 

diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h
index 9efe0f3b61fd2c3b042bcbb174f777779814f70f..b6d69edca073efab8493fa62710a2dfc2a4f74dd 100755 (executable)
--- a/src/SUIT/SUIT_Application.h
+++ b/src/SUIT/SUIT_Application.h
@@ -109,9 +109,6 @@ public:
   //! Invokes application-specific "Select Directory" dialog and returns the selected directory name.
   virtual QString getDirectory( const QString& initial, const QString& caption, QWidget* parent ) = 0;
 
-  //! Perform required actions on the application, just registed in the session
-  virtual void Registered() { myIsInitiallyRegistered = true; };
-
 signals:
   void                  applicationClosed( SUIT_Application* );
   void                  activated( SUIT_Application* );
@@ -169,9 +166,6 @@ protected:
 protected slots:
   virtual void          onDesktopActivated();
 
-protected:
-  bool        myIsInitiallyRegistered; //<! false before the first application registration in the session
-
 private:
   SUIT_Study*           myStudy;
   SUIT_Desktop*         myDesktop;

diff --git a/src/SUIT/SUIT_Session.cxx b/src/SUIT/SUIT_Session.cxx
index 66e84e4b3e07e19abbefbc72f97dc26f1332d1db..b42d02b157ae9db2d571b4784768a123dc9d763e 100755 (executable)
--- a/src/SUIT/SUIT_Session.cxx
+++ b/src/SUIT/SUIT_Session.cxx
@@ -329,8 +329,6 @@ SUIT_ResourceMgr* SUIT_Session::createResourceMgr( const QString& appName ) cons
 void SUIT_Session::onApplicationActivated( SUIT_Application* app )
 {
   myActiveApp = app;
-  if (app)
-    app->Registered();
 }
 
 /*!

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 4df0a4fab88e7162ea626d011ccc741c735f3938..93f1e10aad65c69d88fa12d79caced34cc12dfa3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -154,16 +154,11 @@ void SalomeApp_Application::start()
   LightApp_Application::start();
 
   SalomeApp_EventFilter::Init();
-}
 
-/*!Just registered in the session*/
-void SalomeApp_Application::Registered()
-{
-  if (!myIsInitiallyRegistered)
-  {
-    myIsInitiallyRegistered = true;
+  static bool isFirst = true;
+  if ( isFirst ) {
+    isFirst = false;
 
-    // execute python scripts
     QString hdffile;
     QStringList pyfiles;
 

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 893d53c1dd884bbeba8782bc1619a508a76de918..09ece677d64a0f4906e35435e86f622d0e87ed3c 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -94,8 +94,6 @@ public:
   SUIT_ViewManager*                   newViewManager(const QString&);
   void                                updateSavePointDataObjects( SalomeApp_Study* );
 
-  virtual void Registered();
-
 public slots:
   virtual bool                        onOpenDoc( const QString& );
   virtual void                        onLoadDoc();