Changeset 4428

Timestamp:

2003-05-30T14:16:50+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/gui

Files:

• NewCollectionDetailsPrompt.java (modified) (3 diffs)
• NewCollectionMetadataPrompt.java (modified) (3 diffs)
• Preferences.java (modified) (5 diffs)

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

@@ -11 +11 @@
 import org.greenstone.gatherer.collection.CollectionConfiguration;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
 
 public class NewCollectionDetailsPrompt
-    extends JDialog {
+    extends ModalDialog {
     private boolean cancelled;
     private File base_final;
@@ -30 +32 @@
     static private Dimension label_size = new Dimension(230, 25);
     /** The size of this new collection dialog box. */
-    static private Dimension size = new Dimension(700, 350);
+    static private Dimension size = new Dimension(700, 375);
     static private int FILENAME_SIZE = 8;
 
@@ -206 +208 @@
     Dimension screen_size = Gatherer.config.screen_size;
     setLocation((screen_size.width - size.width) / 2, (screen_size.height - size.height) / 2);
-    show();
+    setVisible(true);
     }
 

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

@@ -12 +12 @@
 import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.cdm.ElementWrapper;
 import org.greenstone.gatherer.msm.MetadataSet;
@@ -19 +20 @@
 
 public class NewCollectionMetadataPrompt 
-    extends JDialog {
+    extends ModalDialog {
 
     private boolean cancelled = true;
@@ -101 +102 @@
     Dimension screen_size = Gatherer.config.screen_size;
     setLocation((screen_size.width - size.width) / 2, (screen_size.height - size.height) / 2);
-    show();
+    setVisible(true);
     }
 

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

@@ -9 +9 @@
 import org.greenstone.gatherer.checklist.Entry;
 import org.greenstone.gatherer.gui.GUIManager;
+import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.NumberField;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XORToggleButtonGroup;
@@ -15 +17 @@
 
 public class Preferences
-    extends JDialog {
+    extends ModalDialog {
 
     private CheckList warning_preferences_check_list;
@@ -37 +39 @@
     static final Dimension LABEL_SIZE = new Dimension(100, 25);
     static final Dimension ROW_SIZE = new Dimension(380, 25);
-    static final Dimension SIZE = new Dimension(400, 320);
+    static final Dimension SIZE = new Dimension(400, 345);
     static final String TRUE = "true";
 
@@ -46 +48 @@
     setSize(SIZE);
     setTitle("Preferences");
+    setJMenuBar(new SimpleMenuBar("10.2"));
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
@@ -90 +93 @@
     tab_pane = null;
     content_pane = null;
-    show();
+    setVisible(true);
     }