Changeset 28626 for main/trunk/gli/src

Timestamp:

2013-11-14T15:38:21+13:00 (10 years ago)

Author:

ak19

Message:

GLI and GEMS Edit menu refers to Apple key on Macs instead of the Ctrl key, since Professor Witten and Jenny discovered that the Apple key now works on Mac machines in GLI (and the Ctrl doesn't work anymore).

Location:

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

Files:

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

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

@@ -447 +447 @@
         edit = new JMenu();
         edit.setText(Dictionary.get("Menu.Edit"));
-        
-        edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut"));
+        String modkey = Utility.isMac() ? "apple" : "ctrl";
+        edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
         edit_cut.addActionListener(this);
         
-        edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy"));
+        edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy", modkey));
         edit_copy.addActionListener(this);
         
-        edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste"));
+        edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste", modkey));
         edit_paste.addActionListener(this);
         

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

@@ -45 +45 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.Utility;
 
 /** The menu bar for the Gatherer main GUI. 
@@ -161 +162 @@
     edit.setText(Dictionary.get("Menu.Edit"));
     edit.setComponentOrientation(Dictionary.getOrientation());
-        
-    edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut"));
+        String modkey = Utility.isMac() ? "apple" : "ctrl";
+    edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
     edit_cut.addActionListener(Gatherer.g_man);
     edit_cut.setComponentOrientation(Dictionary.getOrientation());
         
-    edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy"));
+    edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy", modkey));
     edit_copy.addActionListener(Gatherer.g_man);
         edit_copy.setComponentOrientation(Dictionary.getOrientation());
     
-    edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste"));
+    edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste", modkey));
     edit_paste.addActionListener(Gatherer.g_man);
     edit_paste.setComponentOrientation(Dictionary.getOrientation());