From e3dced609622895440368bbd6f75ab6e6ecf7e6f Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Fri, 10 Aug 2007 07:20:04 +0000 Subject: [PATCH] window implementation svn changeset:1981/svn branch:trunk --- .../gwt/client/ApplicationConnection.java | 20 +++++++++++------ .../gwt/client/DefaultWidgetFactory.java | 3 ++- .../public/component-themes/collection.css | 3 ++- .../component-themes/window/css/window.css | 22 +++++++++++++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index 088f63f070..535605532a 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -22,6 +22,7 @@ import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ui.IContextMenu; +import com.itmill.toolkit.terminal.gwt.client.ui.IView; /** * Entry point classes define onModuleLoad(). @@ -153,14 +154,19 @@ public class ApplicationConnection implements EntryPoint, FocusListener { + uidl.getTag() + ", but there is no such paintable (" + uidl.getId() + ") registered yet."); - Widget window = widgetFactory.createWidget(uidl); - registerPaintable(uidl.getId(), (Paintable) window); - ((Paintable) window).updateFromUIDL(uidl, this); - - // TODO We should also handle other windows - RootPanel.get("itmtk-ajax-window").add(window); + if(uidl.getId().equals("PID0")) { + // view + IView view = new IView(); + view.updateFromUIDL(uidl, this); + // TODO remove hardcoded id name + RootPanel.get("itmtk-ajax-window").add(view); + } else { + Widget window = widgetFactory.createWidget(uidl); + registerPaintable(uidl.getId(), (Paintable) window); + RootPanel.get().add(window); + ((Paintable) window).updateFromUIDL(uidl, this); + } } - } catch (Throwable e) { e.printStackTrace(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java index a40b6985a2..f5d7a923df 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java @@ -28,6 +28,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.ITwinColSelect; import com.itmill.toolkit.terminal.gwt.client.ui.IUnknownComponent; import com.itmill.toolkit.terminal.gwt.client.ui.IOrderedLayout; import com.itmill.toolkit.terminal.gwt.client.ui.IView; +import com.itmill.toolkit.terminal.gwt.client.ui.IWindow; public class DefaultWidgetFactory implements WidgetFactory { @@ -41,7 +42,7 @@ public class DefaultWidgetFactory implements WidgetFactory { return new IButton(); } else if ("window".equals(tag)) - return new IView(); + return new IWindow(); else if ("orderedlayout".equals(tag)) { if ("horizontal".equals(uidl.getStringAttribute("orientation"))) return new IOrderedLayout(IOrderedLayout.ORIENTATION_HORIZONTAL); diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css index 04bf7396d2..ee80367724 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css @@ -5,4 +5,5 @@ @import "tabsheet/css/tabsheet.css"; @import "datefield/css/datefield.css"; @import "table/css/table.css"; -@import "slider/css/slider.css"; \ No newline at end of file +@import "slider/css/slider.css"; +@import "window/css/window.css"; diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css new file mode 100644 index 0000000000..dd5b8bcf14 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css @@ -0,0 +1,22 @@ +.i-window { + border: 1px solid #999; +} +.i-window-header { + background: yellow; + height:20px; +} + +.i-window-footer { + background: #0f0; + height:10px; +} + +.i-window-resizeBox { + position:absolute; + bottom:0; + right:0; + background: black; + width: 10px; + height: 10px; + float:right; +} -- 2.39.5