Modified load/dump actions visibility

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index d81f07848456c9feafe76880d753158920309f13..248ab26cb0bd1791683e7b13a9e5552637381776 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -411,13 +411,13 @@ LightApp_Application::~LightApp_Application()
 /*!Start application.*/
 void LightApp_Application::start()
 {
-  CAM_Application::start();
 
 #ifndef DISABLE_PYCONSOLE
   getWindow( WT_PyConsole );
-  placeDockWindow( WT_PyConsole, Qt::BottomDockWidgetArea );
 #endif
 
+  CAM_Application::start();
+
   updateWindows();
   updateViewManagers();
 

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 19acb4da8bec6fd645d74a910a3645c4c22cc710..af4c6ebdf9aac3fd9f14fbf72db134b75e46f4f4 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -320,13 +320,11 @@ void SalomeApp_Application::createActions()
                 tr( "MEN_DESK_REGISTRY_DISPLAY" ), tr( "PRP_DESK_REGISTRY_DISPLAY" ),
                 /*Qt::SHIFT+Qt::Key_D*/0, desk, false, this, SLOT( onRegDisplay() ) );
 
-  createAction( ConnectId, tr( "TOT_DESK_CONNECT_STUDY" ),
-                resourceMgr()->loadPixmap( "STD", tr( "ICON_FILE_OPEN" ) ),
+  createAction( ConnectId, tr( "TOT_DESK_CONNECT_STUDY" ), QIcon(),
                 tr( "MEN_DESK_CONNECT" ), tr( "PRP_DESK_CONNECT" ),
                 Qt::CTRL+Qt::Key_L, desk, false, this, SLOT( onLoadDoc() ) );
 
-  createAction( DisconnectId, tr( "TOT_DESK_DISCONNECT_STUDY" ),
-                resourceMgr()->loadPixmap( "STD", tr( "ICON_FILE_CLOSE" ) ),
+  createAction( DisconnectId, tr( "TOT_DESK_DISCONNECT_STUDY" ), QIcon(),
                 tr( "MEN_DESK_DISCONNECT" ), tr( "PRP_DESK_DISCONNECT" ),
                 Qt::CTRL+Qt::Key_U, desk, false, this, SLOT( onUnloadDoc() ) );
 
@@ -799,12 +797,12 @@ void SalomeApp_Application::updateCommandsStatus()
   // Dump study menu
   QAction* a = action( DumpStudyId );
   if ( a )
-    a->setEnabled( true );
+    a->setEnabled( activeStudy() );
 
   // Load script menu
   a = action( LoadScriptId );
   if( a )
-    a->setEnabled( true );
+    a->setEnabled( pythonConsole() );
 
   // Properties menu
   a = action( PropertiesId );