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

Fix #83587 - some entries in Alt+F3 don't say the shortcut.

Browse source 
Also update the labels if the shortcuts change.

svn path=/trunk/kdebase/kwin/; revision=324245
This commit is contained in:
Luboš Luňák 2004-06-28 13:15:05 +00:00
parent 2a698ab657
commit 95019e5c16
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
useractions.cpp
View file

@ -54,10 +54,13 @@ QPopupMenu* Workspace::clientPopup()
advanced_popup->setCheckable( TRUE ); advanced_popup->setCheckable( TRUE );
advanced_popup->setFont(KGlobalSettings::menuFont()); advanced_popup->setFont(KGlobalSettings::menuFont());
connect( advanced_popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) ); connect( advanced_popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
advanced_popup->insertItem( SmallIconSet( "up" ), i18n("Keep &Above Others"), Options::KeepAboveOp ); advanced_popup->insertItem( SmallIconSet( "up" ),
advanced_popup->insertItem( SmallIconSet( "down" ), i18n("Keep &Below Others"), Options::KeepBelowOp ); i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp );
advanced_popup->insertItem( SmallIconSet( "window_fullscreen" ), i18n("&Fullscreen"), Options::FullScreenOp ); advanced_popup->insertItem( SmallIconSet( "down" ),
advanced_popup->insertItem( i18n("&No Border"), Options::NoBorderOp ); i18n("Keep &Below Others")+'\t'+keys->shortcut("Window Below Other Windows").seq(0).toString(), Options::KeepBelowOp );
advanced_popup->insertItem( SmallIconSet( "window_fullscreen" ),
i18n("&Fullscreen")+'\t'+keys->shortcut("Window Fullscreen").seq(0).toString(), Options::FullScreenOp );
advanced_popup->insertItem( i18n("&No Border")+'\t'+keys->shortcut("Window No Border").seq(0).toString(), Options::NoBorderOp );
advanced_popup->insertItem( SmallIconSet( "filesave" ), i18n("&Special Window Settings..."), Options::WindowRulesOp ); advanced_popup->insertItem( SmallIconSet( "filesave" ), i18n("&Special Window Settings..."), Options::WindowRulesOp );
popup->insertItem(i18n("Ad&vanced"), advanced_popup ); popup->insertItem(i18n("Ad&vanced"), advanced_popup );
@ -194,6 +197,9 @@ void Workspace::readShortcuts()
cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)"); cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)");
keys->updateConnections(); keys->updateConnections();
delete popup;
popup = NULL; // so that it's recreated next time
} }