Changeset 735 for java/installer2/src/net/oni2

Timestamp:

Mar 22, 2013, 3:10:30 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.99w:

• Minor changes to the UI

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller2.java (modified) (1 diff)
• gui/MainWin.yml (modified) (2 diffs)
• gui/about/AboutDialog.properties (modified) (1 diff)
• localization/MainWin.properties (modified) (3 diffs)

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

@@ -73 +73 @@
                 if (localesDir.isDirectory())
                         addClassPath(localesDir);
+                else {
+                        File localesSubDir = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                        CaseInsensitiveFile.getCaseInsensitiveFile(
+                                                        Paths.getInstallerPath(), "bin"), "locales");
+                        if (localesSubDir.isDirectory()) {
+                                addClassPath(localesSubDir);
+                        }
+                }
                 imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images");
                 basicBundle = ResourceBundle

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

@@ -24 +24 @@
     - JMenuBar:
         - JMenu(name=mainMenu, text=menu.main):
+            - JMenuItem(action=about)
             - JMenuItem(action=settings)
-            - JMenuItem(action=about)
             - JMenuItem(action=exitAction)
         - JMenu(name=fileMenu, text=menu.file):
@@ -61 +61 @@
             - JComboBox(name=cmbShowFilterTo, onAction=updateTableFilter)
             - JScrollPane(name=scrollMods, vScrollBar=always, hScrollBar=never)
-            - JButton(name=btnUnSelectAll, icon=img.unSelect16, text=btnUnSelectAll.text, onAction=[unSelectAll])
-            - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection])
-            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone])
-            - JLabel(name=lblSelectedMods, text=lblSelectedMods.text)
-            - JLabel(name=lblSelectedModsVal)
-            - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
-            - JLabel(name=lblDownloadSizeVal)
+            - JPanel(name=panBottom):
+                - JPanel(name=panBottomLeft):
+                    - JButton(name=btnUnSelectAll, icon=img.unSelect16, text=btnUnSelectAll.text, onAction=[unSelectAll])
+                    - JButton(name=btnRevertSelection, icon=img.undo16, text=btnRevertSelection.text, toolTipText=btnRevertSelection.tooltip, onAction=[revertSelection])
+                    - MigLayout: |
+                         [min]
+                         btnUnSelectAll=1      [min]
+                         btnRevertSelection=1  [min]
+                - JPanel(name=panBottomCenter):
+                    - JLabel(name=lblSelectedMods, text=lblSelectedMods.text)
+                    - JLabel(name=lblSelectedModsVal)
+                    - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
+                    - JLabel(name=lblDownloadSizeVal)
+                    - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, onAction=[install,installExec,installDone])
+                    - MigLayout: |
+                         [grow]                               
+                         |lblSelectedMods<,lblSelectedModsVal<   [min]
+                         |lblDownloadSize<,lblDownloadSizeVal<   [min]
+                         |btnInstall<                            [min]
+                - JPanel(name=panBottomRight):
+                    - JButton(name=btnRunOniFull, action=runOniFull)
+                    - JButton(name=btnRunOniWin, action=runOniWin)
+                    - MigLayout: |
+                         [min]
+                         >btnRunOniFull=1   [min]
+                         >btnRunOniWin=1    [min]
+                - MigLayout: |
+                     [min]           [grow]            [min]
+                     panBottomLeft   panBottomCenter   panBottomRight    [min]
             - MigLayout: |
-                 [min]           [grow]                           [min]
-                 >lblModTypes    cmbModTypes+*                                     [min]
-                 >lblShowOnly    radAll+*,radOnline,radLocal                       [min]
-                 >lblShowFilter  txtShowFilter+*>,cmbShowFilterTo<                 [min]
-                 scrollMods+*                                                      [grow]
-                 >btnUnSelectAll+*,btnRevertSelection                              [min]
-                 lblSelectedMods+2,lblSelectedModsVal             >btnInstall+*+*  [min]
-                 lblDownloadSize+2,lblDownloadSizeVal                              [min]
+                 [min]                 [grow]
+                 >lblModTypes          cmbModTypes<                       [min]
+                 >lblShowOnly          radAll,radOnline,radLocal          [min]
+                 >lblShowFilter        txtShowFilter>,cmbShowFilterTo<    [min]
+                 scrollMods+*                                             [grow]
+                 panBottom+*                                              [min]
         - PackageInfoBox(name=pkgInfo)
     - MigLayout:

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

@@ -2 +2 @@
 btnClose=Close
 
-AEIBy=by Alloc, Iritscen and Gumby
+AEIBy=by Alloc, Gumby and Iritscen
 
 panAE=AE Credits:
-AENames=<html>Demos_Kratos:<br>EdT:<br>Geyser:<br>Gumby:<br>Iritscen:<br>Loser:<br>Neo:<br>Paradox:<br>RossyMiles:<br>Script10k:<br>SFeLi:<br>SSG:</html>
-AEWork=<html>OniSplit GUI (Win)<br>OniSplit GUI (Mac)<br>Original creator of the Edition<br>AE Framework<br>Project management<br>Documenting Oni's game data<br>OniSplit, documenting Oni, tech support<br>Documenting Oni's game data<br>Daodan DLL port to C<br>xmlTools<br>Original Daodan DLL<br>Documenting Oni's game data</html>
+AENames=<html>Alloc:<br>Geyser:<br>Gumby:<br>Iritscen:<br>Loser:<br>Neo:<br>Paradox:<br>RossyMiles:<br>s10k:<br>Sfeli:<br>SSG:</html>
+AEWork=<html>AE Installer 2 (Iritscen forced me to add this line!)<br>Original creator of the Edition<br>Modular AE framework, AE Installer 1<br>Project management, MacOS support<br>Documenting Oni's game data<br>OniSplit, documenting Oni<br>Documenting Oni's game data<br>Daodan DLL port to C<br>xmlTools<br>Original Daodan DLL<br>Documenting Oni's game data</html>
 
 panLinks=Links:

java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties

@@ -2 +2 @@
 buttonExit.title=Exit
 
-menu.main=&Main
+menu.main=&Installer
 menu.settings=&Settings
 menu.settingsTooltip=Settings
@@ -10 +10 @@
 menu.exitTooltip=Exit
 
-menu.file=&File
+menu.file=&Mods
 menu.runOniFull=Run &Oni (fullscreen)
 menu.runOniFullTooltip=Run Oni in fullscreen mode
-menu.runOniWin=Run Oni (&window)
+menu.runOniWin=Run Oni (&windowed)
 menu.runOniWinTooltip=Run Oni in windowed mode
 menu.openEditionFolder=Open Edition folder
@@ -24 +24 @@
 menu.corePackages=&Show core packages
 menu.corePackagesTooltip=View which core packages are used
-menu.reglobalize=&Rebuild Core Data
+menu.reglobalize=&Re-initialize Edition
 menu.reglobalizeTooltip=Rebuild Core Data
 menu.update=&Check for updates