Changeset 5527 for trunk/gli/src/org/greenstone/gatherer/gui/MenuBar.java

Timestamp:

2003-09-23T14:58:18+12:00 (21 years ago)

Author:

mdewsnip

Message:

Partway through tooltip assignment. Made lots of little changes, registered a whole lot more components, removed dead code, fixed help links (with SimpleMenuBars). Lots more of the same to come.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MenuBar.java (modified) (5 diffs)

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

@@ -225 +225 @@
     help_about.addActionListener(Gatherer.g_man);
 
-    help_browse = new JMenuItem(get("GUI.Browser"), Utility.BLANK_ICON);
+    help_browse = new JMenuItem(get("GUI.Hunt"), Utility.BLANK_ICON);
     help_browse.addActionListener(Gatherer.g_man);
 
@@ -231 +231 @@
     help_build.addActionListener(Gatherer.g_man);
 
-    help_collect = new JMenuItem(get("GUI.Collection"), Utility.BLANK_ICON);
+    help_collect = new JMenuItem(get("GUI.Gather"), Utility.BLANK_ICON);
     help_collect.addActionListener(Gatherer.g_man);
 
-    help_design = new JMenuItem(get("GUI.Build"), Utility.BLANK_ICON);
+    help_design = new JMenuItem(get("GUI.Design"), Utility.BLANK_ICON);
     help_design.addActionListener(Gatherer.g_man);
 
@@ -243 +243 @@
     help_general.addActionListener(Gatherer.g_man);
 
-    help_metaedit = new JMenuItem(get("GUI.MetaEdit"), Utility.BLANK_ICON);
+    help_metaedit = new JMenuItem(get("GUI.Enrich"), Utility.BLANK_ICON);
     help_metaedit.addActionListener(Gatherer.g_man);
 
-    help_mirror = new JMenuItem(get("GUI.Mirroring"), Utility.BLANK_ICON);
+    help_mirror = new JMenuItem(get("GUI.Mirror"), Utility.BLANK_ICON);
     help_mirror.addActionListener(Gatherer.g_man);
 
@@ -325 +325 @@
 
     /** In order to provide context aware help advice we keep track of which
-      *  tab the user has open, and then highlight that help menu item with
-      *  separators.
-      *  @param tab_index The index of the selected tab (0-7).
-      */
+     *  tab the user has open, and then highlight that help menu item with
+     *  separators.
+     *  @param tab_index The index of the selected tab (0-7).
+     */
     public void tabSelected(int tab_index) {
     JMenuItem selected;
@@ -347 +347 @@
      
     /** Retrieves a key from the Dictionary, using no extra arguments.
-      * @param key A String which maps to a certain phrase from the Dictionary.
-      * @return The String the matches the key or an error String if no match
-      * found.
-      */
+     * @param key A String which maps to a certain phrase from the Dictionary.
+     * @return The String the matches the key or an error String if no match
+     * found.
+     */
     private String get(String key) {
-    return get(key, null);
+    // return get(key, null);
+    return Gatherer.dictionary.get(key, (String[]) null);
     }
 
     /** Retrieves a key from the Dictionary, providing extra arguments to
-      * be inserted using a String array.
-      * @param key A String which maps to a certain phrase from the Dictionary.
-      * @param args A String array containing further arguments (such as
-      * formatting instructions and variable values) to be taken into account
-      * when Dictionary creates the return String.
-      * @return The String the matches the key or an error String if no match
-      * found.
-      */
-    private String get(String key, String args[]) {
+     * be inserted using a String array.
+     * @param key A String which maps to a certain phrase from the Dictionary.
+     * @param args A String array containing further arguments (such as
+     * formatting instructions and variable values) to be taken into account
+     * when Dictionary creates the return String.
+     * @return The String the matches the key or an error String if no match
+     * found.
+     */
+    /* private String get(String key, String args[]) {
     if(key.indexOf('.') == -1) {
         key = "Menu." + key;
     }
     return Gatherer.dictionary.get(key, args);
-    }
+    } */
 
     public class MagicMenuItem