Changeset 873 for java

Timestamp:

May 20, 2013, 1:24:58 PM (12 years ago)

Author:

alloc

Message:

AEI2.14:

• Fixes #55

Location:

java/installer2

Files:

• locales/net/oni2/aeinstaller/localization/MainWin_de.properties (modified) (1 diff)
• locales/net/oni2/aeinstaller/localization/SettingsDialog_de.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.yml (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml (modified) (2 diffs)
• src/net/oni2/aeinstaller/localization/MainWin.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/localization/SettingsDialog.properties (modified) (1 diff)

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

@@ -95 +95 @@
 doUpdate.title=Aktualisiere Pakete
 
+startupTips.title=Hinweise
+startupTips.text=<h2>Willkommen zu Oni's Anniversary Edition Installer!</h2>\
+<h3>Bitte nimm dir einen Moment um diese Hinweise zu lesen.</h3>\
+<ul><li>Lies die Beschreibungen der Mods sorgfältig, bevor du Sie installierst.</li>\
+<li>Wähle beim ersten Versuch nicht mehr als 20 bis 30 Mods. Zu viele<br>\
+    installierte Mods könnten Oni zum Abstürzen bringen.</li>\
+<li>Um ein Mod zu deinstallieren deselektiere es in der Liste und klicke<br>\
+    erneut auf "Installieren"; du musst keine Pakete löschen.</li>\
+<li>Es wird strengstens empfohlen, Updates für Mods und den AE Installer<br>\
+    durchzuführen, wenn du über neue Versionen benachrichtigt wirst.</li>\
+<li>Wenn du informiert wirst, dass zwei Mods inkompatibel sind, musst du<br>\
+    eines von beiden abwählen bevor du die Installation durchführen kannst.</li>\
+<li>Um Bugs or Probleme mit der Anniversary Edition oder dem Installer zu<br>\
+    melden, klicke <a href="http://oni.bungie.org/community/forum/viewforum.php?id=12">hier</a>.</li>\
+<li>Um ein Problem mit einem bestimmten Mod zu melden, besuche dessen<br>\
+    Thread, der üblicherweise in der Beschreibung der Mods verlinkt ist.</li>\
+<li>Achtung: Wenn zuviele Mods, die neue Partikel verwenden, installiert<br>\
+    werden, könnte Oni abstürzen. Mehr zu diesem Thema\
+    <a href="http://oni.bungie.org/community/forum/viewtopic.php?id=2567">hier</a>.</li>\
+<li>Für weitere Informationen und Hinweise zu den Funktionen des Installers<br>\
+    gehe auf "Hilfe" im "Installer" Menü.</li>\
+<li>Deaktiviere die entsprechende Option in den "Einstellungen" im<br>\
+    "Installer" Menü, um diese Nachricht abzuschalten.</li></ul>
+
+
 jreNotFound.text=Dieses Tool benötigt eine JRE aber es wurde keine gefunden.
 jreNotFound.title=JRE nicht gefunden

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

@@ -16 +16 @@
 auch wenn dafür weitere Pakete heruntergeladen werden. Du wirst dann am <b>Ende</b><br>\
 informiert, welche zusätzlichen Pakete installiert wurden.</html>
+lblShowTipsAtStart=Zeige Tipps beim Start:
 lblCopyIntro=Kopiere Vorspannvideo bei der Installation:
 lblCopyOutro=Kopiere Abspannvideo bei der Installation:

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

@@ -48 +48 @@
 import javax.swing.ToolTipManager;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.text.html.CSS;
 
 import net.oni2.SettingsManager;
@@ -82 +83 @@
 import net.oni2.platformtools.applicationinvoker.ERuntimeNotInstalledException;
 import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
+import net.oni2.swingcomponents.HTMLLinkLabel;
 
 import org.javabuilders.BuildResult;
@@ -460 +462 @@
 
         @SuppressWarnings("unused")
+        private void showTips() {
+                if (SettingsManager.getInstance().get("showTips", true)) {
+                        HTMLLinkLabel text = new HTMLLinkLabel();
+                        text.setCssAttribute("h2", CSS.Attribute.MARGIN_TOP, "0");
+                        text.setCssAttribute("h3", CSS.Attribute.MARGIN_TOP, "0");
+                        text.setCssAttribute("ul", CSS.Attribute.MARGIN_TOP, "0");
+                        text.setCssAttribute("ul", CSS.Attribute.MARGIN_LEFT, "20");
+                        text.setCssAttribute("ul li", CSS.Attribute.MARGIN_TOP, "10");
+                        text.setCssAttribute("ul li", CSS.Attribute.PADDING_LEFT, "10");
+                        text.setText(bundle.getString("startupTips.text"));
+                        JOptionPane.showMessageDialog(this, text,
+                                        bundle.getString("startupTips.title"),
+                                        JOptionPane.INFORMATION_MESSAGE);
+                }
+        }
+
+        @SuppressWarnings("unused")
         private void focus() {
                 SwingUtilities.invokeLater(new Runnable() {

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

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [execDepotUpdate,checkCorePackages,infoCorePackages,checkInitialize,initialize,checkUpdates,doUpdate,refreshToolsMenu,showNewPackages,focus]
+  onWindowOpened: [execDepotUpdate,checkCorePackages,infoCorePackages,checkInitialize,initialize,checkUpdates,doUpdate,refreshToolsMenu,showNewPackages,showTips,focus]
   onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae

java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -41 +41 @@
         private JCheckBox chkNotifyNewPackagesOnStart;
         private JCheckBox chkNotifyDepsAfterInstall;
+        private JCheckBox chkShowTipsAtStart;
         private JCheckBox chkCopyIntro;
         private JCheckBox chkCopyOutro;
@@ -86 +87 @@
                 chkNotifyDepsAfterInstall.setSelected(set.get("notifyDepsAfterInstall",
                                 false));
+                chkShowTipsAtStart.setSelected(set.get("showTips", true));
                 chkCopyIntro.setSelected(set.get("copyintro", false));
                 chkCopyOutro.setSelected(set.get("copyoutro", true));
@@ -145 +147 @@
                 set.put("notifyDepsAfterInstall",
                                 chkNotifyDepsAfterInstall.isSelected());
+                set.put("showTips", chkShowTipsAtStart.isSelected());
                 set.put("copyintro", chkCopyIntro.isSelected());
                 set.put("copyoutro", chkCopyOutro.isSelected());

java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml

@@ -14 +14 @@
       - JCheckBox(name=chkNotifyNewPackagesOnStart, horizontalTextPosition=LEADING, text=lblNotifyNewPackagesOnStart)
       - JCheckBox(name=chkNotifyDepsAfterInstall, horizontalTextPosition=LEADING, text=lblNotifyDepsAfterInstall, toolTipText=lblNotifyDepsAfterInstall.tooltip)
+      - JCheckBox(name=chkShowTipsAtStart, horizontalTextPosition=LEADING, text=lblShowTipsAtStart)
       - JCheckBox(name=chkCopyIntro, horizontalTextPosition=LEADING, text=lblCopyIntro)
       - JCheckBox(name=chkCopyOutro, horizontalTextPosition=LEADING, text=lblCopyOutro)
@@ -21 +22 @@
            >chkNotifyNewPackagesOnStart  [pref]
            >chkNotifyDepsAfterInstall    [pref]
+           >chkShowTipsAtStart           [pref]
            >chkCopyIntro                 [pref]
            >chkCopyOutro                 [pref]

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

@@ -95 +95 @@
 doUpdate.title=Updating packages
 
+startupTips.title=Instructions
+startupTips.text=<h2>Welcome to Oni's Anniversary Edition Installer!</h2>\
+<h3>Please take a moment to read these instructions before you start.</h3>\
+<ul><li>Read each mod's description carefully before you decide to install it.</li>\
+<li>On your first run, try not to install more than 20 to 30 mods. Installing<br>\
+    too many mods can cause Oni to run out of memory.</li>\
+<li>To uninstall a mod, just unselect it from the list and click "Install"<br>\
+    again; you don't have to delete it.</li>\
+<li>It's highly recommended that you update your mods and the AE Installer<br>\
+    whenever you're notified that an update is available.</li>\
+<li>If you're notified that two mods are incompatible, you have to unselect<br>\
+    one of them before you try to install again.</li>\
+<li>To report bugs or problems with the Anniversary Edition itself or the<br>\
+    AE Installer go <a href="http://oni.bungie.org/community/forum/viewforum.php?id=12">here</a>.</li>\
+<li>To report bugs with a particular mod, visit that mod's thread, which is<br>\
+    usually linked to in the mod's description.</li>\
+<li>Warning: If too many mods which use custom particles are installed, Oni<br>\
+    may crash. Read more about this issue <a href="http://oni.bungie.org/community/forum/viewtopic.php?id=2567">here</a>.</li>\
+<li>For more information and instructions on the features of the AE Installer<br>\
+    itself, see "Help" under the "Installer" menu.</li>\
+<li>To disable this message, uncheck the corresponding option in "Settings"<br>\
+    under the "Installer" menu.</li></ul>
+
 jreNotFound.text=This tool requires a JRE but it was not found.
 jreNotFound.title=No JRE found

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

@@ -17 +17 @@
 informed on what additional mods were installed to meet<br>\
 dependencies <b>afterwards</b>.</html>
+lblShowTipsAtStart=Show tips on startup:
 lblCopyIntro=Enable starting video on installation:
 lblCopyOutro=Enable ending video on installation: