From 88c7435d5c5c54b59685cb2226f290dfda6e35bf Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 25 Sep 2014 11:39:49 +0400 Subject: [PATCH] Modified load/dump actions visibility --- src/LightApp/LightApp_Application.cxx | 4 ++-- src/SalomeApp/SalomeApp_Application.cxx | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index d81f07848..248ab26cb 100644 --- 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 19acb4da8..af4c6ebdf 100644 --- 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 ); -- 2.39.2