Changeset 8634

Timestamp:

2004-11-23T15:16:59+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changes to the library URL now affect the preview button immediately.

Location:

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

Files:

• CreatePane.java (modified) (3 diffs)
• EnrichPane.java (modified) (1 diff)
• GUIManager.java (modified) (3 diffs)
• Preferences.java (modified) (5 diffs)

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

@@ -384 +384 @@
     tree.clearSelection();
     tree.setSelectionPath(path);
-
-    // Validate the preview button
-    if (Gatherer.c_man.built() && Configuration.library_url != null) {
-        preview_button.setEnabled(true);
-        simple_preview_button.setEnabled(true);
-    }
-    else {
-        preview_button.setEnabled(false);
-        simple_preview_button.setEnabled(false);
-    }
     }
 
@@ -524 +514 @@
     public void refresh(int refresh_reason, boolean ready)
     {
-    if(Gatherer.c_man == null || !ready) {
+    if (Gatherer.c_man == null || !ready) {
         return;
     }
@@ -552 +542 @@
     }
     tree.valueChanged(null);
+
+    // Validate the preview button
+    if (Gatherer.c_man.built() && Configuration.library_url != null) {
+        preview_button.setEnabled(true);
+        simple_preview_button.setEnabled(true);
+    }
+    else {
+        preview_button.setEnabled(false);
+        simple_preview_button.setEnabled(false);
+    }
     }
 

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

@@ -444 +444 @@
     public void refresh(int refresh_reason, boolean ready)
     {
+//  if (refresh_reason == PREFERENCES_CHANGED) {
+//      valueChanged((TreeSelectionEvent) null); // Refresh metadata table
+//  }
+
     if (ready) {
         // Update label

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

@@ -109 +109 @@
 
     static public final int GUI_REFRESHED = 0;
+    static public final int PREFERENCES_CHANGED = 1;
 
 
@@ -241 +242 @@
     }
 
-    // *****************
-    // Metadata Options.
-    // *****************
-//  else if (esrc == menu_bar.metadata_view) {
-//      showMetaAuditBox();
-//  }
-
     // *************
     // Help Options.
@@ -522 +516 @@
     if (create_pane != null) {
         create_pane.refresh(refresh_reason, ready);
+    }
+
+    if (refresh_reason == PREFERENCES_CHANGED) {
+        // Force both workspace and collection trees to redraw
+        Gatherer.g_man.refreshWorkspaceTree(DragTree.TREE_DISPLAY_CHANGED);
+        Gatherer.g_man.refreshCollectionTree(DragTree.TREE_DISPLAY_CHANGED);
     }
 

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

@@ -604 +604 @@
         this.close = close;
     }
-    public void actionPerformed(ActionEvent event) {
-        // Submit the various changes
+    public void actionPerformed(ActionEvent event)
+    {
         // Connection preferences
         String program_str = program_field.getText();
-        if(program_str.length() > 0 && program_str.indexOf("%1") == -1) {
+        if (program_str.length() > 0 && program_str.indexOf("%1") == -1) {
         program_str = program_str + " %1";
         }
@@ -633 +633 @@
         Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
-        
+
         Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
         Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
@@ -641 +641 @@
         // General preferences
         Configuration.setEmail(email_field.getText());
-
         Configuration.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
-        // Force both workspace and collection trees to redraw
-        if (Gatherer.g_man != null) {
-        Gatherer.g_man.refreshWorkspaceTree(DragTree.TREE_DISPLAY_CHANGED);
-        Gatherer.g_man.refreshCollectionTree(DragTree.TREE_DISPLAY_CHANGED);
-        }
-
         Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
-        Gatherer.g_man.enrich_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
 
         String current_lang = Configuration.getLanguage();
@@ -664 +656 @@
         int current_mode = Configuration.getMode();
         int new_mode;
-        if(assistant_mode_radio_button.isSelected()) {
+        if (assistant_mode_radio_button.isSelected()) {
         new_mode = Configuration.ASSISTANT_MODE;
         }
-        else if(systems_mode_radio_button.isSelected()) {
+        else if (systems_mode_radio_button.isSelected()) {
         new_mode = Configuration.SYSTEMS_MODE;
         }
-        else if(expert_mode_radio_button.isSelected()) {
+        else if (expert_mode_radio_button.isSelected()) {
         new_mode = Configuration.EXPERT_MODE;
         }
-        else  {
+        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) {
+        if (new_mode != current_mode) {
         Configuration.setMode(new_mode);
         Collection collection = Gatherer.c_man.getCollection();
@@ -713 +706 @@
         // Always save configuration changes immediately (in case the GLI crashes)
         Configuration.save();
+
+        // Refresh the GLI to account for the configuration changes
+        Gatherer.g_man.refresh(GUIManager.PREFERENCES_CHANGED, Gatherer.c_man.ready());
 
         // Hide dialog