]> source.dussan.org Git - vaadin-framework.git/commitdiff
Took the liberty to change some graphics.
authorJani Laakso <jani.laakso@itmill.com>
Mon, 12 Feb 2007 01:20:08 +0000 (01:20 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Mon, 12 Feb 2007 01:20:08 +0000 (01:20 +0000)
- faster loading / user experience through "slow" links
- better lookin IMO

svn changeset:676/svn branch:toolkit

43 files changed:
src/com/itmill/toolkit/demo/features/Feature.java
src/com/itmill/toolkit/demo/features/FeatureButton.java
src/com/itmill/toolkit/demo/features/FeatureContainers.java
src/com/itmill/toolkit/demo/features/FeatureDateField.java
src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
src/com/itmill/toolkit/demo/features/FeatureForm.java
src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
src/com/itmill/toolkit/demo/features/FeatureItems.java
src/com/itmill/toolkit/demo/features/FeatureLabel.java
src/com/itmill/toolkit/demo/features/FeatureLink.java
src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
src/com/itmill/toolkit/demo/features/FeaturePanel.java
src/com/itmill/toolkit/demo/features/FeatureSelect.java
src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
src/com/itmill/toolkit/demo/features/FeatureTable.java
src/com/itmill/toolkit/demo/features/FeatureTextField.java
src/com/itmill/toolkit/demo/features/FeatureTree.java
src/com/itmill/toolkit/demo/features/FeatureUpload.java
src/com/itmill/toolkit/demo/features/FeatureWindow.java
src/com/itmill/toolkit/demo/features/IntroWelcome.java
src/com/itmill/toolkit/demo/features/button.jpg [deleted file]
src/com/itmill/toolkit/demo/features/datefield.jpg [deleted file]
src/com/itmill/toolkit/demo/features/embedded.jpg [deleted file]
src/com/itmill/toolkit/demo/features/filetransfer.jpg [deleted file]
src/com/itmill/toolkit/demo/features/form.jpg [deleted file]
src/com/itmill/toolkit/demo/features/framewindow.jpg [deleted file]
src/com/itmill/toolkit/demo/features/gridlayout.jpg [deleted file]
src/com/itmill/toolkit/demo/features/icon_demo.png [new file with mode: 0644]
src/com/itmill/toolkit/demo/features/icon_intro.png [new file with mode: 0644]
src/com/itmill/toolkit/demo/features/items.jpg [deleted file]
src/com/itmill/toolkit/demo/features/label.jpg [deleted file]
src/com/itmill/toolkit/demo/features/link.jpg [deleted file]
src/com/itmill/toolkit/demo/features/orderedlayout.jpg [deleted file]
src/com/itmill/toolkit/demo/features/panel.jpg [deleted file]
src/com/itmill/toolkit/demo/features/parameters.jpg [deleted file]
src/com/itmill/toolkit/demo/features/select.jpg [deleted file]
src/com/itmill/toolkit/demo/features/serverevents.jpg [deleted file]
src/com/itmill/toolkit/demo/features/table.jpg [deleted file]
src/com/itmill/toolkit/demo/features/tabsheet.jpg [deleted file]
src/com/itmill/toolkit/demo/features/textfield.gif [deleted file]
src/com/itmill/toolkit/demo/features/tree.jpg [deleted file]
src/com/itmill/toolkit/demo/features/window.jpg [deleted file]

index 5da2c2d2dbfc1c00253a345a8311b7bd6b39a20f..6398e83781a0224853d72a30cffad1cfcb649904 100644 (file)
@@ -28,7 +28,6 @@
 
 package com.itmill.toolkit.demo.features;
 
-import com.itmill.toolkit.Application;
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.Resource;
 import com.itmill.toolkit.ui.*;
@@ -98,18 +97,23 @@ public abstract class Feature extends CustomComponent {
                String desc = getDescriptionXHTML();
                String title = getTitle();
                if (desc != null) {
-                       GridLayout gl = new GridLayout(2, 1);
+                       OrderedLayout mainLayout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL);
+                       OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
+                       mainLayout.addComponent(layout);
                        if (getImage() != null)
-                               gl.addComponent(new Embedded("", new ClassResource(getImage(),
+                               layout.addComponent(new Embedded("", new ClassResource(getImage(),
                                                this.getApplication())));
                        String label = "";
-                       if (title != null)
-                               label += "<h2>" + title + "</h2>";
                        label += desc;
                        if (propsReminder)
                                label += PROP_REMINDER_TEXT;
-                       gl.addComponent(new Label(label, Label.CONTENT_XHTML));
-                       ts.addTab(gl, "Description", null);
+                       if (title != null) {
+                               layout.addComponent(new Label("<h3>" + title + "</h3>",
+                                               Label.CONTENT_XHTML));
+                       }
+                       mainLayout.addComponent(new Label(label, Label.CONTENT_XHTML));
+
+                       ts.addTab(mainLayout, "Description", null);
                }
 
                // Javadoc tab
index 502a4d9272cb8e8b78d13016e8409dff2694abf1..15e2865d04347bc613cdd0488846b4f9a9d0f662 100644 (file)
@@ -77,7 +77,7 @@ public class FeatureButton extends Feature {
        }
 
        protected String getImage() {
-               return "button.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 5b3f5fe1343277b9305929d801a5669a8e520b3d..af71a56286b1d7f9c60a3d4be0a4ebf74cd3e0bc 100644 (file)
@@ -52,7 +52,7 @@ public class FeatureContainers extends Feature {
                        + "hierarchically. Those ordering models provide basis for "
                        + "Table, Tree and Select UI components. As with other data "
                        + "models, the containers support events for notifying about the "
-                       + "changes."
+                       + "chaembedded.jpgnges."
                        + "<br /><br />Set of utilities for converting between container models by "
                        + "adding external indexing or hierarchy into existing containers. "
                        + "In memory containers implementing indexed and hierarchical "
index 570b2c370b67da65a8677634675e5a5d1447c91b..5aa2eadf186312471badf5d4a4b59cf9213cbf58 100644 (file)
@@ -116,7 +116,7 @@ public class FeatureDateField extends Feature {
        }
 
        protected String getImage() {
-               return "datefield.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index e63792f2cd2503adaa00bffaf685099a01d63b1d..4983f421e4dd63ca9f34e0997e38417ebb49dca2 100644 (file)
@@ -105,7 +105,7 @@ public class FeatureEmbedded extends Feature {
        }
 
        protected String getImage() {
-               return "embedded.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 488b9e9fcbc60d42c83a850a28ee6a562dec394d..52bdc589da8e2dd6606d202278ae988c4f4e748a 100644 (file)
@@ -185,7 +185,7 @@ public class FeatureForm extends Feature implements
        }
 
        protected String getImage() {
-               return "form.jpg";
+               return "icon_demo.png";
        }
 
 }
index 51e430f08429f150693e44c2f7ac69f1ea844607..c68235c36e4906c8a213886cb492456eb4560142 100644 (file)
@@ -89,7 +89,7 @@ public class FeatureFrameWindow extends Feature implements Button.ClickListener
        }
 
        protected String getImage() {
-               return "framewindow.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 99926dba4ee51f243b84f0d7faff63bb4825adf2..3ef95bd711d7b435417dcf1d0a9c0c004cf9c617 100644 (file)
@@ -84,7 +84,7 @@ public class FeatureGridLayout extends Feature {
        }
 
        protected String getImage() {
-               return "gridlayout.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 0ee458debc25085ba8afc648949eac6dfdc754ca..c3d604f48dda22db57d59c87a1018d04749f30ec 100644 (file)
@@ -96,7 +96,7 @@ public class FeatureItems extends Feature {
        }
 
        protected String getImage() {
-               return "items.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index cac095c6f634f70e73c5868ea9fb4ddba2c575d9..742e90e45cb09c15d5dfafefc9696d6525cae77e 100644 (file)
@@ -85,7 +85,7 @@ public class FeatureLabel extends Feature {
        }
 
        protected String getImage() {
-               return "label.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 372a7cb2309d139765b009b4305399fb0ec90db2..350ec604a6c6cac5ffa73b04f43d29c3e1835e04 100644 (file)
@@ -75,7 +75,7 @@ public class FeatureLink extends Feature {
        }
 
        protected String getImage() {
-               return "link.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index a432e3a27b80bf626a2cc49e4ff48fc82f9352f3..c36e45926136c08677f3af02166c77a0f32f9339 100644 (file)
@@ -85,7 +85,7 @@ public class FeatureOrderedLayout extends Feature {
        }
 
        protected String getImage() {
-               return "orderedlayout.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index f65829dcdb42edbec2b9d49760e3eaf96c139901..1213a04e4101b67361bdecf111f738b3e0d72fe0 100644 (file)
@@ -77,7 +77,7 @@ public class FeaturePanel extends Feature {
        }
 
        protected String getImage() {
-               return "panel.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index f0f95ff909e04fb8d40065270e6db42b01716046..963eee11b2f426a395622844b7c6bcd6eec282de 100644 (file)
@@ -88,7 +88,7 @@ public class FeatureSelect extends Feature {
                                + "allows for multiple item selection, this is usually represented as either a "
                                + "listbox of selectable items or as a group of checkboxes."
                                + "<br/><br/>"
-                               + "Data source can be associated both with selected item and the list of selections. "
+                               + "Data soutree.jpgrce can be associated both with selected item and the list of selections. "
                                + "This way you can easily present a selection based on items specified elsewhere in application. "
                                + "<br/><br/>"
                                + "On the demo tab you can try out how the different properties affect the"
@@ -96,7 +96,7 @@ public class FeatureSelect extends Feature {
        }
 
        protected String getImage() {
-               return "select.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 524e4be03aa4c20cc68ba85b881c8bacba3c326a..6d30a1a80b05711c7da38b15f088cd413878a0de 100644 (file)
@@ -75,13 +75,13 @@ public class FeatureTabSheet extends Feature {
 
        protected String getDescriptionXHTML() {
                return "A multicomponent container with tabs for switching between them.<br/>"
-                               + "In the normal case, one would place a layout component on each tab.<br/><br />"
+                               + "In the ntable.jpgormal case, one would place a layout component on each tab.<br/><br />"
                                + "On the demo tab you can try out how the different properties affect "
                                + "the presentation of the component.";
        }
 
        protected String getImage() {
-               return "tabsheet.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index e2cbd2f92226f07a8ef130c9294437a1e5309351..2e58f70d28415734fbb77631b99264066fe4c3e7 100644 (file)
@@ -181,7 +181,7 @@ public class FeatureTable extends Feature implements Action.Handler {
        }
 
        protected String getImage() {
-               return "table.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 342dda1f7794e25ae289e40dac2474c97c925e81..512a4e87d978e95a9eb41a6b6834ba691e69a7ef 100644 (file)
@@ -79,7 +79,7 @@ public class FeatureTextField extends Feature {
        }
 
        protected String getImage() {
-               return "textfield.gif";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 88217494443eefca76da6565eedd7dab4a1cc714..b92ebfada9e5da3bd2ebf4909fd13919e6399126 100644 (file)
@@ -158,7 +158,7 @@ public class FeatureTree extends Feature implements Action.Handler {
        }
 
        protected String getImage() {
-               return "tree.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 452df31c77b6f91ab9aabaa75b3e033551f0af51..371509ad555589cb00cae6f78f6d9b5e91d14a9e 100644 (file)
@@ -88,7 +88,7 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener {
        }
 
        protected String getImage() {
-               return "filetransfer.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index db96a7dba4b1cae5195e7ec23b7af2188bf8d038..7e2a3471f73a829e634bc3d431428646c616a6dc 100644 (file)
@@ -95,7 +95,7 @@ public class FeatureWindow extends Feature {
        }
 
        protected String getImage() {
-               return "window.jpg";
+               return "icon_demo.png";
        }
 
        protected String getTitle() {
index 3f2fa826d8322700ae9c4c4faa58784c8c6c2037..d8f2cc56f431b1fd0e90e6691bd019d8c90923e6 100644 (file)
@@ -103,7 +103,6 @@ public class IntroWelcome extends Feature {
 
        protected String getExampleSrc() {
                return ""
-                               + "// Hello World example application\n\n"
                                + "package com.itmill.toolkit.demo;\n"
                                + "import com.itmill.toolkit.ui.*;\n"
                                + "public class HelloWorld extends com.itmill.toolkit.Application {\n"
@@ -122,11 +121,11 @@ public class IntroWelcome extends Feature {
        }
 
        protected String getImage() {
-               return null;
+               return "icon_intro.png";
        }
 
        protected String getTitle() {
-               return null;
+               return "Welcome";
        }
 
 }
diff --git a/src/com/itmill/toolkit/demo/features/button.jpg b/src/com/itmill/toolkit/demo/features/button.jpg
deleted file mode 100644 (file)
index c7e4bf8..0000000
Binary files a/src/com/itmill/toolkit/demo/features/button.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/datefield.jpg b/src/com/itmill/toolkit/demo/features/datefield.jpg
deleted file mode 100644 (file)
index c035175..0000000
Binary files a/src/com/itmill/toolkit/demo/features/datefield.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/embedded.jpg b/src/com/itmill/toolkit/demo/features/embedded.jpg
deleted file mode 100644 (file)
index c428192..0000000
Binary files a/src/com/itmill/toolkit/demo/features/embedded.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/filetransfer.jpg b/src/com/itmill/toolkit/demo/features/filetransfer.jpg
deleted file mode 100644 (file)
index 4c2ceb0..0000000
Binary files a/src/com/itmill/toolkit/demo/features/filetransfer.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/form.jpg b/src/com/itmill/toolkit/demo/features/form.jpg
deleted file mode 100644 (file)
index d9993bd..0000000
Binary files a/src/com/itmill/toolkit/demo/features/form.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/framewindow.jpg b/src/com/itmill/toolkit/demo/features/framewindow.jpg
deleted file mode 100644 (file)
index 725df76..0000000
Binary files a/src/com/itmill/toolkit/demo/features/framewindow.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/gridlayout.jpg b/src/com/itmill/toolkit/demo/features/gridlayout.jpg
deleted file mode 100644 (file)
index 63f06c3..0000000
Binary files a/src/com/itmill/toolkit/demo/features/gridlayout.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/icon_demo.png b/src/com/itmill/toolkit/demo/features/icon_demo.png
new file mode 100644 (file)
index 0000000..6a5c295
Binary files /dev/null and b/src/com/itmill/toolkit/demo/features/icon_demo.png differ
diff --git a/src/com/itmill/toolkit/demo/features/icon_intro.png b/src/com/itmill/toolkit/demo/features/icon_intro.png
new file mode 100644 (file)
index 0000000..0327129
Binary files /dev/null and b/src/com/itmill/toolkit/demo/features/icon_intro.png differ
diff --git a/src/com/itmill/toolkit/demo/features/items.jpg b/src/com/itmill/toolkit/demo/features/items.jpg
deleted file mode 100644 (file)
index fb5a38d..0000000
Binary files a/src/com/itmill/toolkit/demo/features/items.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/label.jpg b/src/com/itmill/toolkit/demo/features/label.jpg
deleted file mode 100644 (file)
index 402dc4d..0000000
Binary files a/src/com/itmill/toolkit/demo/features/label.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/link.jpg b/src/com/itmill/toolkit/demo/features/link.jpg
deleted file mode 100644 (file)
index 6aaa06e..0000000
Binary files a/src/com/itmill/toolkit/demo/features/link.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/orderedlayout.jpg b/src/com/itmill/toolkit/demo/features/orderedlayout.jpg
deleted file mode 100644 (file)
index 1724c7c..0000000
Binary files a/src/com/itmill/toolkit/demo/features/orderedlayout.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/panel.jpg b/src/com/itmill/toolkit/demo/features/panel.jpg
deleted file mode 100644 (file)
index dd06508..0000000
Binary files a/src/com/itmill/toolkit/demo/features/panel.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/parameters.jpg b/src/com/itmill/toolkit/demo/features/parameters.jpg
deleted file mode 100644 (file)
index f4e5fd5..0000000
Binary files a/src/com/itmill/toolkit/demo/features/parameters.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/select.jpg b/src/com/itmill/toolkit/demo/features/select.jpg
deleted file mode 100644 (file)
index 1ce629f..0000000
Binary files a/src/com/itmill/toolkit/demo/features/select.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/serverevents.jpg b/src/com/itmill/toolkit/demo/features/serverevents.jpg
deleted file mode 100644 (file)
index 36d88a8..0000000
Binary files a/src/com/itmill/toolkit/demo/features/serverevents.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/table.jpg b/src/com/itmill/toolkit/demo/features/table.jpg
deleted file mode 100644 (file)
index fe0f30d..0000000
Binary files a/src/com/itmill/toolkit/demo/features/table.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/tabsheet.jpg b/src/com/itmill/toolkit/demo/features/tabsheet.jpg
deleted file mode 100644 (file)
index 402b2a4..0000000
Binary files a/src/com/itmill/toolkit/demo/features/tabsheet.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/textfield.gif b/src/com/itmill/toolkit/demo/features/textfield.gif
deleted file mode 100644 (file)
index 58b6e57..0000000
Binary files a/src/com/itmill/toolkit/demo/features/textfield.gif and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/tree.jpg b/src/com/itmill/toolkit/demo/features/tree.jpg
deleted file mode 100644 (file)
index d563b90..0000000
Binary files a/src/com/itmill/toolkit/demo/features/tree.jpg and /dev/null differ
diff --git a/src/com/itmill/toolkit/demo/features/window.jpg b/src/com/itmill/toolkit/demo/features/window.jpg
deleted file mode 100644 (file)
index c297341..0000000
Binary files a/src/com/itmill/toolkit/demo/features/window.jpg and /dev/null differ