diff options
Diffstat (limited to 'src')
121 files changed, 174 insertions, 64 deletions
diff --git a/src/com/itmill/toolkit/demo/features/PropertyPanel.java b/src/com/itmill/toolkit/demo/features/PropertyPanel.java index 3c402ec468..899c3608bf 100644 --- a/src/com/itmill/toolkit/demo/features/PropertyPanel.java +++ b/src/com/itmill/toolkit/demo/features/PropertyPanel.java @@ -71,6 +71,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener, // Layout setCaption("Properties"); addComponent(formsLayout); + addStyleName(Panel.STYLE_NO_PADDING); setWidth(100); setWidthUnits(Table.UNITS_PERCENTAGE); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index 5e4adc64e3..cea4565cef 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -51,7 +51,7 @@ public class ApplicationConnection implements FocusListener { appUri = getAppUri(); if (isDebugMode()) { - console = new DebugConsole(); + console = new DebugConsole(this); } else { console = new NullConsole(); } @@ -427,9 +427,12 @@ public class ApplicationConnection implements FocusListener { return true; component.setStyleName(component.getStylePrimaryName()); - // add additional styles as css classes + // add additional styles as css classes, prefixed with component default + // stylename if (uidl.hasAttribute("style")) { - component.addStyleName(uidl.getStringAttribute("style")); + String[] styles = uidl.getStringAttribute("style").split(" "); + for (int i = 0; i < styles.length; i++) + component.addStyleDependentName(styles[i]); } return false; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java b/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java index 14502239ea..8f6a1c822d 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java @@ -13,8 +13,9 @@ public final class DebugConsole extends IWindow implements Console { private Panel panel; - public DebugConsole() { + public DebugConsole(ApplicationConnection client) { super(); + this.client = client; panel = new FlowPanel(); ScrollPanel p = new ScrollPanel(); p.add(panel); @@ -27,8 +28,10 @@ public final class DebugConsole extends IWindow implements Console { private void minimize() { // TODO stack to bottom (create window manager of some sort) setPixelSize(60, 60); - setPopupPosition(Window.getClientWidth() - 80, - Window.getClientHeight() - 80); + setPopupPosition(Window.getClientWidth() + - (60 + IWindow.BORDER_WIDTH_HORIZONTAL), Window + .getClientHeight() + - (80 + IWindow.BORDER_WIDTH_VERTICAL)); } /* diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Util.java b/src/com/itmill/toolkit/terminal/gwt/client/Util.java index 4e36273b10..f0c7883ad2 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/Util.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/Util.java @@ -66,7 +66,7 @@ public class Util { * * @param container */ - public static void runAnchestorsLayout(HasWidgets container) { + public static void runAncestorsLayout(HasWidgets container) { Iterator childWidgets = container.iterator(); while (childWidgets.hasNext()) { Widget child = (Widget) childWidgets.next(); @@ -74,7 +74,7 @@ public class Util { ((ContainerResizedListener) child).iLayout(); } else if (child instanceof HasWidgets) { HasWidgets childContainer = (HasWidgets) child; - runAnchestorsLayout(childContainer); + runAncestorsLayout(childContainer); } } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java index eec9e2b344..5c077d090a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java @@ -346,7 +346,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable, public void iLayout() { if (!iLayoutJS(DOM.getFirstChild(getElement()))) { - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } } @@ -356,7 +356,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable, * containers in custom layout he/she can notify children after resize. */ public void notifyChildrenOfSizeChange() { - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } public void onDetach() { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java index 5db1035073..2854e1635e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java @@ -160,7 +160,7 @@ public class IExpandLayout extends IOrderedLayout implements DOM.removeChild(childContainer, meter); // TODO save previous size and only propagate if really changed - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java index a836d4a95f..8234cd5906 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -32,6 +32,11 @@ public class IPanel extends SimplePanel implements Paintable, DOM.appendChild(getElement(), captionNode); DOM.appendChild(getElement(), contentNode); DOM.appendChild(getElement(), bottomDecoration); + setStyleName(CLASSNAME); + DOM.setElementProperty(captionNode, "className", CLASSNAME + "-caption"); + DOM.setElementProperty(contentNode, "className", CLASSNAME + "-content"); + DOM.setElementProperty(bottomDecoration, "className", CLASSNAME + + "-deco"); } protected Element getContainerElement() { @@ -59,28 +64,33 @@ public class IPanel extends SimplePanel implements Paintable, if (getWidget() != null) { clear(); } - - // Add proper style name for root element - // TODO refactor to support additional styles set from server-side - String className = CLASSNAME; - if (uidl.hasAttribute("style")) - className += "-" + uidl.getStringAttribute("style"); - setStyleName(className); - DOM.setElementProperty(contentNode, "className", className + "-content"); - DOM.setElementProperty(bottomDecoration, "className", className - + "-deco"); - // Handle caption displaying + boolean hasCaption = false; if (uidl.hasAttribute("caption") && !uidl.getStringAttribute("caption").equals("")) { DOM.setInnerText(captionNode, uidl.getStringAttribute("caption")); - DOM.setElementProperty(captionNode, "className", className - + "-caption"); - } else { - // Theme needs this to work around different styling - DOM.setElementProperty(captionNode, "className", className - + "-nocaption"); + hasCaption = true; + } else DOM.setInnerText(captionNode, ""); + + // Add proper stylenames for all elements + if (uidl.hasAttribute("style")) { + String[] styles = uidl.getStringAttribute("style").split(" "); + String captionBaseClass = CLASSNAME + + (hasCaption ? "-caption" : "-nocaption"); + String contentBaseClass = CLASSNAME + "-content"; + String decoBaseClass = CLASSNAME + "-deco"; + String captionClass = captionBaseClass; + String contentClass = contentBaseClass; + String decoClass = decoBaseClass; + for (int i = 0; i < styles.length; i++) { + captionClass += " " + captionBaseClass + "-" + styles[i]; + contentClass += " " + contentBaseClass + "-" + styles[i]; + decoClass += " " + decoBaseClass + "-" + styles[i]; + } + DOM.setElementProperty(captionNode, "className", captionClass); + DOM.setElementProperty(contentNode, "className", contentClass); + DOM.setElementProperty(bottomDecoration, "className", decoClass); } // Height adjustment @@ -128,7 +138,7 @@ public class IPanel extends SimplePanel implements Paintable, } else { DOM.setStyleAttribute(contentNode, "overflow", "hidden"); } - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java index d22c2515f7..bc077c98fb 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java @@ -211,7 +211,7 @@ public class ISplitPanel extends ComplexPanel implements Paintable, break; } - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } private void setFirstWidget(Widget w) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java index 3deeb88999..43fee197a1 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java @@ -78,6 +78,25 @@ public class ITabsheet extends FlowPanel implements Paintable, if (client.updateComponent(this, uidl, false)) return; + + // Add proper stylenames for all elements + if (uidl.hasAttribute("style")) { + String[] styles = uidl.getStringAttribute("style").split(" "); + String tabsBaseClass = CLASSNAME + "-tabs"; + String contentBaseClass = CLASSNAME + "-content"; + String decoBaseClass = CLASSNAME + "-deco"; + String tabsClass = tabsBaseClass; + String contentClass = contentBaseClass; + String decoClass = decoBaseClass; + for (int i = 0; i < styles.length; i++) { + tabsClass += " " + tabsBaseClass + "-" + styles[i]; + contentClass += " " + contentBaseClass + "-" + styles[i]; + decoClass += " " + decoBaseClass + "-" + styles[i]; + } + tp.setStyleName(contentClass); + tb.setStyleName(tabsClass); + DOM.setElementProperty(deco, "className", decoClass); + } // Adjust width and height String h = uidl.hasAttribute("height") ? uidl @@ -86,7 +105,7 @@ public class ITabsheet extends FlowPanel implements Paintable, .getStringAttribute("width") : null; setWidth(w != null ? w : "auto"); - // Try to calculate the height as close as possible + // Height calculations if (h != null) { setHeight(h); } else { @@ -96,6 +115,7 @@ public class ITabsheet extends FlowPanel implements Paintable, DOM.setStyleAttribute(tp.getElement(), "overflow", "hidden"); } + // Render content UIDL tabs = uidl.getChildUIDL(0); boolean keepCurrentTabs = tabKeys.size() == tabs.getNumberOfChildren(); for (int i = 0; keepCurrentTabs && i < tabKeys.size(); i++) @@ -183,6 +203,6 @@ public class ITabsheet extends FlowPanel implements Paintable, tp.setHeight(neededHeight - pixelHeight + "px"); DOM.setStyleAttribute(tp.getElement(), "overflow", ""); } - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java index 2e9767f022..3217d6f2d4 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java @@ -130,7 +130,7 @@ public class IView extends SimplePanel implements Paintable, } public void onWindowResized(int width, int height) { - Util.runAnchestorsLayout(this); + Util.runAncestorsLayout(this); } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java index 5de66ebf45..435d9e9a4d 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java @@ -71,7 +71,7 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener { private Element closeBox; - private ApplicationConnection client; + protected ApplicationConnection client; private String id; @@ -169,8 +169,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener { public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { this.id = uidl.getId(); this.client = client; - - if(client.updateComponent(this, uidl, false)) + + if (client.updateComponent(this, uidl, false)) return; if (uidl.hasAttribute("invisible")) { @@ -253,7 +253,7 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener { } public void setCaption(String c) { - DOM.setInnerHTML(header, c); + DOM.setInnerText(header, c); } protected Element getContainerElement() { diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css index 6fd42a534b..6b71089bd7 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css @@ -8,15 +8,18 @@ } .i-view { - height:100%; + height: 100%; } -input, select, textarea, button { +#itmtk-ajax-window input, +#itmtk-ajax-window select, +#itmtk-ajax-window textarea, +#itmtk-ajax-window button { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; color: #464f52; } -select { +#itmtk-ajax-window select { padding: 0; margin: 0; } @@ -26,13 +29,7 @@ select { filter: Alpha(opacity=30); } -/** - * Layout styles - */ -.i-orderedlayout { - padding: 15px 18px; -} /** * Context menu styles diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-down.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-down.png Binary files differnew file mode 100644 index 0000000000..ffd0ee50a5 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-down.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-left.png Binary files differnew file mode 100644 index 0000000000..27dd25110d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-left.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-right.png Binary files differnew file mode 100644 index 0000000000..69bf88da8a --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-right.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-up.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-up.png Binary files differnew file mode 100644 index 0000000000..76e5b43e08 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/arrow-up.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/attention.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/attention.png Binary files differnew file mode 100644 index 0000000000..350de56aa5 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/attention.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/calendar.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/calendar.png Binary files differnew file mode 100644 index 0000000000..7717a5e220 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/calendar.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/cancel.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/cancel.png Binary files differnew file mode 100644 index 0000000000..19a0783733 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/cancel.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-add.png Binary files differnew file mode 100644 index 0000000000..d84e349526 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-delete.png Binary files differnew file mode 100644 index 0000000000..cc3172224a --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-doc.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-doc.png Binary files differnew file mode 100644 index 0000000000..7def77428a --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-doc.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-image.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-image.png Binary files differnew file mode 100644 index 0000000000..8a1bf253e8 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-image.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-pdf.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-pdf.png Binary files differnew file mode 100644 index 0000000000..b58ccf7567 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-pdf.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-ppt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-ppt.png Binary files differnew file mode 100644 index 0000000000..b60f429be2 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-ppt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-txt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-txt.png Binary files differnew file mode 100644 index 0000000000..05659b19b2 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-txt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-web.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-web.png Binary files differnew file mode 100644 index 0000000000..fcfd8685f0 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-web.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-xsl.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-xsl.png Binary files differnew file mode 100644 index 0000000000..571823847f --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document-xsl.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document.png Binary files differnew file mode 100644 index 0000000000..a2bab1bb0b --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/document.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-reply.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-reply.png Binary files differnew file mode 100644 index 0000000000..be7fd2244d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-reply.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-send.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-send.png Binary files differnew file mode 100644 index 0000000000..0ef7a1c398 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email-send.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email.png Binary files differnew file mode 100644 index 0000000000..68d6c93465 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/email.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-add.png Binary files differnew file mode 100644 index 0000000000..48aa7c9220 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-delete.png Binary files differnew file mode 100644 index 0000000000..7cc389d6b2 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder.png Binary files differnew file mode 100644 index 0000000000..f4fec377c6 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/folder.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/globe.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/globe.png Binary files differnew file mode 100644 index 0000000000..ea4034c149 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/globe.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/help.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/help.png Binary files differnew file mode 100644 index 0000000000..d82a8852bf --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/help.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/lock.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/lock.png Binary files differnew file mode 100644 index 0000000000..29f1023613 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/lock.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/note.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/note.png Binary files differnew file mode 100644 index 0000000000..efafae5570 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/note.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/ok.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/ok.png Binary files differnew file mode 100644 index 0000000000..89591faef2 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/ok.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/reload.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/reload.png Binary files differnew file mode 100644 index 0000000000..2c54836bff --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/reload.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/settings.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/settings.png Binary files differnew file mode 100644 index 0000000000..019f0df663 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/settings.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash-full.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash-full.png Binary files differnew file mode 100644 index 0000000000..7d790e6c9a --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash-full.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash.png Binary files differnew file mode 100644 index 0000000000..8875ae322e --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/trash.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/user.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/user.png Binary files differnew file mode 100644 index 0000000000..522f864884 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/user.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/users.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/users.png Binary files differnew file mode 100644 index 0000000000..01f2a1251c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/16/users.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-down.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-down.png Binary files differnew file mode 100644 index 0000000000..20c33b70fb --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-down.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-left.png Binary files differnew file mode 100644 index 0000000000..ed2aae2cb0 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-left.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-right.png Binary files differnew file mode 100644 index 0000000000..bd7707ec8a --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-right.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-up.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-up.png Binary files differnew file mode 100644 index 0000000000..01c1a8ec83 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/arrow-up.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/attention.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/attention.png Binary files differnew file mode 100644 index 0000000000..6b00733567 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/attention.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/calendar.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/calendar.png Binary files differnew file mode 100644 index 0000000000..789ad9031c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/calendar.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/cancel.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/cancel.png Binary files differnew file mode 100644 index 0000000000..725240d558 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/cancel.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-add.png Binary files differnew file mode 100644 index 0000000000..26bca0d112 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-delete.png Binary files differnew file mode 100644 index 0000000000..43e9a43e5b --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-doc.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-doc.png Binary files differnew file mode 100644 index 0000000000..8df20cfdcf --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-doc.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-image.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-image.png Binary files differnew file mode 100644 index 0000000000..88c78665b8 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-image.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-pdf.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-pdf.png Binary files differnew file mode 100644 index 0000000000..048a02fddf --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-pdf.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-ppt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-ppt.png Binary files differnew file mode 100644 index 0000000000..7fd7385cbd --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-ppt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-txt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-txt.png Binary files differnew file mode 100644 index 0000000000..25264732c6 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-txt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-web.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-web.png Binary files differnew file mode 100644 index 0000000000..72fd847ac3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-web.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-xsl.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-xsl.png Binary files differnew file mode 100644 index 0000000000..2ff4607ad3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document-xsl.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document.png Binary files differnew file mode 100644 index 0000000000..1a38dcc304 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/document.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-reply.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-reply.png Binary files differnew file mode 100644 index 0000000000..fd0203f768 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-reply.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-send.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-send.png Binary files differnew file mode 100644 index 0000000000..dc34ac694d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email-send.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email.png Binary files differnew file mode 100644 index 0000000000..bef86e6cbb --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/email.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-add.png Binary files differnew file mode 100644 index 0000000000..e0b78d6e1d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-delete.png Binary files differnew file mode 100644 index 0000000000..8e3c4a404c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder.png Binary files differnew file mode 100644 index 0000000000..7577a17ac3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/folder.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/globe.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/globe.png Binary files differnew file mode 100644 index 0000000000..6c7d469ba2 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/globe.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/help.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/help.png Binary files differnew file mode 100644 index 0000000000..218910c98d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/help.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/lock.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/lock.png Binary files differnew file mode 100644 index 0000000000..4fc16565f0 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/lock.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/note.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/note.png Binary files differnew file mode 100644 index 0000000000..e7e035dc8c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/note.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/ok.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/ok.png Binary files differnew file mode 100644 index 0000000000..ac0438828c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/ok.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/reload.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/reload.png Binary files differnew file mode 100644 index 0000000000..c3556ec890 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/reload.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/settings.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/settings.png Binary files differnew file mode 100644 index 0000000000..92eda74c54 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/settings.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash-full.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash-full.png Binary files differnew file mode 100644 index 0000000000..a9707e76d6 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash-full.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash.png Binary files differnew file mode 100644 index 0000000000..6eaac86166 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/trash.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/user.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/user.png Binary files differnew file mode 100644 index 0000000000..ebb5a7f9f8 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/user.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/users.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/users.png Binary files differnew file mode 100644 index 0000000000..af225a9e46 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/32/users.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-down.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-down.png Binary files differnew file mode 100644 index 0000000000..bdf5d0474e --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-down.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-left.png Binary files differnew file mode 100644 index 0000000000..b90ed88840 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-left.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-right.png Binary files differnew file mode 100644 index 0000000000..6331a5ddf3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-right.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-up.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-up.png Binary files differnew file mode 100644 index 0000000000..821fbe348f --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/arrow-up.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/attention.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/attention.png Binary files differnew file mode 100644 index 0000000000..77265e48ee --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/attention.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/calendar.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/calendar.png Binary files differnew file mode 100644 index 0000000000..f13fbd6efb --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/calendar.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/cancel.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/cancel.png Binary files differnew file mode 100644 index 0000000000..1d1a719a6c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/cancel.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-add.png Binary files differnew file mode 100644 index 0000000000..acdcb06123 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-delete.png Binary files differnew file mode 100644 index 0000000000..2a46863b7f --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-doc.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-doc.png Binary files differnew file mode 100644 index 0000000000..455c1f15bd --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-doc.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-image.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-image.png Binary files differnew file mode 100644 index 0000000000..079978e850 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-image.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-pdf.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-pdf.png Binary files differnew file mode 100644 index 0000000000..cb6bc59675 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-pdf.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-ppt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-ppt.png Binary files differnew file mode 100644 index 0000000000..dd501bfbc9 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-ppt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-txt.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-txt.png Binary files differnew file mode 100644 index 0000000000..e64f746bd9 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-txt.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-web.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-web.png Binary files differnew file mode 100644 index 0000000000..9d81eb5702 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-web.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-xls.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-xls.png Binary files differnew file mode 100644 index 0000000000..6008085a34 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document-xls.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document.png Binary files differnew file mode 100644 index 0000000000..224de0bc84 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/document.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-reply.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-reply.png Binary files differnew file mode 100644 index 0000000000..2c6f7b690d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-reply.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-send.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-send.png Binary files differnew file mode 100644 index 0000000000..9ec7198853 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email-send.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email.png Binary files differnew file mode 100644 index 0000000000..e11245b2f5 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/email.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-add.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-add.png Binary files differnew file mode 100644 index 0000000000..111318cc3c --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-add.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-delete.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-delete.png Binary files differnew file mode 100644 index 0000000000..d249983eac --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder-delete.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder.png Binary files differnew file mode 100644 index 0000000000..edb7b9f786 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/folder.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/globe.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/globe.png Binary files differnew file mode 100644 index 0000000000..1786635b45 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/globe.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/help.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/help.png Binary files differnew file mode 100644 index 0000000000..a66e8aafa6 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/help.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/lock.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/lock.png Binary files differnew file mode 100644 index 0000000000..deaf7db0a4 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/lock.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/note.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/note.png Binary files differnew file mode 100644 index 0000000000..1383847ed1 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/note.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/ok.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/ok.png Binary files differnew file mode 100644 index 0000000000..dc0d00c38b --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/ok.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/reload.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/reload.png Binary files differnew file mode 100644 index 0000000000..b91f51c67f --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/reload.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/settings.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/settings.png Binary files differnew file mode 100644 index 0000000000..1c9b794ab0 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/settings.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash-full.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash-full.png Binary files differnew file mode 100644 index 0000000000..81d060e509 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash-full.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash.png Binary files differnew file mode 100644 index 0000000000..41ef761061 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/trash.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/user.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/user.png Binary files differnew file mode 100644 index 0000000000..60d6c6e1b3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/user.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/users.png b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/users.png Binary files differnew file mode 100644 index 0000000000..3a42c17790 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/icons/64/users.png diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css index 639f734d2a..e260ab2f5f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css @@ -57,7 +57,7 @@ border-bottom: none;
background-color: #fff;
overflow: auto;
- /*padding: 15px 18px 6px 18px;*/
+ padding: 15px 18px 6px 18px;
}
.i-panel-deco {
@@ -82,31 +82,49 @@ /* Light panel style */
-.i-panel-light-caption {
+.i-panel-light:before {
+ display: none;
+}
+
+.i-panel-caption-light {
border-left: none;
border-right: none;
background: transparent;
padding-top: 14px;
}
-.i-panel-light-content {
+.i-panel-caption-light:before {
+ display: none;
+}
+
+.i-panel-content-light {
border: none;
background: transparent;
+ padding: 15px 18px;
}
-.i-panel-light-deco {
+.i-panel-deco-light {
height: 0;
overflow: hidden;
}
+/* Panel without padding (NO_PADDING style) */
+
+.i-panel-content-nopad {
+ padding: 0;
+}
+
+
+
+
/* Light panel contained within another panel or a tabsheet */
/* Use more precise selector to override IE specific rules automatically */
-.i-panel .i-panel-light-caption,
-.i-tabsheet .i-panel-light-caption {
+.i-panel .i-panel-caption-light,
+.i-tabsheet .i-panel-caption-light {
margin-top: -1px;
padding-top: 14px;
border-top: 1px solid #babfc0;
@@ -129,13 +147,22 @@ padding-top: 14px;
}
+* html .i-panel-caption-light {
+ border-left: none;
+ border-right: none;
+}
+*+html .i-panel-caption-light {
+ border-left: none;
+ border-right: none;
+}
+
* html .i-panel-content {
border-bottom: 1px solid #babfc0;
- /*padding: 15px 18px;*/
+ padding: 15px 18px;
}
*+html .i-panel-content {
border-bottom: 1px solid #babfc0;
- /*padding: 15px 18px;*/
+ padding: 15px 18px;
}
* html .i-panel-deco {
@@ -151,4 +178,12 @@ overflow: hidden;
background: #c1c6cc;
border: none;
+}
+
+/* Without padding */
+* html .i-panel-content-nopad {
+ padding: 0;
+}
+*+html .i-panel-content-nopad {
+ padding: 0;
}
\ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css index bc25835680..cfe4d39830 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css @@ -67,7 +67,7 @@ border-bottom: none;
background-color: #fff;
overflow: auto;
- /*padding: 15px 18px 6px 18px;*/
+ padding: 15px 18px 6px 18px;
}
.i-tabsheet-deco {
@@ -109,6 +109,11 @@ +/* Tabsheet without padding (NO_PADDING style) */
+
+.i-tabsheet-content-nopad {
+ padding: 0;
+}
@@ -116,9 +121,11 @@ /* IE specific styles */
* html .i-tabsheet-content {
border-bottom: 1px solid #babfc0;
+ padding: 15px 18px;
}
*+html .i-tabsheet-content {
border-bottom: 1px solid #babfc0;
+ padding: 15px 18px;
}
* html .i-tabsheet-tabs {
@@ -150,8 +157,19 @@ }
* html .i-tabsheet-deco {
- display: none;
+ height: 0;
+ overflow: hidden;
}
*+html .i-tabsheet-deco {
- display: none;
+ height: 0;
+ overflow: hidden;
+}
+
+/* Without padding */
+
+* html .i-tabsheet-content-nopad {
+ padding: 0;
+}
+*+html .i-tabsheet-content-nopad {
+ padding: 0;
}
\ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css index 7237920b87..2699e2c152 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css @@ -33,7 +33,7 @@ color: #f14c1a; white-space: nowrap; height: 18px; - padding: 6px 18px 14px 18px; + padding: 6px 18px 14px 12px; background: #fff; cursor: move; } @@ -43,7 +43,7 @@ content: ""; width: 21px; height: 21px; - margin: -27px 0 6px -38px; + margin: -27px 0 6px -32px; background: transparent url(img/top-left.png); } @@ -105,9 +105,9 @@ * html .i-window-wrap { padding: 12px; border: 1px solid #e8e9e9; - background: transparent; - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/window/img/bg-color.png", sizingMethod="scale"); - zoom: 1; /* to gain hasLayout, IE won't apply filter otherwise */ + background: #d8dee0; + /*filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/window/img/bg-color.png", sizingMethod="scale");*/ + /*zoom: 1; to gain hasLayout, IE won't apply filter otherwise */ } *+html .i-window-wrap { padding: 12px; @@ -128,7 +128,10 @@ * html .i-window-resizebox { bottom: 0; - background-position: 3px 3px; + width: 22px; + height: 18px; + background: transparent; + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/window/img/resize.png", sizingMethod="crop"); } *+html .i-window-resizebox { bottom: 0; diff --git a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java index de23643681..7bfe7628ba 100644 --- a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java +++ b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java @@ -50,12 +50,14 @@ public class TestForBasicApplicationLayout extends CustomComponent { Panel p = new Panel("Accordion Panel");
p.setHeight(100);
p.setHeightUnits(Panel.UNITS_PERCENTAGE);
+ p.addStyleName(Panel.STYLE_NO_PADDING);
tab = new TabSheet();
tab.setWidth(100);
tab.setWidthUnits(Sizeable.UNITS_PERCENTAGE);
tab.setHeight(740);
tab.setHeightUnits(Sizeable.UNITS_PIXELS);
+ tab.addStyleName(TabSheet.STYLE_NO_PADDING);
Panel report = new Panel("Monthly Program Runs", new ExpandLayout());
OrderedLayout controls = new OrderedLayout();
diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java index dd7d012097..4cf5c70a06 100644 --- a/src/com/itmill/toolkit/ui/Panel.java +++ b/src/com/itmill/toolkit/ui/Panel.java @@ -53,6 +53,17 @@ public class Panel extends AbstractComponentContainer implements Sizeable, Scrollable, ComponentContainer.ComponentAttachListener, ComponentContainer.ComponentDetachListener, Action.Container { + public static final String STYLE_LIGHT = "light"; + + public static final String STYLE_EMPHASIZE = "emphasize"; + + /** + * Use this stylename with {@link #addStyleName(String)} to remove padding + * between Panel borders and content. The actual client-side implementation + * will determine which stylenames it implements. + */ + public static final String STYLE_NO_PADDING = "nopad"; + /** * Layout of the panel. */ diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java index 9152e01745..293d8bcf32 100644 --- a/src/com/itmill/toolkit/ui/TabSheet.java +++ b/src/com/itmill/toolkit/ui/TabSheet.java @@ -47,6 +47,13 @@ import com.itmill.toolkit.terminal.*; public class TabSheet extends AbstractComponentContainer implements Sizeable { /** + * Use this stylename with {@link #addStyleName(String)} to remove padding + * between TabSheet borders and content. The actual client-side implementation + * will determine which stylenames it implements. + */ + public static final String STYLE_NO_PADDING = "nopad"; + + /** * Linked list of component tabs. */ private LinkedList tabs = new LinkedList(); diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java index 4f30743c5b..411f977f81 100644 --- a/src/com/itmill/toolkit/ui/Window.java +++ b/src/com/itmill/toolkit/ui/Window.java @@ -826,7 +826,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { setScrollTop(top < 0 ? 0 : top); } Integer scrollleft = (Integer) variables.get("scrollleft"); - if (positiony != null) { + if (scrollleft != null) { int left = scrollleft.intValue(); setScrollLeft(left < 0 ? 0 : left); } |
