Changeset 4455

Timestamp:

2003-06-03T13:42:51+12:00 (21 years ago)

Author:

mdewsnip

Message:

Rearranged components in pane: "append"/"replace"/"remove" buttons are now horizontal, "edit text" button is now to the right of the value text field. This wastes a lot less space, and the value tree can be bigger.

File:

• trunk/gli/src/org/greenstone/gatherer/valuetree/GValueTree.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueTree.java

@@ -69 +69 @@
     private String args[] = new String[1];
     /** Stock standard size for labels. */
-    static final private Dimension LABEL_SIZE = new Dimension(132, 26);
+    static final private Dimension VALUE_LABEL_SIZE = new Dimension(66, 26);
 
     static final private String NONE = "None";
@@ -106 +106 @@
     tree.putClientProperty("JTree.lineStyle", "Angled");
 
-    JPanel controls_pane = new JPanel();
-
     JPanel value_pane = new JPanel();
     JLabel value_label = new JLabel(get("Value"));
-    value_label.setPreferredSize(LABEL_SIZE);
-    JPanel edit_pane = new JPanel();
-
+    value_label.setPreferredSize(VALUE_LABEL_SIZE);
+
+    JPanel value_field_pane = new JPanel();
     value = new JTextField();
     value.setBackground(Gatherer.config.getColor("coloring.editable", false));
@@ -120 +118 @@
     JPanel button_pane = new JPanel();
 
-    JPanel inner_button_pane = new JPanel();
-
     // Layout
     tree_pane.setLayout(new BorderLayout());
@@ -136 +132 @@
     center_pane.add(auto_pane, NONE);
 
-    value_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-
-    inner_button_pane.setLayout(new GridLayout(3,1,0,0));
-    inner_button_pane.add(add);
-    inner_button_pane.add(update);
-    inner_button_pane.add(remove);
-
-    edit_pane.setLayout(new BorderLayout());
-    edit_pane.add(expand, BorderLayout.NORTH);
-
-    button_pane.setLayout(new BorderLayout());
-    button_pane.add(inner_button_pane, BorderLayout.WEST);
-    button_pane.add(edit_pane, BorderLayout.EAST);
+    button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+    button_pane.setLayout(new GridLayout());
+    button_pane.add(add);
+    button_pane.add(update);
+    button_pane.add(remove);
+
+    value_field_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+    value_field_pane.setLayout(new BorderLayout(0, 0));
+    value_field_pane.add(value, BorderLayout.CENTER);
 
     value_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
     value_pane.setLayout(new BorderLayout());
-    value_pane.add(value_label, BorderLayout.CENTER);
-    value_pane.add(value, BorderLayout.EAST);
+    value_pane.add(value_label, BorderLayout.WEST);
+    value_pane.add(value_field_pane, BorderLayout.CENTER);
+    value_pane.add(expand, BorderLayout.EAST);
     value_pane.add(button_pane, BorderLayout.SOUTH);
-
-    controls_pane.setLayout(new BorderLayout());
-    controls_pane.add(value_pane, BorderLayout.CENTER);
 
     this.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     this.setLayout(new BorderLayout());
-    this.add(controls_pane, BorderLayout.NORTH);
+    this.add(value_pane, BorderLayout.NORTH);
     this.add(center_pane, BorderLayout.CENTER);
     }