Changeset 6389 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2004-01-09T15:08:11+13:00 (20 years ago)

Author:

jmt12

Message:

Introduced the idea of detail modes - these have an effect on several parts of the gui, such as disabling or hiding all regular expression based controls, simplifying the output from perl scripts and (having been given yet another new last minute feature to implement) displays a completely different create pane. Mode is stored in the config.xml and is changable via the Preferences controls

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• CreatePane.java (modified) (24 diffs)
• Filter.java (modified) (4 diffs)
• GComboBox.java (modified) (7 diffs)
• GConfigPane.java (modified) (1 diff)
• GUIManager.java (modified) (8 diffs)
• MetaEditPane.java (modified) (11 diffs)
• OptionsPane.java (modified) (10 diffs)
• Preferences.java (modified) (6 diffs)

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

@@ -44 +44 @@
 import javax.swing.text.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -91 +92 @@
     extends JPanel
     implements GShellListener {
+
+    static private Dimension ARGUMENT_SIZE = new Dimension(800,90);
+    /** The size of the buttons at the bottom of the screen. */
+    static private Dimension BUTTON_SIZE = new Dimension (256, 50);//(386, 50);
+    /** The size of the labels on the progress pane. */
+    static private Dimension LABEL_SIZE = new Dimension(140, 25);
+    /** The threshold for when the simple view is replaced by the complex one. */
+    static private final int THRESHOLD = Configuration.EXPERT_MODE;
+    /** An identifier for the control panel within the card layout. */
+    static private String CONTROL  = "Control";
+    /** An identifier for the progress panel within the card layout. */
+    static private String PROGRESS = "Progress";
+    /** An identifier for the simple panel within the card layout. */
+    static private String SIMPLE   = "Simple";
+
     /** Determines the current view that should be shown for this pane. */
     public boolean processing = false;
@@ -120 +136 @@
     /** The label alongside the import progress bar gets some special treatment so... */
     private JLabel progress_import_label = null;
+    /** A panel containing the two progress bars. */
+    private JPanel bar_area;
+    /** The panel on which buttons are rendered on higher detail modes. */
+    private JPanel button_pane;
     /** The pane which contains the controls for configuration. */
     private JPanel control_pane = null;
@@ -126 +146 @@
     /** The pane which contains the progress information. */
     private JPanel progress_pane = null;
-    /** the pane on the right-hand side - shows the requested options view */
+    /** The pane on the right-hand side - shows the requested options view */
     private JPanel right = null;
+    /** The simple panel on which all of the available arguments are rendered. */
+    private JPanel sargument_configuration_panel;
+    /** The panel on which buttons are rendered on lower details modes. */
+    private JPanel sbutton_panel;
+    /** A simplified version for lower detail modes containing both the control and progress panes smooshed together. */
+    private JPanel simple_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;
+    /** The scrolling pane the simple arguments are rendered within. */
+    private JScrollPane sargument_configuration_scroll;
     /** the scrolling pane the righthand side is inside - only used for import and build options. the log and log list are not inside a scrollpane */
     private JScrollPane scroll_pane;
@@ -138 +172 @@
     /** The homepage address of the current collection */
     private String homepage = null;
-    /** The size of the buttons at the bottom of the screen. */
-    static private Dimension BUTTON_SIZE = new Dimension (256, 50);//(386, 50);
-    /** The size of the labels on the progress pane. */
-    static private Dimension LABEL_SIZE = new Dimension(140, 25);
-    /** An identifier for the control panel within the card layout. */
-    static private String CONTROL = "Control";
-    /** An identifier for the progress panel within the card layout. */
-    static private String PROGRESS      = "Progress";
+
 
     /** The constructor creates important helper classes, and initializes all the components.
@@ -162 +189 @@
     Collection collection = Gatherer.c_man.getCollection();
     log_textarea = new JTextArea();
+    log_scroll = new JScrollPane(log_textarea);
 
     // Create components
@@ -168 +196 @@
     control_pane = new JPanel();
     tree = new OptionTree();
+    button_pane = new JPanel();
 
     // Progress Pane
-    progress_pane = new JPanel();
+    progress_pane = new JPanel(); // One owner of the bar component
+    bar_area = new JPanel(); // This component will be shared about
 
     progress_copy_label = new JLabel();
@@ -202 +232 @@
     Dictionary.registerText(progress_build_label, "CreatePane.Build_Progress");
 
-    build_monitor = new GBuildProgressMonitor((GImportProgressMonitor)import_monitor); //GBasicProgressMonitor();
+    build_monitor = new GBuildProgressMonitor(); //GBasicProgressMonitor();
     Gatherer.c_man.registerBuildMonitor(build_monitor);
+
+    // And the simple panel
+    simple_panel = new JPanel();
+    sbutton_panel = new JPanel();
+    sinner_panel = new JPanel();
 
     // Buttons
@@ -240 +275 @@
     }
     Collection current_collection = Gatherer.c_man.getCollection();
-    if (current_collection != previous_collection) {
+    if (current_collection != previous_collection && !Gatherer.c_man.isImporting()) {
         this.options_pane = new OptionsPane(current_collection.build_options);
         previous_collection = current_collection;
+    }
+    // If we are in simple mode, we have to rebuild the simple arguments list
+    if(Gatherer.config.getMode() < THRESHOLD) {
+        souter_panel.remove(sargument_configuration_scroll);
+        souter_panel.remove(sinner_panel);
+        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);
     }
     tree.valueChanged(null);
@@ -253 +299 @@
     }
     }
+
+    public void destroy() {
+    if(document != null) {
+        document.destroy();
+    }
+    }
     
     /** This method is called to actually layout the components.
@@ -260 +312 @@
     public void display() {
 
+    int current_mode = Gatherer.config.getMode();
+
     // Build control_pane
     JPanel left = new JPanel();
@@ -276 +330 @@
     options_area.add(right, BorderLayout.CENTER);
 
+    button_pane = new JPanel();
+    button_pane.setBorder(BorderFactory.createEmptyBorder(5,10,10,10));
+    button_pane.setLayout(new GridLayout(1,2));
+    if(current_mode >= THRESHOLD) {
+        button_pane.add(build_button);
+        button_pane.add(cancel_button);
+        button_pane.add(preview_button);
+    }
+
     control_pane.setLayout(new BorderLayout());
     control_pane.add(options_area, BorderLayout.CENTER);
+    control_pane.add(button_pane, BorderLayout.SOUTH);
 
     // Build progress_pane
@@ -295 +359 @@
     build_pane.add(build_monitor.getProgress(), BorderLayout.CENTER);
 
-    JPanel bar_area = new JPanel();
     bar_area.setBorder(BorderFactory.createEmptyBorder(10,10,5,10));
 
@@ -304 +367 @@
     progress_pane.setBorder(BorderFactory.createEmptyBorder(20,20,20,20));
     progress_pane.setLayout(new BorderLayout());
-    progress_pane.add(bar_area, BorderLayout.NORTH);
-    progress_pane.add(new JScrollPane(log_textarea), BorderLayout.CENTER);
+    if(current_mode >= THRESHOLD) {
+        progress_pane.add(bar_area, BorderLayout.NORTH);
+        progress_pane.add(log_scroll, BorderLayout.CENTER);
+    }
+
+    // Simple panel
+    sbutton_panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+    sbutton_panel.setLayout(new GridLayout(3,1));
+    if(current_mode < THRESHOLD) {
+        sbutton_panel.add(build_button);
+        sbutton_panel.add(cancel_button);
+        sbutton_panel.add(preview_button);
+    }
+
+    sinner_panel.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+    sinner_panel.setLayout(new BorderLayout());
+    if(current_mode < THRESHOLD) {
+        sinner_panel.add(bar_area, BorderLayout.CENTER);
+    }
+    sinner_panel.add(sbutton_panel, BorderLayout.EAST);
+    
+    if(options_pane != null) {
+        sargument_configuration_panel = options_pane.buildImport(null);
+        sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
+    }
+    else {
+        sargument_configuration_panel = new JPanel();
+    }
+    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);
+    if(current_mode < THRESHOLD) {
+        simple_panel.add(log_scroll, BorderLayout.CENTER);
+    }
 
     // Main pane
     main_pane = new JPanel(card_layout);
+    if(current_mode < THRESHOLD) { // Simple mode - add first
+        main_pane.add(simple_panel, SIMPLE);
+    }
     main_pane.add(control_pane, CONTROL);
     main_pane.add(progress_pane, PROGRESS);
-
-    // Buttons
-    JPanel button_pane = new JPanel();
-    button_pane.setBorder(BorderFactory.createEmptyBorder(5,10,10,10));
-    button_pane.setLayout(new GridLayout(1,2));
-    button_pane.add(build_button);
-    button_pane.add(cancel_button);
-    button_pane.add(preview_button);
+    if(current_mode >= THRESHOLD) { // Expert mode - add last
+        main_pane.add(simple_panel, SIMPLE);
+    }
 
     this.setLayout(new BorderLayout());
     this.add(main_pane, BorderLayout.CENTER);
-    this.add(button_pane, BorderLayout.SOUTH);
     }
 
@@ -331 +431 @@
      */
     public void gainFocus() {
-    if(!processing) {
+    if(Gatherer.config.getMode() < THRESHOLD) {
+        card_layout.show(main_pane, SIMPLE);
+    }
+    else if(!processing) {
         card_layout.show(main_pane, CONTROL);
+    }
+    else {
+        card_layout.show(main_pane, PROGRESS);
     }
     // Refresh the set of controls.
@@ -339 +445 @@
     tree.setSelectionPath(path);
     }
-
-    /** Method to acquire the progress monitor associated with builds.
-     * @return The build <strong>GShellProgressMonitor</strong>.
-     */
-    /* private GShellProgressMonitor getBuildProgress() {
-    return build_monitor;
-    } */
-
-    /** Method to acquire the progress monitor associated with copying.
-     * @return The copying <strong>GShellProgressMonitor</strong>.
-     */
-    /* private GShellProgressMonitor getCopyProgress() {
-    return copy_monitor;
-    } */
-
-    /** Method to acquire the progress monitor associated with import.
-     * @return The import <strong>GShellProgressMonitor</strong>.
-     */
-    /* private GShellProgressMonitor getImportProgress() {
-    return import_monitor;
-    } */
 
     /** We are informed when this view pane loses focus so we can update build options. */
@@ -376 +461 @@
     document.appendLine(event.getMessage());
     log_textarea.setCaretPosition(document.getLengthToNearestLine());
+    }
+
+    /** Called when the detail mode has changed which in turn may cause several import/build configuration arguments to be available/hidden
+     * @param mode the new mode as an int
+     */
+    public void modeChanged(int mode) {
+    // If we are below the complexity threshold ensure the simple controls are being shown
+    if(Gatherer.config.getMode() < THRESHOLD) {
+        // Update the arguments
+        souter_panel.remove(sargument_configuration_scroll);
+        souter_panel.remove(sinner_panel);
+        if(options_pane != null) {
+        sargument_configuration_panel = options_pane.buildImport(null);
+        sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
+        }
+        else {
+        sargument_configuration_panel = new JPanel();
+        }
+        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);
+        // Remove the shared components from the expert panels
+        button_pane.remove(build_button);
+        button_pane.remove(cancel_button);
+        button_pane.remove(preview_button);
+        progress_pane.remove(bar_area);
+        progress_pane.remove(log_scroll);
+        // And add to simple one
+        sbutton_panel.add(build_button);
+        sbutton_panel.add(cancel_button);
+        sbutton_panel.add(preview_button);
+        sinner_panel.add(bar_area, BorderLayout.CENTER);
+        simple_panel.add(log_scroll, BorderLayout.CENTER);
+        // And bring the card to the front
+        card_layout.show(main_pane, SIMPLE);
+    }
+    // And if we are above the threshold change to the complex controls
+    else {
+        // Remove the shared components from the simple panel
+        sbutton_panel.remove(build_button);
+        sbutton_panel.remove(cancel_button);
+        sbutton_panel.remove(preview_button);
+        sinner_panel.remove(bar_area);
+        simple_panel.remove(log_scroll);
+        // And add then to the expert ones
+        button_pane.add(build_button);
+        button_pane.add(cancel_button);
+        button_pane.add(preview_button);
+        progress_pane.add(bar_area, BorderLayout.NORTH);
+        progress_pane.add(log_scroll, BorderLayout.CENTER);
+        // And bring the appropriate card to the front
+        if(!processing) {
+        card_layout.show(main_pane, CONTROL);
+        }
+        else {
+        card_layout.show(main_pane, PROGRESS);
+        }
+    }
+    tree.valueChanged(null); // Ensure tree argument panels are rebuilt
     }
 
@@ -397 +542 @@
         document.setSpecialCharacter(OptionsPane.SUCCESSFUL);
         options_pane.resetFileEntry();
-        card_layout.show(main_pane, CONTROL);
+        build_monitor.reset();
+        import_monitor.reset();
+        if(Gatherer.config.getMode() >= THRESHOLD) {
+            card_layout.show(main_pane, CONTROL);
+        }
         }
         // Otherwise its completed import but still got build to go
@@ -414 +563 @@
         }
         options_pane.resetFileEntry();
-        card_layout.show(main_pane, CONTROL);
+        if(Gatherer.config.getMode() >= THRESHOLD) {
+        card_layout.show(main_pane, CONTROL);
+        }
     }
     }
@@ -457 +608 @@
         // First we force the build options to be updated if we haven't already.
         tree.valueChanged(null);
+        
+        // Remember that for lower thresholds the above doesn't work, so try this instead
+        if(Gatherer.config.getMode() < THRESHOLD) {
+        options_pane.update(sargument_configuration_panel);
+        }
+
         // Now go about building.
         build_button.setEnabled(false);
         cancel_button.setEnabled(true);
         preview_button.setEnabled(false);
-        // Create a new log document and assign it to the two textareas
         document = options_pane.createNewLogDocument();
         log_textarea.setDocument(document);
@@ -467 +623 @@
         // Change the view.
         processing = true;
-        card_layout.show(main_pane, PROGRESS);
+        if(Gatherer.config.getMode() >= THRESHOLD) {
+        card_layout.show(main_pane, PROGRESS);
+        }
         // Reset the stop flag in all the process monitors, just incase.
         ((GBuildProgressMonitor)build_monitor).reset();
@@ -496 +654 @@
         processing = false;
         document.setSpecialCharacter(OptionsPane.CANCELLED);
-        card_layout.show(main_pane, CONTROL);
+        if(Gatherer.config.getMode() >= THRESHOLD) {
+        card_layout.show(main_pane, CONTROL);
+        }
         // Set the stop flag in all the process monitor.
         build_monitor.setStop(true);
+        build_monitor.reset();
         copy_monitor.setStop(true);
         import_monitor.setStop(true);
+        import_monitor.reset();
         // Set removeold automatically.
         Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
@@ -591 +753 @@
         }
         if(node != null && node.equals(building)) {
-        previous_pane = options_pane.buildBuild();
+        previous_pane = options_pane.buildBuild(null);
         scroll_pane = new JScrollPane(previous_pane);
         right.add(scroll_pane, BorderLayout.CENTER);
@@ -597 +759 @@
         }
         else if(node != null && node.equals(importing)) {
-        previous_pane = options_pane.buildImport();
+        previous_pane = options_pane.buildImport(null);
         scroll_pane = new JScrollPane(previous_pane);
         right.add(scroll_pane, BorderLayout.CENTER);

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

@@ -72 +72 @@
     private DragTree tree = null;
     /** The default size for the label. */
-    static final private Dimension SIZE = new Dimension(100,25);
+    static final private Dimension SIZE = new Dimension(100,30);
     /** Preprogrammed default filters. */
     static final private String DEFAULTS[] = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.*\\.gif$)|(^.*\\.bmp$)|(^.*\\.tif$)"};
@@ -97 +97 @@
     this.tree = tree;
     // Create components.
-    combobox = new GComboBox();
+    combobox = new GComboBox(true);
     combobox.add(new Entry());
     for(int i = 0; i < DEFAULTS.length; i++) {
@@ -108 +108 @@
         }
     }
-    combobox.setEditable(true);
     label = new JLabel();
     label.setPreferredSize(SIZE);
@@ -153 +152 @@
     combobox.setSelectedItem(selection);
     ignore = false;
+    }
+
+    /** Sets whether this combobox is editable or not
+     * @param value true to make the control editable, false otherwise
+     */
+    public void setEditable(boolean value) {
+    combobox.setEditable(value);        
     }
 

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

@@ -45 +45 @@
 /**
  * @author John Thompson, Greenstone Digital Library, University of Waikato
- * @version
+ * @version 2.3
  */
 public class GComboBox
@@ -175 +175 @@
     super.setEditable(editable);
     this.editable = editable;
-    setEditor(new Editor());
-    setRenderer(new Renderer());
+    if(editable) {
+        this.setBackground(editable_background);
+        this.setForeground(editable_foreground);
+    }
+    else {
+        this.setBackground(background);
+        this.setForeground(foreground);
+    }
+    setEditor(new Editor());
+    setRenderer(new Renderer());
+    updateUI();
     }
 
@@ -201 +210 @@
     ComboBoxModel old_model = (ComboBoxModel) getModel();
     setModel(model);
+    setOpaque(true);
     // Restore any data given into our model
     for(int i = 0; i < old_model.getSize(); i++) {
@@ -226 +236 @@
     setBorder(BorderFactory.createLoweredBevelBorder());
     setEditor(new Editor());
-    setOpaque(true);
     setRenderer(new Renderer());
     }
@@ -234 +243 @@
     implements ComboBoxEditor {
     public Editor() {
-        setBackground(editable_background);
-        setForeground(editable_foreground);
         setOpaque(true);
         if(editable) {
-        setSelectionColor(selection_background);
-        setSelectedTextColor(selection_foreground);
-        }
+        setBackground(editable_background);
+        setForeground(editable_foreground);
+        }
+        else {
+        setBackground(background);
+        setForeground(foreground);
+        }
+        setSelectionColor(selection_background);
+        setSelectedTextColor(selection_foreground);
     }
 
@@ -301 +314 @@
     public Renderer() {
         super("");
-        this.setBackground(background);
-        this.setForeground(foreground);
         this.setOpaque(true);
     }
@@ -312 +323 @@
         this.setText("");
         }
-        if(editable) {
+        if(isSelected) {
+        this.setBackground(selection_background);
+        this.setForeground(selection_foreground);
+        }
+        else if(editable) {
         this.setBackground(editable_background);
         this.setForeground(editable_foreground);

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

@@ -104 +104 @@
       }
    }
+
+    /** Called whenever the detail mode changes to ensure the filters are at an appropriate level (ie only editable by those that understand regular expression matching)
+     * @param mode the mode level as an int
+     */
+    public void modeChanged(int mode) {
+    cdm.modeChanged(mode);
+    }
    
    public Rectangle setSelectedElement(ElementWrapper element) {

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

@@ -74 +74 @@
 import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.help.HelpFrame;
+import org.greenstone.gatherer.mem.MetadataEditorManager;
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.Metadata;
@@ -392 +393 @@
     }
 
+    public void destroy() {
+    // Destroying create pane ensures the latest log has been closed
+    if(create_pane != null) {
+        create_pane.destroy();
+    }
+    }
+
     /** Enabled events on the window to be trapped, creates all the visual components, then builds the tab and other layouts.
      */
@@ -511 +519 @@
     }
     else {
-        if(help != null) {
+        // Deal to help
+        if(help != null) {
             help.destroy();
             help = null;
-        }
+        }
         Gatherer.self.exit();
     }
@@ -547 +556 @@
         int config_pos = tab_pane.indexOfComponent(config_pane);
         tab_pane.setEnabledAt(config_pos, !lock);
+    }
+    }
+
+    public void modeChanged(int mode) {
+    // Set the title
+    String collection_title = null;
+    String collection_name = null;
+    if (Gatherer.c_man.ready()) {
+        Collection collection = Gatherer.c_man.getCollection();
+        collection_title = collection.getTitle();
+        collection_name = collection.getName();
+        collection = null;
+    }
+    setTitle(collection_title, collection_name);
+    collection_title = null;
+    collection_name = null;
+    // Now pass on the message to anyone who cares
+    if(collection_pane != null) {
+        collection_pane.modeChanged(mode);
+    }
+    if(config_pane != null) {
+        config_pane.modeChanged(mode);
+    }
+    if(create_pane != null) {
+        create_pane.modeChanged(mode);
+    }
+    if(metaedit_pane != null) {
+        metaedit_pane.modeChanged(mode);
     }
     }
@@ -615 +652 @@
     // Finally display the collection name in the title bar.
     StringBuffer title_buffer = new StringBuffer(Utility.PROGRAM_NAME);
-    title_buffer.append(StaticStrings.COLON_CHARACTER);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    // Describe the current user mode
+    title_buffer.append(StaticStrings.MODE_STR);
+    title_buffer.append(Gatherer.config.getModeAsString());
+    title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    // Now for the current collection
+    title_buffer.append(StaticStrings.COLLECTION_STR);
     if (title != null && name != null) {
         title_buffer.append(title);
@@ -635 +679 @@
     public void showEditMetadataBox() {
     if(Gatherer.c_man.getCollection() != null) {
-        Gatherer.c_man.getCollection().msm.editMDS();
+        Gatherer.c_man.getCollection().msm.editMDS(null, MetadataEditorManager.NORMAL);
     }
     }
@@ -964 +1008 @@
         }
         if(config_pos != -1) {
-        tab_pane.setEnabledAt(config_pos, ready && Gatherer.config.get("workflow.design", false));
+        tab_pane.setEnabledAt(config_pos, ready && Gatherer.config.get("workflow.design", false) && Gatherer.config.getMode() > Configuration.ASSISTANT_MODE);
         }
         if(export_pos != -1) {
@@ -994 +1038 @@
     }
 }
+
+

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

@@ -46 +46 @@
 import javax.swing.table.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -140 +141 @@
      * @param tree_sync The <strong>TreeSynchronizer</strong> to be used on the collection tree
      * @see org.greenstone.gatherer.Configuration
-     * @see org.greenstone.gatherer.gui.table.GTable
-     * @see org.greenstone.gatherer.valuetree.GValueTree
+     * @see org.greenstone.gatherer.gui.MetaEditPane.GValueTree
      */
     public MetaEditPane(TreeSynchronizer tree_sync)
@@ -190 +190 @@
      * @param event An <strong>ActionEvent</strong> containing information about the event.
      * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.MetaEditPane.GValueTree
      * @see org.greenstone.gatherer.gui.table.GTableModel
      * @see org.greenstone.gatherer.msm.ElementWrapper
      * @see org.greenstone.gatherer.msm.MetadataSetManager
      * @see org.greenstone.gatherer.msm.MSMEvent
-     * @see org.greenstone.gatherer.valuetree.GValueTree
      */
     public void actionPerformed(ActionEvent event) {
@@ -317 +317 @@
      * @param ready <i>true</i> if there is a collection currently ready to be editing, <i>false</i> otherwise.
      * @see org.greenstone.gatherer.collection.CollectionManager
-     * @see org.greenstone.gatherer.collection.CollectionModel
-     * @see org.greenstone.gatherer.tree.GTree
      * @see org.greenstone.gatherer.util.TreeSynchronizer
      */
@@ -358 +356 @@
      * @see org.greenstone.gatherer.Gatherer
      * @see org.greenstone.gatherer.collection.CollectionManager
-     * @see org.greenstone.gatherer.collection.CollectionModel
      * @see org.greenstone.gatherer.file.FileOpenActionListener
      * @see org.greenstone.gatherer.gui.Filter
      * @see org.greenstone.gatherer.gui.GComboBox
      * @see org.greenstone.gatherer.gui.table.GTableModel
-     * @see org.greenstone.gatherer.tree.GTree
-     * @see org.greenstone.gatherer.tree.GTreeModel
-     * @see org.greenstone.gatherer.valuetree.GValueTree
      */
     public void display() {
@@ -403 +397 @@
     filter = Gatherer.g_man.getFilter(collection_tree);
     filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-    // Change the default colours of this filters combobox.
-    GComboBox fcb = filter.getComboBox();
-    fcb.setBackgroundNonSelectionColor(Color.white);
-    fcb.setTextNonSelectionColor(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    fcb.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
-    Dictionary.registerTooltip(fcb, "Collection.Filter_Tooltip");
-    fcb = null;
+    filter.setEditable(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE);
+    Dictionary.registerTooltip(filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Connection
@@ -584 +572 @@
     /** Ensures a certain tree path is expanded, visible and selected within the collection tree.
      * @param path The <strong>TreePath</strong> to make visible.
-     * @see org.greenstone.gatherer.tree.GTree
+     * @see org.greenstone.gatherer.gui.tree.DragTree
      */
     private void expandPath(TreePath path) {
@@ -591 +579 @@
     }
     /** Called to inform this control panel that it has just gained focus as an effect of the user clicking on its tab.
-     * @see org.greenstone.gatherer.tree.GTree
+     * @see org.greenstone.gatherer.gui.tree.DragTree
      */
     public void gainFocus() {
@@ -630 +618 @@
      */
     public void metadataChanged(MSMEvent event) {}
+
+    /** Called whenever the detail mode changes to ensure the filters are at an appropriate level (ie only editable by those that understand regular expression matching)
+     * @param mode the mode level as an int
+     */
+    public void modeChanged(int mode) {
+    filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
+    }
 
     public void refreshTrees() {
@@ -717 +712 @@
      * @param event The <strong>ListSelectionEvent</strong> which contains all the information about the event that has been fired.
      * @see org.greenstone.gatherer.gui.table.GTableModel
-     * @see org.greenstone.gatherer.valuetree.GValueTree
+     * @see org.greenstone.gatherer.gui.MetaEditPane.GValueTree
      */
     public void valueChanged(ListSelectionEvent event) {
@@ -750 +745 @@
      * @param event A <strong>TreeSelectionEvent</strong> containing information about the event.
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.FileNode
+     * @see org.greenstone.gatherer.file.FileNode
      * @see org.greenstone.gatherer.gui.GUIManager
      * @see org.greenstone.gatherer.gui.MenuBar
      * @see org.greenstone.gatherer.gui.table.GTableModel
      * @see org.greenstone.gatherer.msm.MetadataSetManager
-     * @see org.greenstone.gatherer.tree.GTree
+     * @see org.greenstone.gatherer.gui.tree.DragTree
      * @see org.greenstone.gatherer.util.ArrayTools
      */

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

@@ -44 +44 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -69 +70 @@
     static final public char UNKNOWN = 'x';
 
+    static private int BUILD = 0;
+    static private int IMPORT = 1;
+    static private int MINIMUM_ROWS = 11;
+    static private Dimension LABEL_SIZE = new Dimension(180, 25);
+    static private Dimension ROW_SIZE = new Dimension(610, 30);
+    static private Dimension SPINNER_SIZE = new Dimension(100, 25);
+    static private String DESCRIPTION_SEP = " + ";
+
     /** All process messages are written to this log text area. */
     public JTextArea log_textarea = null;
@@ -85 +94 @@
     private Vector writing_documents;
 
-    static private int BUILD = 0;
-    static private int IMPORT = 1;
-    static private Dimension LABEL_SIZE = new Dimension(180, 25);
-    static private Dimension ROW_SIZE = new Dimension(610, 25);
-    static private Dimension SPINNER_SIZE = new Dimension(100, 25);
-    static private String DESCRIPTION_SEP = " + ";
-
 
     /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
@@ -105 +107 @@
 
     /** This method creates the panel with all the build only options on it.
-     * @return A <strong>JPanel</strong> which can be used to display all the build only options.
+     * @param pane a JPanel which already has previous arguments available on it, to allow for lower moes to concatenate all of the arguments together
+     * @return a JPanel which can be used to display all the build only options
+     * @see org.greenstone.gatherer.Configuration#EXPERT_MODE
+     * @see org.greenstone.gatherer.Configuration#getColor
+     * @see org.greenstone.gatherer.Configuration#getMode
+     * @see org.greenstone.gatherer.Gatherer#config
+     * @see org.greenstone.gatherer.cdm.Argument
+     * @see org.greenstone.gatherer.collection.BuildOptions#getBuildArgument
+     * @see org.greenstone.gatherer.collection.BuildOptions#getBuildArgumentCount
+     * @see org.greenstone.gatherer.collection.BuildOptions#getBuildValue
+     * @see org.greenstone.gatherer.collection.BuildOptions#getBuildValueEnabled
+     * @see org.greenstone.gatherer.gui.OptionsPane#ArgumentControl
      */
-    public JPanel buildBuild() {
-    current_controls.clear();
-    JPanel pane = new JPanel();
-    pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    int build_argument_count = build_options.getBuildArgumentCount();
-    pane.setLayout(new GridLayout(build_argument_count, 1, 5, 5));
-    for(int i = 0; i < build_argument_count; i++) {
+    public JPanel buildBuild(JPanel pane) {
+    // Reset the arguments
+    if(pane == null) {
+        current_controls.clear();
+    }
+    ArrayList build_arguments = new ArrayList();
+    int current_mode = Gatherer.config.getMode();
+    int total_build_argument_count = build_options.getBuildArgumentCount();       
+    for(int i = 0; i < total_build_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
         Argument argument = build_options.getBuildArgument(i);
-        // Now attempt to retrieve any existing value for this argument.
-        boolean enabled = build_options.getBuildValueEnabled(argument.getName());
-        String value = build_options.getBuildValue(argument.getName());
-        ArgumentControl argument_control = new ArgumentControl(BUILD, argument, enabled, value);
-        pane.add(argument_control);
-        current_controls.add(argument_control);
+        if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
+        // Now attempt to retrieve any existing value for this argument.
+        boolean enabled = build_options.getBuildValueEnabled(argument.getName());
+        String value = build_options.getBuildValue(argument.getName());
+        ArgumentControl argument_control = new ArgumentControl(BUILD, argument, enabled, value);
+        build_arguments.add(argument_control);
+        }
+    }
+    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) {
+        pane = new JPanel();
+        pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pane.setBackground(Gatherer.config.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(current_mode >= Configuration.EXPERT_MODE) {
+        if(argument_count < MINIMUM_ROWS) {
+            argument_count = MINIMUM_ROWS;
+        }
+        pane.setLayout(new GridLayout(argument_count, 1, 5, 5));
+        }
+        // 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));
+        }
+    }
+    for(int j = 0; j < build_arguments.size(); j++) {
+        pane.add((JComponent)build_arguments.get(j));
     }
     pane.addMouseListener(this);
+    build_arguments = null;
     return pane;
     }
+
     /** This method creates the panel with all the import only options on it.
-     * @return A <strong>JPanel</strong> which can be used to display all the import only options.
+     * @param pane a JPanel which already has previous arguments available on it, to allow for lower moes to concatenate all of the arguments together
+     * @return a JPanel which can be used to display all the build only options
+     * @see org.greenstone.gatherer.Configuration#EXPERT_MODE
+     * @see org.greenstone.gatherer.Configuration#getColor
+     * @see org.greenstone.gatherer.Configuration#getMode
+     * @see org.greenstone.gatherer.Gatherer#config
+     * @see org.greenstone.gatherer.cdm.Argument
+     * @see org.greenstone.gatherer.collection.BuildOptions#getImportArgument
+     * @see org.greenstone.gatherer.collection.BuildOptions#getImportArgumentCount
+     * @see org.greenstone.gatherer.collection.BuildOptions#getImportValue
+     * @see org.greenstone.gatherer.collection.BuildOptions#getImportValueEnabled
+     * @see org.greenstone.gatherer.gui.OptionsPane#ArgumentControl
      */
-    public JPanel buildImport() {
-    current_controls.clear();
-    JPanel pane = new JPanel();
-    pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    int import_argument_count = build_options.getImportArgumentCount();
-    pane.setLayout(new GridLayout(import_argument_count, 1, 5, 5));
-    for(int i = 0; i < import_argument_count; i++) {
+    public JPanel buildImport(JPanel pane) {
+    // Reset the arguments
+    if(pane == null) {
+        current_controls.clear();
+    }
+    ArrayList import_arguments = new ArrayList();
+    int current_mode = Gatherer.config.getMode();
+    int total_import_argument_count = build_options.getImportArgumentCount();       
+    for(int i = 0; i < total_import_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
         Argument argument = build_options.getImportArgument(i);
-        // Now attempt to retrieve any existing value for this argument.
-        boolean enabled = build_options.getImportValueEnabled(argument.getName());
-        String value = build_options.getImportValue(argument.getName());
-        ArgumentControl argument_control = new ArgumentControl(IMPORT, argument, enabled, value);
-        pane.add(argument_control);
-        current_controls.add(argument_control);
+        if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
+        // Now attempt to retrieve any existing value for this argument.
+        boolean enabled = build_options.getImportValueEnabled(argument.getName());
+        String value = build_options.getImportValue(argument.getName());
+        ArgumentControl argument_control = new ArgumentControl(IMPORT, argument, enabled, value);
+        import_arguments.add(argument_control);
+        }
+    }
+    current_controls.addAll(import_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) {
+        pane = new JPanel();
+        pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pane.setBackground(Gatherer.config.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
+        if(current_mode >= Configuration.EXPERT_MODE) {
+        if(argument_count < MINIMUM_ROWS) {
+            argument_count = MINIMUM_ROWS;
+        }
+        pane.setLayout(new GridLayout(argument_count, 1, 5, 5));
+        }
+        // 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));
+        }
+    }
+    for(int j = 0; j < import_arguments.size(); j++) {
+        pane.add((JComponent)import_arguments.get(j));
     }
     pane.addMouseListener(this);
+    import_arguments = null;
     return pane;
     }
+
     /** This method is used to build a panel based on the message log, which is nothing like any of the other panels.
      * @return A <strong>JPanel</strong> containing a scrollable text area which represents the shell process message log.
@@ -322 +398 @@
         setLayout(new BorderLayout());
         setPreferredSize(ROW_SIZE);
+        setMaximumSize(ROW_SIZE);
 
         // Try to determine what the value_controls value should be.
@@ -425 +502 @@
         value_control = textfield;
         break;
+        case Argument.METADATUM:
+        GComboBox gcombobox = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
+        gcombobox.setEnabled(enable);
+        // Now ensure we have the existing value or default value selected if either exist.
+        if(value != null) {
+            boolean found = selectValue(gcombobox, value);
+            // Its possible that this is a custom value and so doesn't exist in the combobox. If so add it and then select it
+            if(!found) {
+            gcombobox.addItem(value);
+            gcombobox.setSelectedItem(value);
+            }
+        }
+        add(gcombobox, BorderLayout.CENTER);
+        value_control = gcombobox;
+        break;
         }
 
@@ -454 +546 @@
     }
 
+    /** Method to ensure that a certain value is selected, if it exists within that combobox to begin with.
+     * @param combobox the JComboBox whose selection we are trying to preset
+     * @param target The desired value of the selection as a String
+     * @return true if the item was found and selected, false otherwise
+     */
+    public boolean selectValue(JComboBox combobox, String target) {
+        for(int i = 0; i < combobox.getItemCount(); i++) {
+        if(combobox.getItemAt(i).toString().equals(target)) {
+            combobox.setSelectedIndex(i);
+            return true;
+        }
+        }
+        return false;
+    }
+
     /** Update the values stored in the collection so as to rememebr the current state of this argument. */
     public void update() {
@@ -472 +579 @@
         }
         else if(value_control instanceof JComboBox) {
-        value = (String) ((JComboBox)value_control).getSelectedItem();
-        }
-                // If this argument was a flag, but is now disabled, remove from the build options altogether
+        value = (((JComboBox)value_control).getSelectedItem()).toString();
+        }
+        // If this argument was a flag, but is now disabled, remove from the build options altogether
         if(!enable && value == null) {
         if(type == BUILD) {
@@ -483 +590 @@
         }
         }
-                // Otherwise update the argument value
+        // Otherwise update the argument value
         else {
         if(type == BUILD) {
@@ -638 +745 @@
     public void valueChanged(ListSelectionEvent e) {
         if (!e.getValueIsAdjusting()) { // we get two events for one change in list selection - use the false one ( the second one)
+        ///ystem.err.println("Log change detected.");
         JList source  = (JList)e.getSource();
         file_entry = (FileEntry) source.getSelectedValue();
         // First we determine if the old log has been completely written to file
         Document document = log_textarea.getDocument();
-        if(document instanceof AppendLineOnlyFileDocument) {
-            AppendLineOnlyFileDocument append_line_only_file_document = (AppendLineOnlyFileDocument) document;
+        ///ystem.err.println(" * current document: " + document);
+        ///ystem.err.println(" * new document:     " + file_entry.getDocument());
+        // If we are dealing with the same document don't do anything.
+        if(document != file_entry.getDocument()) {
+            if(document instanceof AppendLineOnlyFileDocument) {
+            AppendLineOnlyFileDocument append_line_only_file_document = (AppendLineOnlyFileDocument) document;
             if(append_line_only_file_document.isStillWriting()) {
+                ///ystem.err.println("Current log is still active... finishing.");
                 writing_documents.add(append_line_only_file_document); // We have to maintain a reference until they are all done.
                 append_line_only_file_document.setOwner(OptionsPane.this);
                 append_line_only_file_document.setExit();
             }
-        }
-        // Load the new log
-        log_textarea.setDocument(file_entry.getDocument());
+            else {
+                ///ystem.err.println("Current log is complete. Nothing to do.");
+            }
+            }
+            // Load the new log
+            log_textarea.setDocument(file_entry.getDocument());
+        }
         }
     }

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

@@ -76 +76 @@
     private JLabel recursion_depth_label;
     private JLabel title_label;
+    private JRadioButton assistant_mode_radio_button;
+    private JRadioButton expert_mode_radio_button;
+    private JRadioButton librarian_mode_radio_button;
+    private JRadioButton systems_mode_radio_button;
+    private JSpinner proxy_port_field;
+    private JSpinner recursion_depth_spinner;
     private JTabbedPane tab_pane;
+    private JTextArea mode_description_textarea;
     private JTextField library_path_field;
     private JTextField proxy_host_field;
-    private JSpinner proxy_port_field;
-    private JSpinner recursion_depth_spinner;
     private Preferences self;
 
-    static final Dimension LABEL_SIZE = new Dimension(175, 25);
+    static final Dimension LABEL_SIZE = new Dimension(240, 25);
     static final Dimension ROW_SIZE = new Dimension(640, 25);
     static final Dimension SIZE = new Dimension(640, 345);
@@ -101 +106 @@
     JPanel general_preferences = createGeneralPreferences();
     tab_pane.add("Preferences.General", general_preferences);
+    tab_pane.add("Preferences.Mode", createModePreferences());
     tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
     tab_pane.add("Preferences.Connection", createConnectionPreferences());
@@ -330 +336 @@
     }
 
+    /** Generate the controls for altering the detail mode.
+     * @return a JPanel of controls
+     */
+    private JPanel createModePreferences() {
+    // Create Controls
+    JPanel mode_panel = new JPanel();
+    JPanel button_panel = new JPanel();
+    ButtonGroup mode_button_group = new ButtonGroup();
+    assistant_mode_radio_button = new JRadioButton(Dictionary.get("Preferences.Mode.Assistant"));
+    assistant_mode_radio_button.setOpaque(false);
+    mode_button_group.add(assistant_mode_radio_button);
+    expert_mode_radio_button = new JRadioButton(Dictionary.get("Preferences.Mode.Expert"));
+    expert_mode_radio_button.setOpaque(false);
+    mode_button_group.add(expert_mode_radio_button);
+    librarian_mode_radio_button = new JRadioButton(Dictionary.get("Preferences.Mode.Librarian"));
+    librarian_mode_radio_button.setOpaque(false);
+    mode_button_group.add(librarian_mode_radio_button);
+    systems_mode_radio_button = new JRadioButton(Dictionary.get("Preferences.Mode.Systems"));
+    systems_mode_radio_button.setOpaque(false);
+    mode_button_group.add(systems_mode_radio_button);
+    mode_description_textarea = new JTextArea();
+    mode_description_textarea.setEditable(false);
+    mode_description_textarea.setLineWrap(true);
+    mode_description_textarea.setWrapStyleWord(true);
+    // Determine which value is already selected
+    switch(Gatherer.config.getMode()) {
+    case Configuration.ASSISTANT_MODE:
+        assistant_mode_radio_button.setSelected(true);
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Assistant_Description"));
+        break;
+    case Configuration.SYSTEMS_MODE:
+        systems_mode_radio_button.setSelected(true);
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Systems_Description"));
+        break;
+    case Configuration.EXPERT_MODE:
+        expert_mode_radio_button.setSelected(true);
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Expert_Description"));
+        break;
+    default:
+        librarian_mode_radio_button.setSelected(true);
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Librarian_Description"));
+    }
+    // Connection - when a radio button is selected we have to change the description
+    ModeRadioButtonListener listener = new ModeRadioButtonListener();
+    assistant_mode_radio_button.addActionListener(listener);
+    expert_mode_radio_button.addActionListener(listener);
+    librarian_mode_radio_button.addActionListener(listener);
+    systems_mode_radio_button.addActionListener(listener);
+    listener = null;
+    // Layout
+    button_panel.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+    button_panel.setLayout(new GridLayout(4,1,2,2));
+    button_panel.add(assistant_mode_radio_button);
+    button_panel.add(librarian_mode_radio_button);
+    button_panel.add(systems_mode_radio_button);
+    button_panel.add(expert_mode_radio_button);
+
+    mode_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    mode_panel.setLayout(new BorderLayout());
+    mode_panel.add(button_panel, BorderLayout.NORTH);
+    mode_panel.add(new JScrollPane(mode_description_textarea), BorderLayout.CENTER);
+
+    return mode_panel;
+    }
+
     /** The warning preferences are controlled through a checklist. */
     private JPanel createWarningPreferences() {
@@ -504 +575 @@
         Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, ((Integer)recursion_depth_spinner.getValue()).intValue());
 
+        // Mode preferences
+        int current_mode = Gatherer.config.getMode();
+        int new_mode;
+        if(assistant_mode_radio_button.isSelected()) {
+        new_mode = Configuration.ASSISTANT_MODE;
+        }
+        else if(systems_mode_radio_button.isSelected()) {
+        new_mode = Configuration.SYSTEMS_MODE;
+        }
+        else if(expert_mode_radio_button.isSelected()) {
+        new_mode = Configuration.EXPERT_MODE;
+        }
+        else  {
+        new_mode = Configuration.LIBRARIAN_MODE;
+        }
+        // If there has been a change in modes, update the config, and also inform the persistant gui views that have a need to know
+        if(new_mode != current_mode) {
+        Gatherer.config.setMode(new_mode);
+        Gatherer.c_man.getCollection().cdm.modeChanged(new_mode);
+        Gatherer.g_man.modeChanged(new_mode);
+        }
         // Warning preferences
         for(int i = 0; i < warning_preferences_check_list.getEntryCount(); i++) {
@@ -522 +614 @@
         Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
         Gatherer.g_man.workflowUpdate("Enrich", workflow_enrich.isSelected());
-        Gatherer.g_man.workflowUpdate("Design", workflow_design.isSelected());
+        Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Gatherer.config.getMode() > Configuration.ASSISTANT_MODE));
         Gatherer.g_man.workflowUpdate("Export", workflow_export.isSelected());
         Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
@@ -568 +660 @@
         return locale.getDisplayName();
         }
+    }
+    }
+
+    /** This listener updates the mode description depending on what mode is selected. */
+    private class ModeRadioButtonListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        Object source = event.getSource();
+        if(source == assistant_mode_radio_button) {
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Assistant_Description"));
+        }
+        else if(source == expert_mode_radio_button) {
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Expert_Description"));
+        }
+        else if(source == systems_mode_radio_button) {
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Systems_Description"));
+        }
+        else {
+        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Librarian_Description"));
+        }
+        source = null;
     }
     }