Changeset 28627 for main/trunk/gli

Timestamp:

2013-11-14T16:09:39+13:00 (10 years ago)

Author:

ak19

Message:

Related to the previous commit. Displaying the apple symbol instead of the word apple for the Mac modifier key for editing cmd shortcuts.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• gems/GEMS.java (modified) (1 diff)
• gui/MenuBar.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -447 +447 @@
         edit = new JMenu();
         edit.setText(Dictionary.get("Menu.Edit"));
-        String modkey = Utility.isMac() ? "apple" : "ctrl";
+
+        String modkey = "ctrl";
+        if(Utility.isMac()) { // on Mac, we now use the Apple key instead of Ctrl for GLI/GEMS edit shortcuts
+        char appleKeyCodepoint = 0x2318; // applekey symbol unicode codepoint: U+2318 (\u2318)
+        String appleKeySymbol = String.valueOf(appleKeyCodepoint);
+        modkey = appleKeySymbol;
+        }
+
         edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
         edit_cut.addActionListener(this);

main/trunk/gli/src/org/greenstone/gatherer/gui/MenuBar.java

@@ -162 +162 @@
     edit.setText(Dictionary.get("Menu.Edit"));
     edit.setComponentOrientation(Dictionary.getOrientation());
-        String modkey = Utility.isMac() ? "apple" : "ctrl";
+
+    String modkey = "ctrl";
+    if(Utility.isMac()) { // on Mac, we now use the Apple key instead of Ctrl for GLI/GEMS edit shortcuts
+        char appleKeyCodepoint = 0x2318; // applekey symbol unicode codepoint: U+2318 (\u2318)
+        String appleKeySymbol = String.valueOf(appleKeyCodepoint);
+        modkey = appleKeySymbol;
+    }
+
     edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
     edit_cut.addActionListener(Gatherer.g_man);