Changeset 873 for java/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

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

Author:

alloc

Message:

AEI2.14:

• Fixes #55

Location:

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

Files:

• MainWin.java (modified) (3 diffs)
• MainWin.yml (modified) (1 diff)
• settings/SettingsDialog.java (modified) (3 diffs)
• settings/SettingsDialog.yml (modified) (2 diffs)

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]