Changeset 12120

Timestamp:

2006-07-10T14:57:57+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. removed commented out custom args code

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java (modified) (4 diffs)

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

@@ -68 +68 @@
     /** The central pane where a list of known arguments is displayed. */
     private JPanel central_pane = null;
-    /** The field for entering custom arguments. */
-    //private JTextField custom = null;
-    /** The panel for the custom arguments */
-    //private JPanel custom_pane = null;
     /** The name of the owner of the last argument control. */
     private String previous_owner = null;
@@ -94 +90 @@
     setSize(SIZE);
     setJMenuBar(new SimpleMenuBar("designingacollection")); // can we tell whether we are doing a classifier or plugin, to make the help more specific??
-    Dictionary.setText(this, "CDM.ArgumentConfiguration.Title");
+    setTitle(Dictionary.get("CDM.ArgumentConfiguration.Title"));
 
     central_pane = new JPanel();
     JPanel content_pane = (JPanel) getContentPane();
 
-//  custom_pane = new JPanel();
-//  String custom_str = data.getCustom();
-//  if (custom_str != null) {
-//      custom = new JTextField(custom_str);
-//  }
-//  else {
-//      custom = new JTextField();
-//  }
-//  JLabel custom_label = new JLabel();
-//  custom_label.setPreferredSize(LABEL_SIZE);
-//  Dictionary.setText(custom_label, "CDM.ArgumentConfiguration.Custom");
-
     JPanel header_pane = new JPanel();
-    JLabel header = new JLabel();
+    JLabel header = new JLabel(Dictionary.get("CDM.ArgumentConfiguration.Header", data.getName()));
     header.setHorizontalAlignment(JLabel.CENTER);
     header.setOpaque(true);
-    String args[] = new String[1];
-    args[0] = data.getName();
-    Dictionary.setText(header, "CDM.ArgumentConfiguration.Header", args);
-
+    
     JPanel button_pane = new JPanel();
-    cancel = new GLIButton();
-    cancel.setMnemonic(KeyEvent.VK_C);
-    Dictionary.setBoth(cancel, "General.Cancel", "General.Pure_Cancel_Tooltip");
-    ok = new GLIButton();
-    ok.setMnemonic(KeyEvent.VK_O);
-    Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
-
+    cancel = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
+        
+    ok = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
+    
     // Listeners
     cancel.addActionListener(this);
     ok.addActionListener(this);
     ok.addActionListener(CollectionDesignManager.all_change_listener);
-
-    // Layout
-//  custom_pane.setLayout(new BorderLayout());
-//  custom_pane.add(custom_label, BorderLayout.WEST);
-//  custom_pane.add(custom, BorderLayout.CENTER);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -169 +142 @@
     if (event.getSource() == ok) {
         // Clear the current focus to ensure components such as combobox have correctly updated
-        //custom.requestFocus();
-        // Update the details stored in the data objects arguments.
-        //data.setCustom(custom.getText());
         // Loop through each of the controls in the central pane, updating the matching argument as necessary.
         for(int i = 0; i < central_pane.getComponentCount(); i++) {
@@ -243 +213 @@
         }
     }
-    // now add in the custom args bit
-//  coloured = !coloured;
-//  Color color = (coloured ? Configuration.getColor("coloring.collection_heading_background", false) : Configuration.getColor("coloring.collection_tree_background", false));
-//  addHeader(Dictionary.get("CDM.ArgumentConfiguration.Custom_Header"), color);
-//  custom_pane.setBackground(color);
-//  central_pane.add(custom_pane);
     if(total_height > 0) {
         JPanel filler = new JPanel();