[haiku-commits] r39479 - haiku/trunk/src/kits/tracker

From: alex@xxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 18 Nov 2010 16:05:32 +0100 (CET)
Author: aldeck
Date: 2010-11-18 16:05:32 +0100 (Thu, 18 Nov 2010)
New Revision: 39479
Changeset: http://dev.haiku-os.org/changeset/39479
Ticket: http://dev.haiku-os.org/ticket/6833

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
Log:
* 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



Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp    2010-11-18 13:58:49 UTC 
(rev 39478)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp    2010-11-18 15:05:32 UTC 
(rev 39479)
@@ -3900,10 +3900,9 @@
                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 @@
                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
        }
 }
[haiku-commits] r39479 - haiku/trunk/src/kits/tracker

Other related posts:
