Changeset 4418

Timestamp:

2003-05-30T12:25:22+12:00 (21 years ago)

Author:

kjdon

Message:

the modal dialog now is one of our special ModalDialogs which only block the parent, enabling the use of help files while the dialog is open. A SimpleMenuBar with help on it has been added to the dialog.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• msm/ExportMDSPrompt.java (modified) (6 diffs)
• sarm/SearchAndReplace.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/ExportMDSPrompt.java

@@ -45 +45 @@
 import org.greenstone.gatherer.msm.MetadataSetManager;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
+
 /** A GUI component for allowing the user to export a metadata set, based on certain conditions, and to a certain file (not necessarily a .mds file). 
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -50 +53 @@
  */
 final public class ExportMDSPrompt
-    extends JDialog 
+    extends ModalDialog 
     implements ActionListener, KeyListener {
     /** Is this an export prompt or an import one? */
@@ -77 +80 @@
     private MetadataSetManager manager;
     /** The default size for this dialog window. */
-    final static public Dimension EXPORT_SIZE = new Dimension(500,220);
+    final static public Dimension EXPORT_SIZE = new Dimension(500,245);
     /** The default size for this dialog window. */
-    final static public Dimension IMPORT_SIZE = new Dimension(500,120);
+    final static public Dimension IMPORT_SIZE = new Dimension(500,145);
     /** The default export action (there are several depending on how much information you wish to export). */
     final static public int EXPORT = 0;
@@ -88 +91 @@
      */
     public ExportMDSPrompt(MetadataSetManager manager, boolean export) {
-    super();
+    super(Gatherer.g_man);
     this.export = export;
     // Creation
@@ -95 +98 @@
         setSize(EXPORT_SIZE);
         setTitle(get("Export_Title"));
+        setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     }
     else {
         setSize(IMPORT_SIZE);
         setTitle(get("Import_Title"));
+        setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     }
     JPanel content_pane = (JPanel) getContentPane();
@@ -206 +211 @@
       */
     public int display() {
-    show();
+    setVisible(true);
     return action;
     }

trunk/gli/src/org/greenstone/gatherer/sarm/SearchAndReplace.java

@@ -55 +55 @@
 import org.greenstone.gatherer.valuetree.GValueModel;
 import org.greenstone.gatherer.valuetree.GValueNode;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
 /** Provides a convenient class which searches through all of the various data attached to a collection, globally searching and replacing values as necessary, and firing the relevant events to have the gui update properly. 
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -60 +62 @@
  */
 public class SearchAndReplace
-    extends JDialog {
+    extends ModalDialog {
     /** <i>true</i> if this dialog should allow for the replace and replace all buttons to be validated, <i>false</i> otherwise. */
     private boolean enable_replace = false;
@@ -124 +126 @@
     static final private Dimension LABEL_SIZE = new Dimension(120, 30);
     /** The default size for the dialog. */
-    static final private Dimension SIZE = new Dimension(640,210);
+    static final private Dimension SIZE = new Dimension(640,235);
     /** Constructor.
      * @param enable_replace <i>true</i> if this dialog can be used for replace actions, <i>false</i> otherwise.
       */
     public SearchAndReplace(boolean enable_replace) {
-    super();
+    super(Gatherer.g_man);
     ///ystem.err.println("Creating a new search and replace dialog.");
     this.enable_replace = enable_replace;
@@ -137 +139 @@
     setSize(SIZE);
     setTitle(get("Title"));
+    setJMenuBar(new SimpleMenuBar("10.1"));  
     JPanel content_pane = (JPanel) getContentPane();
 
@@ -278 +281 @@
     // Restore visual position.
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
-    show();
+    setVisible(true);
     }
     /** Updates the status bar to reflect the result of the latest action. Includes the ability to reset the status label whenever the find() state resets.