From: Teppo Kurki Date: Tue, 13 Jan 2009 11:10:40 +0000 (+0000) Subject: Wrote the remaining Window examples. Added getName() for previous examples in order... X-Git-Tag: 6.7.0.beta1~3351 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5c3afe65849de5b2ea4ba71e0fa87149fa12970c;p=vaadin-framework.git Wrote the remaining Window examples. Added getName() for previous examples in order to display more reasonable names. svn changeset:6513/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java index ce2990a317..a16ed83a66 100644 --- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java +++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java @@ -40,6 +40,10 @@ import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetDisabled; import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetIcons; import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetScrolling; import com.itmill.toolkit.demo.sampler.features.windows.WindowChild; +import com.itmill.toolkit.demo.sampler.features.windows.WindowChildAutosize; +import com.itmill.toolkit.demo.sampler.features.windows.WindowChildModal; +import com.itmill.toolkit.demo.sampler.features.windows.WindowChildPositionSize; +import com.itmill.toolkit.demo.sampler.features.windows.WindowChildScrollable; import com.itmill.toolkit.demo.sampler.features.windows.WindowNativeNew; import com.itmill.toolkit.demo.sampler.features.windows.WindowNativeShared; @@ -210,6 +214,10 @@ public class FeatureSet extends Feature { new WindowNativeShared(), // new WindowNativeNew(), // new WindowChild(), // + new WindowChildAutosize(), // + new WindowChildModal(), // + new WindowChildPositionSize(), // + new WindowChildScrollable(), // }); } } diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java index 5e7d22c719..66e9d88ec7 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java +++ b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.Accordion; public class AccordionDisabled extends Feature { + @Override + public String getName() { + return "Accordion - Disabling tabs"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java index 9503378875..06bcd27e09 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java +++ b/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.Accordion; public class AccordionIcons extends Feature { + @Override + public String getName() { + return "Accordion with icons"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java index 605cdadfc9..67988bcf3f 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java +++ b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.Panel; public class PanelBasic extends Feature { + @Override + public String getName() { + return "Panel with caption"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java index 6cc3db4ec1..6ce8d4e968 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java +++ b/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.Panel; public class PanelLight extends Feature { + @Override + public String getName() { + return "Panel - Light style"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java index f91f9c2a13..e6762f3f5b 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ComboBox; public class ComboBoxContains extends Feature { + @Override + public String getName() { + return "Combobox - Contains"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java index 7d8b60b883..6579b094ba 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ComboBox; public class ComboBoxNewItems extends Feature { + @Override + public String getName() { + return "Combobox - Add items"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java index 8f993b3595..6dceeea68a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ComboBox; public class ComboBoxPlain extends Feature { + @Override + public String getName() { + return "Combobox"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java index d90e549262..a971097b98 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ComboBox; public class ComboBoxStartsWith extends Feature { + @Override + public String getName() { + return "Combobox - Starts with"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java index 372fcfc119..8c5c069918 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ListSelect; public class ListSelectMultiple extends Feature { + @Override + public String getName() { + return "Listselect - Multi"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java index ba149e2549..78ae9aee1d 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.ListSelect; public class ListSelectSingle extends Feature { + @Override + public String getName() { + return "Listselect - Single"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java index b6b54ef2d1..08b9ef49b0 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.NativeSelect; public class NativeSelection extends Feature { + @Override + public String getName() { + return "Native select"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java index d91ebb297c..98a8a89f04 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java +++ b/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.TwinColSelect; public class TwinColumnSelect extends Feature { + @Override + public String getName() { + return "Twin column select"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java index bf1026193c..ffa5898c26 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java +++ b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.TabSheet; public class TabSheetDisabled extends Feature { + @Override + public String getName() { + return "Tabsheet - Disabling tabs"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java index 03c7f60db7..5713fdcc23 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java +++ b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.TabSheet; public class TabSheetIcons extends Feature { + @Override + public String getName() { + return "Tabsheet with icons"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java index 1d3bf93a2c..8155727bbc 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java +++ b/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java @@ -6,6 +6,10 @@ import com.itmill.toolkit.demo.sampler.NamedExternalResource; import com.itmill.toolkit.ui.TabSheet; public class TabSheetScrolling extends Feature { + @Override + public String getName() { + return "Tabsheet - Scrolling tabs"; + } @Override public String getDescription() { diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.java index 7ec9d0f85b..83e07a6fca 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.java +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.java @@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window; public class WindowChild extends Feature { + @Override + public String getName() { + return "Child window"; + } + @Override public String getDescription() { return "Creates and opens a new floating child window with its own state." @@ -21,7 +26,9 @@ public class WindowChild extends Feature { @Override public Class[] getRelatedFeatures() { - return new Class[] { WindowNativeShared.class, WindowNativeNew.class }; + return new Class[] { WindowNativeShared.class, WindowNativeNew.class, + WindowChildAutosize.class, WindowChildModal.class, + WindowChildPositionSize.class, WindowChildScrollable.class }; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.png new file mode 100644 index 0000000000..6f64bace3b Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChild.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.java new file mode 100644 index 0000000000..9780713241 --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.java @@ -0,0 +1,47 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.Component; +import com.itmill.toolkit.ui.Window; + +public class WindowChildAutosize extends Feature { + + @Override + public String getName() { + return "Window autosizing"; + } + + @Override + public String getDescription() { + return "Creates and opens a new floating child window with its own state." + + "
The size of this child window will be adjusted automatically" + + " to fit the content (in this example, the caption). This is default" + + " behavior for a child window."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(Window.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { WindowNativeShared.class, WindowNativeNew.class, + WindowChild.class, WindowChildModal.class, + WindowChildPositionSize.class, WindowChildScrollable.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Component getExample() { + return new WindowChildExample(); + } + +} diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.png new file mode 100644 index 0000000000..bc7217ab60 Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildAutosize.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.java new file mode 100644 index 0000000000..5d47c1fe88 --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.java @@ -0,0 +1,40 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.Window; + +public class WindowChildModal extends Feature { + + @Override + public String getName() { + return "Window modality"; + } + + @Override + public String getDescription() { + return "Creates and opens a new modal child window with its own state." + + "
Child window modality means that you cannot access the" + + " underlying window(s) while the modal window is displayed."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(Window.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { WindowNativeShared.class, WindowNativeNew.class, + WindowChild.class, WindowChildAutosize.class, + WindowChildPositionSize.class, WindowChildScrollable.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.png new file mode 100644 index 0000000000..83c91547db Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModal.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModalExample.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModalExample.java new file mode 100644 index 0000000000..4e0dc89ba5 --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildModalExample.java @@ -0,0 +1,43 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.Label; +import com.itmill.toolkit.ui.VerticalLayout; +import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Window.CloseEvent; + +public class WindowChildModalExample extends VerticalLayout implements + Window.CloseListener { + + private Button b; + + public WindowChildModalExample() { + setSpacing(true); + + b = new Button("Create and open a new modal child window", this, + "openButtonClick"); + addComponent(b); + } + + public void openButtonClick(ClickEvent event) { + Window w = new Window("Modal child window"); + Label desc = new Label( + "This is a modal child window with its own state." + + " You cannot access the main window while the modal child" + + " window is shown."); + w.addComponent(desc); + w.addListener(this); + w.setResizable(false); + w.setModal(true); + getApplication().getMainWindow().addWindow(w); + } + + public void windowClose(CloseEvent e) { + // In this example, the window will be removed after closing + getApplication().getMainWindow().removeWindow(e.getWindow()); + System.err + .println("Sampler->WindowChildModalExample: Window close event"); + } + +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.java new file mode 100644 index 0000000000..05851c5752 --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.java @@ -0,0 +1,40 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.Window; + +public class WindowChildPositionSize extends Feature { + + @Override + public String getName() { + return "Window position and size"; + } + + @Override + public String getDescription() { + return "Creates and opens a new floating child window with specified" + + " size and position attributes. This child window is also" + + " set to allow resizing."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(Window.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { WindowNativeShared.class, WindowNativeNew.class, + WindowChild.class, WindowChildAutosize.class, + WindowChildModal.class, WindowChildScrollable.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.png new file mode 100644 index 0000000000..1ff040c9eb Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSize.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSizeExample.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSizeExample.java new file mode 100644 index 0000000000..6b4e196f95 --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildPositionSizeExample.java @@ -0,0 +1,65 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.Label; +import com.itmill.toolkit.ui.VerticalLayout; +import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Window.CloseEvent; + +public class WindowChildPositionSizeExample extends VerticalLayout implements + Window.CloseListener { + + private Button b1; + private Button b2; + private Label l; + + public WindowChildPositionSizeExample() { + setSpacing(true); + + b1 = new Button("Create and open a new child window", this, + "openButtonClick"); + addComponent(b1); + + l = new Label("Amount of child windows attached to the main window: x"); + addComponent(l); + + b2 = new Button("Refresh", this, "refreshButtonClick"); + addComponent(b2); + } + + public void openButtonClick(ClickEvent event) { + Window w = new Window("New child window"); + Label desc = new Label("This is a new child window with a preset" + + " width, height and position. Resizing has also been" + + " enabled for this window."); + w.addComponent(desc); + w.addListener(this); + + // Set window position + w.setPositionX(300); + w.setPositionY(300); + + // Set window size + w.setWidth(300, UNITS_PIXELS); + w.setHeight(300, UNITS_PIXELS); + + // Enable resizing + w.setResizable(true); + + getApplication().getMainWindow().addWindow(w); + } + + public void refreshButtonClick(ClickEvent event) { + l.setValue("Amount of child windows attached to the main window: " + + getApplication().getMainWindow().getChildWindows().size()); + } + + public void windowClose(CloseEvent e) { + // In this example, the window will be removed after closing + getApplication().getMainWindow().removeWindow(e.getWindow()); + System.err + .println("Sampler->WindowChildPositionSizeExample: Window close event"); + } + +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.java new file mode 100644 index 0000000000..df16dbb24a --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.java @@ -0,0 +1,41 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.demo.sampler.APIResource; +import com.itmill.toolkit.demo.sampler.Feature; +import com.itmill.toolkit.demo.sampler.NamedExternalResource; +import com.itmill.toolkit.ui.Window; + +public class WindowChildScrollable extends Feature { + + @Override + public String getName() { + return "Window - Scrollable"; + } + + @Override + public String getDescription() { + return "Creates and opens a new floating child window with specified" + + " size and position attributes. The content for this window" + + " is too big to fit in the specified size. Therefore you can" + + " use the scrollbars to view different part of the content."; + } + + @Override + public APIResource[] getRelatedAPI() { + return new APIResource[] { new APIResource(Window.class) }; + } + + @Override + public Class[] getRelatedFeatures() { + return new Class[] { WindowNativeShared.class, WindowNativeNew.class, + WindowChild.class, WindowChildAutosize.class, + WindowChildModal.class, WindowChildPositionSize.class }; + } + + @Override + public NamedExternalResource[] getRelatedResources() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.png new file mode 100644 index 0000000000..9c6ac438fc Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollable.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollableExample.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollableExample.java new file mode 100644 index 0000000000..94e9829f8e --- /dev/null +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowChildScrollableExample.java @@ -0,0 +1,68 @@ +package com.itmill.toolkit.demo.sampler.features.windows; + +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.Label; +import com.itmill.toolkit.ui.VerticalLayout; +import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Window.CloseEvent; + +public class WindowChildScrollableExample extends VerticalLayout implements + Window.CloseListener { + + private Button b1; + private Button b2; + private Label l; + + public WindowChildScrollableExample() { + setSpacing(true); + + b1 = new Button("Create and open a scrollable child window", this, + "openButtonClick"); + addComponent(b1); + + l = new Label("Amount of child windows attached to the main window: x"); + addComponent(l); + + b2 = new Button("Refresh", this, "refreshButtonClick"); + addComponent(b2); + } + + public void openButtonClick(ClickEvent event) { + Window w = new Window("Scroll"); + Label desc = new Label( + "This is a new child window with a preset" + + " width, height and position. Resizing has been" + + " disabled for this window. Additionally, this text label" + + " is intentionally too large to fit the window. You can" + + " use the scrollbars to view different parts of the window content."); + w.addComponent(desc); + w.addListener(this); + + // Set window position + w.setPositionX(300); + w.setPositionY(300); + + // Set window size + w.setWidth(170, UNITS_PIXELS); + w.setHeight(100, UNITS_PIXELS); + + // Disable resizing + w.setResizable(false); + + getApplication().getMainWindow().addWindow(w); + } + + public void refreshButtonClick(ClickEvent event) { + l.setValue("Amount of child windows attached to the main window: " + + getApplication().getMainWindow().getChildWindows().size()); + } + + public void windowClose(CloseEvent e) { + // In this example, the window will be removed after closing + getApplication().getMainWindow().removeWindow(e.getWindow()); + System.err + .println("Sampler->WindowChildScrollableExample: Window close event"); + } + +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.java index d4bf5e7f06..a254e4783a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.java +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.java @@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window; public class WindowNativeNew extends Feature { + @Override + public String getName() { + return "Native window - Unique"; + } + @Override public String getDescription() { return "Creates and opens a new native browser window with its own state." @@ -27,7 +32,9 @@ public class WindowNativeNew extends Feature { @Override public Class[] getRelatedFeatures() { - return new Class[] { WindowNativeShared.class, WindowChild.class }; + return new Class[] { WindowNativeShared.class, WindowChild.class, + WindowChildAutosize.class, WindowChildModal.class, + WindowChildPositionSize.class, WindowChildScrollable.class }; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.png new file mode 100644 index 0000000000..e215772660 Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeNew.png differ diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.java b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.java index 33b0baa6b1..62229d4ee9 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.java +++ b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.java @@ -7,6 +7,11 @@ import com.itmill.toolkit.ui.Window; public class WindowNativeShared extends Feature { + @Override + public String getName() { + return "Native window - Shared"; + } + @Override public String getDescription() { return "Creates and opens a new native browser window with shared state. If the" @@ -29,7 +34,9 @@ public class WindowNativeShared extends Feature { @Override public Class[] getRelatedFeatures() { - return new Class[] { WindowNativeNew.class, WindowChild.class }; + return new Class[] { WindowNativeNew.class, WindowChild.class, + WindowChildAutosize.class, WindowChildModal.class, + WindowChildPositionSize.class, WindowChildScrollable.class }; } @Override diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.png b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.png new file mode 100644 index 0000000000..12381496b4 Binary files /dev/null and b/src/com/itmill/toolkit/demo/sampler/features/windows/WindowNativeShared.png differ