Changeset 772 for java/installer2

Timestamp:

Apr 1, 2013, 2:12:20 AM (12 years ago)

Author:

alloc

Message:

AEI2.00:

• Version
• Main win default size

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (1 diff)
• backend/oni/OniLauncher.java (modified) (1 diff)
• gui/MainWin.java (modified) (3 diffs)
• gui/about/AboutDialog.java (modified) (2 diffs)
• gui/about/AboutDialog.yml (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99y
+appversion=.00

java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -179 +179 @@
                 JFrame.setDefaultLookAndFeelDecorated(true);
 
-                System.out.println(basicBundle.getString("appname") + " "
+                System.out.println(basicBundle.getString("appname")
                                 + basicBundle.getString("appversion"));
                 System.out.println("JarPath:   " + Paths.getInstallerPath());

java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java

@@ -22 +22 @@
                         case LINUX:
                                 exe = new File(Paths.getEditionBasePath(), "Oni.exe");
-                                if (exe.exists())
-                                        return exe;
-                                else
-                                        throw new FileNotFoundException(
-                                                        "Oni's executable was not found");
+                                break;
                         case MACOS:
                                 exe = new File("./Oni.app/Contents/MacOS/Oni");
-                                if (new File(Paths.getEditionBasePath(),
-                                                "Oni.app/Contents/MacOS/Oni").exists())
-                                        return exe;
-                                else
-                                        throw new FileNotFoundException(
-                                                        "Oni's executable was not found");
+                                break;
                         default:
                 }
-                return null;
+                if (exe.exists())
+                        return exe;
+                else
+                        throw new FileNotFoundException(
+                                        "Oni's executable was not found");
         }
 

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

@@ -136 +136 @@
         public MainWin() {
                 this.setTitle(SwingJavaBuilder.getConfig().getResource("appname")
-                                + " - v"
                                 + SwingJavaBuilder.getConfig().getResource("appversion"));
 
@@ -144 +143 @@
 
                 contents.setDividerLocation(SettingsManager.getInstance().get(
-                                "win_main_divloc", 550));
+                                "win_main_divloc", 700));
                 contents.setResizeWeight(0.4);
 
@@ -172 +171 @@
                 tblMods.addDownloadSizeListener(this);
 
-                setSize(SettingsManager.getInstance().get("win_main_width", 950),
+                setSize(SettingsManager.getInstance().get("win_main_width", 1050),
                                 SettingsManager.getInstance().get("win_main_height", 600));
                 setLocationRelativeTo(null);

java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java

@@ -27 +27 @@
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
 
-        private JLabel lblAppversion;
+        private JLabel lblAppname;
         private HTMLLinkLabel txtLinks;
         private HTMLLinkLabel lblAE;
@@ -35 +35 @@
          */
         public AboutDialog() {
-                lblAppversion.setText("v"
+                lblAppname.setText(SwingJavaBuilder.getConfig().getResource("appname")
                                 + SwingJavaBuilder.getConfig().getResource("appversion"));
 

java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.yml

@@ -10 +10 @@
     - JButton(name=btnClose, text=btnClose, onAction=[dispose])
     - JPanel(name=panAEI):
-      - JLabel(name=lblAppname, text=appname)
-      - JLabel(name=lblAppversion)
+      - JLabel(name=lblAppname)
       - HTMLLinkLabel(name=lblAE)
       - JLabel(name=lblAEIBy, text=AEIBy)
       - MigLayout: |
            [grow]
-           lblAppname<,lblAppversion<   [min]
-           lblAE                        [min]
-           lblAEIBy                     [min]
+           lblAppname<   [min]
+           lblAE         [min]
+           lblAEIBy      [min]
     - JPanel(name=panAE, groupTitle=panAE):
       - JLabel(name=lblNames, text=AENames, horizontalAlignment=right)