Changeset 886
- Timestamp:
- Jun 24, 2013, 8:06:11 PM (12 years ago)
- Location:
- java/installer2
- Files:
-
- 7 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/.classpath
r852 r886 29 29 <classpathentry combineaccessrules="false" kind="src" path="/NaturalOrderComparator"/> 30 30 <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/> 31 <classpathentry kind="lib" path="/_ThirdPartyLibs/javax.mail.jar"/> 31 32 <classpathentry kind="output" path="bin"/> 32 33 </classpath> -
java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties
r873 r886 9 9 menu.help=&Hilfe 10 10 menu.helpTooltip=Hilfe 11 menu.help=Hilfe erbitten 12 menu.helpTooltip=Sende eine Mail inklusive der Logdateien 11 13 menu.exit=&Beenden\tCtrl+Q 12 14 menu.exitTooltip=Beenden -
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r880 r886 1 1 appname=AE Installer 2 2 appversion=.1 52 appversion=.16 -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r857 r886 5 5 import java.io.FileNotFoundException; 6 6 import java.io.IOException; 7 import java.io.PrintStream;8 7 import java.lang.reflect.InvocationTargetException; 9 8 import java.lang.reflect.Method; … … 11 10 import java.net.URL; 12 11 import java.net.URLClassLoader; 12 import java.text.SimpleDateFormat; 13 import java.util.Date; 13 14 import java.util.ResourceBundle; 14 15 … … 24 25 import net.oni2.SettingsManager; 25 26 import net.oni2.aeinstaller.backend.CaseInsensitiveFile; 27 import net.oni2.aeinstaller.backend.LogPrintStream; 26 28 import net.oni2.aeinstaller.backend.Paths; 27 29 import net.oni2.aeinstaller.backend.RuntimeOptions; … … 127 129 RuntimeOptions.setUseWorkingDir(true); 128 130 } 131 LogPrintStream lps = LogPrintStream.getInstance(); 129 132 if (!RuntimeOptions.isDebug()) { 130 133 try { 131 PrintStream ps = new PrintStream(new File(Paths.getPrefsPath(), 132 "aei_output.log")); 133 System.setOut(ps); 134 System.setErr(ps); 134 lps.setFile(new File(Paths.getPrefsPath(), "aei_output.log")); 135 135 } catch (FileNotFoundException e1) { 136 136 e1.printStackTrace(); 137 } catch (IOException e) { 138 e.printStackTrace(); 137 139 } 138 140 } … … 142 144 143 145 SettingsManager.deserializeFromFile(Paths.getSettingsFilename()); 144 146 145 147 if (Paths.getProxySettingsFilename().exists()) { 146 148 ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename()); 147 149 } 148 150 149 151 initBundles(); 150 152 … … 181 183 JFrame.setDefaultLookAndFeelDecorated(true); 182 184 185 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 183 186 System.out.println(basicBundle.getString("appname") 184 187 + basicBundle.getString("appversion")); 188 System.out.println("Time: " + sdf.format(new Date())); 189 System.out.println("Java: \"" 190 + System.getProperty("java.runtime.name") + "\" v. " 191 + System.getProperty("java.version") + " by \"" 192 + System.getProperty("java.vendor") + "\" (spec. " 193 + System.getProperty("java.specification.version") + ")"); 194 System.out.println("Java home: " + System.getProperty("java.home")); 195 System.out.println("Command: " 196 + System.getProperty("sun.java.command")); 185 197 System.out.println("JarPath: " + Paths.getJarPath()); 186 198 System.out.println("PrefsPath: " + Paths.getPrefsPath()); -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r873 r886 75 75 import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType; 76 76 import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox; 77 import net.oni2.aeinstaller.gui.reporter.ReporterDialog; 77 78 import net.oni2.aeinstaller.gui.settings.SettingsDialog; 78 79 import net.oni2.aeinstaller.gui.toolmanager.ToolManager; … … 514 515 } 515 516 } 517 518 @SuppressWarnings("unused") 519 private void showReport() { 520 new ReporterDialog().setVisible(true); 521 } 516 522 517 523 private JFileChooser getConfigOpenSaveDialog(boolean save) { -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
r873 r886 14 14 - Action(name=about, text=menu.about, toolTipText=menu.aboutTooltip, icon=img.about, onAction=[showAbout]) 15 15 - Action(name=help, text=menu.help, toolTipText=menu.helpTooltip, icon=img.help, onAction=[showHelp]) 16 - Action(name=report, text=menu.report, toolTipText=menu.reportTooltip, icon=img.help, onAction=[showReport]) 16 17 - Action(name=runOniFull, text=menu.runOniFull, toolTipText=menu.runOniFullTooltip, icon=img.oni, onAction=[oniFull]) 17 18 - Action(name=runOniWin, text=menu.runOniWin, toolTipText=menu.runOniWinTooltip, icon=img.oni, onAction=[oniWin]) … … 23 24 - Action(name=reglobalize, text=menu.reglobalize, toolTipText=menu.reglobalizeTooltip, icon=img.refresh, onAction=[reglobalizeVerify,reglobalize]) 24 25 - Action(name=tools, text=menu.manageTools, toolTipText=menu.manageToolsTooltip, icon=img.tools, onAction=[tools,refreshToolsMenu]) 25 - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[ checkUpdates,doUpdate])26 - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[execDepotUpdate,checkCorePackages,infoCorePackages,checkUpdates,doUpdate,showNewPackages]) 26 27 - Action(name=corePackages, text=menu.corePackages, toolTipText=menu.corePackagesTooltip, icon=img.core, onAction=[showCorePackagesDialog]) 27 28 - JMenuBar: … … 29 30 - JMenuItem(action=about) 30 31 - JMenuItem(action=help) 32 - JMenuItem(action=report) 31 33 - JMenuItem(action=settings) 32 34 - JMenuItem(action=exitAction) -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r873 r886 9 9 menu.help=&Help 10 10 menu.helpTooltip=Help 11 menu.help=&Request help 12 menu.helpTooltip=Request help including log files 11 13 menu.exit=&Exit\tCtrl+Q 12 14 menu.exitTooltip=Exit
Note:
See TracChangeset
for help on using the changeset viewer.