-New style for Panel, now supports "highlight" and "emphasize" styles also.

-Some method names converted to comply GWT 1.4 naming.
-TahSheet now supports Sizeable interface.

svn changeset:2124/svn branch:trunk

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 9118563107dbc4d63abd2bc9bba87cdb6a4bebed..3be27b2306e48d8e77361f5d797698dffdd2f765 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
@@ -1,5 +1,7 @@
 package com.itmill.toolkit.terminal.gwt.client.ui;
 
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.SimplePanel;
@@ -39,6 +41,10 @@ public class IPanel extends FlowPanel implements Paintable {
                
                // TODO optimize: if only the caption has changed, don't re-render whole content
                clear();
+               // Remove shadow
+               Element deco = DOM.getChild(getElement(), 0);
+               if(deco != null)
+                       DOM.removeChild(getElement(), deco);
                
                if(uidl.hasAttribute("style"))
                        setStyleName(CLASSNAME + " " + CLASSNAME+"-"+uidl.getStringAttribute("style"));
@@ -48,10 +54,13 @@ public class IPanel extends FlowPanel implements Paintable {
                // Handle caption displaying
                if(uidl.hasAttribute("caption") && !uidl.getStringAttribute("caption").equals("")) {
                        caption.setText(uidl.getStringAttribute("caption"));
+                       caption.setStyleName(CLASSNAME+"-caption");
+                       add(caption);
+               } else {
+                       // Theme needs this to work around different paddings
+                       caption.setStyleName(CLASSNAME+"-nocaption");
+                       caption.setText("");
                        add(caption);
-               } else if(uidl.hasAttribute("style")) {
-                               // Theme needs this to work around different paddings
-                               addStyleName(CLASSNAME+"-nocaption");
                }
                
                // Size panel
@@ -67,6 +76,7 @@ public class IPanel extends FlowPanel implements Paintable {
                setWidth(w>=0?w+widthUnit:"auto");
                content.setHeight(h>=0?h+heightUnit:"auto");
                
+               // Render content
                UIDL layoutUidl = uidl.getChildUIDL(0);
                Widget layout = client.getWidget(layoutUidl);
                ((Paintable)layout).updateFromUIDL(layoutUidl, client);
@@ -74,6 +84,11 @@ public class IPanel extends FlowPanel implements Paintable {
                
                add(content);
                
+               // Add a decoration element for shadow
+               deco = DOM.createDiv();
+               DOM.setElementProperty(deco, "className", CLASSNAME+"-deco");
+               DOM.appendChild(getElement(), deco);
+               
        }
        
 }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
index 458c65e6b79329662bdf4a4e54f96c79836ddff4..78754e68c6f21504cb8d9f17efb3894052d57580 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
@@ -56,10 +56,10 @@ public class ISlider extends Widget implements Paintable {
                bigger = DOM.createDiv();\r
                \r
                setStyleName(CLASSNAME);\r
-               DOM.setAttribute(base, "className", CLASSNAME+"-base");\r
-               DOM.setAttribute(handle, "className", CLASSNAME+"-handle");\r
-               DOM.setAttribute(smaller, "className", CLASSNAME+"-smaller");\r
-               DOM.setAttribute(bigger, "className", CLASSNAME+"-bigger");\r
+               DOM.setElementProperty(base, "className", CLASSNAME+"-base");\r
+               DOM.setElementProperty(handle, "className", CLASSNAME+"-handle");\r
+               DOM.setElementProperty(smaller, "className", CLASSNAME+"-smaller");\r
+               DOM.setElementProperty(bigger, "className", CLASSNAME+"-bigger");\r
                \r
                DOM.appendChild(getElement(), bigger);\r
                DOM.appendChild(getElement(), smaller);\r
@@ -97,7 +97,7 @@ public class ISlider extends Widget implements Paintable {
                        DOM.setStyleAttribute(smaller, "display", "block");\r
                        DOM.setStyleAttribute(bigger, "display", "block");\r
                        if(vertical) {\r
-                               int arrowSize = Integer.parseInt(DOM.getAttribute(smaller, "offsetWidth"));\r
+                               int arrowSize = Integer.parseInt(DOM.getElementProperty(smaller, "offsetWidth"));\r
                                DOM.setStyleAttribute(bigger, "marginLeft", arrowSize+"px");\r
                                DOM.setStyleAttribute(bigger, "marginRight", arrowSize+"px");\r
                        }\r
@@ -143,7 +143,7 @@ public class ISlider extends Widget implements Paintable {
                                DOM.setStyleAttribute(getElement(), "width", size + "px");\r
                        else {\r
                                Element p = DOM.getParent(getElement());\r
-                               if(Integer.parseInt(DOM.getAttribute(p, "offsetWidth")) > 50)\r
+                               if(Integer.parseInt(DOM.getElementProperty(p, "offsetWidth")) > 50)\r
                                        DOM.setStyleAttribute(getElement(), "width", "auto");\r
                                else {\r
                                        // Set minimum of 50px width and adjust after all \r
@@ -152,7 +152,7 @@ public class ISlider extends Widget implements Paintable {
                                        Timer adjust = new Timer() {\r
                                                public void run() {\r
                                                        Element p = DOM.getParent(getElement());\r
-                                                       if(Integer.parseInt(DOM.getAttribute(p, "offsetWidth")) > 50)\r
+                                                       if(Integer.parseInt(DOM.getElementProperty(p, "offsetWidth")) > 50)\r
                                                                DOM.setStyleAttribute(getElement(), "width", "auto");\r
                                                }\r
                                        };\r
@@ -173,12 +173,12 @@ public class ISlider extends Widget implements Paintable {
                if(vertical) {\r
                        // TODO\r
                } else {\r
-                       int t = Integer.parseInt(DOM.getAttribute(base, "offsetHeight")) - Integer.parseInt(DOM.getAttribute(handle, "offsetHeight"));\r
+                       int t = Integer.parseInt(DOM.getElementProperty(base, "offsetHeight")) - Integer.parseInt(DOM.getElementProperty(handle, "offsetHeight"));\r
                        DOM.setStyleAttribute(handle, "top", (t/2)+"px");\r
                        DOM.setStyleAttribute(handle, "left", "0px");\r
-                       int w = (int) (Double.parseDouble(DOM.getAttribute(base, "offsetWidth")) / 100 * handleSize);\r
+                       int w = (int) (Double.parseDouble(DOM.getElementProperty(base, "offsetWidth")) / 100 * handleSize);\r
                        if(handleSize == -1) {\r
-                               int baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth"));\r
+                               int baseW = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth"));\r
                                double range = (max - min) * (resolution+1) * 3;\r
                                w = (int) (baseW - range);\r
                        }\r
@@ -195,8 +195,8 @@ public class ISlider extends Widget implements Paintable {
                if(vertical) {\r
                        // TODO\r
                } else {\r
-                       int handleWidth = Integer.parseInt(DOM.getAttribute(handle, "offsetWidth"));\r
-                       int baseWidth = Integer.parseInt(DOM.getAttribute(base, "offsetWidth"));\r
+                       int handleWidth = Integer.parseInt(DOM.getElementProperty(handle, "offsetWidth"));\r
+                       int baseWidth = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth"));\r
                        int range = baseWidth - handleWidth;\r
                        double v = value.doubleValue();\r
                        double valueRange = max - min;\r
@@ -341,9 +341,9 @@ public class ISlider extends Widget implements Paintable {
                if(vertical) {\r
                        // TODO\r
                } else {\r
-                       double handleW = Integer.parseInt(DOM.getAttribute(handle, "offsetWidth"));\r
+                       double handleW = Integer.parseInt(DOM.getElementProperty(handle, "offsetWidth"));\r
                        double baseX = DOM.getAbsoluteLeft(base) + handleW/2;\r
-                       double baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth"));\r
+                       double baseW = Integer.parseInt(DOM.getElementProperty(base, "offsetWidth"));\r
                        v = ((x-baseX)/(baseW-handleW)) * (max-min) + min;\r
                }\r
                \r

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 a62a140fb277c5fa5437030784e74da3c85046ba..1ecddffc391966943a58bb3b32095cc1698a11b2 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -3,6 +3,8 @@ package com.itmill.toolkit.terminal.gwt.client.ui;
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.DeckPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.SourcesTabEvents;
@@ -27,6 +29,8 @@ public class ITabsheet extends TabPanel implements Paintable {
        ArrayList captions = new ArrayList();
 
        int activeTabIndex = 0;
+       
+       private Element deco;
 
        TabListener tl = new TabListener() {
 
@@ -58,7 +62,7 @@ public class ITabsheet extends TabPanel implements Paintable {
                        }
 
                });
-
+               
        }
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
@@ -71,6 +75,23 @@ public class ITabsheet extends TabPanel implements Paintable {
                TabBar tb = getTabBar();
                tb.setStyleName(CLASSNAME+"-tabs");
 
+               // Add a decoration element for shadow
+               // TODO refactor tabsheet with plain DIV-implementation
+               /*if(!DOM.compare(deco, null)) {
+                       DOM.removeChild(DOM.getParent(getElement()), deco);
+                       deco = null;
+               }
+               deco = DOM.createDiv();
+               DOM.setElementProperty(deco, "className", CLASSNAME+"-deco");
+               DOM.appendChild(DOM.getParent(getElement()), deco);
+               */
+               // Adjust width and height
+               String h = uidl.hasAttribute("height")? uidl.getStringAttribute("height") : "";
+               String w = uidl.hasAttribute("width")? uidl.getStringAttribute("width") : "";
+               setWidth(w!=""?w:"auto");
+               //DOM.setStyleAttribute(deco, "width", w!=""?w:"auto");
+               dp.setHeight(h!=""?h:"auto");
+
                UIDL tabs = uidl.getChildUIDL(0);
                boolean keepCurrentTabs = tabKeys.size() == tabs.getNumberOfChildren();
                for (int i = 0; keepCurrentTabs && i < tabKeys.size(); i++)

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
index f2769090a0ac3b6af1e8525f91e74d833291b728..64c9177eb0d1c8454fb9018224d0c62ac61eb468 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
@@ -1,9 +1,9 @@
 body {\r
-       background: #fafafc url(../img/window-bottom-bg.gif) no-repeat right bottom fixed;\r
+       background: #f5f6f7 url(../img/window-bottom-bg.gif) no-repeat right bottom fixed;\r
        font-family: helvetica, arial, tahoma, verdana, sans-serif;\r
-       color: #222;\r
-       font-size: 68.75%;\r
-       line-height: 1.4em;\r
+       color: #454a51;\r
+       font-size: 13px;\r
+       line-height: 19px;\r
        padding: 8px;\r
        margin: 0;\r
 }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png
new file mode 100644 (file)
index 0000000..a35c6b6
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png
new file mode 100644 (file)
index 0000000..fa3d1d0
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif
index 150e849d199b5889d781972218051463f36766f3..e8068d9a8be68f201581be275eefc13565ca752c 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
index 41d230bdf194d9b51a843a20288ae1badd29c26a..1815c43ff0a1a64ff27212d035729ca19ba43fc0 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
@@ -1,101 +1,214 @@
 .i-panel {\r
-       border: 1px solid #29528a;\r
-       padding: 5px 3px 2px 2px;\r
-       margin: 5px;\r
+       margin: 8px 0 1px 0;\r
+}\r
+\r
+.i-panel-caption {\r
+       font-size: 12px;\r
+       line-height: 12px;\r
+       font-weight: normal;\r
+       color: #2c3c49;\r
+       white-space: nowrap;\r
+       height: 27px;\r
+       padding: 0 5px 0 5px;\r
+       border: 1px solid #c1c6cc;\r
+       border-bottom: none;\r
        background: #fff url(../img/top-bg.png) repeat-x top left;\r
 }\r
 \r
-.i-panel:before {\r
+.i-panel-caption:before {\r
        display: block;\r
-       height: 7px;\r
+       height: 28px;\r
        overflow: hidden;\r
        background: transparent url(../img/top-right.png) no-repeat right top;\r
        content: url(../img/top-left.png);\r
-       margin: -6px -4px 3px -3px;\r
+       margin: -1px -6px -20px -6px;\r
+}\r
+\r
+.i-panel-content {\r
+       border: 1px solid #c1c6cc;\r
+       border-top: none;\r
+       background-color: #fff;\r
+       overflow: auto;\r
+       padding: 8px;\r
 }\r
 \r
-.i-panel:after {\r
+.i-panel-deco {\r
+       height: 9px;\r
+       background: transparent url(../../common/img/shadow.png) repeat-x left bottom;\r
+       margin-top: -2px;\r
+       position: relative;\r
+}\r
+\r
+.i-panel-deco:before {\r
        display: block;\r
        height: 2px;\r
        overflow: hidden;\r
        background: transparent url(../img/bottom-right.png) no-repeat right top;\r
        content: url(../img/bottom-left.png);\r
-       margin: 2px -4px -3px -3px;\r
 }\r
 \r
-.i-panel-caption {\r
-       font-size: 1.1em;\r
-       font-weight: bold;\r
-       color: #1c3e6e;\r
-       margin: 0 0 7px 4px;\r
-       overflow: hidden;\r
+.i-panel-nocaption {\r
+       border-top: 1px solid #c1c6cc;\r
+       background-color: #fff;\r
 }\r
 \r
-.i-panel-content {\r
-       overflow: auto;\r
-       padding: 3px;\r
+.i-panel-nocaption:before {\r
+       display: block;\r
+       height: 2px;\r
+       overflow: hidden;\r
+       background: transparent url(../img/top-right-small.png) no-repeat right top;\r
+       content: url(../img/top-left-small.png);\r
+       margin-top: -1px;\r
 }\r
 \r
 \r
 \r
 /* Strong style */\r
-.i-panel-strong {\r
+\r
+.i-panel-strong .i-panel-caption {\r
        background-image: url(../img/top-bg-strong.png);\r
+       border-color: #6c9ad8;\r
+       color: #fff;\r
+       font-weight: bold;\r
 }\r
 \r
-.i-panel-strong:before {\r
-       height: 28px;\r
+.i-panel-strong .i-panel-caption:before {\r
        background-image: url(../img/top-right-strong.png);\r
        content: url(../img/top-left-strong.png);\r
 }\r
 \r
-.i-panel-strong .i-panel-caption {\r
-       color: #fff;\r
-       margin: -25px 0 12px 4px;\r
-       white-space: nowrap;\r
+\r
+\r
+/* Light style */\r
+\r
+.i-panel-light .i-panel-caption {\r
+       background: transparent;\r
+       font-weight: bold;\r
+       border: none;\r
+       padding: 3px 0 0 2px;\r
+       height: 16px;\r
+       margin-bottom: 1px;\r
+       border-bottom: 1px solid #e7e7e8;\r
 }\r
 \r
-/* Strong style without caption */\r
-.i-panel-strong.i-panel-nocaption {\r
-       background-image: url(../img/top-bg.png);\r
+.i-panel-light .i-panel-caption:before {\r
+       display: none;\r
 }\r
-.i-panel-strong.i-panel-nocaption:before {\r
-       height: 7px;\r
-       background-image: url(../img/top-right.png);\r
-       content: url(../img/top-left.png);\r
+\r
+.i-panel-light .i-panel-caption:after {\r
+       display: block;\r
+       height: 2px;\r
+       overflow: hidden;\r
+       background: transparent url(../img/top-right-light.png) no-repeat top right;\r
+       content: url(../img/top-left-light.png);\r
+       margin: 4px 0 0 -2px;\r
 }\r
 \r
+.i-panel-light .i-panel-content {\r
+       border: 1px solid #e7e7e8;\r
+       border-top: none;\r
+       background: #fff url(../img/bg-light.png) repeat-x 0 1px;\r
+}\r
 \r
-/* Light style */\r
-.i-panel-light {\r
-       background-image: url(../img/top-bg-light.png);\r
-       border-color: #b3c2d6;\r
-       border-top-color: #2667a2;\r
-       margin-top: 20px;\r
+.i-panel-light .i-panel-deco {\r
+       background: transparent;\r
+       height: 2px;\r
+}\r
+\r
+.i-panel-light .i-panel-deco:before {\r
+       background: transparent url(../img/bottom-right-light.png) no-repeat top right;\r
+       content: url(../img/bottom-left-light.png);\r
 }\r
 \r
-.i-panel-light:before {\r
-       height: 6px;\r
+/* Light style without caption */\r
+.i-panel-light .i-panel-nocaption {\r
+       border-color: #e7e7e8;\r
+}\r
+\r
+.i-panel-light .i-panel-nocaption:before {\r
        background-image: url(../img/top-right-light.png);\r
        content: url(../img/top-left-light.png);\r
 }\r
 \r
-.i-panel-light:after {\r
-       background-image: url(../img/bottom-right-light.png);\r
-       content: url(../img/bottom-left-light.png);\r
+\r
+\r
+/* Highlight style */\r
+\r
+.i-panel-highlight .i-panel-caption {\r
+       background-image: url(../img/top-bg-highlight.png);\r
+       background-color: #fffdec;\r
+       border-color: #c0baae;\r
+       color: #4e4640;\r
 }\r
 \r
-.i-panel-light .i-panel-caption {\r
-       margin: -26px -2px 10px -2px;\r
-       font-size: 1em;\r
-       white-space: nowrap;\r
+.i-panel-highlight .i-panel-caption:before {\r
+       background-image: url(../img/top-right-highlight.png);\r
+       content: url(../img/top-left-highlight.png);\r
 }\r
 \r
-/* Light style without caption */\r
-.i-panel-light.i-panel-nocaption {\r
-       margin-top: 7px;\r
+.i-panel-highlight .i-panel-content {\r
+       background-color: #fffdec;\r
+       border-color: #c0baae;\r
+       color: #605b52;\r
+}\r
+\r
+/* Highlight style without caption */\r
+.i-panel-highlight .i-panel-nocaption {\r
+       border-color: #c0baae;\r
+       background-color: #fffdec;\r
+}\r
+\r
+\r
+\r
+/* Emphasized style */\r
+\r
+.i-panel-emphasize .i-panel-caption {\r
+       background: #6899d9 url(../img/top-bg-em.gif) repeat-x;\r
+       border-color: #78a2db;\r
+       color: #fff;\r
+       font-weight: bold;\r
+       height: 22px;\r
 }\r
 \r
+.i-panel-emphasize .i-panel-caption:before {\r
+       background-image: url(../img/top-right-em.gif);\r
+       content: url(../img/top-left-em.gif);\r
+}\r
+\r
+.i-panel-emphasize .i-panel-content {\r
+       background: #3a6bab url(../img/bg-em.gif) repeat-x;\r
+       color: #dee6f2;\r
+       border-color: #78a2db;\r
+}\r
+\r
+.i-panel-emphasize .i-panel-deco {\r
+       margin-top: -4px;\r
+       height: 11px;\r
+       background-image: url(../../common/img/shadow-em.png);\r
+}\r
+\r
+.i-panel-emphasize .i-panel-deco:before {\r
+       background-image: url(../img/bottom-right-em.gif);\r
+       content: url(../img/bottom-left-em.gif);\r
+       height: 4px;\r
+}\r
+\r
+/* Emphasized style without caption */\r
+.i-panel-emphasize .i-panel-nocaption {\r
+       background: #6899d9 url(../img/top-bg-em.gif) repeat-x;\r
+       border: 1px solid #78a2db;\r
+       border-bottom: none;\r
+       height: 3px;\r
+}\r
+\r
+.i-panel-emphasize .i-panel-nocaption:before {\r
+       background-image: url(../img/top-right-em.gif);\r
+       content: url(../img/top-left-em.gif);\r
+       margin: -1px;\r
+}\r
+\r
+\r
+\r
 \r
 \r
 \r
@@ -104,41 +217,90 @@
  * These selectors must be separate because IE6 won't \r
  * apply them if they are grouped together.\r
 */\r
-* html .i-panel {\r
-       zoom: 1;\r
+* html .i-panel-caption {\r
+       padding-top: 7px;\r
+       height: 19px;\r
 }\r
-*+html .i-panel {\r
-       zoom: 1;\r
+*+html .i-panel-caption {\r
+       padding-top: 7px;\r
+       height: 19px;\r
 }\r
-* html .i-panel .i-panel-caption {\r
-       margin-top: 3px;\r
+\r
+* html .i-panel-deco {\r
+       position: static;\r
+       background: transparent;\r
+       margin: 0;\r
+       font-size: 1;\r
+       height: 7px;\r
+       overflow: hidden;\r
+       /* TODO change url when packaging is complete */\r
+       filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale");\r
 }\r
-*+html .i-panel .i-panel-caption {\r
-       margin-top: 3px;\r
+\r
+/* Without caption */\r
+* html .i-panel-nocaption {\r
+       height: 1px;\r
+       overflow: hidden;\r
+       background: #c1c6cc;\r
+       border: none;\r
 }\r
 \r
 \r
-* html .i-panel-strong .i-panel-caption {\r
-       margin: 0 0 10px 4px;\r
+/* Light style */\r
+\r
+* html .i-panel-light .i-panel-caption {\r
+       background: transparent;\r
+       font-weight: bold;\r
+       border: none;\r
+       padding: 3px 0 0 2px;\r
+       height: 16px;\r
 }\r
-*+html .i-panel-strong .i-panel-caption {\r
-       margin: 1px 0 10px 4px;\r
+*+html .i-panel-light .i-panel-caption {\r
+       background: transparent;\r
+       font-weight: bold;\r
+       border: none;\r
+       padding: 3px 0 0 2px;\r
+       height: 16px;\r
 }\r
 \r
-* html .i-panel-light {\r
-       margin-top: 5px;\r
+* html .i-panel-light .i-panel-content {\r
+       border: 1px solid #e7e7e8;\r
+       background-position: 0 2px;\r
 }\r
-*+html .i-panel-light {\r
-       margin-top: 23px;\r
+*+html .i-panel-light .i-panel-content {\r
+       border: 1px solid #e7e7e8;\r
+       background-position: 0 2px;\r
 }\r
-* html .i-panel-light .i-panel-caption {\r
-       margin-left: 4px;\r
-       margin-bottom: 5px;\r
-       padding-bottom: 0;\r
+\r
+* html .i-panel-light .i-panel-deco {\r
+       display: none;\r
 }\r
-*+html .i-panel-light .i-panel-caption {\r
-       /*margin-left: 4px;\r
-       margin-bottom: 5px;\r
-       padding-bottom: 0;*/\r
-       margin-top: -23px;\r
+\r
+/* Without caption */\r
+* html .i-panel-light .i-panel-nocaption {\r
+       display: none;\r
+}\r
+*+html .i-panel-light .i-panel-nocaption {\r
+       display: none;\r
+}\r
+\r
+\r
+/* Emphasized style */\r
+* html .i-panel-emphasize .i-panel-caption {\r
+       height: 15px;\r
+}\r
+*+html .i-panel-emphasize .i-panel-caption {\r
+       height: 15px;\r
+}\r
+\r
+* html .i-panel-emphasize .i-panel-content {\r
+       background-attachment: fixed;\r
+}\r
+\r
+* html .i-panel-emphasize .i-panel-deco {\r
+       height: 7px;\r
+       margin-top: 0;\r
+       background: transparent;\r
+       /* TODO change url when packaging is complete */\r
+       filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow-em.png", sizingMethod="scale");\r
 }
\ No newline at end of file

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif
new file mode 100644 (file)
index 0000000..1c817bf
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-light.png
new file mode 100644 (file)
index 0000000..1ad2068
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-light.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-em.gif
new file mode 100644 (file)
index 0000000..909ddc9
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png
index 9312e5bc03ed89e3d3d3ee0c3c3ec2c95684debd..91e395dd4a3a2a7db3949b4f4f72a97f98cc8161 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png
index 3fda5f3c516e98116c368c2332dbfef210dc3dbe..9ce9c8efe9810682aa4fa3bc367dd771c83880ad 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif
new file mode 100644 (file)
index 0000000..1ffd865
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png
index c542a426290140e66cff699f349e3409661552f0..31e6252f909121e680f3ac8b418090ee806f2ed0 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right.png
index 5f8ff7a3b12e4ae0027ee7f2d6ed48bb1508bf3c..001f63cad545b3c0a22384881cc2670fb0397853 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif
new file mode 100644 (file)
index 0000000..57a3d6a
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-highlight.png
new file mode 100644 (file)
index 0000000..9e68c95
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-highlight.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png
index 5b89dd68c26377950f91978078a3fbb6a1ee53c0..8385dced7de2330a6e8cbc1f9d158b4e84ce11f0 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png
index bdfca2710738db514a19e0cb146f64a325e703fb..8a2914625710e58e6f80c9b352e4cafbe5c3dc50 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-em.gif
new file mode 100644 (file)
index 0000000..94d4e9a
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-highlight.png
new file mode 100644 (file)
index 0000000..26f6a7f
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-highlight.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-light.png
index c46f8add3b9874f1412b94009dc89e6d9443ae37..c732482b0dd43ebbc8d0aa4240d3e8e202e6c3ce 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-light.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-light.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png
index 64c0c5c91c6d00f662c570229b5a111d5410d618..047d62d054c73c434ba26de311e779f517014cea 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-strong.png
index 4eddbe5b5d562191752fa6603f4135a2e6bfab70..0ecac10257cd4e38d8abba73f690c3f31655fe2d 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-strong.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-strong.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left.png
index d16ced131e9ee24f8dd50c41bece51a815a76d7b..9c4505986bfab40334b384100e1fe4d747a32fb2 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-em.gif
new file mode 100644 (file)
index 0000000..35069a1
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-em.gif differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png
new file mode 100644 (file)
index 0000000..58f0127
Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-light.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-light.png
index d2bcd46c5509a587d7a37e27c810b29ddb5745dc..feabbb1ca4da41e1aa40269c6c66aa9d85a9d24d 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-light.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-light.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png
index 8ba960b21097c907c8962332bda52a53d4da1461..a19338806f849b372cde9b77d159ec00f5a5d4ba 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-strong.png
index b1d3858f1b55a0d76beaaae6f79768fae3149bad..75ea5f536b1799b7b4ba96a0feacded88a07248b 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-strong.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-strong.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png
index dcf9c5c0dc7e4b003c43dedefa7dafdf6dfff074..a9261fea2296d9d26138f64f3684f7b23817f9a3 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css
index a11ec6e3f4fcd2e10336cebfa54c633366e36e3b..c7c4f665bdbce4753aadfd5859e6da5834b4b5f1 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css
@@ -28,14 +28,20 @@
 .i-slider-base {\r
        background: #c3d0dd url(../img/bg.png) repeat-x;\r
        height: 14px;\r
-       margin: 0 1px;\r
        overflow: hidden;\r
 }\r
 .i-slider-handle {\r
        background: #fff url(../img/handle-bg.png) repeat-x;\r
        border: 1px solid #29528a;\r
        height: 10px;\r
-       overflow: hidden;\r
+       font-size: 1px;\r
+}\r
+.i-slider-handle:before {\r
+       display: block;\r
+       height: 12px;\r
+       background: transparent url(../img/handle-right.png) no-repeat right top;\r
+       margin: -1px -1px 0 -1px;\r
+       content: url(../img/handle-left.png);\r
 }\r
 .i-slider-bigger {\r
        background: #dde4ef url(../img/arrow-right.png);\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css
index fb8750b02873fffdef86b207b721362db1410934..682817d4f67352157db54a1e168e801b4af2175d 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css
@@ -1,5 +1,5 @@
 .i-tabsheet {\r
-       margin: 5px;\r
+       \r
 }\r
 \r
 .i-tabsheet-tabs {\r
@@ -12,80 +12,75 @@
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarRest {\r
-       border-bottom: solid 1px #29528a;\r
+       border-bottom: solid 1px #c1c6cc;\r
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarItem {\r
-       border: solid 1px #6082b0;\r
-       border-bottom-color: #29528a;\r
-       height: 17px;\r
-       padding: 4px 8px;\r
-       color: #1c3e6e;\r
-       background: #e6ebf0 url(../img/tab-bg.png) repeat-x;\r
+       border: solid 1px #9cacb9;\r
+       border-bottom-color: #c1c6cc;\r
+       height: 18px;\r
+       padding: 4px 25px;\r
+       color: #2c3c49;\r
+       font-size: 12px;\r
+       background: #ecf0f4 url(../img/tab-bg.png) repeat-x;\r
        margin-right: 1px;\r
        cursor: pointer;\r
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarItem-selected {\r
-       border-color: #29528a;\r
+       border-color: #c1c6cc;\r
        border-bottom-color: #fff;\r
        background: #fff url(../img/tab-selected-bg.png) repeat-x;\r
        padding-top: 7px;\r
        padding-bottom: 5px;\r
        margin-bottom: -1px;\r
-       font-weight: bold;\r
        cursor: default;\r
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarItem:hover {\r
-       border-color: #29528a;\r
-       background: #3a639b url(../img/tab-hover-bg.png) repeat-x;\r
-       color: #fff;\r
+       color: #62788a;\r
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarItem-selected:hover {\r
-       background: #fff url(../img/tab-selected-bg.png) repeat-x;\r
-       color: #1c3e6e;\r
+       color: #2c3c49;\r
 }\r
 \r
-/* Rounded corners effects */\r
 .i-tabsheet-tabs .gwt-TabBarItem:before {\r
        display: block;\r
        height: 2px;\r
        overflow: hidden;\r
        background: transparent url(../img/tab-right.png) no-repeat right top;\r
        content: url(../img/tab-left.png);\r
-       margin: -5px -9px 3px -9px;\r
+       margin: -5px -26px 3px -26px;\r
 }\r
 \r
 .i-tabsheet-tabs .gwt-TabBarItem-selected:before {\r
-       height: 7px;\r
+       height: 27px;\r
        background-image: url(../img/tab-selected-right.png);\r
        content: url(../img/tab-selected-left.png);\r
-       margin: -8px -9px 0 -9px;\r
+       margin: -8px -26px -20px -26px;\r
 }\r
 \r
-.i-tabsheet-tabs .gwt-TabBarItem:hover:before {\r
-       background-image: url(../img/tab-hover-right.png);\r
-       content: url(../img/tab-hover-left.png);\r
+.i-tabsheet-content {\r
+       background-color: #fff;\r
+       border: solid 1px #c1c6cc;\r
+       border-top: none;\r
+       padding: 8px;\r
 }\r
 \r
-.i-tabsheet-content:after {\r
+.i-tabsheet-deco {\r
+       height: 9px;\r
+       background: transparent url(../../common/img/shadow.png) repeat-x left bottom;\r
+       margin: -2px 0 0 1px;\r
+       position: relative;\r
+}\r
+\r
+.i-tabsheet-deco:before {\r
        display: block;\r
        height: 2px;\r
        overflow: hidden;\r
        background: transparent url(../../panel/img/bottom-right.png) no-repeat right top;\r
        content: url(../../panel/img/bottom-left.png);\r
-       margin: 5px -6px -6px -6px;\r
-}\r
-\r
-\r
-\r
-.i-tabsheet-content {\r
-       background-color: #fff;\r
-       border: solid 1px #29528a;\r
-       border-top: none;\r
-       padding: 5px;\r
 }\r
 \r
 /* Fix Safari bug (one pixel table offset) */\r
@@ -97,4 +92,19 @@
        width: 1px;\r
        height: 1px;\r
        overflow: hidden;\r
+}\r
+\r
+\r
+\r
+\r
+/* IE specific styles */\r
+* html .i-tabsheet-deco {\r
+       position: static;\r
+       background: transparent;\r
+       margin-top: 0;\r
+       font-size: 1;\r
+       height: 7px;\r
+       overflow: hidden;\r
+       /* TODO change url when packaging is complete */\r
+       filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale");\r
 }
\ No newline at end of file

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png
index dc89d4119e167f26417e0a51765a90e71ea9862f..aef042a41e5847aa5dbcde1800857ab62ddbcee2 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-bg.png
deleted file mode 100644 (file)
index a192e32..0000000
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-bg.png and /dev/null differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png
deleted file mode 100644 (file)
index 0ee9612..0000000
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-left.png and /dev/null differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png
deleted file mode 100644 (file)
index e05b830..0000000
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-hover-right.png and /dev/null differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png
index b0ceef078eed3482374d68a8da1c2de5d2274372..a3f43bc7e5c0d7b6e6bd5a0f8d3f575d62280746 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png
index 1461c8f6320099dc5959c245f3b85519e4eba9da..59c71623053281be9b40f49b91cfa24f1ca4a636 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png
index bdfca2710738db514a19e0cb146f64a325e703fb..4c04dee4aa575b5e14616171b26a5d8175886e70 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png
index 114655614b6ffedb00315f3fae5a428276f318bd..12bdc0ab031b4e4ac107fc2f7323a2252b8b7f4e 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png differ

diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png
index 9f47da4d812259d27fb11f7d8a50aa2a2cf44a70..828f62b8e51e8cab0467775a61a0922bc9370b27 100644 (file)
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png differ

diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java
index c1edd1b65c67853dcdcbed98033a90ef6beaaa75..fac5ea5d4bd748c636aad2c9e8c4386ff6753232 100644 (file)
--- a/src/com/itmill/toolkit/ui/TabSheet.java
+++ b/src/com/itmill/toolkit/ui/TabSheet.java
@@ -44,7 +44,7 @@ import com.itmill.toolkit.terminal.*;
  * @VERSION@
  * @since 3.0
  */
-public class TabSheet extends AbstractComponentContainer {
+public class TabSheet extends AbstractComponentContainer implements Sizeable {
 
        /**
         * Linked list of component tabs.
@@ -72,6 +72,15 @@ public class TabSheet extends AbstractComponentContainer {
         * Holds the value of property tabsHIdden.
         */
        private boolean tabsHidden;
+       
+       private int height;
+
+       private int heightUnit;
+
+       private int width;
+
+       private int widthUnit;
+
 
        /**
         * Constructs a new Tabsheet. Tabsheet is immediate by default.
@@ -194,6 +203,15 @@ public class TabSheet extends AbstractComponentContainer {
 
                if (areTabsHidden())
                        target.addAttribute("hidetabs", true);
+               
+               if(width > 0) {
+                       target.addAttribute("width", width + UNIT_SYMBOLS[widthUnit]);
+               } else {
+                       target.addAttribute("width", "100%");
+               }
+               if(height > 0) {
+                       target.addAttribute("height", height + UNIT_SYMBOLS[widthUnit]);
+               }
 
                target.startTag("tabs");
 
@@ -483,4 +501,36 @@ public class TabSheet extends AbstractComponentContainer {
        protected void fireSelectedTabChange() {
                fireEvent(new SelectedTabChangeEvent(this));
        }
+
+       public int getHeight() {
+               return height;
+       }
+
+       public int getHeightUnits() {
+               return heightUnit;
+       }
+
+       public int getWidth() {
+               return width;
+       }
+
+       public int getWidthUnits() {
+               return widthUnit;
+       }
+
+       public void setHeight(int height) {
+               this.height = height;
+       }
+
+       public void setHeightUnits(int units) {
+               this.heightUnit = units;
+       }
+
+       public void setWidth(int width) {
+               this.width = width;
+       }
+
+       public void setWidthUnits(int units) {
+               this.widthUnit = units;
+       }
 }