From: Jouni Koivuviita Date: Tue, 4 May 2010 13:21:27 +0000 (+0000) Subject: New Runo theme demo application and Runo theme style constants. X-Git-Tag: 6.7.0.beta1~1693 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee0fea3874651c2d375120b1cd546797bedc1146;p=vaadin-framework.git New Runo theme demo application and Runo theme style constants. svn changeset:13026/svn branch:6.4 --- diff --git a/WebContent/VAADIN/themes/demo/book-covers/comics.png b/WebContent/VAADIN/themes/demo/book-covers/comics.png new file mode 100644 index 0000000000..98bfb368d9 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/comics.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png new file mode 100644 index 0000000000..7c8f97183d Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png new file mode 100644 index 0000000000..471f6711d9 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png new file mode 100644 index 0000000000..48cddc5789 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-mind.png b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png new file mode 100644 index 0000000000..d23fe11b47 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-type.png b/WebContent/VAADIN/themes/demo/book-covers/new-type.png new file mode 100644 index 0000000000..9ad7ffa07b Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/new-type.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png new file mode 100644 index 0000000000..9468f7e80f Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/simplicity.png b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png new file mode 100644 index 0000000000..cdfb79aa42 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/tcss.png b/WebContent/VAADIN/themes/demo/book-covers/tcss.png new file mode 100644 index 0000000000..d40cf1bb00 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/tcss.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/upod.png b/WebContent/VAADIN/themes/demo/book-covers/upod.png new file mode 100644 index 0000000000..5da43f2525 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/upod.png differ diff --git a/WebContent/VAADIN/themes/demo/book-covers/wfd.png b/WebContent/VAADIN/themes/demo/book-covers/wfd.png new file mode 100644 index 0000000000..3bcc62cb39 Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/wfd.png differ diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index dfdedf5dce..6b6b681525 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -24,32 +24,32 @@ resourceCacheTime 3600 - + VaadinApplicationRunner com.vaadin.terminal.gwt.server.ApplicationRunnerServlet defaultPackages com.vaadin.tests,com.vaadin.demo,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd - - - - RobustnessSimple - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.tests.robustness.RobustnessSimple - - - - - - DemoTestBench - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.testbench.TestBench - + + + + RobustnessSimple + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.tests.robustness.RobustnessSimple + + + + + + DemoTestBench + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.demo.testbench.TestBench + TestForNativeWindowing @@ -165,6 +165,15 @@ + + RunoTheme + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.demo.themes.RunoTheme + + + FeaturesApplication com.vaadin.terminal.gwt.server.ApplicationServlet @@ -255,44 +264,44 @@ - - ColorPickerApplication - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.colorpicker.ColorPickerApplication - + + ColorPickerApplication + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.demo.colorpicker.ColorPickerApplication + widgetset com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet - - BookTestServlet - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.tests.book.BookTestApplication - - - - - WindowTestServlet - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.tests.book.WindowTestApplication - - - - - ChatServlet - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.tests.book.ChatApplication - + + BookTestServlet + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.tests.book.BookTestApplication + + + + + WindowTestServlet + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.tests.book.WindowTestApplication + + + + + ChatServlet + com.vaadin.terminal.gwt.server.ApplicationServlet + + application + com.vaadin.tests.book.ChatApplication + @@ -302,16 +311,16 @@ application com.vaadin.tests.appengine.GAESyncTest - - - - VaadinApplicationRunner - /run/* + + + + VaadinApplicationRunner + /run/* - - DemoTestBench - /DemoTestBench/* + + DemoTestBench + /DemoTestBench/* TestForNativeWindowing @@ -319,11 +328,11 @@ - - RobustnessSimple - /RobustnessSimple/* - - + + RobustnessSimple + /RobustnessSimple/* + + TestSplitPanel /TestSplitPanel/* @@ -337,12 +346,12 @@ TestBench /TestBench/* - + TestBench /t/* - - + + CustomLayoutDemo /CustomLayoutDemo/* @@ -412,23 +421,23 @@ - - ColorPickerApplication - /colorpicker/* + + ColorPickerApplication + /colorpicker/* - - BookTestServlet - /book/* + + BookTestServlet + /book/* - - WindowTestServlet - /windowtest/* - - - - ChatServlet - /chat/* - + + WindowTestServlet + /windowtest/* + + + + ChatServlet + /chat/* + @@ -439,8 +448,8 @@ GAESyncTest /gaesynctest/* - - + + AddressBook /AddressBook/* @@ -450,6 +459,11 @@ ReindeerThemeStyles /ReindeerTheme/* + + + RunoTheme + /RunoTheme/* + index.jsp diff --git a/WebContent/index.html b/WebContent/index.html index f1fd714e75..68589abe17 100644 --- a/WebContent/index.html +++ b/WebContent/index.html @@ -150,11 +150,10 @@
- + RunoClean and easy to extend - (mockup only, demo coming soon)
diff --git a/src/com/vaadin/ui/themes/Reindeer.java b/src/com/vaadin/ui/themes/Reindeer.java index 33a91069a3..2febbb9305 100644 --- a/src/com/vaadin/ui/themes/Reindeer.java +++ b/src/com/vaadin/ui/themes/Reindeer.java @@ -48,9 +48,9 @@ public class Reindeer extends BaseTheme { **************************************************************************/ /** - * Default action style for buttons (the button that gets activated when - * user presses 'enter' in a form). Use sparingly, only one default button - * per screen should be visible. + * Default action style for buttons (the button that should get activated + * when the user presses 'enter' in a form). Use sparingly, only one default + * button per view should be visible. */ public static final String BUTTON_DEFAULT = "primary"; diff --git a/src/com/vaadin/ui/themes/Runo.java b/src/com/vaadin/ui/themes/Runo.java index 29cc7089a6..88011addc4 100644 --- a/src/com/vaadin/ui/themes/Runo.java +++ b/src/com/vaadin/ui/themes/Runo.java @@ -7,6 +7,10 @@ public class Runo extends BaseTheme { public static final String THEME_NAME = "Runo"; + public static String themeName() { + return THEME_NAME.toLowerCase(); + } + /*************************************************************************** * * Button styles @@ -18,6 +22,18 @@ public class Runo extends BaseTheme { */ public static final String BUTTON_SMALL = "small"; + /** + * Big sized button, use to gather much attention for some particular action + */ + public static final String BUTTON_BIG = "big"; + + /** + * Default action style for buttons (the button that should get activated + * when the user presses 'enter' in a form). Use sparingly, only one default + * button per view should be visible. + */ + public static final String BUTTON_DEFAULT = "default"; + /*************************************************************************** * * Panel styles @@ -40,4 +56,128 @@ public class Runo extends BaseTheme { */ public static final String TABSHEET_SMALL = "light"; + /*************************************************************************** + * + * SplitPanel styles + * + **************************************************************************/ + + /** + * Reduces the width/height of the split handle. Useful when you don't want + * the split handle to touch the sides of the containing layout. + */ + public static final String SPLITPANEL_REDUCED = "rounded"; + + /** + * Reduces the visual size of the split handle to one pixel (the active drag + * size is still larger). + */ + public static final String SPLITPANEL_SMALL = "small"; + + /*************************************************************************** + * + * Label styles + * + **************************************************************************/ + + /** + * Largest title/header size. Use for main sections in your application. + */ + public static final String LABEL_H1 = "h1"; + + /** + * Similar style as in panel captions. Useful for sub-sections within a + * view. + */ + public static final String LABEL_H2 = "h2"; + + /** + * Small font size. Useful for contextual help texts and similar less + * frequently needed information. Use with modesty, since this style will be + * more harder to read due to its smaller size and contrast. + */ + public static final String LABEL_SMALL = "small"; + + /*************************************************************************** + * + * Layout styles + * + **************************************************************************/ + + /** + * An alternative background color for layouts. Use on top of white + * background (e.g. inside Panels, TabSheets and sub-windows). + */ + public static final String LAYOUT_DARKER = "darker"; + + /** + * Add a drop shadow around the layout and its contained components. + * Produces a rectangular shadow, even if the contained component would have + * a different shape. + *

+ * Note: does not work in Internet Explorer 6 + */ + public static final String CSSLAYOUT_SHADOW = "box-shadow"; + + /** + * Adds necessary styles to the layout to make it look selectable (i.e. + * clickable). Add a click listener for the layout, and toggle the + * {@link #CSSLAYOUT_SELECTABLE_SELECTED} style for the same layout to make + * it look selected or not. + */ + public static final String CSSLAYOUT_SELECTABLE = "selectable"; + public static final String CSSLAYOUT_SELECTABLE_SELECTED = "selectable-selected"; + + /*************************************************************************** + * + * TextField styles + * + **************************************************************************/ + + /** + * Small sized text field with small font + */ + public static final String TEXTFIELD_SMALL = "small"; + + /*************************************************************************** + * + * Table styles + * + **************************************************************************/ + + /** + * Smaller header and item fonts. + */ + public static final String TABLE_SMALL = "small"; + + /** + * Removes the border and background color from the table. Removes + * alternating row background colors as well. + */ + public static final String TABLE_BORDERLESS = "borderless"; + + /*************************************************************************** + * + * Accordion styles + * + **************************************************************************/ + + /** + * A detached looking accordion, providing space around its captions and + * content. Doesn't necessarily need a Panel or other container to wrap it + * in order to make it look right. + */ + public static final String ACCORDION_LIGHT = "light"; + + /*************************************************************************** + * + * Window styles + * + **************************************************************************/ + + /** + * Smaller header and a darker background color for the window. Useful for + * smaller dialog-like windows. + */ + public static final String WINDOW_DIALOG = "dialog"; }