From dd4ac7a947ce17d5841fcf74c8fe34eaab5d0801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 24 Jul 2009 07:49:03 +0000 Subject: [PATCH] Backport rev 1001760: Remove default shortcuts for cylinder and sphere. The effect isn't enabled by default and cylinder and sphere are not so important that it qualifies for a default shortcut. svn path=/branches/KDE/4.3/kdebase/workspace/; revision=1001761 --- effects/cube/cube.cpp | 4 ++-- effects/cube/cube_config.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp index 13163d2508..9cdcdc88c5 100644 --- a/effects/cube/cube.cpp +++ b/effects/cube/cube.cpp @@ -212,11 +212,11 @@ void CubeEffect::loadConfig( QString config ) cubeShortcut = cubeAction->globalShortcut(); KAction* cylinderAction = static_cast< KAction* >( actionCollection->addAction( "Cylinder" )); cylinderAction->setText( i18n("Desktop Cylinder" )); - cylinderAction->setGlobalShortcut( KShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_F11 )); + cylinderAction->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut); cylinderShortcut = cylinderAction->globalShortcut(); KAction* sphereAction = static_cast< KAction* >( actionCollection->addAction( "Sphere" )); sphereAction->setText( i18n("Desktop Sphere" )); - sphereAction->setGlobalShortcut( KShortcut( Qt::CTRL + Qt::META + Qt::Key_F11 )); + sphereAction->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut); sphereShortcut = sphereAction->globalShortcut(); connect( cubeAction, SIGNAL( triggered( bool )), this, SLOT( toggleCube())); connect( cylinderAction, SIGNAL( triggered( bool )), this, SLOT( toggleCylinder())); diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp index bf8cdbeda5..9bad59550b 100644 --- a/effects/cube/cube_config.cpp +++ b/effects/cube/cube_config.cpp @@ -65,11 +65,11 @@ CubeEffectConfig::CubeEffectConfig(QWidget* parent, const QVariantList& args) : KAction* cylinderAction = (KAction*) m_actionCollection->addAction( "Cylinder" ); cylinderAction->setText( i18n("Desktop Cylinder" )); cylinderAction->setProperty("isConfigurationAction", true); - cylinderAction->setGlobalShortcut( KShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_F11 )); + cylinderAction->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut); KAction* sphereAction = (KAction*) m_actionCollection->addAction( "Sphere" ); sphereAction->setText( i18n("Desktop Sphere" )); sphereAction->setProperty("isConfigurationAction", true); - sphereAction->setGlobalShortcut( KShortcut( Qt::CTRL + Qt::META + Qt::Key_F11 )); + sphereAction->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut); m_ui->editor->addCollection(m_actionCollection);