Changeset 18364 for gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:

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

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -60 +60 @@
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.metadata.MetadataSet;
+import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
@@ -204 +205 @@
     }
     else if (esrc == menu_bar.file_save) {
-        Gatherer.c_man.saveCollection();
+      // Very important: make sure metadata values are saved too
+      enrich_pane.stopEditingAndRebuild();
+      // Make sure all the metadata has been saved to file
+      MetadataXMLFileManager.saveMetadataXMLFiles();
+      
+      Gatherer.c_man.saveCollection();
     }
 
@@ -346 +352 @@
 
         // Pretty corner icon
-        this.setIconImage(JarTools.getImage("gatherer_small.gif").getImage());
+        String gsmall_image = "gatherer_small.gif";
+        if (Configuration.fedora_info.isActive()) {
+        gsmall_image = "fli-" + gsmall_image;
+        }
+        this.setIconImage(JarTools.getImage(gsmall_image).getImage());
         // BorderLayout for the main screen. I'll try my best to avoid these in subcomponents as they're space greedy.
         content_pane.setLayout(new BorderLayout());
@@ -392 +402 @@
         if (Configuration.get("workflow.design", true)) {
         // "GUI.Design_Tooltip" is used automatically
-        tab_pane.addTab(Dictionary.get("GUI.Design"), JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        if (Configuration.fedora_info.isActive()) {
+            tab_pane.addTab("Plugins", JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        }
+        else {
+            tab_pane.addTab(Dictionary.get("GUI.Design"), JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        }
+
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(design_pane), false);
         }
@@ -441 +457 @@
         remote_greenstone_server_progress_panel.setLayout(new BorderLayout());
         remote_greenstone_server_progress_panel.add(remote_greenstone_server_progress_label, BorderLayout.LINE_START);
-        remote_greenstone_server_progress_panel.add(RemoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
+        remote_greenstone_server_progress_panel.add(Gatherer.remoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
         content_pane.add(remote_greenstone_server_progress_panel, BorderLayout.SOUTH);
         }
@@ -467 +483 @@
     // If we have a collection open remember it for next time, then save it and close it
     if (Gatherer.c_man.ready()) {
-        Configuration.setString("general.open_collection", true, CollectionManager.getLoadedCollectionColFilePath());
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, CollectionManager.getLoadedCollectionColFilePath());
         saveThenCloseCurrentCollection();
     }
     else {
-        Configuration.setString("general.open_collection", true, null);
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, null);
     }
 
@@ -650 +667 @@
     public void setTitle(String title, String name) {
     // Finally display the collection name in the title bar.
-    StringBuffer title_buffer = new StringBuffer(Gatherer.PROGRAM_NAME);
+    StringBuffer title_buffer = new StringBuffer(Configuration.getApplicationTitle());
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(Gatherer.PROGRAM_VERSION);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    // Server version information
+    title_buffer.append(Gatherer.getServerVersionAsString());
+    title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    title_buffer.append(StaticStrings.SPACE_CHARACTER); 
     // Describe the current user mode
     title_buffer.append(StaticStrings.MODE_STR);