LayoutExample added (+ small changes)

svn changeset:3148/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index 5a20a3f965649755231d35f2a59b398b425df3d6..a15547472b7317f6e8d3a0125f6e06c58614c987 100644 (file)
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
@@ -66,6 +66,9 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
             // Getting started: Selects
             { "Getting started", "Choices, choices",
                     "Some variations of simple selects", SelectExample.class },
+            // Layouts
+            { "Getting started", "Layouts", "Laying out components",
+                    LayoutExample.class },
             // Wrangling data: ComboBox
             { "Wrangling data", "ComboBox", "ComboBox - the swiss army select",
                     ComboBoxExample.class },
@@ -236,13 +239,22 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         exp.addComponent(ts);
         exp.expand(ts);
 
-        Label status = new Label("Copyright IT Mill 2007");
+        Label status = new Label(
+                "<a href=\"http://www.itmill.com/index_developers.htm\">Developer Area</a>"
+                        + " | <a href=\"http://www.itmill.com/developers_documentation.htm\">Documentation</a>");
+        status.setContentMode(Label.CONTENT_XHTML);
         exp.addComponent(status);
         exp.setComponentAlignment(status, ExpandLayout.ALIGNMENT_RIGHT,
                 ExpandLayout.ALIGNMENT_VERTICAL_CENTER);
 
         // select initial section ("All")
         tree.setValue(rootId);
+
+        getMainWindow()
+                .showNotification(
+                        "Welcome",
+                        "Choose an example to begin.<br/><br/>And remember to experiment!",
+                        Window.Notification.TYPE_TRAY_NOTIFICATION);
     }
 
     private void initItem(Item item, Object[] data) {

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
new file mode 100644 (file)
index 0000000..1451059
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
@@ -0,0 +1,81 @@
+package com.itmill.toolkit.demo.featurebrowser;\r
+\r
+import com.itmill.toolkit.ui.CustomComponent;\r
+import com.itmill.toolkit.ui.GridLayout;\r
+import com.itmill.toolkit.ui.Label;\r
+import com.itmill.toolkit.ui.OrderedLayout;\r
+import com.itmill.toolkit.ui.Panel;\r
+import com.itmill.toolkit.ui.SplitPanel;\r
+import com.itmill.toolkit.ui.TabSheet;\r
+\r
+/**\r
+ * A few examples of layout possibilities.\r
+ * \r
+ * @author IT Mill Ltd.\r
+ */\r
+public class LayoutExample extends CustomComponent {\r
+\r
+    public LayoutExample() {\r
+\r
+        OrderedLayout main = new OrderedLayout();\r
+        main.setMargin(true);\r
+        setCompositionRoot(main);\r
+\r
+        GridLayout g = new GridLayout(2, 5);\r
+        main.addComponent(g);\r
+\r
+        // panel\r
+        Panel p = new Panel("This is a normal panel");\r
+        Label l = new Label("A normal panel.");\r
+        p.addComponent(l);\r
+        g.addComponent(p);\r
+        // lightpanel\r
+        p = new Panel("This is a light panel");\r
+        p.setStyleName(Panel.STYLE_LIGHT);\r
+        l = new Label("A light-style panel.");\r
+        p.addComponent(l);\r
+        g.addComponent(p);\r
+\r
+        TabSheet ts = new TabSheet();\r
+        g.addComponent(ts, 0, 1, 1, 1);\r
+\r
+        OrderedLayout ol = new OrderedLayout();\r
+        ol.setMargin(true);\r
+        ol.addComponent(new Label("Component 1"));\r
+        ol.addComponent(new Label("Component 2"));\r
+        ol.addComponent(new Label("Component 3"));\r
+        ts.addTab(ol, "Vertical OrderedLayout", null);\r
+\r
+        ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        ol.setMargin(true);\r
+        ol.addComponent(new Label("Component 1"));\r
+        ol.addComponent(new Label("Component 2"));\r
+        ol.addComponent(new Label("Component 3"));\r
+        ts.addTab(ol, "Horizontal OrderedLayout", null);\r
+\r
+        GridLayout gl = new GridLayout(3, 3);\r
+        gl.setMargin(true);\r
+        gl.addComponent(new Label("Component 1.1"));\r
+        gl.addComponent(new Label("Component 1.2"));\r
+        gl.addComponent(new Label("Component 1.3"));\r
+        gl.addComponent(new Label("Component 2.2"), 1, 1);\r
+        gl.addComponent(new Label("Component 3.1"), 0, 2);\r
+        gl.addComponent(new Label("Component 3.3"), 2, 2);\r
+        ts.addTab(gl, "GridLayout", null);\r
+\r
+        ts = new TabSheet();\r
+        ts.setHeight(150);\r
+        g.addComponent(ts, 0, 2, 1, 2);\r
+\r
+        SplitPanel sp = new SplitPanel();\r
+        sp.addComponent(new Label("Component 1"));\r
+        sp.addComponent(new Label("Component 2"));\r
+        ts.addTab(sp, "Vertical SplitPanel", null);\r
+\r
+        sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);\r
+        sp.addComponent(new Label("Component 1"));\r
+        sp.addComponent(new Label("Component 2"));\r
+        ts.addTab(sp, "Horizontal SplitPanel", null);\r
+\r
+    }\r
+}\r