From 617c8e858c0426e3b0878ec3c6fd98ba5f7f1c1b Mon Sep 17 00:00:00 2001 From: ptv Date: Fri, 31 Aug 2007 06:59:35 +0000 Subject: [PATCH] remove excess functionality --- src/LightApp/LightApp_Application.cxx | 28 +++++++++++++-------------- src/STD/STD_Application.cxx | 8 ++++---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 3329bc149..b43d3fe3b 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -585,23 +585,21 @@ void LightApp_Application::createActions() // New window int windowMenu = createMenu( tr( "MEN_DESK_WINDOW" ), -1, MenuWindowId, 100 ); - int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 ); + //int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 ); createMenu( separator(), windowMenu, -1, 1 ); - -#ifndef DISABLE_GLVIEWER - createActionForViewer( NewGLViewId, newWinMenu, QString::number( 0 ), ALT+Key_G ); -#endif -#ifndef DISABLE_PLOT2DVIEWER - createActionForViewer( NewPlot2dId, newWinMenu, QString::number( 1 ), ALT+Key_P ); -#endif -#ifndef DISABLE_OCCVIEWER - createActionForViewer( NewOCCViewId, newWinMenu, QString::number( 2 ), ALT+Key_O ); -#endif -#ifndef DISABLE_VTKVIEWER - createActionForViewer( NewVTKViewId, newWinMenu, QString::number( 3 ), ALT+Key_K ); -#endif - +//#ifndef DISABLE_GLVIEWER +// createActionForViewer( NewGLViewId, newWinMenu, QString::number( 0 ), ALT+Key_G ); +//#endif +//#ifndef DISABLE_PLOT2DVIEWER +// createActionForViewer( NewPlot2dId, newWinMenu, QString::number( 1 ), ALT+Key_P ); +//#endif +//#ifndef DISABLE_OCCVIEWER +// createActionForViewer( NewOCCViewId, newWinMenu, QString::number( 2 ), ALT+Key_O ); +//#endif +//#ifndef DISABLE_VTKVIEWER +// createActionForViewer( NewVTKViewId, newWinMenu, QString::number( 3 ), ALT+Key_K ); +//#endif createAction( RenameId, tr( "TOT_RENAME" ), QIconSet(), tr( "MEN_DESK_RENAME" ), tr( "PRP_RENAME" ), SHIFT+Key_R, desk, false, this, SLOT( onRenameWindow() ) ); diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index baed5dbfe..26f64dcb5 100755 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -180,8 +180,8 @@ void STD_Application::createActions() a->setOn( desk->statusBar()->isVisibleTo( desk ) ); connect( a, SIGNAL( toggled( bool ) ), this, SLOT( onViewStatusBar( bool ) ) ); - createAction( NewWindowId, tr( "TOT_DESK_NEWWINDOW" ), QIconSet(), - tr( "MEN_DESK_NEWWINDOW" ), tr( "PRP_DESK_NEWWINDOW" ), 0, desk ); + //createAction( NewWindowId, tr( "TOT_DESK_NEWWINDOW" ), QIconSet(), + // tr( "MEN_DESK_NEWWINDOW" ), tr( "PRP_DESK_NEWWINDOW" ), 0, desk ); createAction( HelpAboutId, tr( "TOT_DESK_HELP_ABOUT" ), QIconSet(), tr( "MEN_DESK_HELP_ABOUT" ), tr( "PRP_DESK_HELP_ABOUT" ), @@ -601,8 +601,8 @@ void STD_Application::updateCommandsStatus() action( FileSaveAsId )->setEnabled( aHasStudy ); if ( action( FileCloseId ) ) action( FileCloseId )->setEnabled( aHasStudy ); - if ( action( NewWindowId ) ) - action( NewWindowId )->setEnabled( aHasStudy ); + //if ( action( NewWindowId ) ) + // action( NewWindowId )->setEnabled( aHasStudy ); } /*!\retval SUIT_ViewManager by viewer manager type name.*/ -- 2.39.2