yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source 
svn path=/branches/KDE/4.3/kdebase/workspace/; revision=1001761
This commit is contained in:
Martin Gräßlin 2009-07-24 07:49:03 +00:00
parent 1ccbe87438
commit dd4ac7a947
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
effects/cube/cube.cpp
View file

@ -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()));

4
effects/cube/cube_config.cpp
View file

@ -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);