Changeset 7241

Timestamp:

2004-04-29T10:32:13+12:00 (20 years ago)

Author:

kjdon

Message:

moved the custom arguments panel to teh end of teh scrolling args

File:

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

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

@@ -73 +73 @@
     /** 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;
@@ -100 +102 @@
     JPanel content_pane = (JPanel) getContentPane();
 
-    JPanel custom_pane = new JPanel();
+    custom_pane = new JPanel();
     String custom_str = data.getCustom();
     if (custom_str != null) {
@@ -137 +139 @@
     custom_pane.add(custom, BorderLayout.CENTER);
 
-    header_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
-    header_pane.setLayout(new BorderLayout());
-    header_pane.add(header, BorderLayout.NORTH);
-    header_pane.add(custom_pane, BorderLayout.CENTER);
-
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
     button_pane.setLayout(new GridLayout(1,2));
@@ -152 +149 @@
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     content_pane.setLayout(new BorderLayout());
-    content_pane.add(header_pane, BorderLayout.NORTH);
+    content_pane.add(header, BorderLayout.NORTH);
     content_pane.add(new JScrollPane(central_pane), BorderLayout.CENTER);
     content_pane.add(button_pane, BorderLayout.SOUTH);
@@ -197 +194 @@
     cancel = null;
     central_pane = null;
+    custom_pane = null;
     custom = null;
     data = null;
@@ -247 +245 @@
         }
     }
+    // now add in the custom args bit
+    coloured = !coloured;
+    Color color = (coloured ? Gatherer.config.getColor("coloring.collection_heading_background", false) : Gatherer.config.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();