Changeset 12123 for trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java

Timestamp:

2006-07-10T15:02:33+12:00 (18 years ago)

Author:

kjdon

Message:

Changed text handling to use Dictionary.get rather than Dictionary.setText or Dictionary.registerBoth etc. also removed mnemonics cos they suck for other languages.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java

@@ -307 +307 @@
         JPanel center_panel = new JPanel();
 
-        JLabel selected_languages_list_label = new JLabel();
-        Dictionary.registerText(selected_languages_list_label, "CDM.LanguageManager.Assigned_Languages");
+        JLabel selected_languages_list_label = new JLabel(Dictionary.get("CDM.LanguageManager.Assigned_Languages"));
         selected_languages_list = new JList(model);
         selected_languages_list.setCellRenderer(new MyLanguageListCellRenderer());
@@ -316 +315 @@
 
         JPanel control_panel = new JPanel();
-        JLabel selector_label = new JLabel();
-        Dictionary.registerText(selector_label, "CDM.LanguageManager.Selector");
-
+        JLabel selector_label = new JLabel(Dictionary.get("CDM.LanguageManager.Selector"));
+        
         language_combobox = new JComboBox(getLanguageCodes().toArray());
         language_combobox.setPreferredSize(COMPONENT_SIZE);
         language_combobox.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         language_combobox.setRenderer(new LanguageListCellRenderer());
-        Dictionary.registerTooltip(language_combobox, "CDM.LanguageManager.Selector_Tooltip");
-
+        language_combobox.setToolTipText(Dictionary.get("CDM.LanguageManager.Selector_Tooltip"));
+        
         JPanel movement_pane = new JPanel();
-        move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
+        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
         move_up_button.setEnabled(false);
-        move_up_button.setMnemonic(KeyEvent.VK_U);
-        Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
-
-        move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
+        
+        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
         move_down_button.setEnabled(false);
-        move_down_button.setMnemonic(KeyEvent.VK_D);
-        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
-
-        set_default_button = new GLIButton();
+        
+        set_default_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Set_Default"), Dictionary.get("CDM.LanguageManager.Set_Default_Tooltip"));
         set_default_button.setEnabled(false);
-        set_default_button.setMnemonic(KeyEvent.VK_S);
-        Dictionary.registerBoth(set_default_button, "CDM.LanguageManager.Set_Default", "CDM.LanguageManager.Set_Default_Tooltip");
-
+        
         JPanel button_panel = new JPanel();
 
-        add_button = new GLIButton();
-        add_button.setMnemonic(KeyEvent.VK_A);
-        Dictionary.registerBoth(add_button, "CDM.LanguageManager.Add", "CDM.LanguageManager.Add_Tooltip");
+        add_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Add"), Dictionary.get("CDM.LanguageManager.Add_Tooltip"));
+        
         if (getLanguage((String)language_combobox.getItemAt(0))==null) {
         add_button.setEnabled(true);
@@ -351 +342 @@
         add_button.setEnabled(false);
         }
-        remove_button = new GLIButton();
-        remove_button.setMnemonic(KeyEvent.VK_R);
+        remove_button = new GLIButton(Dictionary.get("CDM.LanguageManager.Remove"), Dictionary.get("CDM.LanguageManager.Remove_Tooltip"));
         remove_button.setEnabled(false);
-        Dictionary.registerBoth(remove_button, "CDM.LanguageManager.Remove", "CDM.LanguageManager.Remove_Tooltip");
-
+        
         // Set up and connect listeners.
         add_button.addActionListener(new AddListener());