From d769c15ad58d2c32a9d2ff0ec44789411edae2d8 Mon Sep 17 00:00:00 2001 From: Alexandre Deckner Date: Thu, 18 Nov 2010 15:05:32 +0000 Subject: [PATCH] * Remove cmd+opt+ctrl+up shortcuts since that's an undocumented old combo and it clashes with workspace navigation. Only cmd+up and opt+cmd+up remains. I've checked that it indeed conforms to the user guide, but having a second eye wouldn't hurt. Also reordered the constants for more consitency between the calls. Fixes #6833 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39479 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/tracker/ContainerWindow.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index 84f48b19be..521a85d8d6 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -3900,10 +3900,9 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled) if (!Navigator()) return; - RemoveShortcut(B_DOWN_ARROW, B_OPTION_KEY | B_COMMAND_KEY); + RemoveShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_OPTION_KEY); + RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY); RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY); - RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY | B_CONTROL_KEY); - RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_CONTROL_KEY); AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY, new BMessage(kNavigatorCommandBackward), Navigator()); @@ -3930,16 +3929,14 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled) RemoveShortcut(B_UP_ARROW, B_OPTION_KEY | B_COMMAND_KEY); // This also changes meaning, added again below. - AddShortcut(B_DOWN_ARROW, B_OPTION_KEY | B_COMMAND_KEY, + AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_OPTION_KEY, new BMessage(kOpenSelection), PoseView()); AddShortcut(B_UP_ARROW, B_COMMAND_KEY, new BMessage(kOpenParentDir), PoseView()); // We change the meaning from kNavigatorCommandUp to kOpenParentDir. AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY, new BMessage(kOpenParentDir), PoseView()); - AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY | B_CONTROL_KEY, - new BMessage(kOpenParentDir), PoseView()); - // the command option results in closing the parent window + // command + option results in closing the parent window } }