Changeset 12827

Timestamp:

2006-09-22T09:54:59+12:00 (18 years ago)

Author:

kjdon

Message:

changed the layout slightly - now uses a splitpane, so user can resize the arguments bit at the top

File:

• trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (7 diffs)

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

@@ -130 +130 @@
     private JPanel sbutton_panel;
     /** A simplified version for lower detail modes containing both the control and progress panes smooshed together. */
-    private JPanel simple_panel;
+    private JSplitPane simple_panel;
+    /** The lower part of the panel which is global so the log pane can be added and removed from it */
+    private JPanel slower_panel;
     /** The inner panel of the simple pane which is global so that the bar_area can be added and removed from it. */
     private JPanel sinner_panel;
-    /** The outer panel of the simple pane which is global so that the arguments pane can be added and removed from it. */
-    private JPanel souter_panel;
     /** The scrolling pane for the log. */
     private JScrollPane log_scroll;
@@ -189 +189 @@
 
     // And the simple panel
-    simple_panel = new JPanel();
+    slower_panel = new JPanel();
     sbutton_panel = new JPanel();
     sinner_panel = new JPanel();
@@ -358 +358 @@
     sargument_configuration_scroll = new JScrollPane(sargument_configuration_panel);
     sargument_configuration_scroll.setPreferredSize(ARGUMENT_SIZE);
-    souter_panel = new JPanel();
-    souter_panel.setSize(new Dimension(400,800));
-    souter_panel.setLayout(new GridLayout(2,1));
-    souter_panel.add(sargument_configuration_scroll);
-    souter_panel.add(sinner_panel);
-
-    simple_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    simple_panel.setLayout(new BorderLayout());
-    simple_panel.add(souter_panel, BorderLayout.NORTH);
+    
+    slower_panel.setLayout(new BorderLayout());
+    slower_panel.add(sinner_panel, BorderLayout.NORTH);
     if(current_mode < THRESHOLD) {
-        simple_panel.add(log_scroll, BorderLayout.CENTER);
-    }
-
+        slower_panel.add(log_scroll, BorderLayout.CENTER);
+    }
+    
+    simple_panel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, sargument_configuration_scroll, slower_panel);
     // Main pane
     main_pane = new JPanel(card_layout);
@@ -472 +467 @@
     if(Configuration.getMode() < THRESHOLD) {
         // Update the arguments
-        souter_panel.remove(sargument_configuration_scroll);
-        souter_panel.remove(sinner_panel);
+        simple_panel.remove(sargument_configuration_scroll);
         if(options_pane != null) {
         sargument_configuration_panel = options_pane.buildImport(null);
@@ -483 +477 @@
         sargument_configuration_scroll = new JScrollPane(sargument_configuration_panel);
         sargument_configuration_scroll.setPreferredSize(ARGUMENT_SIZE);
-        souter_panel.add(sargument_configuration_scroll);
-        souter_panel.add(sinner_panel);
+        simple_panel.setTopComponent(sargument_configuration_scroll);
         // Remove the shared components from the expert panels
         progress_pane.remove(log_scroll);
         // And add to simple one
-        simple_panel.add(log_scroll, BorderLayout.CENTER);
+        slower_panel.add(log_scroll, BorderLayout.CENTER);
         // And bring the card to the front
         card_layout.show(main_pane, SIMPLE);
@@ -495 +488 @@
     else {
         // Remove the shared components from the simple panel
-        simple_panel.remove(log_scroll);
+        slower_panel.remove(log_scroll);
         // And add then to the expert ones
         progress_pane.add(log_scroll, BorderLayout.CENTER);
@@ -595 +588 @@
     // If we are in simple mode, we have to rebuild the simple arguments list
     if(Configuration.getMode() < THRESHOLD) {
-        souter_panel.remove(sargument_configuration_scroll);
-        souter_panel.remove(sinner_panel);
+        simple_panel.remove(sargument_configuration_scroll);
         sargument_configuration_panel = options_pane.buildImport(null);
         sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
         sargument_configuration_scroll = new JScrollPane(sargument_configuration_panel);
         sargument_configuration_scroll.setPreferredSize(ARGUMENT_SIZE);
-        souter_panel.add(sargument_configuration_scroll);
-        souter_panel.add(sinner_panel);
+        simple_panel.setTopComponent(sargument_configuration_scroll);
     }
     tree.valueChanged(null);