Changeset 880

Timestamp:

Jun 3, 2013, 11:46:25 AM (11 years ago)

Author:

alloc

Message:

AEI2.15:

• Fixes #59

Location:

java

Files:

• SwingComponents/src/net/oni2/swingcomponents/HTMLLinkLabel.java (modified) (4 diffs)
• installer2/src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)

java/SwingComponents/src/net/oni2/swingcomponents/HTMLLinkLabel.java

@@ -15 +15 @@
 import javax.swing.event.HyperlinkListener;
 import javax.swing.text.DefaultCaret;
+import javax.swing.text.html.CSS;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
@@ -39 +40 @@
 
                 setContentType("text/html");
-
-                HTMLEditorKit hek = (HTMLEditorKit) getEditorKit();
-                StyleSheet css = hek.getStyleSheet();
-                css.removeStyle("p");
-
+                
                 Font font = new JLabel().getFont();
 
@@ -80 +77 @@
 
         /**
+         * Add or reset a CSS attribute for styling the text
+         * 
+         * @param selector
+         *            CSS selector
+         * @param attribute
+         *            CSS attribute
+         * @param value
+         *            Value
+         */
+        public void setCssAttribute(String selector, CSS.Attribute attribute,
+                        String value) {
+                HTMLEditorKit hek = (HTMLEditorKit) getEditorKit();
+                StyleSheet css = hek.getStyleSheet();
+                css.addRule(String.format("%s {%s: %s}", selector, attribute.toString(), value));
+        }
+
+        /**
          * Allow or forbid to set a non-null border
          * 
@@ -99 +113 @@
         @Override
         public void setText(String t) {
+                if (t.startsWith("<p>"))
+                        t = t.replaceFirst("<p>", "<p style=\"margin-top: 0\">");
                 super.setText(prefix + t + suffix);
         }

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.14
+appversion=.15