aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2007-12-04 15:40:02 +0000
committerMarc Englund <marc.englund@itmill.com>2007-12-04 15:40:02 +0000
commitdf1908ead27b2bb62d44914ecd8b0f67892f2ded (patch)
treee655b7354d520b62183b82d1f0f9cd23a378530e
parentd331d43f2ae215d37a6288b18576b0ed4ebf9b77 (diff)
downloadvaadin-framework-df1908ead27b2bb62d44914ecd8b0f67892f2ded.tar.gz
vaadin-framework-df1908ead27b2bb62d44914ecd8b0f67892f2ded.zip
LayoutExample added (+ small changes)
svn changeset:3148/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java14
-rw-r--r--src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java81
2 files changed, 94 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index 5a20a3f965..a15547472b 100644
--- 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
index 0000000000..14510597ca
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
@@ -0,0 +1,81 @@
+package com.itmill.toolkit.demo.featurebrowser;
+
+import com.itmill.toolkit.ui.CustomComponent;
+import com.itmill.toolkit.ui.GridLayout;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.SplitPanel;
+import com.itmill.toolkit.ui.TabSheet;
+
+/**
+ * A few examples of layout possibilities.
+ *
+ * @author IT Mill Ltd.
+ */
+public class LayoutExample extends CustomComponent {
+
+ public LayoutExample() {
+
+ OrderedLayout main = new OrderedLayout();
+ main.setMargin(true);
+ setCompositionRoot(main);
+
+ GridLayout g = new GridLayout(2, 5);
+ main.addComponent(g);
+
+ // panel
+ Panel p = new Panel("This is a normal panel");
+ Label l = new Label("A normal panel.");
+ p.addComponent(l);
+ g.addComponent(p);
+ // lightpanel
+ p = new Panel("This is a light panel");
+ p.setStyleName(Panel.STYLE_LIGHT);
+ l = new Label("A light-style panel.");
+ p.addComponent(l);
+ g.addComponent(p);
+
+ TabSheet ts = new TabSheet();
+ g.addComponent(ts, 0, 1, 1, 1);
+
+ OrderedLayout ol = new OrderedLayout();
+ ol.setMargin(true);
+ ol.addComponent(new Label("Component 1"));
+ ol.addComponent(new Label("Component 2"));
+ ol.addComponent(new Label("Component 3"));
+ ts.addTab(ol, "Vertical OrderedLayout", null);
+
+ ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
+ ol.setMargin(true);
+ ol.addComponent(new Label("Component 1"));
+ ol.addComponent(new Label("Component 2"));
+ ol.addComponent(new Label("Component 3"));
+ ts.addTab(ol, "Horizontal OrderedLayout", null);
+
+ GridLayout gl = new GridLayout(3, 3);
+ gl.setMargin(true);
+ gl.addComponent(new Label("Component 1.1"));
+ gl.addComponent(new Label("Component 1.2"));
+ gl.addComponent(new Label("Component 1.3"));
+ gl.addComponent(new Label("Component 2.2"), 1, 1);
+ gl.addComponent(new Label("Component 3.1"), 0, 2);
+ gl.addComponent(new Label("Component 3.3"), 2, 2);
+ ts.addTab(gl, "GridLayout", null);
+
+ ts = new TabSheet();
+ ts.setHeight(150);
+ g.addComponent(ts, 0, 2, 1, 2);
+
+ SplitPanel sp = new SplitPanel();
+ sp.addComponent(new Label("Component 1"));
+ sp.addComponent(new Label("Component 2"));
+ ts.addTab(sp, "Vertical SplitPanel", null);
+
+ sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
+ sp.addComponent(new Label("Component 1"));
+ sp.addComponent(new Label("Component 2"));
+ ts.addTab(sp, "Horizontal SplitPanel", null);
+
+ }
+}