Changeset 625 for AE/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

Jan 16, 2013, 5:12:24 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.85:

• Added intro/outro copy and settings
• Added tool manager dialog (empty for now)
• AEI uses jar-path as working location again. Only uses workingdirectory if run with -debug now

Location:

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

Files:

• MainWin.java (modified) (2 diffs)
• settings/SettingsDialog.java (modified) (4 diffs)
• settings/SettingsDialog.properties (modified) (1 diff)
• settings/SettingsDialog.yml (modified) (1 diff)
• toolmanager (added)
• toolmanager/ToolManager.java (added)

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -65 +65 @@
 import net.oni2.aeinstaller.gui.modtable.ModTableModel;
 import net.oni2.aeinstaller.gui.settings.SettingsDialog;
+import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
 
 import org.javabuilders.BuildResult;
@@ -428 +429 @@
         @SuppressWarnings("unused")
         private void tools() {
-                // TODO: Open tools manager
-                JOptionPane.showMessageDialog(this, "tools", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
+                new ToolManager().setVisible(true);
         }
 

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

@@ -34 +34 @@
 
         private JCheckBox chkNotifyOnStart;
+        private JCheckBox chkCopyIntro;
+        private JCheckBox chkCopyOutro;
 
         /**
@@ -40 +42 @@
         public SettingsDialog() {
                 setResizable(false);
-//              setMinimumSize(new Dimension(320, (int) getSize().getHeight() + 0));
 
                 AbstractAction closeAction = new AbstractAction() {
@@ -67 +68 @@
 
                 chkNotifyOnStart.setSelected(set.get("notifyupdates", true));
+                chkCopyIntro.setSelected(set.get("copyintro", false));
+                chkCopyOutro.setSelected(set.get("copyoutro", true));
         }
 
@@ -73 +76 @@
                 Settings set = Settings.getInstance();
 
-                set.get("notifyupdates", chkNotifyOnStart.isSelected());
+                set.put("notifyupdates", chkNotifyOnStart.isSelected());
+                set.put("copyintro", chkCopyIntro.isSelected());
+                set.put("copyoutro", chkCopyOutro.isSelected());
 
                 String oldLaf = set.get("lookandfeel", UIManager.getLookAndFeel()

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

@@ -8 +8 @@
 panCommon=Common settings
 lblNotifyOnStart=Notify about updates on startup:
+lblCopyIntro=Enable starting video on installation:
+lblCopyOutro=Enable ending video on installation:
 
 newLaF.text=A new GUI theme was selected.\nPlease restart the application in order to apply the changes.

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

@@ -13 +13 @@
       - JLabel(name=lblNotifyOnStart, text=lblNotifyOnStart)
       - JCheckBox(name=chkNotifyOnStart)
+      - JLabel(name=lblCopyIntro, text=lblCopyIntro)
+      - JCheckBox(name=chkCopyIntro)
+      - JLabel(name=lblCopyOutro, text=lblCopyOutro)
+      - JCheckBox(name=chkCopyOutro)
       - MigLayout: |
            [min]                [grow]
            >lblNotifyOnStart    chkNotifyOnStart         [pref]
+           >lblCopyIntro        chkCopyIntro             [pref]
+           >lblCopyOutro        chkCopyOutro             [pref]
     - JPanel(name=panUI, groupTitle=panUI):
       - JLabel(name=lblLaF, text=lblLaF)