Changeset 7314

Timestamp:

2004-05-13T15:40:26+12:00 (20 years ago)

Author:

kjdon

Message:

added veronikas changes for the feedback stuff

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (9 diffs)
• gui/GUIManager.java (modified) (2 diffs)
• gui/ModalDialog.java (modified) (1 diff)
• gui/Splash.java (modified) (1 diff)
• util/StaticStrings.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -50 +50 @@
 import org.greenstone.gatherer.cdm.CommandTokenizer;
 import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.feedback.ActionRecorderDialog;
 import org.greenstone.gatherer.file.FileManager;
 import org.greenstone.gatherer.file.FileAssociationManager;
@@ -124 +125 @@
     /** The name of the necessary environment variable to check for in the programs environment. */
     static public String KEY = "GSDLPATH";
+
+    // feedback stuff
+    /** is the feedback feature enabled? */
+    static public boolean feedback_enabled = true;
+    /** the action recorder dialog */
+    static public ActionRecorderDialog feedback_dialog = null;
     /** Extra environment information which must be set before shell processes will run properly. Should always be null if the startup script/program has done its job properly. */
     static public String extra_env[] = null;
@@ -205 +212 @@
         loadConfig(gsdl_path, exec_path, perl_path, mirroring_enabled, wget_version_str, wget_path);
 
-        // MDSTesting
-        //new MDSTest("dublin.mds"); // Old style
-        //new MDSTest("dublin2.mds"); // Multilingually Optimizated
-        //System.exit(0);
-
+        // the feedback dialog has been loaded with a default locale, 
+        // now set the user specified one
+        if (feedback_enabled && feedback_dialog != null) {
+        feedback_dialog.setLocale(config.getLocale("general.locale", true));
+        }
+        
         // Read Dictionary
         dictionary = new Dictionary(config.getLocale("general.locale", true), config.getFont("general.font", true));
+
 
         if (gsdl_path == null) {
@@ -305 +314 @@
 
         // After the window has been made visible, check that it is in the correct place
+        // sometimes java places a window not in the correct place, 
+        // but with an offset. If so, we work out what the offset is ]
+        // and change the desired location to take that into account 
         Point location = g_man.getLocation();
         int x_offset = bounds.x - location.x;
@@ -310 +322 @@
         // If not, offset the window to move it into the correct location
         if (x_offset > 0 || y_offset > 0) {
+        ///ystem.err.println("changing the location to "+(bounds.x + x_offset)+" "+ (bounds.y + y_offset));
         g_man.setLocation(bounds.x + x_offset, bounds.y + y_offset);
         }
@@ -492 +505 @@
     System.setProperty("java.util.prefs.syncInterval","2000000"); // One message every 600 hours!
 
+
     // Override the exception handler with a new one which we can easily quiet the exceptions from.
     // System.setProperty("sun.awt.exception.handler", "GLIExceptionHandler");
@@ -502 +516 @@
         exception.printStackTrace();
     }
-
+    
     Gatherer gatherer = new Gatherer();
-
     boolean debug = false;
+    boolean feedback_enabled = false;
     boolean mirroring_enabled = false;
     boolean no_load = false;
@@ -569 +583 @@
             debug = true;
             }
+            // Run GLI with feedback enabled. 
+            else if(argument_name.equals(StaticStrings.FEEDBACK_ARGUMENT)) {
+            feedback_enabled = true;
+            }
             // Forces no loading on previous collection.
             else if(argument_name.equals(StaticStrings.NO_LOAD_ARGUMENT)) {
@@ -661 +679 @@
     // Arguments all parsed.
 
+    if (feedback_enabled) {
+        // if feedback is enabled, set up the recorder dialog
+        Locale currLocale = Locale.getDefault(); // use teh default locale for now - this will be changed by the Gatherer run method
+        ActionRecorderDialog dlg = new ActionRecorderDialog (currLocale);
+        gatherer.feedback_enabled = true;
+        gatherer.feedback_dialog = dlg;
+    }
+    
     // Splash screen.
     Splash splash = new Splash();

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

@@ -446 +446 @@
         // Create the menu-bar and stick it up the top.
         menu_bar = new MenuBar(new MenuListenerImpl());
-        content_pane.add(menu_bar, BorderLayout.NORTH);
+
+        //feedback changes
+        //content_pane.add(menu_bar, BorderLayout.NORTH);
+        this.setJMenuBar(menu_bar);
+        // end feedback changes
+
         // Create the tabbed pane and plop it in the center where it will
         // expand to consume all available space like any good gas would.
@@ -452 +457 @@
         tab_pane.addChangeListener(this);
         tab_pane.setFont(Gatherer.config.getFont("general.font", false));
-
-//          // May have to play with the order in which tabs are added.
-//          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));
-//          }
 
         if(Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, true)) {

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

@@ -38 +38 @@
 /** An extension of the JDialog that overrides the JVM's typical modal behaviour. This typical behaviour is that when a modal dialog is opened, all other windows cease to respond to user events until the modal dialog is disposed. However this prevents us opening the help documents property whenever a modal dialog is open. Thus we override the modal behaviour so that only the owner frame or dialog is blocked. 
  * Note that because we always call the super constructor with modal set to false, this should be made visible with setVisible(true) rather than show() which will return straight away. */
+// feedback note: veronika had changed all the super constructor calls to 
+// use modal instead of false - not sure if this is needed so I have not 
+// put that in. --kjdon
 public class ModalDialog
     extends JDialog {

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

@@ -64 +64 @@
     public void destroy() {
     dispose();
-    rootPane = null;
+    // feedback change - don't set the rootPane to null
+    //rootPane = null;
     }
 }

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -106 +106 @@
     static final public String EXTRACTED_NAMESPACE                        = "ex.";
     static final public String FALSE_STR                                  = "false";
+    static final public String FEEDBACK_ARGUMENT                          = "-feedback";
     static final public String FILE_ATTRIBUTE                             = "file";
     static final public String FILENAME_STR                               = "Filename";