Index: AE/installer2/.classpath =================================================================== --- AE/installer2/.classpath (revision 650) +++ AE/installer2/.classpath (revision 651) @@ -25,5 +25,4 @@ - Index: AE/installer2/locales/net/oni2/aeinstaller/localization/CorePackagesDialog.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/CorePackagesDialog.properties (revision 650) +++ (revision ) @@ -1,11 +1,0 @@ -frame.title=AE Installer: Core packages - -lblTitle.text=Name: -lblCreator.text=Creator: -lblTypes.text=Types: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblVersionNumber.text=Version number: -lblLastChange.text=Last change: -lblDescription.text=Description: -lblDownloadSize.text=Download size of this package: Index: AE/installer2/locales/net/oni2/aeinstaller/localization/CorePackagesDialog_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/CorePackagesDialog_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/CorePackagesDialog_de.properties (revision 651) @@ -0,0 +1,3 @@ +frame.title=AE Installer: Kernpakete + +lblDownloadSize.text=Downloadgröße dieses Pakets: Index: AE/installer2/locales/net/oni2/aeinstaller/localization/Downloader.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/Downloader.properties (revision 650) +++ (revision ) @@ -1,15 +1,0 @@ -frame.title=AE Installer: Downloading mods - -btnAbort.title=Abort -lblName.title=Currently downloading: -lblIsDep.title= (dependency) -lblElapsed.title=Elapsed: -lblRemaining.title=Remaining: -lblDownloaded.title=Downloaded: -lblTotal.title=Total: -lblRate.title=Rate: - -abort.text=If you abort the download now the installation of mods will also be aborted.\nDo you want to abort now? -abort.title=Really abort? - -unpacking=none - unpacking files Index: AE/installer2/locales/net/oni2/aeinstaller/localization/Downloader_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/Downloader_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/Downloader_de.properties (revision 651) @@ -0,0 +1,16 @@ +frame.title=AE Installer: Mods herunterladen + +btnAbort.title=Abbrechen +lblName.title=Aktuelle Datei: +lblIsDep.title= (Abhängigkeit) +lblElapsed.title=Vergangen: +lblRemaining.title=Verbleibend: +lblDownloaded.title=Heruntergeladen: +lblTotal.title=Gesamtgröße: +lblRate.title=Geschwindigkeit: + +abort.text=Wenn du den Download jetzt abbrichst wird die Installation als gesamtes abgebrochen.\n +Wirklich abbrechen? +abort.title=Wirklich abbrechen? + +unpacking=keine - entpacke Dateien Index: AE/installer2/locales/net/oni2/aeinstaller/localization/Global.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/Global.properties (revision 650) +++ (revision ) @@ -1,11 +1,0 @@ -offlineMode.title=Offline mode -offlineMode.text=AEI is running in offline mode.\nNo updates or downloads of new mods are possible.\nPlease restart AEI when you have internet connection to update or download new packages. - -invalidPath.title=Wrong directory -invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar - -dotNetMissing.title=.NET is not installed -dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.
Please download and install it:
%1 - -offlineModeStartup.title=Offline mode -offlineModeStartup.text=Connection to the ModDepot could not be established.\nAEI will run in offline mode.\nUpdates or installation of mods not already downloaded will not be possible. Index: AE/installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/Global_de.properties (revision 651) @@ -0,0 +1,28 @@ +offlineMode.title=Offline-Modus +offlineMode.text=AEI läuft im Offline-Modus.\n\ +Aktualisierungen oder Downloads sind nicht möglich.\n\ +Bitte starte AEI neu, wenn du eine Verbindung zum Internet hast, damit du wieder Aktualisierungen und Downloads ausführen kannst. + +invalidPath.title=Falscher Ordner +invalidPath.text=Dieses Programm muss im Unterordner Edition/AEInstaller innerhalb einer regulären Oni-Installation liegen.\n\ +Der volle Pfad zu der .jar-Datei sollte so aussehen:\n\ +OniFolder/Edition/AEInstaller/AEInstaller2.jar + +dotNetMissing.title=.NET ist nicht installiert +dotNetMissing.text=.NET, welches für dieses Programm benötigt wird, ist nicht installiert.
Bitte lade es herunter und installiere es:
%1 + +offlineModeStartup.title=Offline-Modus +offlineModeStartup.text=Es konnte keine Verbindung zum ModDepot hergestellt werden.\n\ +AEI wird im Offline-Modus ausgeführt.\n\ +Aktualisierungen oder Downloads sind nicht möglich. + + +lblTitle.text=Name: +lblCreator.text=Entwickler: +lblTypes.text=Typen: +lblPlatform.text=Plattform: +lblPackageNumber.text=Paketnummer: +lblVersionNumber.text=Versionsnummer: +lblLastChange.text=Letzte Änderung: +lblFiles.text=Anzahl der Dateien: +lblDescription.text=Beschreibung: Index: AE/installer2/locales/net/oni2/aeinstaller/localization/MainWin.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/MainWin.properties (revision 650) +++ (revision ) @@ -1,87 +1,0 @@ -# Main Frame -buttonExit.title=Exit - -menu.main=&Main -menu.settings=&Settings -menu.settingsTooltip=Settings -menu.about=&About -menu.aboutTooltip=About -menu.exit=&Exit\tCtrl+Q -menu.exitTooltip=Exit - -menu.file=&File -menu.runOniFull=Run &Oni (fullscreen) -menu.runOniFullTooltip=Run Oni in fullscreen mode -menu.runOniWin=Run Oni (&window) -menu.runOniWinTooltip=Run Oni in windowed mode -menu.openEditionFolder=Open Edition folder -menu.openEditionFolderTooltip=Open the Edition folder in the file explorer -menu.loadConfig=&Load mod selection... -menu.loadConfigTooltip=Load mod selection from a file -menu.saveConfig=&Save current mod selection... -menu.saveConfigTooltip=Save current mod selection to a file - -menu.corePackages=&Show core packages -menu.corePackagesTooltip=View which core packages are used -menu.reglobalize=&Rebuild Core Data -menu.reglobalizeTooltip=Rebuild Core Data -menu.update=&Check for updates -menu.updateTooltip=Check for updates to already downloaded packages on the Depot - -menu.tools=&Tools -menu.manageTools=&Manage Tools -menu.manageToolsTooltip=Install/Remove Tools - -btnRevertSelection.text=Revert selection -btnRevertSelection.tooltip=Select mods which are currently installed -btnInstall.text=&Install -btnInstall.tooltip=Install selected mods -lblModTypes.text=Mod type: -lblShowOnly.text=Show only: -radAll.text=All -radOnline.text=Online -radLocal.text=Downloaded -lblDownloadSize.text=Size of files to download: - -lblTitle.text=Name: -lblCreator.text=Creator: -lblTypes.text=Types: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblVersionNumber.text=Version number: -lblFiles.text=Number of files: -lblDescription.text=Description: - -updateDepot.title=Updating Mod Depot cache - -installDependencies.title=Unmet dependencies -installDependencies.text=There are unmet dependencies for some mods.\n\n\ -Following mods are already downloaded and will be selected:\n%s\n\n\ -These mods will have to be additionally downloaded:\n%s\n\n\ -Size of files to be downloaded: %s.\n\nContinue? -installDependencies.none= -installIncompatibilities.title=Incompatible mods -installIncompatibilities.text=The following mods are incompatible:\n\n%s\n\nInstallation will be aborted. -installDone.title=Installation done -installDone.text=You can now play AE Oni. -installDoneDeps.text=In addition to the manually selected mods the following\nwere installed because they were depended upon:\n%s\n\nYou can now play AE Oni. - -updatesAvailable.title=Updates available -updatesAvailable.text=The following mods and tools have newer versions on the Depot.
Check the packages you want to be updated. -updatesAvailableSize.text=Size of files to download is %s.
Update now? -checkOnStartup.text=Check for updates at startup - -noOniSplit.title=OniSplit not available -noOniSplit.text=The Edition is not yet initialized and OniSplit is missing (offline mode?).\nCan not resume from here, exiting! -askInitialize.title=Initialize Edition -askInitialize.text=The Edition is not yet initialized.\nIf you do not initialize now the installer will exit.\nInitialize Edition core now? - -initializingEdition.title=Initializing Edition core -installing.title=Installing mods -checkCorePackages.title=Checking for core packages -coreToolsInstall.title=Installing core tools -corePackagesUpdated.title=Updated core packages -corePackagesUpdated.text=The following core packages have been updated:%s - -doUpdate.title=Updating packages - Index: AE/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties (revision 650) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties (revision 651) @@ -22,66 +22,74 @@ menu.saveConfigTooltip=Speichere die aktuelle Mod-Auswahl in eine Datei -menu.corePackages=&Zeige Core-Pakete -menu.corePackagesTooltip=Zeige welche Core-Pakete genutzt werden +menu.corePackages=&Zeige Kernpakete +menu.corePackagesTooltip=Zeige welche Kernpakete genutzt werden menu.reglobalize=&Baue die Kerndaten neu auf menu.reglobalizeTooltip=Baue die Kerndaten neu auf -menu.update=Überprüfe auf Updates -menu.updateTooltip=Überprüfe auf Updates für Pakete die bereits heruntergeladen wurden +menu.update=Überprüfe auf Aktualisierungen +menu.updateTooltip=Überprüfe auf Aktualisierungen für Pakete die bereits heruntergeladen wurden menu.tools=&Tools -menu.manageTools=&Manage Tools -menu.manageToolsTooltip=Install/Remove Tools +menu.manageTools=&Tools verwalten +menu.manageToolsTooltip=Installiere/Entferne Tools -btnRevertSelection.text=Revert selection -btnRevertSelection.tooltip=Select mods which are currently installed -btnInstall.text=&Install -btnInstall.tooltip=Install selected mods -lblModTypes.text=Mod type: -lblShowOnly.text=Show only: -radAll.text=All +btnRevertSelection.text=Auswahl zurücksetzen +btnRevertSelection.tooltip=Wähle Mods, die zur Zeit installiert sind +btnInstall.text=&Installieren +btnInstall.tooltip=Installiere die ausgewählten Mods +lblModTypes.text=Mod Typ: +lblShowOnly.text=Zeige: +radAll.text=Alle radOnline.text=Online -radLocal.text=Downloaded -lblDownloadSize.text=Size of files to download: +radLocal.text=Heruntergeladen +lblDownloadSize.text=Größe der herunterzuladenden Dateien: -lblTitle.text=Name: -lblCreator.text=Creator: -lblTypes.text=Types: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblVersionNumber.text=Version number: -lblFiles.text=Number of files: -lblDescription.text=Description: +updateDepot.title=Aktualisiere Mod Depot Cache -updateDepot.title=Updating Mod Depot cache +installDependencies.title=Unerfüllte Abhängigkeiten +installDependencies.text=Es gibt zur Zeit unerfüllte Abhängigkeiten für einige Mods.\n\ +\n\ +Die folgenden Mods sind bereits heruntergeladen und werden ausgewählt:\n\ +%s\n\ +\n\ +Diese Mods werden zusätzlich heruntergeladen:\n\ +%s\n\ +\n\ +Die Größe der herunterzuladenden Dateien beträgt: %s.\n\ +\n\ +Continue? +installDependencies.none= +installIncompatibilities.title=Inkompatible Mods +installIncompatibilities.text=Die folgenden Mods sind inkompatibel:\n\ +\n\ +%s\n\ +\n\ +Die Installation wird abgebrochen. +installDone.title=Installation abgeschlossen +installDone.text=Du kannst AE Oni nun spielen. +installDoneDeps.text=Zusätzlich zu den manuell gewählten Mods wurden\n\ +folgende Mods installiert um Abhängigkeiten zu erfüllen:\n\ +%s\n\ +\n\ +Du kannst AE Oni nun spielen. -installDependencies.title=Unmet dependencies -installDependencies.text=There are unmet dependencies for some mods.\n\n\ -Following mods are already downloaded and will be selected:\n%s\n\n\ -These mods will have to be additionally downloaded:\n%s\n\n\ -Size of files to be downloaded: %s.\n\nContinue? -installDependencies.none= -installIncompatibilities.title=Incompatible mods -installIncompatibilities.text=The following mods are incompatible:\n\n%s\n\nInstallation will be aborted. -installDone.title=Installation done -installDone.text=You can now play AE Oni. -installDoneDeps.text=In addition to the manually selected mods the following\nwere installed because they were depended upon:\n%s\n\nYou can now play AE Oni. +updatesAvailable.title=Aktualisierungen verfügbar +updatesAvailable.text=Für die folgenden Mods und Tools gibt es neuere Versionen im Mod Depot.
Wähle die Pakete, die du aktualisieren willst. +updatesAvailableSize.text=Größe der herunterzuladenden Dateien: %s.
Jetzt aktualisieren? +checkOnStartup.text=Beim Start auf Aktualisierungen prüfen? -updatesAvailable.title=Updates available -updatesAvailable.text=The following mods and tools have newer versions on the Depot.
Check the packages you want to be updated. -updatesAvailableSize.text=Size of files to download is %s.
Update now? -checkOnStartup.text=Check for updates at startup +noOniSplit.title=OniSplit nicht vorhanden +noOniSplit.text=Die Edition ist noch nicht initialisiert und OniSplit ist nicht vorhanden (Offline-Modus?).\n\ +Kann hier nicht fortfahren, beende. +askInitialize.title=Initialisiere Edition +askInitialize.text=Die Edition ist noch nicht initialisiert.\n\ +Wenn du jetzt nicht initialisierst wird der Installer beendet.\n\ +Edition nun initialisieren? -noOniSplit.title=OniSplit not available -noOniSplit.text=The Edition is not yet initialized and OniSplit is missing (offline mode?).\nCan not resume from here, exiting! -askInitialize.title=Initialize Edition -askInitialize.text=The Edition is not yet initialized.\nIf you do not initialize now the installer will exit.\nInitialize Edition core now? +initializingEdition.title=Initialisiere Edition Kerndaten +installing.title=Installiere Mods +checkCorePackages.title=Überprüfe Kernpakete +coreToolsInstall.title=Installiere Kernpakete +corePackagesUpdated.title=Kernpakete aktualisiert +corePackagesUpdated.text=Die folgenden Kernpakete wurden aktualisiert:%s -initializingEdition.title=Initializing Edition core -installing.title=Installing mods -checkCorePackages.title=Checking for core packages -coreToolsInstall.title=Installing core tools -corePackagesUpdated.title=Updated core packages -corePackagesUpdated.text=The following core packages have been updated:%s - -doUpdate.title=Updating packages - +doUpdate.title=Aktualisiere Pakete Index: AE/installer2/locales/net/oni2/aeinstaller/localization/ModTable.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/ModTable.properties (revision 650) +++ (revision ) @@ -1,15 +1,0 @@ -mod.name=Name -mod.package_number=Pkg# -mod.install=Install -mod.creator=Creator -mod.state=State -mod.date=Last change - -state.installed=Is Installed -state.updatable=Update available -state.downloaded=Is Downloaded -yes=Yes -no=No - -openModFolder.text=Open mod folder -openDepotPage.text=Open Depot page in browser Index: AE/installer2/locales/net/oni2/aeinstaller/localization/ModTable_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/ModTable_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/ModTable_de.properties (revision 651) @@ -0,0 +1,15 @@ +mod.name=Name +mod.package_number=Pkg# +mod.install=Installieren +mod.creator=Entwickler +mod.state=Status +mod.date=Letzte Änderung + +state.installed=Ist Installiert +state.updatable=Update verfügbar +state.downloaded=Ist Downloaded +yes=Ja +no=Nein + +openModFolder.text=Ordner des Mods öffnen +openDepotPage.text=Depot-Seite des Mods im Browser öffnen Index: AE/installer2/locales/net/oni2/aeinstaller/localization/SettingsDialog.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/SettingsDialog.properties (revision 650) +++ (revision ) @@ -1,22 +1,0 @@ -frame.title=AE Installer: Settings -btnOk=Save -btnCancel=Cancel - -panUI=Look and feel -lblLaF=GUI theme: - -panCommon=Common settings -lblNotifyOnStart=Notify about updates on startup: -lblNotifyDepsAfterInstall=Only notify about dependencies after installation: -lblNotifyDepsAfterInstall.tooltip=\ -Normally you are notified about unmet dependencies before
\ -the installation continues so you can choose not to download
\ -these packages. If you select this option the installation
\ -process is not interrupted until it is finished and you are
\ -informed on what additional mods were installed to meet
\ -dependencies afterwards. -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. -newLaF.title=Restart to apply theme Index: AE/installer2/locales/net/oni2/aeinstaller/localization/SettingsDialog_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/SettingsDialog_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/SettingsDialog_de.properties (revision 651) @@ -0,0 +1,22 @@ +frame.title=AE Installer: Einstellungen +btnOk=Speichern +btnCancel=Abbrechen + +panUI=Aussehen +lblLaF=Oberflächendesign: + +panCommon=Allgemeine Einstellungen +lblNotifyOnStart=Benachrichtige über Aktualisierungen beim Start: +lblNotifyDepsAfterInstall=Benachrichtige über Abhängigkeiten nach der Installation: +lblNotifyDepsAfterInstall.tooltip=\ +Normalerweise werden unerfüllte Abhängigkeiten angezeigt bevor die
\ +Installation fortgesetzt wird, damit du die Wahl hast den Download abzubrechen.
\ +Wenn du diese Option wählst wird die Installation komplett durchgeführt,
\ +auch wenn dafür weitere Pakete heruntergeladen werden. Du wirst dann am Ende
\ +informiert, welche zusätzlichen Pakete installiert wurden. +lblCopyIntro=Kopiere Vorspannvideo bei der Installation: +lblCopyOutro=Kopiere Abspannvideo bei der Installation: + +newLaF.text=Ein neues Oberflächendesign wurde gewählt.\n\ +Bitte die Anwendung neu starten damit die Änderung wirksam wird. +newLaF.title=Neustarten um Änderung anzuwenden Index: AE/installer2/locales/net/oni2/aeinstaller/localization/ToolManager.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/ToolManager.properties (revision 650) +++ (revision ) @@ -1,15 +1,0 @@ -frame.title=AE Installer: Tool Manager - -btnInstall.text=Install -btnInstall.tooltip=Install this tool -btnInstall.un.text=Uninstall -btnInstall.un.tooltip=Uninstall this tool - -lblTitle.text=Name: -lblCreator.text=Creator: -lblPlatform.text=Platform: -lblPackageNumber.text=Package number: -lblVersionNumber.text=Version number: -lblLastChange.text=Last change: -lblDescription.text=Description: -lblDownloadSize.text=Download size of this package: Index: AE/installer2/locales/net/oni2/aeinstaller/localization/ToolManager_de.properties =================================================================== --- AE/installer2/locales/net/oni2/aeinstaller/localization/ToolManager_de.properties (revision 651) +++ AE/installer2/locales/net/oni2/aeinstaller/localization/ToolManager_de.properties (revision 651) @@ -0,0 +1,8 @@ +frame.title=AE Installer: Tool Verwaltung + +btnInstall.text=Installiere +btnInstall.tooltip=Installiere dieses Tool +btnInstall.un.text=Entferne +btnInstall.un.tooltip=Entferne dieses Tool + +lblDownloadSize.text=Downloadgröße dieses Pakets: Index: AE/installer2/setup_win/AEI.iss =================================================================== --- AE/installer2/setup_win/AEI.iss (revision 650) +++ AE/installer2/setup_win/AEI.iss (revision 651) @@ -50,4 +50,5 @@ Source: "JRE\*"; DestDir: "{app}\Edition\AEInstaller\JRE"; Excludes: ".svn"; Flags: createallsubdirs recursesubdirs onlyifdoesntexist; Components: JRE Source: "AElogo.ico"; DestDir: "{app}\Edition\AEInstaller"; Components: AEI +Source: "..\locales\*"; DestDir: "{app}\Edition\AEInstaller\locales"; Excludes: ".svn"; Flags: createallsubdirs recursesubdirs onlyifdoesntexist; Components: AEI [Icons] Index: AE/installer2/setup_win/AEI_no_jre.iss =================================================================== --- AE/installer2/setup_win/AEI_no_jre.iss (revision 650) +++ AE/installer2/setup_win/AEI_no_jre.iss (revision 651) @@ -47,4 +47,5 @@ Source: "AEInstaller2.jar"; DestDir: "{app}\Edition\AEInstaller" Source: "AElogo.ico"; DestDir: "{app}\Edition\AEInstaller" +Source: "..\locales\*"; DestDir: "{app}\Edition\AEInstaller\locales"; Excludes: ".svn"; Flags: createallsubdirs recursesubdirs onlyifdoesntexist [Icons] Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 650) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties (revision 651) @@ -1,2 +1,2 @@ appname=AE Installer 2 -appversion=0.99e +appversion=0.99f Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 650) +++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (revision 651) @@ -6,5 +6,9 @@ import java.io.IOException; import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; import java.net.URL; +import java.net.URLClassLoader; import java.util.ResourceBundle; @@ -36,10 +40,7 @@ public class AEInstaller2 { - private static ResourceBundle imagesBundle = ResourceBundle - .getBundle("net.oni2.aeinstaller.Images"); - private static ResourceBundle basicBundle = ResourceBundle - .getBundle("net.oni2.aeinstaller.AEInstaller"); - private static ResourceBundle globalBundle = ResourceBundle - .getBundle("net.oni2.aeinstaller.localization.Global"); + private static ResourceBundle imagesBundle; + private static ResourceBundle basicBundle; + private static ResourceBundle globalBundle; private static Application app = null; @@ -58,4 +59,23 @@ } catch (IOException e) { e.printStackTrace(); + } + } + + private static void addClassPath(File dir) { + try { + URL u = dir.toURI().toURL(); + URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader + .getSystemClassLoader(); + Class urlClass = URLClassLoader.class; + Method method = urlClass.getDeclaredMethod("addURL", + new Class[] { URL.class }); + method.setAccessible(true); + method.invoke(urlClassLoader, new Object[] { u }); + } catch (MalformedURLException e) { + } catch (SecurityException e) { + } catch (NoSuchMethodException e) { + } catch (IllegalArgumentException e) { + } catch (IllegalAccessException e) { + } catch (InvocationTargetException e) { } } @@ -95,4 +115,13 @@ Settings.setDebug(debug); Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate); + + File localesDir = new File(Paths.getInstallerPath(), "locales"); + if (localesDir.isDirectory()) + addClassPath(localesDir); + imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images"); + basicBundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.AEInstaller"); + globalBundle = ResourceBundle + .getBundle("net.oni2.aeinstaller.localization.Global"); SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle); Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 650) +++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (revision 651) @@ -130,5 +130,5 @@ setSize(getWidth() + 150, getHeight()); - contents.setDividerLocation(500); + contents.setDividerLocation(550); contents.setResizeWeight(0.4); Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 650) +++ AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (revision 651) @@ -129,4 +129,13 @@ switch (colNum) { case 0: + w = 70; + col.setPreferredWidth(w); + col.setMinWidth(w); + col.setMaxWidth(w); + break; + case 1: + col.setPreferredWidth(150); + break; + case 2: w = 60; col.setPreferredWidth(w); @@ -134,24 +143,15 @@ col.setMaxWidth(w); break; - case 1: - col.setPreferredWidth(150); - break; - case 2: - w = 55; - col.setPreferredWidth(w); - col.setMinWidth(w); - col.setMaxWidth(w); - break; case 3: col.setPreferredWidth(90); break; case 4: - w = 55; - col.setPreferredWidth(w); - col.setMinWidth(w); - col.setMaxWidth(w); - break; - case 5: - w = 95; + w = 60; + col.setPreferredWidth(w); + col.setMinWidth(w); + col.setMaxWidth(w); + break; + case 5: + w = 115; col.setPreferredWidth(w); col.setMinWidth(w); Index: AE/installer2/src/net/oni2/aeinstaller/localization/CorePackagesDialog.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/CorePackagesDialog.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/CorePackagesDialog.properties (revision 651) @@ -0,0 +1,3 @@ +frame.title=AE Installer: Core packages + +lblDownloadSize.text=Download size of this package: Index: AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/Downloader.properties (revision 651) @@ -0,0 +1,16 @@ +frame.title=AE Installer: Downloading mods + +btnAbort.title=Abort +lblName.title=Currently downloading: +lblIsDep.title= (dependency) +lblElapsed.title=Elapsed: +lblRemaining.title=Remaining: +lblDownloaded.title=Downloaded: +lblTotal.title=Total: +lblRate.title=Rate: + +abort.text=If you abort the download now the installation of mods will also be aborted.\n\ +Do you want to abort now? +abort.title=Really abort? + +unpacking=none - unpacking files Index: AE/installer2/src/net/oni2/aeinstaller/localization/Global.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/Global.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/Global.properties (revision 651) @@ -0,0 +1,28 @@ +offlineMode.title=Offline mode +offlineMode.text=AEI is running in offline mode.\n\ +No updates or downloads of new mods are possible.\n\ +Please restart AEI when you have internet connection to update or download new packages. + +invalidPath.title=Wrong directory +invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\n\ +The full path of the .jar-file has to be:\n\ +OniFolder/Edition/AEInstaller/AEInstaller2.jar + +dotNetMissing.title=.NET is not installed +dotNetMissing.text=.NET, which is required to use this tool, is not installed on this machine.
Please download and install it:
%1 + +offlineModeStartup.title=Offline mode +offlineModeStartup.text=Connection to the ModDepot could not be established.\n\ +AEI will run in offline mode.\n\ +Updates or installation of mods not already downloaded will not be possible. + + +lblTitle.text=Name: +lblCreator.text=Creator: +lblTypes.text=Types: +lblPlatform.text=Platform: +lblPackageNumber.text=Package number: +lblVersionNumber.text=Version number: +lblFiles.text=Number of files: +lblLastChange.text=Last change: +lblDescription.text=Description: Index: AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties (revision 651) @@ -0,0 +1,96 @@ +# Main Frame +buttonExit.title=Exit + +menu.main=&Main +menu.settings=&Settings +menu.settingsTooltip=Settings +menu.about=&About +menu.aboutTooltip=About +menu.exit=&Exit\tCtrl+Q +menu.exitTooltip=Exit + +menu.file=&File +menu.runOniFull=Run &Oni (fullscreen) +menu.runOniFullTooltip=Run Oni in fullscreen mode +menu.runOniWin=Run Oni (&window) +menu.runOniWinTooltip=Run Oni in windowed mode +menu.openEditionFolder=Open Edition folder +menu.openEditionFolderTooltip=Open the Edition folder in the file explorer +menu.loadConfig=&Load mod selection... +menu.loadConfigTooltip=Load mod selection from a file +menu.saveConfig=&Save current mod selection... +menu.saveConfigTooltip=Save current mod selection to a file + +menu.corePackages=&Show core packages +menu.corePackagesTooltip=View which core packages are used +menu.reglobalize=&Rebuild Core Data +menu.reglobalizeTooltip=Rebuild Core Data +menu.update=&Check for updates +menu.updateTooltip=Check for updates to already downloaded packages on the Depot + +menu.tools=&Tools +menu.manageTools=&Manage Tools +menu.manageToolsTooltip=Install/Remove Tools + +btnRevertSelection.text=Revert selection +btnRevertSelection.tooltip=Select mods which are currently installed +btnInstall.text=&Install +btnInstall.tooltip=Install selected mods +lblModTypes.text=Mod type: +lblShowOnly.text=Show only: +radAll.text=All +radOnline.text=Online +radLocal.text=Downloaded +lblDownloadSize.text=Size of files to download: + +updateDepot.title=Updating Mod Depot cache + +installDependencies.title=Unmet dependencies +installDependencies.text=There are unmet dependencies for some mods.\n\ +\n\ +Following mods are already downloaded and will be selected:\n\ +%s\n\ +\n\ +These mods will have to be additionally downloaded:\n\ +%s\n\ +\n\ +Size of files to be downloaded: %s.\n\ +\n\ +Continue? +installDependencies.none= +installIncompatibilities.title=Incompatible mods +installIncompatibilities.text=The following mods are incompatible:\n\ +\n\ +%s\n\ +\n\ +Installation will be aborted. +installDone.title=Installation done +installDone.text=You can now play AE Oni. +installDoneDeps.text=In addition to the manually selected mods the following\n\ +were installed because they were depended upon:\n\ +%s\n\ +\n\ +You can now play AE Oni. + +updatesAvailable.title=Updates available +updatesAvailable.text=The following mods and tools have newer versions on the Depot.
Check the packages you want to be updated. +updatesAvailableSize.text=Size of files to download is %s.
Update now? +checkOnStartup.text=Check for updates at startup + +noOniSplit.title=OniSplit not available +noOniSplit.text=The Edition is not yet initialized and OniSplit is missing (offline mode?).\n\ +Can not resume from here, exiting! +askInitialize.title=Initialize Edition +askInitialize.text=The Edition is not yet initialized.\n\ +If you do not initialize now the installer will exit.\n\ +Initialize Edition core now? + +initializingEdition.title=Initializing Edition core +installing.title=Installing mods +checkCorePackages.title=Checking for core packages +coreToolsInstall.title=Installing core tools +corePackagesUpdated.title=Updated core packages +corePackagesUpdated.text=The following core packages have been updated:%s + +doUpdate.title=Updating packages + Index: AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ModTable.properties (revision 651) @@ -0,0 +1,15 @@ +mod.name=Name +mod.package_number=Pkg# +mod.install=Install +mod.creator=Creator +mod.state=State +mod.date=Last change + +state.installed=Is Installed +state.updatable=Update available +state.downloaded=Is Downloaded +yes=Yes +no=No + +openModFolder.text=Open mod folder +openDepotPage.text=Open Depot page in browser Index: AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/SettingsDialog.properties (revision 651) @@ -0,0 +1,23 @@ +frame.title=AE Installer: Settings +btnOk=Save +btnCancel=Cancel + +panUI=Look and feel +lblLaF=GUI theme: + +panCommon=Common settings +lblNotifyOnStart=Notify about updates on startup: +lblNotifyDepsAfterInstall=Only notify about dependencies after installation: +lblNotifyDepsAfterInstall.tooltip=\ +Normally you are notified about unmet dependencies before
\ +the installation continues so you can choose not to download
\ +these packages. If you select this option the installation
\ +process is not interrupted until it is finished and you are
\ +informed on what additional mods were installed to meet
\ +dependencies afterwards. +lblCopyIntro=Enable starting video on installation: +lblCopyOutro=Enable ending video on installation: + +newLaF.text=A new GUI theme was selected.\n\ +Please restart the application in order to apply the changes. +newLaF.title=Restart to apply theme Index: AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties =================================================================== --- AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 651) +++ AE/installer2/src/net/oni2/aeinstaller/localization/ToolManager.properties (revision 651) @@ -0,0 +1,8 @@ +frame.title=AE Installer: Tool Manager + +btnInstall.text=Install +btnInstall.tooltip=Install this tool +btnInstall.un.text=Uninstall +btnInstall.un.tooltip=Uninstall this tool + +lblDownloadSize.text=Download size of this package: