From 038ca710dba4ea9b92a2b6a9744907d4e848d9f7 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 19 Sep 2007 14:05:26 +0000
Subject: [PATCH] Widgetset default styles refactor

svn changeset:2338/svn branch:trunk
---
 .../demo/reservation/gwt/WidgetSet.gwt.xml        |  12 ++++++------
 .../reservation/gwt/client/ui/IGoogleMap.java     |   3 +++
 .../public/reservr/googlemap/css/googlemap.css    |   3 +++
 .../reservation/gwt/public/reservr/styles.css     |   1 +
 .../toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml |   4 ++--
 .../terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml  |  14 +++++++++++---
 .../button/css/button.css                         |   0
 .../caption/css/caption.css                       |   0
 .../{component-themes => default}/collection.css  |   0
 .../common/css/common.css                         |   0
 .../common/img/shadow-em.png                      | Bin
 .../common/img/shadow.png                         | Bin
 .../common/img/window-bg.png                      | Bin
 .../common/img/window-bottom-bg.gif               | Bin
 .../datefield/css/datefield.css                   |   0
 .../filterselect/css/filterselect.css             |   0
 .../panel/css/panel.css                           |   0
 .../panel/img/bg-em.gif                           | Bin
 .../panel/img/bg-light.png                        | Bin
 .../panel/img/bottom-left-em.gif                  | Bin
 .../panel/img/bottom-left-light.png               | Bin
 .../panel/img/bottom-left.png                     | Bin
 .../panel/img/bottom-right-em.gif                 | Bin
 .../panel/img/bottom-right-light.png              | Bin
 .../panel/img/bottom-right.png                    | Bin
 .../panel/img/top-bg-em.gif                       | Bin
 .../panel/img/top-bg-highlight.png                | Bin
 .../panel/img/top-bg-light.png                    | Bin
 .../panel/img/top-bg-strong.png                   | Bin
 .../panel/img/top-bg.png                          | Bin
 .../panel/img/top-left-em.gif                     | Bin
 .../panel/img/top-left-highlight.png              | Bin
 .../panel/img/top-left-light.png                  | Bin
 .../panel/img/top-left-small.png                  | Bin
 .../panel/img/top-left-strong.png                 | Bin
 .../panel/img/top-left.png                        | Bin
 .../panel/img/top-right-em.gif                    | Bin
 .../panel/img/top-right-highlight.png             | Bin
 .../panel/img/top-right-light.png                 | Bin
 .../panel/img/top-right-small.png                 | Bin
 .../panel/img/top-right-strong.png                | Bin
 .../panel/img/top-right.png                       | Bin
 .../select/css/select.css                         |   0
 .../slider/css/slider.css                         |   0
 .../slider/img/arrow-left-over.png                | Bin
 .../slider/img/arrow-left.png                     | Bin
 .../slider/img/arrow-right-over.png               | Bin
 .../slider/img/arrow-right.png                    | Bin
 .../slider/img/bg.png                             | Bin
 .../slider/img/handle-bg.png                      | Bin
 .../slider/img/handle-left.png                    | Bin
 .../slider/img/handle-right.png                   | Bin
 .../splitpanel/css/splitpanel.css                 |   0
 .../table/css/table.css                           |   0
 .../table/img/colsel.png                          | Bin
 .../table/img/header-bg.png                       | Bin
 .../table/img/resizer-bg.png                      | Bin
 .../table/img/selected-bg.png                     | Bin
 .../tabsheet/css/tabsheet.css                     |   0
 .../tabsheet/img/tab-bg.png                       | Bin
 .../tabsheet/img/tab-left.png                     | Bin
 .../tabsheet/img/tab-right.png                    | Bin
 .../tabsheet/img/tab-selected-bg.png              | Bin
 .../tabsheet/img/tab-selected-left.png            | Bin
 .../tabsheet/img/tab-selected-right.png           | Bin
 .../textfield/css/textfield.css                   |   0
 .../textfield/img/bg.png                          | Bin
 .../tree/css/tree.css                             |   0
 .../window/css/window.css                         |   0
 69 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
 create mode 100644 src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/button/css/button.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/caption/css/caption.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/collection.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/common/css/common.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/common/img/shadow-em.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/common/img/shadow.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/common/img/window-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/common/img/window-bottom-bg.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/datefield/css/datefield.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/filterselect/css/filterselect.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/css/panel.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bg-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bg-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-left-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-left-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-right-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-right-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/bottom-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-bg-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-bg-highlight.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-bg-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-bg-strong.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left-highlight.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left-small.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left-strong.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right-em.gif (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right-highlight.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right-light.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right-small.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right-strong.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/panel/img/top-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/select/css/select.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/css/slider.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/arrow-left-over.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/arrow-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/arrow-right-over.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/arrow-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/handle-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/handle-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/slider/img/handle-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/splitpanel/css/splitpanel.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/table/css/table.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/table/img/colsel.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/table/img/header-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/table/img/resizer-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/table/img/selected-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/css/tabsheet.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-selected-bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-selected-left.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tabsheet/img/tab-selected-right.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/textfield/css/textfield.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/textfield/img/bg.png (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/tree/css/tree.css (100%)
 rename src/com/itmill/toolkit/terminal/gwt/public/{component-themes => default}/window/css/window.css (100%)

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml
index bcff23a087..969f0d86cd 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml
@@ -1,14 +1,14 @@
 <module>
-
+	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
 	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> 
 	
-	<inherits name='com.mapitz.gwt.googleMaps.GoogleMaps' /> 
+	<!-- The googlemaps_gwt module -->
+	<inherits name="com.mapitz.gwt.googleMaps.GoogleMaps" /> 
 	
-	<!-- Component stylesheets                                -->
-	
-	<stylesheet src="component-themes/collection.css"/>
+	<!-- WidgetSet default theme -->	
+	<stylesheet src="reservr/styles.css"/>
 
-	<!-- Specify the app entry point class.                   -->
+	<!-- Entry point -->
 	<entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.WidgetSet"/>
   
 </module>
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java
index 2aa244f3ae..e7d6091174 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java
@@ -15,11 +15,14 @@ import com.mapitz.gwt.googleMaps.client.GMarkerEventManager;
 
 public class IGoogleMap extends GMap2Widget implements Paintable {
 
+    public static final String CLASSNAME = "i-googlemap";
+    
     GMap2EventManager mapEventManager;
     GMarkerEventManager markerEventManager;
     GMap2 map;
 
     public IGoogleMap() {
+	setStyleName(CLASSNAME);
 	mapEventManager = GMap2EventManager.getInstance();
 	map = this.getGmap();
     }
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css b/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
new file mode 100644
index 0000000000..87248cc390
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
@@ -0,0 +1,3 @@
+.i-googlemap {
+	border: 1px solid red;
+}
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css b/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css
new file mode 100644
index 0000000000..14761b77e1
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css
@@ -0,0 +1 @@
+@import "googlemap/css/googlemap.css";
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml
index 30ead61889..a226292394 100644
--- a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -1,7 +1,7 @@
 <module>
 	<source path="client"/>
-
+
+	<!-- This module just defines a entrypoint for the DefaultWidgetSet -->
 	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry"/>
-
   	<entry-point class="com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet"/>
 </module>
diff --git a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
index 8c1c5f48cd..259e91ec43 100644
--- a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
+++ b/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
@@ -1,4 +1,9 @@
 <module>
+	<!-- 
+		This is the NoEntry version of DefaultWidgetSet.
+		This is the module you want to extend when creating an extended
+		widget set.
+	-->
 
 	<inherits name="com.google.gwt.user.User"/>
 
@@ -12,8 +17,11 @@
 	
 	<source path="gwtwidgets"/>
 	
-	<!-- Component stylesheets                                -->
-	
-	<stylesheet src="component-themes/collection.css"/>
+	<!-- 
+		Default theme for this widgetset. 
+		Please name the subdirectory differently when creating a extended widgetset
+		(e.g. src="mywidgets/collection.css") to avoid naming conflicts.
+	 -->
+	<stylesheet src="default/styles.css"/>
 
 </module>
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/button/css/button.css b/src/com/itmill/toolkit/terminal/gwt/public/default/button/css/button.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/button/css/button.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/button/css/button.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/caption/css/caption.css b/src/com/itmill/toolkit/terminal/gwt/public/default/caption/css/caption.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/caption/css/caption.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/caption/css/caption.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css b/src/com/itmill/toolkit/terminal/gwt/public/default/collection.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/collection.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/collection.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/css/common.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/common/css/common.css
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/default/common/img/shadow-em.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow-em.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow-em.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/shadow.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bg.png
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/default/common/img/window-bottom-bg.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/img/window-bottom-bg.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bottom-bg.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/css/datefield.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/datefield/css/datefield.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/datefield/css/datefield.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/filterselect/css/filterselect.css b/src/com/itmill/toolkit/terminal/gwt/public/default/filterselect/css/filterselect.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/filterselect/css/filterselect.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/filterselect/css/filterselect.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/css/panel.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/css/panel.css
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/default/panel/img/bg-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-em.gif
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/default/panel/img/bg-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bg-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-light.png
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/default/panel/img/bottom-left-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-em.gif
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/default/panel/img/bottom-left-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-light.png
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/default/panel/img/bottom-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png
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/default/panel/img/bottom-right-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-em.gif
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/default/panel/img/bottom-right-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-light.png
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/default/panel/img/bottom-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/bottom-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png
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/default/panel/img/top-bg-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-em.gif
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/default/panel/img/top-bg-highlight.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-highlight.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-highlight.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-light.png
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/default/panel/img/top-bg-strong.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg-strong.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-strong.png
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/default/panel/img/top-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg.png
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/default/panel/img/top-left-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-em.gif
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/default/panel/img/top-left-highlight.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-highlight.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-highlight.png
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/default/panel/img/top-left-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-light.png
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/default/panel/img/top-left-small.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-small.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-small.png
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/default/panel/img/top-left-strong.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left-strong.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-strong.png
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/default/panel/img/top-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png
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/default/panel/img/top-right-em.gif
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-em.gif
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-em.gif
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/default/panel/img/top-right-highlight.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-highlight.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-highlight.png
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/default/panel/img/top-right-light.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-light.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-light.png
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/default/panel/img/top-right-small.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-small.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-small.png
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/default/panel/img/top-right-strong.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right-strong.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-strong.png
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/default/panel/img/top-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/img/top-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/select/css/select.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/css/select.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/select/css/select.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/select/css/select.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/css/slider.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/css/slider.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/css/slider.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-left-over.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-left-over.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-left-over.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-left-over.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-right-over.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-right-over.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-right-over.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-right-over.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/arrow-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/arrow-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-left.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/slider/img/handle-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/splitpanel/css/splitpanel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/css/splitpanel.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/splitpanel/css/splitpanel.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/css/splitpanel.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/css/table.css b/src/com/itmill/toolkit/terminal/gwt/public/default/table/css/table.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/css/table.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/table/css/table.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/colsel.png b/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/colsel.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/colsel.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/table/img/colsel.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/header-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/header-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/table/img/header-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/resizer-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/resizer-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/resizer-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/table/img/resizer-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/selected-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/table/img/selected-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/table/img/selected-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/table/img/selected-bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/css/tabsheet.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/css/tabsheet.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/css/tabsheet.css
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/default/tabsheet/img/tab-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png
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/default/tabsheet/img/tab-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-left.png
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/default/tabsheet/img/tab-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-right.png
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/default/tabsheet/img/tab-selected-bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-bg.png
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/default/tabsheet/img/tab-selected-left.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-left.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-left.png
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/default/tabsheet/img/tab-selected-right.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tabsheet/img/tab-selected-right.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-selected-right.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/css/textfield.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/textfield/css/textfield.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/img/bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/img/bg.png
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/img/bg.png
rename to src/com/itmill/toolkit/terminal/gwt/public/default/textfield/img/bg.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/tree/css/tree.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/css/tree.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/tree/css/tree.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/tree/css/tree.css
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css b/src/com/itmill/toolkit/terminal/gwt/public/default/window/css/window.css
similarity index 100%
rename from src/com/itmill/toolkit/terminal/gwt/public/component-themes/window/css/window.css
rename to src/com/itmill/toolkit/terminal/gwt/public/default/window/css/window.css
-- 
2.39.5