[MOD] GUI: Shortcuts revised (mostly Mac)

Author: ChristianGruen

basex-core/src/main/java/org/basex/gui/GUIMenuCmd.java

@@ -101,7 +101,7 @@ public void execute(final GUI gui) {
   },
 
   /** Closes the database. */
-  C_CLOSE(CLOSE, "% Q", true, false) {
+  C_CLOSE(CLOSE, Prop.MAC ? null : "% Q", true, false) {
     @Override
     public void execute(final GUI gui) {
       gui.execute(new Close());
@@ -494,7 +494,7 @@ public boolean enabled(final GUI gui) {
   },
 
   /** Filters the currently marked nodes. */
-  C_FILTER_NODES(FILTER_SELECTED, "alt DOWN", true, false) {
+  C_FILTER_NODES(FILTER_SELECTED, null, true, false) {
     @Override
     public void execute(final GUI gui) {
       final Context ctx = gui.context;
@@ -808,7 +808,7 @@ public void execute(final GUI gui) {
   },
 
   /** Shows a preference dialog. */
-  C_PREFERENCES(PREFERENCES + DOTS, Prop.MAC ? "% COMMA" : "% shift P", false, false) {
+  C_PREFERENCES(PREFERENCES + DOTS, Prop.MAC ? null : "% shift P", false, false) {
     @Override
     public void execute(final GUI gui) {
       DialogPrefs.show(gui);
@@ -852,7 +852,7 @@ public void execute(final GUI gui) {
   /* BROWSE COMMANDS */
 
   /** Goes one step back. */
-  C_GO_BACK(GO_BACK, "alt LEFT", true, false) {
+  C_GO_BACK(GO_BACK, Prop.MAC ? null : "alt LEFT", true, false) {
     @Override
     public void execute(final GUI gui) {
       gui.notify.hist(false);
@@ -865,7 +865,7 @@ public boolean enabled(final GUI gui) {
   },
 
   /** Goes one step forward. */
-  C_GO_FORWARD(GO_FORWARD, "alt RIGHT", true, false) {
+  C_GO_FORWARD(GO_FORWARD, Prop.MAC ? null : "alt RIGHT", true, false) {
     @Override
     public void execute(final GUI gui) {
       gui.notify.hist(true);
@@ -878,7 +878,7 @@ public boolean enabled(final GUI gui) {
   },
 
   /** Goes one level up. */
-  C_GO_UP(GO_UP, "alt UP", true, false) {
+  C_GO_UP(GO_UP, null, true, false) {
     @Override
     public void execute(final GUI gui) {
       // skip operation for root context
@@ -913,7 +913,7 @@ public boolean enabled(final GUI gui) {
   },
 
   /** Goes to the root node. */
-  C_GO_HOME(GO_HOME, "alt HOME", true, false) {
+  C_GO_HOME(GO_HOME, Prop.MAC ? null : "alt HOME", true, false) {
     @Override
     public void execute(final GUI gui) {
       // skip operation for root context

basex-core/src/main/java/org/basex/gui/layout/BaseXKeys.java

@@ -76,11 +76,10 @@ public enum BaseXKeys {
   /** Previous tab.          */ PREVTAB(CTRL | SHIFT, VK_TAB),
   /** Close tab.             */ CLOSETAB(META, VK_F4),
 
-  /** Go back.               */ GOBACK(MAC ? META : ALT, VK_LEFT),
-  /** Go forward.            */ GOFORWARD(MAC ? META : ALT, VK_RIGHT),
-  /** Go up.                 */ GOUP(MAC ? META : ALT, VK_PAGE_UP),
-  /** Go down.               */ FILTER(MAC ? META : ALT, VK_PAGE_DOWN),
-  /** Go home.               */ GOHOME(MAC ? META : ALT, VK_HOME),
+  // browse shortcuts: disabled with Mac, as ALT and META are reserved for cursor movements
+  /** Go back.               */ GOBACK(ALT, VK_LEFT),
+  /** Go forward.            */ GOFORWARD(ALT, VK_RIGHT),
+  /** Go home.               */ GOHOME(ALT, VK_HOME),
 
   /** Go to line.            */ GOTOLINE(META, VK_L),
 

basex-core/src/main/java/org/basex/gui/layout/BaseXLayout.java

@@ -334,17 +334,13 @@ public static void addInteraction(final Component comp, final BaseXWindow win) {
   private static KeyListener globalShortcuts(final GUI gui) {
     if(keys == null) keys = (KeyPressedListener) e -> {
       // browse back/forward
-      if(gui.context.data() != null) {
+      if(!Prop.MAC && gui.context.data() != null) {
         if(GOBACK.is(e)) {
           GUIMenuCmd.C_GO_BACK.execute(gui);
         } else if(GOFORWARD.is(e)) {
           GUIMenuCmd.C_GO_FORWARD.execute(gui);
-        } else if(GOUP.is(e)) {
-          GUIMenuCmd.C_GO_UP.execute(gui);
         } else if(GOHOME.is(e)) {
           GUIMenuCmd.C_GO_HOME.execute(gui);
-        } else if(FILTER.is(e)) {
-          GUIMenuCmd.C_FILTER_NODES.execute(gui);
         }
       }