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

Make per-window shortcut not crash and make it work, the dialog

Browse source 
still could use some more work though.
BUG: 161342


svn path=/trunk/KDE/kdebase/workspace/; revision=815186
This commit is contained in:
Luboš Luňák 2008-06-01 11:36:07 +00:00
parent 1b9e7e59e6
commit 8854248626
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
useractions.cpp
View file

@ -399,7 +399,7 @@ void Workspace::setupWindowShortcutDone( bool ok )
if( ok )
client_keys_client->setShortcut( KShortcut( client_keys_dialog->shortcut()).toString());
closeActivePopup();
delete client_keys_dialog;
client_keys_dialog->deleteLater();
client_keys_dialog = NULL;
client_keys_client = NULL;
}
@ -410,8 +410,15 @@ void Workspace::clientShortcutUpdated( Client* c )
QAction* action = client_keys->action( key.toLatin1().constData() );
if( !c->shortcut().isEmpty())
{
action->setShortcuts(c->shortcut());
connect(action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
if( action == NULL ) // new shortcut
{
action = client_keys->addAction( key );
connect( action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
}
// no autoloading, since it's configured explicitly here and is not meant to be reused
// (the key is the window id anyway, which is kind of random)
qobject_cast< KAction* >( action )->setGlobalShortcut(
c->shortcut(), KAction::ActiveShortcut, KAction::NoAutoloading );
action->setEnabled( true );
}
else