From 95019e5c161cc71ca7cc2af830db7ab79c85c390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 28 Jun 2004 13:15:05 +0000 Subject: [PATCH] Fix #83587 - some entries in Alt+F3 don't say the shortcut. Also update the labels if the shortcuts change. svn path=/trunk/kdebase/kwin/; revision=324245 --- useractions.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/useractions.cpp b/useractions.cpp index 62aa905df6..7b8b7964de 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -54,10 +54,13 @@ QPopupMenu* Workspace::clientPopup() advanced_popup->setCheckable( TRUE ); advanced_popup->setFont(KGlobalSettings::menuFont()); 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( "down" ), i18n("Keep &Below Others"), Options::KeepBelowOp ); - advanced_popup->insertItem( SmallIconSet( "window_fullscreen" ), i18n("&Fullscreen"), Options::FullScreenOp ); - advanced_popup->insertItem( i18n("&No Border"), Options::NoBorderOp ); + advanced_popup->insertItem( SmallIconSet( "up" ), + i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); + advanced_popup->insertItem( SmallIconSet( "down" ), + 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 ); popup->insertItem(i18n("Ad&vanced"), advanced_popup ); @@ -194,6 +197,9 @@ void Workspace::readShortcuts() cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)"); keys->updateConnections(); + + delete popup; + popup = NULL; // so that it's recreated next time }