Changeset 6145

Timestamp:

2003-12-08T14:19:24+13:00 (20 years ago)

Author:

jmt12

Message:

Changed how a collection name appears. It now displays the collection title, followed by the shorter filename in curved brackets. Also added methods for changing the frame title from outside g_man

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (9 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;
@@ -77 +77 @@
 import org.greenstone.gatherer.msm.Metadata;
 import org.greenstone.gatherer.shell.GShell;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
@@ -105 +106 @@
     public MirrorPane mirror_pane = null;
     /** The preview pane contains a preview of your build collection. */
-    public PreviewPane preview_pane = null;
+    //public PreviewPane preview_pane = null;
     /** Are certain panes currently locked? */
     private boolean locked = false;
@@ -374 +375 @@
         SwingUtilities.invokeLater(tab_updater);
     }
-    // Finally display the collection name in the title bar.
+    // Set the title
+    String collection_title = null;
+    String collection_name = null;
     if (ready) {
-        this.setTitle(Utility.PROGRAM_NAME + ":\"" + Gatherer.c_man.getCollection().getTitle() + "\"");
-    }
-    else {
-        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.get("Collection.No_Collection"));
-    }
+        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 is a good time to force a garbage collect.
     ///ystem.err.println("Calling garbage collection.");
@@ -395 +401 @@
     try {
         this.setSize(size);
-        if(Gatherer.c_man.ready()) {
-        this.setTitle(Utility.PROGRAM_NAME + ":\"" + Gatherer.c_man.getCollection().getTitle() + "\"");
-        }
-        else {
-        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.get("Collection.No_Collection"));
-        }
+
+        // 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;
+
         // Pretty corner icon
         this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
@@ -461 +475 @@
         }
 
-        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);
-        }
+        //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);
+        //}
 
         // Find the first tab that is enabled and select that.
@@ -559 +573 @@
         // 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());
         }
@@ -587 +602 @@
         collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     }
+    }
+
+    /** Change the string shown in the title bar of the main gui frame. If either value is null, the 'No Collection' string is shown instead.
+     * @param title
+     * @param name
+     */
+    public void setTitle(String title, String name) {
+    // 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);
+    if (title != null && name != null) {
+        title_buffer.append(title);
+        title_buffer.append(StaticStrings.SPACE_CHARACTER);
+        title_buffer.append(StaticStrings.OPEN_PARENTHESIS_CHARACTER);
+        title_buffer.append(name);
+        title_buffer.append(StaticStrings.CLOSE_PARENTHESIS_CHARACTER);
+    }
+    else {
+        title_buffer.append(Dictionary.get("Collection.No_Collection"));
+    }
+    this.setTitle(title_buffer.toString());
+    title_buffer = null;
     }
 
@@ -796 +834 @@
         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();