From 3e604d14b07935f2e479b98dc0dfe16c0a107d0a Mon Sep 17 00:00:00 2001 From: Ellis Whitehead Date: Fri, 29 Jun 2001 04:30:25 +0000 Subject: [PATCH] Remove "Window iconify all" since we now how "Toggle Show Desktop". Index: kwinbindings.cpp =================================================================== RCS file: /home/kde/kdebase/kwin/kwinbindings.cpp,v retrieving revision 1.24 diff -u -3 -d -p -r1.24 kwinbindings.cpp --- kwinbindings.cpp 2001/06/26 23:30:52 1.24 +++ kwinbindings.cpp 2001/06/29 04:29:14 @@ -22,7 +22,7 @@ keys->insertItem(i18n("Window Maximize Vertical"), "Window maximize vertical", KKey(), KKey("Meta+Bar")); keys->insertItem(i18n("Window Maximize Horizontal"), "Window maximize horizontal", KKey(), KKey("Meta+Equal")); keys->insertItem(i18n("Window Iconify"), "Window iconify", KKey(), KKey("Meta+Minus")); - keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus")); + //keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus")); keys->insertItem(i18n("Window Shade"), "Window shade", KKey(), KKey("Meta+Underscore")); keys->insertItem(i18n("Window Move"), "Window move", 0); keys->insertItem(i18n("Window Resize"), "Window resize", 0); @@ -113,6 +113,6 @@ This belongs in taskbar rather than here #endif keys->insertItem(i18n("Mouse Emulation"), "Mouse emulation", KKey("ALT+F12"), KKey()); keys->insertItem(i18n("Kill Window"), "Kill Window", KKey("CTRL+ALT+Escape"), KKey("Meta+Ctrl+Delete")); - keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey()); - keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+PrtSc"), KKey()); + keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey("Alt+Print")); + keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+Print"), KKey("Meta+Print")); Index: workspace.cpp =================================================================== RCS file: /home/kde/kdebase/kwin/workspace.cpp,v retrieving revision 1.263 diff -u -3 -d -p -r1.263 workspace.cpp --- workspace.cpp 2001/06/29 00:16:26 1.263 +++ workspace.cpp 2001/06/29 04:29:24 @@ -2553,7 +2553,7 @@ void Workspace::createKeybindings(){ keys->connectItem( "Window maximize horizontal", this, SLOT( slotWindowMaximizeHorizontal() ) ); keys->connectItem( "Window maximize vertical", this, SLOT( slotWindowMaximizeVertical() ) ); keys->connectItem( "Window iconify", this, SLOT( slotWindowIconify() ) ); - keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) ); + //keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) ); keys->connectItem( "Window shade", this, SLOT( slotWindowShade() ) ); keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) ); keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) ); @@ -2744,6 +2744,7 @@ void Workspace::slotWindowIconify() performWindowOperation( popup_client, Options::IconifyOp ); } +// This should probably be removed now that there is a "Show Desktop" binding. void Workspace::slotWindowIconifyAll() { int iDesktop = currentDesktop(); svn path=/trunk/kdebase/kwin/; revision=104351 --- kwinbindings.cpp | 6 +++--- workspace.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kwinbindings.cpp b/kwinbindings.cpp index 60f750a050..ddcfd65a21 100644 --- a/kwinbindings.cpp +++ b/kwinbindings.cpp @@ -22,7 +22,7 @@ keys->insertItem(i18n("Window Maximize Vertical"), "Window maximize vertical", KKey(), KKey("Meta+Bar")); keys->insertItem(i18n("Window Maximize Horizontal"), "Window maximize horizontal", KKey(), KKey("Meta+Equal")); keys->insertItem(i18n("Window Iconify"), "Window iconify", KKey(), KKey("Meta+Minus")); - keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus")); + //keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus")); keys->insertItem(i18n("Window Shade"), "Window shade", KKey(), KKey("Meta+Underscore")); keys->insertItem(i18n("Window Move"), "Window move", 0); keys->insertItem(i18n("Window Resize"), "Window resize", 0); @@ -113,6 +113,6 @@ This belongs in taskbar rather than here, so it'll have to wait until after 2.2 #endif keys->insertItem(i18n("Mouse Emulation"), "Mouse emulation", KKey("ALT+F12"), KKey()); keys->insertItem(i18n("Kill Window"), "Kill Window", KKey("CTRL+ALT+Escape"), KKey("Meta+Ctrl+Delete")); - keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey()); - keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+PrtSc"), KKey()); + keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey("Alt+Print")); + keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+Print"), KKey("Meta+Print")); diff --git a/workspace.cpp b/workspace.cpp index 16de1d7174..d721657c27 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -2553,7 +2553,7 @@ void Workspace::createKeybindings(){ keys->connectItem( "Window maximize horizontal", this, SLOT( slotWindowMaximizeHorizontal() ) ); keys->connectItem( "Window maximize vertical", this, SLOT( slotWindowMaximizeVertical() ) ); keys->connectItem( "Window iconify", this, SLOT( slotWindowIconify() ) ); - keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) ); + //keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) ); keys->connectItem( "Window shade", this, SLOT( slotWindowShade() ) ); keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) ); keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) ); @@ -2744,6 +2744,7 @@ void Workspace::slotWindowIconify() performWindowOperation( popup_client, Options::IconifyOp ); } +// This should probably be removed now that there is a "Show Desktop" binding. void Workspace::slotWindowIconifyAll() { int iDesktop = currentDesktop();