From: nds Date: Mon, 12 Dec 2005 11:50:12 +0000 (+0000) Subject: Bug IPAL10672: ?underligned letter? and hotkey for menus X-Git-Tag: T_3_1_0pre~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a42ab16739ef7312cbe2629e08afb3b0f487694f;p=modules%2Fgui.git Bug IPAL10672: ?underligned letter? and hotkey for menus --- diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 0e420e26b..614f604c5 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -336,7 +336,7 @@ void LightApp_Application::createActions() //! Preferences createAction( PreferencesId, tr( "TOT_DESK_PREFERENCES" ), QIconSet(), tr( "MEN_DESK_PREFERENCES" ), tr( "PRP_DESK_PREFERENCES" ), - CTRL+Key_P, desk, false, this, SLOT( onPreferences() ) ); + CTRL+Key_F, desk, false, this, SLOT( onPreferences() ) ); //! Help for modules int helpMenu = createMenu( tr( "MEN_DESK_HELP" ), -1, -1, 1000 ); @@ -483,8 +483,8 @@ void LightApp_Application::createActions() createMenu( a, newWinMenu, -1 ); } - createAction( RenameId, tr( "TOT_RENAME" ), QIconSet(), tr( "MEN_RENAME" ), tr( "PRP_RENAME" ), - 0, desk, false, this, SLOT( onRenameWindow() ) ); + createAction( RenameId, tr( "TOT_RENAME" ), QIconSet(), tr( "MEN_DESK_RENAME" ), tr( "PRP_RENAME" ), + SHIFT+Key_R, desk, false, this, SLOT( onRenameWindow() ) ); createMenu( RenameId, windowMenu, -1 ); connect( modGroup, SIGNAL( selected( QAction* ) ), this, SLOT( onModuleActivation( QAction* ) ) ); diff --git a/src/LightApp/resources/LightApp_msg_en.po b/src/LightApp/resources/LightApp_msg_en.po index d8a4d4f86..c272e8fc2 100644 --- a/src/LightApp/resources/LightApp_msg_en.po +++ b/src/LightApp/resources/LightApp_msg_en.po @@ -35,8 +35,8 @@ msgstr "Trying to activate module \"%1\"" msgid "LightApp_Application::TOT_RENAME" msgstr "Rename" -msgid "LightApp_Application::MEN_RENAME" -msgstr "Rename" +msgid "LightApp_Application::MEN_DESK_RENAME" +msgstr "&Rename" msgid "LightApp_Application::PRP_RENAME" msgstr "Rename active window" @@ -45,7 +45,7 @@ msgid "LightApp_Application::TOT_DESK_PREFERENCES" msgstr "Preferences" msgid "LightApp_Application::MEN_DESK_PREFERENCES" -msgstr "Preferences..." +msgstr "Pre&ferences..." msgid "LightApp_Application::TOT_DESK_MRU" msgstr "Most recently used" @@ -66,16 +66,16 @@ msgid "LightApp_Application::PRP_MODULE" msgstr "Switch to the module \"%1\"" msgid "LightApp_Application::NEW_WINDOW_0" -msgstr "GL view" +msgstr "&GL view" msgid "LightApp_Application::NEW_WINDOW_1" -msgstr "Plot2d view" +msgstr "&Plot2d view" msgid "LightApp_Application::NEW_WINDOW_2" -msgstr "OCC view" +msgstr "&OCC view" msgid "LightApp_Application::NEW_WINDOW_3" -msgstr "VTK view" +msgstr "VT&K view" msgid "LightApp_Application::INF_CANCELLED" msgstr "Module activation cancelled" diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 706ecedb5..f7fb0d702 100755 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -147,7 +147,7 @@ void STD_Application::createActions() createAction( FileSaveAsId, tr( "TOT_DESK_FILE_SAVEAS" ), QIconSet(), tr( "MEN_DESK_FILE_SAVEAS" ), tr( "PRP_DESK_FILE_SAVEAS" ), - 0, desk, false, this, SLOT( onSaveAsDoc() ) ); + CTRL+Key_A, desk, false, this, SLOT( onSaveAsDoc() ) ); createAction( EditCopyId, tr( "TOT_DESK_EDIT_COPY" ), resMgr->loadPixmap( "STD", tr( "ICON_EDIT_COPY" ) ), @@ -161,7 +161,7 @@ void STD_Application::createActions() QAction* a = createAction( ViewStatusBarId, tr( "TOT_DESK_VIEW_STATUSBAR" ), QIconSet(), tr( "MEN_DESK_VIEW_STATUSBAR" ), - tr( "PRP_DESK_VIEW_STATUSBAR" ), 0, desk, true ); + tr( "PRP_DESK_VIEW_STATUSBAR" ), SHIFT+Key_S, desk, true ); a->setOn( desk->statusBar()->isVisibleTo( desk ) ); connect( a, SIGNAL( toggled( bool ) ), this, SLOT( onViewStatusBar( bool ) ) ); @@ -170,7 +170,7 @@ void STD_Application::createActions() createAction( HelpAboutId, tr( "TOT_DESK_HELP_ABOUT" ), QIconSet(), tr( "MEN_DESK_HELP_ABOUT" ), tr( "PRP_DESK_HELP_ABOUT" ), - 0, desk, false, this, SLOT( onHelpAbout() ) ); + SHIFT+Key_A, desk, false, this, SLOT( onHelpAbout() ) ); //SRN: BugID IPAL9021, add an action "Load" createAction( FileLoadId, tr( "TOT_DESK_FILE_LOAD" ), diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx index 935b36dcb..24dfd5ccf 100644 --- a/src/STD/STD_TabDesktop.cxx +++ b/src/STD/STD_TabDesktop.cxx @@ -47,7 +47,7 @@ myWorkstackAction( 0 ) myWorkstack = new QtxWorkstack( base ); // setting Expanding size policy for central workstack. If there are several widgets - // in central area of Desktop, other widgets will be added below the workstack (CATHARE, TIRPOLI modules). + // in central area of Desktop, other widgets will be added below the workstack (CATHARE, TRIPOLI modules). // But the workstack must occupy as much space as possible -- set Expanding for it. myWorkstack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); diff --git a/src/STD/resources/STD_msg_en.po b/src/STD/resources/STD_msg_en.po index a88cd6ece..2c5d9fd37 100755 --- a/src/STD/resources/STD_msg_en.po +++ b/src/STD/resources/STD_msg_en.po @@ -123,7 +123,7 @@ msgid "MEN_DESK_VIEW_TOOLBARS" msgstr "T&oolbars" msgid "MEN_DESK_VIEW_STATUSBAR" -msgstr "Stat&us Bar" +msgstr "&Status Bar" msgid "MEN_DESK_VIEW_STDTOOLBAR" msgstr "&Standard" diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index a73131d02..41b86354d 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -101,27 +101,27 @@ void SalomeApp_Application::createActions() //! Dump study createAction( DumpStudyId, tr( "TOT_DESK_FILE_DUMP_STUDY" ), QIconSet(), tr( "MEN_DESK_FILE_DUMP_STUDY" ), tr( "PRP_DESK_FILE_DUMP_STUDY" ), - 0, desk, false, this, SLOT( onDumpStudy() ) ); + CTRL+Key_D, desk, false, this, SLOT( onDumpStudy() ) ); //! Load script createAction( LoadScriptId, tr( "TOT_DESK_FILE_LOAD_SCRIPT" ), QIconSet(), tr( "MEN_DESK_FILE_LOAD_SCRIPT" ), tr( "PRP_DESK_FILE_LOAD_SCRIPT" ), - 0, desk, false, this, SLOT( onLoadScript() ) ); + CTRL+Key_T, desk, false, this, SLOT( onLoadScript() ) ); //! Properties createAction( PropertiesId, tr( "TOT_DESK_PROPERTIES" ), QIconSet(), tr( "MEN_DESK_PROPERTIES" ), tr( "PRP_DESK_PROPERTIES" ), - 0, desk, false, this, SLOT( onProperties() ) ); + CTRL+Key_P, desk, false, this, SLOT( onProperties() ) ); //! Catalog Generator createAction( CatalogGenId, tr( "TOT_DESK_CATALOG_GENERATOR" ), QIconSet(), tr( "MEN_DESK_CATALOG_GENERATOR" ), tr( "PRP_DESK_CATALOG_GENERATOR" ), - 0, desk, false, this, SLOT( onCatalogGen() ) ); + SHIFT+Key_G, desk, false, this, SLOT( onCatalogGen() ) ); //! Registry Display createAction( RegDisplayId, tr( "TOT_DESK_REGISTRY_DISPLAY" ), QIconSet(), tr( "MEN_DESK_REGISTRY_DISPLAY" ), tr( "PRP_DESK_REGISTRY_DISPLAY" ), - 0, desk, false, this, SLOT( onRegDisplay() ) ); + SHIFT+Key_D, desk, false, this, SLOT( onRegDisplay() ) ); int fileMenu = createMenu( tr( "MEN_DESK_FILE" ), -1 ); diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.po b/src/SalomeApp/resources/SalomeApp_msg_en.po index 63a7477fa..a739779d2 100644 --- a/src/SalomeApp/resources/SalomeApp_msg_en.po +++ b/src/SalomeApp/resources/SalomeApp_msg_en.po @@ -37,7 +37,7 @@ msgid "SalomeApp_Application::TOT_DESK_FILE_DUMP_STUDY" msgstr "Dump study" msgid "SalomeApp_Application::MEN_DESK_FILE_DUMP_STUDY" -msgstr "Dump study..." +msgstr "&Dump study..." msgid "SalomeApp_Application::PRP_DESK_FILE_DUMP_STUDY" msgstr "Dumps study to the python script" @@ -46,7 +46,7 @@ msgid "SalomeApp_Application::TOT_DESK_FILE_LOAD_SCRIPT" msgstr "Load python script" msgid "SalomeApp_Application::MEN_DESK_FILE_LOAD_SCRIPT" -msgstr "Load script..." +msgstr "Load scrip&t..." msgid "SalomeApp_Application::PRP_DESK_FILE_LOAD_SCRIPT" msgstr "Loads python script from file" @@ -55,13 +55,13 @@ msgid "SalomeApp_Application::TOT_FILE_DESK_PREFERENCES" msgstr "Preferences" msgid "SalomeApp_Application::MEN_DESK_TOOLS" -msgstr "Tools" +msgstr "&Tools" msgid "SalomeApp_Application::TOT_DESK_CATALOG_GENERATOR" msgstr "Catalog generator" msgid "SalomeApp_Application::MEN_DESK_CATALOG_GENERATOR" -msgstr "Catalog generator" +msgstr "Catalog &generator" msgid "SalomeApp_Application::PRP_DESK_CATALOG_GENERATOR" msgstr "Generates XML catalog of a component's interface" @@ -70,7 +70,7 @@ msgid "SalomeApp_Application::TOT_DESK_REGISTRY_DISPLAY" msgstr "Registry display" msgid "SalomeApp_Application::MEN_DESK_REGISTRY_DISPLAY" -msgstr "Registry display" +msgstr "Registry &display" msgid "SalomeApp_Application::PRP_DESK_REGISTRY_DISPLAY" msgstr "Displays content of the Registry CORBA server" @@ -85,7 +85,7 @@ msgid "SalomeApp_Application::TOT_DESK_PROPERTIES" msgstr "Study properties" msgid "SalomeApp_Application::MEN_DESK_PROPERTIES" -msgstr "Properties..." +msgstr "Pro&perties..." msgid "SalomeApp_Application::PRP_DESK_PROPERTIES" msgstr "Edits study properties"