#include "SalomeApp_EventFilter.h"
#include "SalomeApp_WidgetContainer.h"
#include "SalomeApp_ModuleDlg.h"
+#include "SalomeApp_OBFilter.h"
#include <LogWindow.h>
int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 );
createMenu( separator(), windowMenu, -1, 1 );
+ QMap<int, int> accelMap;
+ accelMap[NewGLViewId] = ALT+Key_G;
+ accelMap[NewPlot2dId] = ALT+Key_P;
+ accelMap[NewOCCViewId] = ALT+Key_O;
+ accelMap[NewVTKViewId] = ALT+Key_K;
+
for ( int id = NewGLViewId; id <= NewVTKViewId; id++ )
{
QAction* a = createAction( id, tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ), QIconSet(),
- tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ),
- tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ),
- 0, desk, false, this, SLOT( onNewWindow() ) );
+ tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ),
+ tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ),
+ accelMap.contains( id ) ? accelMap[id] : 0, desk, false, this, SLOT( onNewWindow() ) );
createMenu( a, newWinMenu, -1 );
}
//=======================================================================
void SalomeApp_Application::onHelpAbout()
{
- //QAD_MessageBox::info1( myDesktop, tr( "ABOUT" ), tr( "APP_NAME_LONG" ).arg( APP_VERSION ), tr( "BUT_OK" ) );
-
QMessageBox aDlg( desktop(), "AboutDlg" );
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
QFontMetrics m( aDlg.font() );
QImage anImage = aPixmap.convertToImage();
- int w = m.height() * 3;
+ int w = m.height() * 5;
anImage = anImage.scale( w, w );
aPixmap.convertFromImage( anImage );
sId = activeStudy()->id();
}
+ QWidget* wid = myWindows[flag]->widget( sId );
myWindows[flag]->remove( sId );
+ delete wid;
setWindowShown( flag, !myWindows[flag]->isEmpty() );
}
emit studyClosed();
activateModule( "" );
- if ( objectBrowser() != 0 )
- objectBrowser()->setRootObject( 0 );
saveWindowsGeometry();
}
removeWindow( itr.key(), s->id() );
}
-void SalomeApp_Application::afterCloseDoc()
-{
- updateWindows();
-
- CAM_Application::afterCloseDoc();
-}
-
void SalomeApp_Application::updateActions()
{
updateCommandsStatus();
if ( flag == WT_ObjectBrowser )
{
OB_Browser* ob = new OB_Browser( desktop() );
-
+ ob->setAutoUpdate( true );
+ ob->setAutoOpenLevel( 1 );
ob->setCaption( tr( "OBJECT_BROWSER" ) );
ob->resize( OBJECT_BROWSER_WIDTH, ob->height() );
- ob->setAutoUpdate( true );
+ ob->setFilter( new SalomeApp_OBFilter( selectionMgr() ) );
// Create OBSelector
new SalomeApp_OBSelector( ob, mySelMgr );
{
}
+void SalomeApp_Application::afterCloseDoc()
+{
+ updateWindows();
+
+ CAM_Application::afterCloseDoc();
+}
+
CORBA::ORB_var SalomeApp_Application::orb()
{
ORB_INIT& init = *SINGLETON_<ORB_INIT>::Instance();