PR: oops... wrong commit, restore previous version

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 63c3e07aaf9fb909df9f3be15a967760535c9ab4..d69115d96d7850b570297a334aa56e20213c9843 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -625,7 +625,7 @@ void LightApp_Application::createActions()
 
 
   createAction( RenameId, tr( "TOT_RENAME" ), QIconSet(), tr( "MEN_DESK_RENAME" ), tr( "PRP_RENAME" ),
-               CTRL+SHIFT+Key_R, desk, false, this, SLOT( onRenameWindow() ) );
+               SHIFT+Key_R, desk, false, this, SLOT( onRenameWindow() ) );
   createMenu( RenameId, windowMenu, -1 );
 
   int fileMenu = createMenu( tr( "MEN_DESK_FILE" ), -1 );

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 254c6a90a5ad4321407812bc4b4dfd78d62439b7..177dd82956e15c8ceeeeccd78125ac21447f2415 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -190,7 +190,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" ), CTRL+SHIFT+Key_S, 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 ) ) );
 
@@ -199,7 +199,7 @@ void STD_Application::createActions()
 
   createAction( HelpAboutId, tr( "TOT_DESK_HELP_ABOUT" ), QIconSet(),
                 tr( "MEN_DESK_HELP_ABOUT" ), tr( "PRP_DESK_HELP_ABOUT" ),
-                CTRL+SHIFT+Key_A, desk, false, this, SLOT( onHelpAbout() ) );
+                SHIFT+Key_A, desk, false, this, SLOT( onHelpAbout() ) );
 
   QtxDockAction* da = new QtxDockAction( tr( "TOT_DOCK_WINDOWS" ), tr( "MEN_DOCK_WINDOWS" ), desk );
   registerAction( ViewWindowsId, da );

diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index b05c45f5cef9218daba2bf1807205a997f3076ad..64518803523ec5598c2f4835b6840e9f53ad38ac 100644 (file)
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.cxx
@@ -51,9 +51,9 @@ myWorkstackAction( 0 )
   // But the workstack must occupy as much space as possible -- set Expanding for it.
   myWorkstack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
 
-  myWorkstack->setAccel(QtxWorkstack::SplitVertical,   CTRL + SHIFT + Key_V);
-  myWorkstack->setAccel(QtxWorkstack::SplitHorizontal, CTRL + SHIFT + Key_H);
-  myWorkstack->setAccel(QtxWorkstack::Close,           CTRL + SHIFT + Key_C);
+  myWorkstack->setAccel(QtxWorkstack::SplitVertical,   SHIFT + Key_V);
+  myWorkstack->setAccel(QtxWorkstack::SplitHorizontal, SHIFT + Key_H);
+  myWorkstack->setAccel(QtxWorkstack::Close,           SHIFT + Key_C);
 
   connect( myWorkstack, SIGNAL( windowActivated( QWidget* ) ),
            this, SLOT( onWindowActivated( QWidget* ) ) );

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 6eab08de16a49fbe95537f4302c8f4ce65312d26..4fbe1d0b9ef81bb5acc8f6f5c5ab3cdb446dd978 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -251,7 +251,7 @@ void SalomeApp_Application::createActions()
   //! Catalog Generator
   createAction( CatalogGenId, tr( "TOT_DESK_CATALOG_GENERATOR" ),  QIconSet(),
                tr( "MEN_DESK_CATALOG_GENERATOR" ), tr( "PRP_DESK_CATALOG_GENERATOR" ),
-               CTRL+SHIFT+Key_G, desk, false, this, SLOT( onCatalogGen() ) );
+               SHIFT+Key_G, desk, false, this, SLOT( onCatalogGen() ) );
 
   //! Registry Display
   createAction( RegDisplayId, tr( "TOT_DESK_REGISTRY_DISPLAY" ),  QIconSet(),