Changeset 766 for java

Timestamp:

Mar 31, 2013, 5:13:35 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99y:

• Restore files missing in WC

Location:

java/installer2

Files:

• locales/net/oni2/aeinstaller/localization/MainWin_de.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/AEInstaller2.java (modified) (1 diff)
• src/net/oni2/aeinstaller/backend/oni/OniLauncher.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/localization/MainWin.properties (modified) (1 diff)

java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties

@@ -15 +15 @@
 menu.runOniWin=Oni starten (&Fenster)
 menu.runOniWinTooltip=Starte Oni im Fenstermodus
-menu.openEditionFolder=Edition-Ordner öffnen
-menu.openEditionFolderTooltip=Öffne den Ordner der Edition im Dateiexplorer
+menu.openEditionFolder=AE-Ordner öffnen
+menu.openEditionFolderTooltip=Öffne den Ordner der AE im Dateiexplorer
 menu.loadConfig=Mod-Auswahl &laden...
 menu.loadConfigTooltip=Lade eine Auswahl von Mods aus einer Datei

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

@@ -259 +259 @@
                                                 new File(Paths.getPrefsPath(), "bin"));
                                 if (x > 0) {
-                                        // Update available
+                                        // Update available or missing files
                                         int res = JOptionPane.showConfirmDialog(null,
                                                         globalBundle.getString("aeiUpdateAvailable.text"),

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

@@ -23 +23 @@
                                 break;
                         case MACOS:
-                                exe = new File(Paths.getEditionBasePath(),
-                                                "Oni.app/Contents/MacOS/Oni");
+                                exe = new File("./Oni.app/Contents/MacOS/Oni");
+                                if (new File(Paths.getEditionBasePath(),
+                                                "Oni.app/Contents/MacOS/Oni").exists())
+                                        return exe;
                                 break;
                         case LINUX:
@@ -44 +46 @@
                 }
         }
-        
+
         /**
          * @param windowed
@@ -62 +64 @@
                 if (windowed)
                         params.add("-noswitch");
-                ApplicationInvoker.execute(getOniExeType(), Paths.getEditionBasePath(), exe,
-                                params);
+                ApplicationInvoker.execute(getOniExeType(), Paths.getEditionBasePath(),
+                                exe, params);
         }
 

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

@@ -15 +15 @@
 menu.runOniWin=Run Oni (&windowed)
 menu.runOniWinTooltip=Run Oni in windowed mode
-menu.openEditionFolder=Open Edition folder
-menu.openEditionFolderTooltip=Open the Edition folder in the file explorer
+menu.openEditionFolder=Open AE folder
+menu.openEditionFolderTooltip=Open the AE folder in the file explorer
 menu.loadConfig=&Load mod selection...
 menu.loadConfigTooltip=Load mod selection from a file