Changeset 593 for AE/installer2/src/net/oni2/aeinstaller/gui/settings

Timestamp:

Dec 31, 2012, 2:48:32 PM (12 years ago)

Author:

alloc

Message:

 

Location:

AE/installer2/src/net/oni2/aeinstaller/gui/settings

Files:

• SettingsDialog.java (modified) (4 diffs)
• SettingsDialog.yml (modified) (2 diffs)

AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -9 +9 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
-import javax.swing.JFrame;
+import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -23 +22 @@
  * @author Christian Illy
  */
-public class SettingsDialog extends JFrame {
+public class SettingsDialog extends JDialog {
         private static final long serialVersionUID = -5719515325671846620L;
 
@@ -31 +30 @@
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
 
-        private static SettingsDialog openWindow = null;
-
         private JComboBox cmbLaF;
         private LaFComboModel laFModel;
 
         /**
-         * Open the Settings dialog if not currently opened or brings the existing
-         * one to front
+         * Open the settings
          */
-        public static void openWindow() {
-                if (openWindow != null) {
-                        SwingUtilities.invokeLater(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                        openWindow.toFront();
-                                        openWindow.repaint();
-                                }
-                        });
-                } else {
-                        new SettingsDialog().setVisible(true);
-                }
-        }
-
-        private SettingsDialog() {
-                openWindow = this;
+        public SettingsDialog() {
                 setMinimumSize(new Dimension(500, (int) getSize().getHeight() + 0));
 
@@ -85 +65 @@
 
         @SuppressWarnings("unused")
-        private void close() {
-                openWindow = null;
-        }
-
-        @SuppressWarnings("unused")
         private boolean save() {
                 Settings set = Settings.getInstance();

AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml

@@ -1 @@
-JFrame:
+JDialog:
   name: frame
   title: frame.title
@@ -5 +5 @@
   locationRelativeTo: null
   defaultCloseOperation: disposeOnClose
-  onWindowClosed: [close]
-  iconImage: img.kdt
+  iconImage: img.ae
+  modalityType: applicationModal
   content:
     - JButton(name=btnOk, text=btnOk, onAction=[save,dispose])