From 09a2bfb7692e0180f461b009aaf61ebd01c29e53 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Fri, 31 Aug 2007 08:15:01 +0000
Subject: [PATCH] Join modifications from V3_2_0_maintainance branch

---
 src/SUIT/SUIT_Application.cxx           |  3 +--
 src/SUIT/SUIT_Application.h             |  6 ------
 src/SUIT/SUIT_Session.cxx               |  2 --
 src/SalomeApp/SalomeApp_Application.cxx | 11 +++--------
 src/SalomeApp/SalomeApp_Application.h   |  2 --
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index 903d7141a..421014056 100755
--- 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 9efe0f3b6..b6d69edca 100755
--- 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 66e84e4b3..b42d02b15 100755
--- 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 4df0a4fab..93f1e10aa 100644
--- 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 893d53c1d..09ece677d 100644
--- 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();
-- 
2.39.2