From 4e1125895edeea80e1b90fe24bc1875e3fec359b Mon Sep 17 00:00:00 2001 From: ptv Date: Sun, 10 Dec 2006 13:19:43 +0000 Subject: [PATCH] remove excess menu items --- src/LightApp/LightApp_Application.cxx | 4 ++-- src/STD/STD_Application.cxx | 12 ++++++------ src/STD/STD_CloseDlg.cxx | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 213cb9a7c..3329bc149 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -1782,8 +1782,8 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) int studyGroup = pref->addPreference( tr( "PREF_GROUP_STUDY" ), genTab ); pref->setItemProperty( studyGroup, "columns", 1 ); - pref->addPreference( tr( "PREF_MULTI_FILE" ), studyGroup, LightApp_Preferences::Bool, "Study", "multi_file" ); - pref->addPreference( tr( "PREF_ASCII_FILE" ), studyGroup, LightApp_Preferences::Bool, "Study", "ascii_file" ); + //pref->addPreference( tr( "PREF_MULTI_FILE" ), studyGroup, LightApp_Preferences::Bool, "Study", "multi_file" ); + //pref->addPreference( tr( "PREF_ASCII_FILE" ), studyGroup, LightApp_Preferences::Bool, "Study", "ascii_file" ); pref->addPreference( tr( "PREF_STORE_POS" ), studyGroup, LightApp_Preferences::Bool, "Study", "store_positions" ); int extgroup = pref->addPreference( tr( "PREF_GROUP_EXT_BROWSER" ), genTab ); diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 85b71d09c..b9360fe00 100755 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -187,12 +187,12 @@ void STD_Application::createActions() tr( "MEN_DESK_HELP_ABOUT" ), tr( "PRP_DESK_HELP_ABOUT" ), SHIFT+Key_A, desk, false, this, SLOT( onHelpAbout() ) ); - //SRN: BugID IPAL9021, add an action "Load" - createAction( FileLoadId, tr( "TOT_DESK_FILE_LOAD" ), - resMgr->loadPixmap( "STD", tr( "ICON_FILE_OPEN" ) ), - tr( "MEN_DESK_FILE_LOAD" ), tr( "PRP_DESK_FILE_LOAD" ), - CTRL+Key_L, desk, false, this, SLOT( onLoadDoc() ) ); - //SRN: BugID IPAL9021: End + ////SRN: BugID IPAL9021, add an action "Load" + //createAction( FileLoadId, tr( "TOT_DESK_FILE_LOAD" ), + // resMgr->loadPixmap( "STD", tr( "ICON_FILE_OPEN" ) ), + //tr( "MEN_DESK_FILE_LOAD" ), tr( "PRP_DESK_FILE_LOAD" ), + //CTRL+Key_L, desk, false, this, SLOT( onLoadDoc() ) ); + ////SRN: BugID IPAL9021: End QtxDockAction* da = new QtxDockAction( tr( "TOT_DOCK_WINDOWS" ), tr( "MEN_DOCK_WINDOWS" ), desk ); registerAction( ViewWindowsId, da ); diff --git a/src/STD/STD_CloseDlg.cxx b/src/STD/STD_CloseDlg.cxx index ff09c551a..b0986f942 100644 --- a/src/STD/STD_CloseDlg.cxx +++ b/src/STD/STD_CloseDlg.cxx @@ -64,14 +64,14 @@ STD_CloseDlg::STD_CloseDlg( QWidget* parent, bool modal, WFlags f ) m_pb1 = new QPushButton( tr ("CLOSE_DLG_SAVE_CLOSE"), this ); m_pb2 = new QPushButton( tr ("CLOSE_DLG_CLOSE"), this ); - m_pb3 = new QPushButton( tr ("CLOSE_DLG_UNLOAD"), this ); + //m_pb3 = new QPushButton( tr ("CLOSE_DLG_UNLOAD"), this ); m_pb4 = new QPushButton( tr ("BUT_CANCEL"), this ); QGridLayout* m_hl2 = new QGridLayout(); m_hl2->setMargin( 0 ); m_hl2->setSpacing( 6 ); m_hl2->addWidget( m_pb1, 0, 0 ); m_hl2->addWidget( m_pb2, 0, 1 ); - m_hl2->addWidget( m_pb3, 0, 2 ); + //m_hl2->addWidget( m_pb3, 0, 2 ); m_hl2->addColSpacing( 3, 10 ); m_hl2->setColStretch( 3, 5 ); m_hl2->addWidget( m_pb4, 0, 4 ); @@ -81,7 +81,7 @@ STD_CloseDlg::STD_CloseDlg( QWidget* parent, bool modal, WFlags f ) connect( m_pb1, SIGNAL( clicked() ), this, SLOT( onButtonClicked() ) ); connect( m_pb2, SIGNAL( clicked() ), this, SLOT( onButtonClicked() ) ); - connect( m_pb3, SIGNAL( clicked() ), this, SLOT( onButtonClicked() ) ); + //connect( m_pb3, SIGNAL( clicked() ), this, SLOT( onButtonClicked() ) ); connect( m_pb4, SIGNAL( clicked() ), this, SLOT( reject() ) ); } @@ -95,6 +95,6 @@ void STD_CloseDlg::onButtonClicked() done( 1 ); if ( btn == m_pb2 ) done( 2 ); - if ( btn == m_pb3 ) - done( 3 ); + //if ( btn == m_pb3 ) + // done( 3 ); } -- 2.39.2