Updated LabelsExample, added ButtonExample

svn changeset:3120/svn branch:trunk

3 files changed, 146 insertions, 2 deletions

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
new file mode 100644
index 0000000000..2fdcb135ca
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
@@ -0,0 +1,143 @@
+package com.itmill.toolkit.demo.featurebrowser;

+

+import com.itmill.toolkit.terminal.ExternalResource;

+import com.itmill.toolkit.terminal.ThemeResource;

+import com.itmill.toolkit.ui.Button;

+import com.itmill.toolkit.ui.CheckBox;

+import com.itmill.toolkit.ui.CustomComponent;

+import com.itmill.toolkit.ui.Label;

+import com.itmill.toolkit.ui.Link;

+import com.itmill.toolkit.ui.OrderedLayout;

+import com.itmill.toolkit.ui.Panel;

+import com.itmill.toolkit.ui.Button.ClickEvent;

+

+/**

+ * Shows a few variations of Buttons and Links.

+ * 

+ * @author IT Mill Ltd.

+ */

+public class ButtonExample extends CustomComponent implements

+        Button.ClickListener {

+

+    Panel status;

+

+    public ButtonExample() {

+

+        OrderedLayout main = new OrderedLayout();

+        main.setMargin(true);

+        setCompositionRoot(main);

+

+        OrderedLayout horiz = new OrderedLayout(

+                OrderedLayout.ORIENTATION_HORIZONTAL);

+        main.addComponent(horiz);

+        Panel basic = new Panel("Basic buttons");

+        basic.setStyleName(Panel.STYLE_LIGHT);

+        horiz.addComponent(basic);

+        Panel bells = new Panel("+ bells & whistles");

+        bells.setStyleName(Panel.STYLE_LIGHT);

+        horiz.addComponent(bells);

+        status = new Panel("Clicked");

+        status.setStyleName(Panel.STYLE_LIGHT);

+        horiz.addComponent(status);

+

+        Button b = new Button("Basic button");

+        b.addListener(this);

+        basic.addComponent(b);

+

+        b = new Button("Button w/ icon + tooltip");

+        b.addListener(this);

+        b.setIcon(new ThemeResource("icons/ok.png"));

+        b.setDescription("This button does nothing, fast");

+        bells.addComponent(b);

+

+        b = new CheckBox("CheckBox - a switch-button");

+        b.setImmediate(true); // checkboxes are not immediate by default

+        b.addListener(this);

+        basic.addComponent(b);

+

+        b = new CheckBox("CheckBox w/ icon + tooltip");

+        b.setImmediate(true); // checkboxes are not immediate by default

+        b.addListener(this);

+        b.setIcon(new ThemeResource("icons/ok.png"));

+        b.setDescription("This is a CheckBox");

+        bells.addComponent(b);

+

+        b = new Button("Link-style button");

+        b.addListener(this);

+        b.setStyleName(Button.STYLE_LINK);

+        basic.addComponent(b);

+

+        b = new Button("Link button w/ icon + tooltip");

+        b.addListener(this);

+        b.setStyleName(Button.STYLE_LINK);

+        b.setIcon(new ThemeResource("icons/ok.png"));

+        b.setDescription("Link-style, icon+tootip, no caption");

+        bells.addComponent(b);

+

+        b = new Button();

+        b.addListener(this);

+        b.setStyleName(Button.STYLE_LINK);

+        b.setIcon(new ThemeResource("icons/ok.png"));

+        b.setDescription("Link-style, icon+tootip, no caption");

+        basic.addComponent(b);

+

+        Panel links = new Panel("Links");

+        links.setStyleName(Panel.STYLE_LIGHT);

+        main.addComponent(links);

+        Label desc = new Label(

+                "The main difference between a Link and"

+                        + " a link-styled Button is that the Link works client-"

+                        + " side, whereas the Button works server side.<br/> This means"

+                        + " that the Button triggers some event on the server,"

+                        + " while the Link is a normal web-link. <br/><br/>Note that for"

+                        + " opening new windows, the Link might be a safer "

+                        + " choice, since popup-blockers might interfer with "

+                        + " server-initiated window opening.");

+        desc.setContentMode(Label.CONTENT_XHTML);

+        links.addComponent(desc);

+        Link l = new Link("IT Mill home", new ExternalResource(

+                "http://www.itmill.com"));

+        l.setDescription("Link without target name, opens in this window");

+        links.addComponent(l);

+

+        l = new Link("IT Mill home (new window)", new ExternalResource(

+                "http://www.itmill.com"));

+        l.setTargetName("_blank");

+        l.setDescription("Link with target name, opens in new window");

+        links.addComponent(l);

+

+        l = new Link("IT Mill home (new window, less decor)",

+                new ExternalResource("http://www.itmill.com"));

+        l.setTargetName("_blank");

+        l.setTargetBorder(Link.TARGET_BORDER_MINIMAL);

+        l.setTargetName("_blank");

+        l

+                .setDescription("Link with target name and BORDER_MINIMAL, opens in new window with less decor");

+        links.addComponent(l);

+

+        l = new Link("IT Mill home (new 200x200 window, no decor, icon)",

+                new ExternalResource("http://www.itmill.com"), "_blank", 200,

+                200, Link.TARGET_BORDER_NONE);

+        l.setTargetName("_blank");

+        l

+                .setDescription("Link with target name and BORDER_NONE, opens in new window with no decor");

+        l.setIcon(new ThemeResource("icons/ok.png"));

+        links.addComponent(l);

+

+    }

+

+    public void buttonClick(ClickEvent event) {

+        Button clicked = event.getButton();

+        String caption = clicked.getCaption();

+        if (caption == null) {

+            caption = "&lt;icon&gt;";

+        }

+        status.removeAllComponents();

+        Label l = new Label("Clicked: " + caption + "<br/>" + "Value: "

+                + clicked.getValue());

+        l.setContentMode(Label.CONTENT_XHTML);

+        status.addComponent(l);

+

+    }

+

+}

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index fd254f73f0..220ac9960f 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
@@ -52,7 +52,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
                     LabelsExample.class },
             // Getting started: Buttons
             { "Getting started", "Buttons and links",
-                    "Some variations of Buttons and Links", Button.class },
+                    "Some variations of Buttons and Links", ButtonExample.class },
             // Getting started: Fields
             { "Getting started", "User input",
                     "TextFields, DateFields, and such", Button.class },
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LabelsExample.java b/src/com/itmill/toolkit/demo/featurebrowser/LabelsExample.java
index 04e3352767..adb4b53bbc 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/LabelsExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/LabelsExample.java
@@ -39,10 +39,11 @@ public class LabelsExample extends CustomComponent {
         p.addComponent(l);

         g.addComponent(p);

         // plain w/ caption

-        p = new Panel("Plain w/ caption");

+        p = new Panel("Plain w/ caption + tooltip");

         p.setStyleName(Panel.STYLE_LIGHT);

         l = new Label("A plain label with caption.");

         l.setCaption("Label caption");

+        l.setDescription("This is a description (tooltip) for the label.");

         p.addComponent(l);

         g.addComponent(p);

         // plain w/ xhtml