Changeset 9096

Timestamp:

2005-02-18T13:34:32+13:00 (19 years ago)

Author:

mdewsnip

Message:

Updated dialog to look nice on Windows and be more similar to cdm/ParsingProgress (eventually these should be merged?).

File:

• trunk/gli/src/org/greenstone/gatherer/gui/ModalProgressPopup.java (modified) (5 diffs)

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

@@ -7 +7 @@
  * Author: Michael Dewsnip, NZDL Project, University of Waikato, NZ
  *
- * Copyright (C) 2004 New Zealand Digital Library Project
+ * Copyright (C) 2005 New Zealand Digital Library Project
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38 +38 @@
 {
     /** The size of the popup */
-    final static private Dimension SIZE = new Dimension(300, 70);
+    final static private Dimension SIZE = new Dimension(300, 75);
 
-    private JLabel process_label = null;
+    private String message = null;
     private JProgressBar progress_bar = null;
 
 
     /** Constructor */
-    public ModalProgressPopup(String process_string)
+    public ModalProgressPopup(String title, String message)
     {
-    super(Gatherer.g_man);
-    this.process_label = new JLabel((process_string != null) ? process_string : "");
+    super(Gatherer.g_man, title);
+
+    this.message = message;
     }
 
@@ -56 +57 @@
     public void display()
     {
+    setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
     setModal(true);
     setSize(SIZE);
@@ -65 +67 @@
     // Layout
     JPanel content_pane = (JPanel) getContentPane();
-    content_pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     content_pane.setLayout(new BorderLayout());
-    content_pane.add(process_label, BorderLayout.CENTER);
-    content_pane.add(progress_bar, BorderLayout.SOUTH);
+    content_pane.add(new JLabel(message), BorderLayout.NORTH);
+    content_pane.add(progress_bar, BorderLayout.CENTER);
 
     Dimension screen_size = Configuration.screen_size;
@@ -74 +76 @@
     setVisible(true);
     }
-
-
-    public void setProgress(int progress)
-    {
-    progress_bar.setValue(progress);
-    }
 }