Changeset 5985

Timestamp:

2003-11-25T16:14:21+13:00 (20 years ago)

Author:

jmt12

Message:

Corrected some code so that certain visual components, such as the PreviewPane, are not created unless activated in the config.xml. This may cause problems with server configuration commands, until we are able to move said commands somewhere else

File:

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

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

@@ -68 +68 @@
 import org.greenstone.gatherer.gui.OpenCollectionDialog;
 import org.greenstone.gatherer.gui.Preferences;
-//import org.greenstone.gatherer.gui.PreviewPane;
+import org.greenstone.gatherer.gui.PreviewPane;
 import org.greenstone.gatherer.gui.SimpleOpenCollectionDialog;
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
@@ -105 +105 @@
     public MirrorPane mirror_pane = null;
     /** The preview pane contains a preview of your build collection. */
-    /** not used anymore */
-    //public PreviewPane preview_pane = null;
+    public PreviewPane preview_pane = null;
     /** Are certain panes currently locked? */
     private boolean locked = false;
@@ -363 +362 @@
 
     if(!locked) {
-                // Now enable tabs as necessary. Do this on event queue to prevent crazy NPEs
+        // Now enable tabs as necessary. Do this on event queue to prevent crazy NPEs
         if(tab_updater == null) {
         tab_updater = new TabUpdater(tab_pane, ready);
@@ -414 +413 @@
 
         // May have to play with the order in which tabs are added.
-        browser_pane = new BrowsingPane();
         if(Gatherer.config.get("workflow.browse", true)) {
+        browser_pane = new BrowsingPane();
         tab_pane.addTab("GUI.Hunt", Utility.getImage("browsing.gif"), browser_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
         }
 
-        mirror_pane = new MirrorPane();
         if(Gatherer.config.get("workflow.mirror", true)) {
+        mirror_pane = new MirrorPane();
         tab_pane.addTab("GUI.Mirror", Utility.getImage("mirroring.gif"), mirror_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
@@ -459 +458 @@
         }
 
-//          preview_pane = new PreviewPane();
-//          preview_pane.display();
-//          if(Gatherer.config.get("workflow.preview", true)) {
-//          tab_pane.addTab("GUI.Preview", Utility.getImage("final.gif"), preview_pane);
-//          tab_pane.setEnabledAt(tab_pane.indexOfComponent(preview_pane), false);
-//          }
+        if(Gatherer.config.get("workflow.preview", true)) {
+        preview_pane = new PreviewPane();
+        preview_pane.display();         
+        tab_pane.addTab("GUI.Preview", Utility.getImage("final.gif"), preview_pane);
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(preview_pane), false);
+        }
 
         // Find the first tab that is enabled and select that.
@@ -557 +556 @@
         // Some tabs are also dependant on if a collection is ready
         Component component = tab_pane.getComponentAt(index);
-//          if(component == preview_pane) {
-//          tab_pane.setEnabledAt(index, state && Gatherer.c_man != null && Gatherer.c_man.ready() && Gatherer.c_man.built());
-//          }
-//          else 
-        if(component == metaedit_pane || component == config_pane || component == export_pane || component == create_pane) {
+        if(component == preview_pane) {
+        tab_pane.setEnabledAt(index, state && Gatherer.c_man != null && Gatherer.c_man.ready() && Gatherer.c_man.built());
+        }
+        else if(component == metaedit_pane || component == config_pane || component == export_pane || component == create_pane) {
         tab_pane.setEnabledAt(index, state && Gatherer.c_man != null && Gatherer.c_man.ready());
         }
@@ -795 +793 @@
         create_pane.gainFocus();
     }
-//      else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(preview_pane)) {
-//          config_pane.saveConfiguration();
-//          preview_pane.gainFocus();
-//      }
+    else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(preview_pane)) {
+        config_pane.saveConfiguration();
+        preview_pane.gainFocus();
+    }
 
     previous_pane = (JPanel) tab_pane.getSelectedComponent();