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

ALLWAYS set isConfigurationAction if you create action just for

Browse source 
configuration purposes.

And do it before you set a global shortcut. Doing it after that is good
intention but still tool late.

svn path=/trunk/KDE/kdebase/workspace/; revision=1021763
This commit is contained in:
Michael Jansen 2009-09-09 23:43:58 +00:00
parent 2371de7ac2
commit 6b8a3a61a1
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kcmkwin/kwindesktop/main.cpp
View file

@ -89,21 +89,32 @@ void KWinDesktopConfig::init()
// actions for switch desktop collection - other action is filled dynamically // actions for switch desktop collection - other action is filled dynamically
KAction* a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch to Next Desktop" )); KAction* a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch to Next Desktop" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch to Next Desktop" )); a->setText( i18n( "Switch to Next Desktop" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch to Previous Desktop" )); a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch to Previous Desktop" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch to Previous Desktop" )); a->setText( i18n( "Switch to Previous Desktop" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop to the Right" )); a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop to the Right" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch One Desktop to the Right" )); a->setText( i18n( "Switch One Desktop to the Right" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop to the Left" )); a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop to the Left" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch One Desktop to the Left" )); a->setText( i18n( "Switch One Desktop to the Left" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop Up" )); a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop Up" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch One Desktop Up" )); a->setText( i18n( "Switch One Desktop Up" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop Down" )); a = qobject_cast<KAction*>(m_switchDesktopCollection->addAction( "Switch One Desktop Down" ));
a->setProperty("isConfigurationAction", true);
a->setText( i18n( "Switch One Desktop Down" )); a->setText( i18n( "Switch One Desktop Down" ));
a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); a->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
@ -396,6 +407,7 @@ void KWinDesktopConfig::slotChangeShortcuts( int number )
// add desktop // add desktop
int desktop = m_actionCollection->count() + 1; int desktop = m_actionCollection->count() + 1;
KAction* action = qobject_cast<KAction*>(m_actionCollection->addAction(QString("Switch to Desktop %1").arg(desktop))); KAction* action = qobject_cast<KAction*>(m_actionCollection->addAction(QString("Switch to Desktop %1").arg(desktop)));
action->setProperty("isConfigurationAction", true);
action->setText( i18n("Switch to Desktop %1", desktop) ); action->setText( i18n("Switch to Desktop %1", desktop) );
action->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut ); action->setGlobalShortcut( KShortcut(), KAction::ActiveShortcut );
QString shortcutString = extrapolatedShortcut(desktop); QString shortcutString = extrapolatedShortcut(desktop);
@ -428,7 +440,6 @@ void KWinDesktopConfig::slotChangeShortcuts( int number )
} }
} }
} }
action->setProperty("isConfigurationAction", true);
} }
} }
m_editor->clearCollections(); m_editor->clearCollections();