Changeset 12822

Timestamp:

2006-09-21T17:22:44+12:00 (18 years ago)

Author:

kjdon

Message:

changed from a BoxLayout to a GridLayout for build and import options - looks nicer

File:

• trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (6 diffs)

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

@@ -72 +72 @@
     static private int IMPORT = 1;
     static private int MINIMUM_ROWS = 11;
- 
+    
     /** All process messages are written to this log text area. */
     public JTextArea log_textarea = null;
@@ -138 +138 @@
     }
     current_controls.addAll(build_arguments);
+
     // Now that we know how many arguments there are we can build the pane to view them on. Modes lower than EXPERT can provide a previous pane on which to add the arguments.
     if(pane == null || current_mode >= Configuration.EXPERT_MODE) {
@@ -144 +145 @@
         pane.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         int argument_count = build_arguments.size();
-        // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number or lines in the grid layout
+        // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number of lines in the grid layout
         if(current_mode >= Configuration.EXPERT_MODE) {
         if(argument_count < MINIMUM_ROWS) {
@@ -153 +154 @@
         // Otherwise we're just going to throw them on one after another and chuck it in a scroll pane anyway
         else {
-        pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
-        }
-    }
+        // use  GridLayout with 0 rows == as many rows as needed. Unfortunately, rows will 
+        // grow fat if space too large, but we don't know how many rows we'll need yet.
+        pane.setLayout(new GridLayout(0, 1, 5, 5));
+        }
+    }
+
     for(int j = 0; j < build_arguments.size(); j++) {
         pane.add((JComponent)build_arguments.get(j));
@@ -203 +207 @@
         pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         pane.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
-        int argument_count = import_arguments.size();
-        // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number or lines in the grid layout
+        int argument_count = import_arguments.size();       
+        // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number of lines in the grid layout
         if(current_mode >= Configuration.EXPERT_MODE) {
         if(argument_count < MINIMUM_ROWS) {
@@ -213 +217 @@
         // Otherwise we're just going to throw them on one after another and chuck it in a scroll pane anyway
         else {
-        pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
-        }
-    }
+        // use  GridLayout with 0 rows == as many rows as needed. Unfortunately, rows will 
+        // grow fat if space too large, but we don't know how many rows we'll need yet.
+        pane.setLayout(new GridLayout(0, 1, 5, 5));
+        }
+    } 
+
     for(int j = 0; j < import_arguments.size(); j++) {
         pane.add((JComponent)import_arguments.get(j));