Changeset 12119 for trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

Timestamp:

2006-07-10T14:57:04+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/gui/GatherPane.java (modified) (6 diffs)

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

@@ -130 +130 @@
 
     // Create components.
-    stop_action = new GLIButton();
+    stop_action = new GLIButton(Dictionary.get("Collection.Stop"), Dictionary.get("Collection.Stop_Tooltip"));
     stop_action.addActionListener(this);
     stop_action.setEnabled(false);
     stop_action.setMnemonic(KeyEvent.VK_S);
     file_queue.registerStopButton(stop_action);
-    Dictionary.registerBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
-    
-    new_folder = new GLIButton(JarTools.getImage("folder.gif"));
+        
+    new_folder = new GLIButton(JarTools.getImage("folder.gif"), Dictionary.get("Collection.New_Folder_Tooltip"));
     new_folder.addActionListener(this);
     new_folder.setEnabled(false);
@@ -143 +142 @@
     new_folder.setMnemonic(KeyEvent.VK_N);
     new_folder.setPreferredSize(MIN_SIZE);
-    Dictionary.registerTooltip(new_folder, "Collection.New_Folder_Tooltip");
+    
     }
 
@@ -212 +211 @@
     workspace_pane.setSize(TREE_SIZE);
 
-    workspace_label = new JLabel();
+    workspace_label = new JLabel(Dictionary.get("Collection.Workspace"));
     workspace_label.setOpaque(true);
     workspace_label.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
     workspace_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground", false));
-    Dictionary.registerText(workspace_label, "Collection.Workspace");
-
+    
     workspace_tree = new WorkspaceTree();
     group.add(workspace_tree);
@@ -231 +229 @@
     collection_pane.setSize(TREE_SIZE);
 
-    collection_label = new JLabel();
+    collection_label = new JLabel(Dictionary.get("Collection.Collection"));
     collection_label.setOpaque(true);
-    Dictionary.registerText(collection_label, "Collection.Collection");
-
+    
     collection_tree = Gatherer.c_man.getCollectionTree();
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
@@ -246 +243 @@
     no_collection_pane.setBackground(Color.lightGray);
 
-    JLabel no_collection_label = new JLabel();
+    JLabel no_collection_label = new JLabel(Dictionary.get("Collection.Collection"));
     no_collection_label.setBackground(Color.lightGray);
     no_collection_label.setForeground(Color.black);
     no_collection_label.setOpaque(true);
-    Dictionary.registerText(no_collection_label, "Collection.Collection");
-
+    
     JPanel no_collection_loaded_panel = new JPanel();
     no_collection_loaded_panel.setBorder(BorderFactory.createLineBorder(Color.black));
     no_collection_loaded_panel.setBackground(Color.lightGray);
 
-    JLabel no_collection_loaded_label = new JLabel();
+    JLabel no_collection_loaded_label = new JLabel(Dictionary.get("Collection.No_Collection_Loaded"));
     no_collection_loaded_label.setHorizontalAlignment(JLabel.CENTER);
     no_collection_loaded_label.setVerticalAlignment(JLabel.CENTER);
-    Dictionary.registerText(no_collection_loaded_label, "Collection.No_Collection_Loaded");
-
+    
     // Status pane
     control_pane = new JPanel();
@@ -280 +275 @@
     recycle_bin.setMinimumSize(MIN_SIZE);
     recycle_bin.setPreferredSize(MIN_SIZE);
-    Dictionary.registerTooltip(recycle_bin, "Collection.Delete_Tooltip");
+    recycle_bin.setToolTipText(Dictionary.get("Collection.Delete_Tooltip"));
     group.add(recycle_bin);