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

Timestamp:

2003-10-03T14:07:35+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many more small improvements and tooltips added. Still more to come!

File:

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

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.Utility;
+
 /** The menu bar for the Gatherer main GUI. 
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -50 +53 @@
     /** The icon to be displayed alongside the context choosen help file. */
     private int current_tab          = -1;
+
     private JMenu file               = null;
     private JMenu edit               = null;
     private JMenu metadata           = null;
     private JMenu tools              = null;
-    private JMenu log                = null;
-    private JMenu window             = null;
-    private JMenu source             = null;
-    private JMenu level              = null; 
     public JMenu help                = null;
     public JMenuItem file_associations;
@@ -75 +75 @@
     public JMenuItem edit_replace = null;
     public JMenuItem edit_search = null;
-    public JMenuItem metadata_add    = null;
+    public JMenuItem metadata_import = null;
     public JMenuItem metadata_edit   = null;
     public JMenuItem metadata_export = null;
@@ -92 +92 @@
     public MagicMenuItem metadata_view   = null;
 
-    public MenuBar(MenuListener menu_listener) {
-
-    file = new JMenu(get("Menu.File"));
+    public MenuBar(MenuListener menu_listener)
+    {
+    file = new JMenu();
     file.setMnemonic(KeyEvent.VK_F);
-    this.add(file);
-
-    file_associations = new JMenuItem(get("Menu.File_Associations"), KeyEvent.VK_A);
+    Dictionary.registerText(file, "Menu.File");
+
+    file_associations = new JMenuItem();
     file_associations.addActionListener(Gatherer.g_man);      
-
-    file_close = new JMenuItem(get("Menu.File_Close"), KeyEvent.VK_C);
+    file_associations.setMnemonic(KeyEvent.VK_A);
+    Dictionary.registerText(file_associations, "Menu.File_Associations");
+
+    file_close = new JMenuItem();
     file_close.addActionListener(Gatherer.g_man);
     file_close.setEnabled(false);
-
-    file_delete = new JMenuItem(get("Menu.File_Delete"), KeyEvent.VK_D);
+    file_close.setMnemonic(KeyEvent.VK_C);
+    Dictionary.registerText(file_close, "Menu.File_Close");
+
+    file_delete = new JMenuItem();
     file_delete.addActionListener(Gatherer.g_man);
-
-    file_exit = new JMenuItem(get("Menu.File_Exit"), KeyEvent.VK_X);
+    file_delete.setMnemonic(KeyEvent.VK_D);
+    Dictionary.registerText(file_delete, "Menu.File_Delete");
+
+    file_exit = new JMenuItem();
     file_exit.addActionListener(Gatherer.g_man);
-
-    file_new = new JMenuItem(get("Menu.File_New"), KeyEvent.VK_N);
+    file_exit.setMnemonic(KeyEvent.VK_X);
+    Dictionary.registerText(file_exit, "Menu.File_Exit");
+
+    file_new = new JMenuItem();
     file_new.addActionListener(Gatherer.g_man);
-
-    file_open = new JMenuItem(get("Menu.File_Open"), KeyEvent.VK_O);
+    file_new.setMnemonic(KeyEvent.VK_N);
+    Dictionary.registerText(file_new, "Menu.File_New");
+
+    file_open = new JMenuItem();
     file_open.addActionListener(Gatherer.g_man);
-
-    file_options = new JMenuItem(get("Menu.File_Options"), KeyEvent.VK_P);
-    file_options.addActionListener(Gatherer.g_man);   
-
-    file_save = new JMenuItem(get("Menu.File_Save"), KeyEvent.VK_S);
+    file_open.setMnemonic(KeyEvent.VK_O);
+    Dictionary.registerText(file_open, "Menu.File_Open");
+
+    file_options = new JMenuItem();
+    file_options.addActionListener(Gatherer.g_man);
+    file_options.setMnemonic(KeyEvent.VK_P);
+    Dictionary.registerText(file_options, "Menu.File_Options");
+
+    file_save = new JMenuItem();
     file_save.addActionListener(Gatherer.g_man);
     file_save.setEnabled(false);
-
-    file_save_as = new JMenuItem(get("Menu.File_Save_As"), KeyEvent.VK_A);
-    //file_save_as.addActionListener(Gatherer.g_man);
-    file_save_as.setEnabled(false);       
-
-    // Layout file menu
+    file_save.setMnemonic(KeyEvent.VK_S);
+    Dictionary.registerText(file_save, "Menu.File_Save");
+
+    // file_save_as = new JMenuItem();
+    // file_save_as.addActionListener(Gatherer.g_man);
+    // file_save_as.setEnabled(false);
+    // file_save_as.setMnemonic(KeyEvent.VK_A);
+    // Dictionary.registerText(file_save_as, "Menu.File_Save_As");
+
+    // Layout (file menu)
     file.add(file_new);
     file.add(file_open);
     file.add(file_save);
-    //file.add(file_save_as);
+    // file.add(file_save_as);
     file.add(file_close);
-    //file.add(new JSeparator());
     file.add(file_delete);
     file.add(new JSeparator());
@@ -143 +160 @@
 
     // Edit menu
-    edit = new JMenu(get("Menu.Edit"));
+    edit = new JMenu();
     edit.setMnemonic(KeyEvent.VK_E);
-    this.add(Box.createHorizontalStrut(15));
-    this.add(edit);
+    Dictionary.registerText(edit, "Menu.Edit");
           
-    edit_cut = new JMenuItem(get("Menu.Edit_Cut") + " (ctrl-x)", KeyEvent.VK_X);
+    edit_cut = new JMenuItem();
     edit_cut.addActionListener(Gatherer.g_man);
-
-    edit_copy = new JMenuItem(get("Menu.Edit_Copy") + " (ctrl-c)", KeyEvent.VK_C);
+    edit_cut.setMnemonic(KeyEvent.VK_X);
+    Dictionary.registerText(edit_cut, "Menu.Edit_Cut");
+
+    edit_copy = new JMenuItem();
     edit_copy.addActionListener(Gatherer.g_man);
-
-    edit_paste = new JMenuItem(get("Menu.Edit_Paste") + " (ctrl-v)", KeyEvent.VK_V);
+    edit_copy.setMnemonic(KeyEvent.VK_C);
+    Dictionary.registerText(edit_copy, "Menu.Edit_Copy");
+
+    edit_paste = new JMenuItem();
     edit_paste.addActionListener(Gatherer.g_man);
-
-    edit_undo = new JMenuItem(get("Menu.Edit_Undo"), KeyEvent.VK_U);
-    edit_undo.setEnabled(false);
-
-    edit_redo = new JMenuItem(get("Menu.Edit_Redo"), KeyEvent.VK_D);
-    edit_redo.setEnabled(false);
-
-    edit_search = new JMenuItem(get("Menu.Edit_Search"), KeyEvent.VK_S);
-    edit_search.addActionListener(Gatherer.g_man);
-
-    edit_replace = new JMenuItem(get("Menu.Edit_Replace"), KeyEvent.VK_R);
-    edit_replace.addActionListener(Gatherer.g_man);
-
+    edit_paste.setMnemonic(KeyEvent.VK_V);
+    Dictionary.registerText(edit_paste, "Menu.Edit_Paste");
+
+    // edit_undo = new JMenuItem();
+    // edit_undo.setEnabled(false);
+    // edit_undo.setMnemonic(KeyEvent.VK_U);
+    // Dictionary.registerText(edit_undo, "Menu.Edit_Undo");
+
+    // edit_redo = new JMenuItem();
+    // edit_redo.setEnabled(false);
+    // edit_redo.setMnemonic(KeyEvent.VK_D);
+    // Dictionary.registerText(edit_redo, "Menu.Edit_Redo");
+
+    // edit_search = new JMenuItem();
+    // edit_search.addActionListener(Gatherer.g_man);
+    // edit_search.setMnemonic(KeyEvent.VK_S);
+    // Dictionary.registerText(edit_search, "Menu.Edit_Search");
+
+    // edit_replace = new JMenuItem();
+    // edit_replace.addActionListener(Gatherer.g_man);
+    // edit_replace.setMnemonic(KeyEvent.VK_R);
+    // Dictionary.registerText(edit_replace, "Menu.Edit_Replace");
+
+    // Layout (edit menu)
     edit.add(edit_cut);
     edit.add(edit_copy);
     edit.add(edit_paste);
-    //edit.add(new JSeparator());
-    //edit.add(edit_undo);
-    //edit.add(edit_redo);
-    //edit.add(new JSeparator());
-    //edit.add(edit_search);
-    //edit.add(edit_replace);
+    // edit.add(new JSeparator());
+    // edit.add(edit_undo);
+    // edit.add(edit_redo);
+    // edit.add(new JSeparator());
+    // edit.add(edit_search);
+    // edit.add(edit_replace);
 
     // Metadata menu
-    metadata = new JMenu(get("Menu.Metadata"));
+    metadata = new JMenu();
     metadata.setEnabled(false);
     metadata.setMnemonic(KeyEvent.VK_M);
-
-    metadata_add = new JMenuItem(get("Menu.Metadata_Add"), KeyEvent.VK_I);
-    metadata_add.addActionListener(Gatherer.g_man);
-
-    metadata_edit = new JMenuItem(get("Menu.Metadata_Edit"), KeyEvent.VK_E);
+    Dictionary.registerText(metadata, "Menu.Metadata");
+
+    metadata_import = new JMenuItem();
+    metadata_import.addActionListener(Gatherer.g_man);
+    metadata_import.setMnemonic(KeyEvent.VK_I);
+    Dictionary.registerText(metadata_import, "Menu.Metadata_Import");
+
+    metadata_edit = new JMenuItem();
     metadata_edit.addActionListener(Gatherer.g_man);
-
-    metadata_export = new JMenuItem(get("Menu.Metadata_Export"), KeyEvent.VK_X);
+    metadata_edit.setMnemonic(KeyEvent.VK_E);
+    Dictionary.registerText(metadata_edit, "Menu.Metadata_Edit");
+
+    metadata_export = new JMenuItem();
     metadata_export.addActionListener(Gatherer.g_man);
-
-    metadata_view = new MagicMenuItem(get("Menu.Metadata_View") + " " + get("FileActions.No_Selection"), KeyEvent.VK_A);
+    metadata_export.setMnemonic(KeyEvent.VK_X);
+    Dictionary.registerText(metadata_export, "Menu.Metadata_Export");
+
+    metadata_view = new MagicMenuItem(Dictionary.newget("Menu.Metadata_View") + " " + Dictionary.newget("FileActions.No_Selection"), KeyEvent.VK_A);
     metadata_view.addActionListener(Gatherer.g_man);    
 
-    metadata.add(metadata_add);
+    // Layout (metadata sets menu)
+    metadata.add(metadata_import);
     metadata.add(metadata_edit);
     metadata.add(metadata_export);
     metadata.add(metadata_view);
+
+    // Tools menu
+    // tools = new JMenu();
+    // tools.setEnabled(false);
+    // tools.setMnemonic(KeyEvent.VK_T);
+    // Dictionary.registerText(tools, "Menu.Tools");
+
+    // tools_log = new JMenuItem();
+    // tools_log.addActionListener(Gatherer.g_man);
+    // tools_log.setMnemonic(KeyEvent.VK_L);
+    // Dictionary.registerText(tools_log, "Menu.Tools_Log");
+
+    // tools_size = new JMenuItem();
+    // tools_size.addActionListener(Gatherer.g_man);
+    // tools_size.setMnemonic(KeyEvent.VK_C);
+    // Dictionary.registerText(tools_size, "Menu.Tools_Calculate_Record_Size");
+
+    // Layout (tools menu)
+    // tools.add(tools_log);
+    // tools.add(tools_size);
+
+    // Help menu
+    help = new JMenu();
+    help.setIcon(Utility.HELP_ICON);
+    Dictionary.setText(help, "Menu.Help");
+
+    help_about = new JMenuItem();
+    help_about.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_about, "Menu.Help_About");
+
+    help_browse = new JMenuItem(Utility.BLANK_ICON);
+    help_browse.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_browse, "GUI.Hunt");
+
+    help_build = new JMenuItem(Utility.BLANK_ICON);
+    help_build.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_build, "GUI.Create");
+
+    help_collect = new JMenuItem(Utility.BLANK_ICON);
+    help_collect.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_collect, "GUI.Gather");
+
+    help_design = new JMenuItem(Utility.BLANK_ICON);
+    help_design.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_design, "GUI.Design");
+
+    help_export = new JMenuItem(Utility.BLANK_ICON);
+    help_export.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_export, "GUI.Export");
+
+    help_general = new JMenuItem();
+    help_general.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_general, "Source.General");
+
+    help_metaedit = new JMenuItem(Utility.BLANK_ICON);
+    help_metaedit.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_metaedit, "GUI.Enrich");
+
+    help_mirror = new JMenuItem(Utility.BLANK_ICON);
+    help_mirror.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_mirror, "GUI.Mirror");
+
+    help_preview = new JMenuItem(Utility.BLANK_ICON);
+    help_preview.addActionListener(Gatherer.g_man);
+    Dictionary.registerText(help_preview, "GUI.Preview");
+
+    // Layout (help menu)
+    help.add(help_general);
+    help.add(new JSeparator());
+    if (Gatherer.config.get("workflow.browse", true)) {
+        help.add(help_browse);
+    }
+    if (Gatherer.config.get("workflow.mirror", true)) {
+        help.add(help_mirror);
+    }
+    if (Gatherer.config.get("workflow.gather", true)) {
+        help.add(help_collect);
+    }
+    if (Gatherer.config.get("workflow.enrich", true)) {
+        help.add(help_metaedit);
+    }
+    if (Gatherer.config.get("workflow.design", true)) {
+        help.add(help_design);
+    }
+    if (Gatherer.config.get("workflow.export", true)) {
+        help.add(help_export);
+    }
+    if (Gatherer.config.get("workflow.create", true)) {
+        help.add(help_build);
+    }
+    if (Gatherer.config.get("workflow.preview", true)) {
+        help.add(help_preview);
+    }
+    help.add(new JSeparator());
+    help.add(help_about);
+
+    // Layout (menu bar)
+    this.add(file);
+    this.add(Box.createHorizontalStrut(15));
+    this.add(edit);
     this.add(Box.createHorizontalStrut(15));
     this.add(metadata);
-
-    // Tools menu
-    tools = new JMenu(get("Menu.Tools"));
-
-    tools_log = new JMenuItem(get("Menu.Tools_Log"), KeyEvent.VK_L);
-    tools_log.addActionListener(Gatherer.g_man);
-
-    tools_size = new JMenuItem("Calculate Record Size", KeyEvent.VK_S);
-    tools_size.addActionListener(Gatherer.g_man);
-
-    tools.add(tools_log);
-    tools.add(tools_size);
-    //this.add(Box.createHorizontalStrut(15));
-    //this.add(tools);
-
-    // Help menu
-    help = new JMenu(get("Menu.Help"));
-    //help.addMenuListener(menu_listener);
-    help.setIcon(Utility.HELP_ICON);
-
-    help_about = new JMenuItem(get("Menu.Help_About"));
-    help_about.addActionListener(Gatherer.g_man);
-
-    help_browse = new JMenuItem(get("GUI.Hunt"), Utility.BLANK_ICON);
-    help_browse.addActionListener(Gatherer.g_man);
-
-    help_build = new JMenuItem(get("GUI.Create"), Utility.BLANK_ICON);
-    help_build.addActionListener(Gatherer.g_man);
-
-    help_collect = new JMenuItem(get("GUI.Gather"), Utility.BLANK_ICON);
-    help_collect.addActionListener(Gatherer.g_man);
-
-    help_design = new JMenuItem(get("GUI.Design"), Utility.BLANK_ICON);
-    help_design.addActionListener(Gatherer.g_man);
-
-    help_export = new JMenuItem(get("GUI.Export"), Utility.BLANK_ICON);
-    help_export.addActionListener(Gatherer.g_man);
-
-    help_general = new JMenuItem(get("Source.General"));
-    help_general.addActionListener(Gatherer.g_man);
-
-    help_metaedit = new JMenuItem(get("GUI.Enrich"), Utility.BLANK_ICON);
-    help_metaedit.addActionListener(Gatherer.g_man);
-
-    help_mirror = new JMenuItem(get("GUI.Mirror"), Utility.BLANK_ICON);
-    help_mirror.addActionListener(Gatherer.g_man);
-
-    help_preview = new JMenuItem(get("GUI.Preview"), Utility.BLANK_ICON);
-    help_preview.addActionListener(Gatherer.g_man);
-
-    // Layout help
-    help.add(help_general);
-    help.add(new JSeparator());
-    if(Gatherer.config.get("workflow.browse", true)) {
-        help.add(help_browse);
-    }
-    if(Gatherer.config.get("workflow.mirror", true)) {
-        help.add(help_mirror);
-    }
-    if(Gatherer.config.get("workflow.gather", true)) {
-        help.add(help_collect);
-    }
-    if(Gatherer.config.get("workflow.enrich", true)) {
-        help.add(help_metaedit);
-    }
-    if(Gatherer.config.get("workflow.design", true)) {
-        help.add(help_design);
-    }
-    if(Gatherer.config.get("workflow.export", true)) {
-        help.add(help_export);
-    }
-    if(Gatherer.config.get("workflow.create", true)) {
-        help.add(help_build);
-    }
-    if(Gatherer.config.get("workflow.preview", true)) {
-        help.add(help_preview);
-    }
-    help.add(new JSeparator());
-    help.add(help_about);
+    // this.add(Box.createHorizontalStrut(15));
+    // this.add(tools);
     this.add(Box.createHorizontalGlue());
     this.add(help);
@@ -288 +350 @@
     file_close.setEnabled(ready);
     file_save.setEnabled(ready);
-    file_save_as.setEnabled(ready);
+    // file_save_as.setEnabled(ready);
     metadata.setEnabled(ready);
-    tools.setEnabled(ready);
-    if(ready) {
-        Gatherer.c_man.undo.registerRedoSource(edit_redo);
-        Gatherer.c_man.undo.registerUndoSource(edit_undo);
+    // tools.setEnabled(ready);
+    if (ready) {
+        // Gatherer.c_man.undo.registerRedoSource(edit_redo);
+        // Gatherer.c_man.undo.registerUndoSource(edit_undo);
     }
     }
@@ -299 +361 @@
     /** Once a quit has been requested by the user, prevent any further menu selections. */
     public void exit() {
+    file.setEnabled(false);
     edit.setEnabled(false);
-    file.setEnabled(false);
+    metadata.setEnabled(false);
+    // tools.setEnabled(false);
     help.setEnabled(false);
-    metadata.setEnabled(false);
     }
 
@@ -308 +371 @@
     ///ystem.err.println("**** Set suffix: " + metaaudit_suffix);
     if(metaaudit_suffix == null) {
-        metadata_view.setText(get("Menu.Metadata_View") + " " + get("FileActions.No_Selection"));
+        metadata_view.setText(Dictionary.newget("Menu.Metadata_View") + " " + Dictionary.newget("FileActions.No_Selection"));
         metadata_view.setEnabled(false);
     }
     else {
         ///ystem.err.println("Set metadata view suffix: " + metaaudit_suffix);
-        metadata_view.setText(get("Menu.Metadata_View") + " " + metaaudit_suffix);
+        metadata_view.setText(Dictionary.newget("Menu.Metadata_View") + " " + metaaudit_suffix);
         metadata_view.setEnabled(true);
     }
@@ -332 +395 @@
     JMenuItem selected;
     if(current_tab != -1) {
-                // Remove the image
+        // Remove the image
         selected = help.getItem(current_tab);
         if(selected != null) {
@@ -345 +408 @@
     selected = null;
     }
-     
-    /** 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.
-     */
-    private String get(String key) {
-    // 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[]) {
-    if(key.indexOf('.') == -1) {
-        key = "Menu." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    } */
+
 
     public class MagicMenuItem
     extends JMenuItem {
-    
+
     private boolean can_enable;
     private boolean should_enable;
@@ -386 +424 @@
 
     public void setCanEnable(boolean can_enable) {
-        ///ystem.err.println("can_enable = " + can_enable);
         this.can_enable = can_enable;
         if (can_enable) {
-        ///ystem.err.println("setEnable(" + should_enable + ")");
         super.setEnabled(should_enable);
         }
@@ -398 +434 @@
 
     public void setEnabled(boolean should_enable) {
-        ///ystem.err.println("should_enable = " + should_enable);
         this.should_enable = should_enable;
-        if(can_enable) {
-        ///ystem.err.println("setEnable(" + should_enable + ")");
+        if (can_enable) {
         super.setEnabled(should_enable);
         }
     }
     }
-
-    private class NonFocusMenu
-    extends JMenu {
-        public NonFocusMenu(String name) {
-        super(name);
-            setFocusPainted(false);
-        }
-        
-        public boolean isFocusable(){
-            return false;
-        }
-        
-        public void requestFocus(){
-    }
-
-        public boolean requestFocus(boolean t){
-        return false;
-    }
-
-    public void setFocusable(boolean f) {
-    }
-    }
-
-    private class NonFocusMenuItem
-    extends JMenuItem {
-        public NonFocusMenuItem(String name, int key) {
-        super(name, key);
-            setFocusPainted(false);
-        }
-        
-        public boolean isFocusable(){
-            return false;
-        }
-        
-        public void requestFocus(){
-    }
-
-        public boolean requestFocus(boolean t){
-        return false;
-    }
-
-    public void setFocusable(boolean f) {
-    }
-          
-    }
 }