Merge from 6.6

svn changeset:19412/svn branch:6.7

24 files changed, 44 insertions, 25 deletions

diff --git a/WebContent/VAADIN/themes/base/menubar/img/check.gif b/WebContent/VAADIN/themes/base/menubar/img/check.gif
new file mode 100644
index 0000000000..0a89195168
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/menubar/img/check.gif
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index d1972ac4ec..042ec15d1d 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
@@ -79,4 +79,15 @@
 .v-menubar-popup .popupContent:focus,
 .v-menubar-popup .popupContent .v-menubar-submenu:focus{
 	outline: none;	
-}
\ No newline at end of file
+}
+/* Checkboxes for checkable/checked menu items */
+/* Checked/unchecked requires combined style selected-(un)checked for IE6 */
+.v-menubar-submenu-check-column .v-menubar-menuitem {
+	padding-left: 6px;
+}
+.v-menubar-submenu-check-column .v-menubar-menuitem-caption {
+	padding-left: 18px;
+}
+.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { 
+	background: transparent url(img/check.gif) no-repeat left;
+}
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
deleted file mode 100644
index a64c209cb1..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-item.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png
deleted file mode 100644
index c56b8f4244..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index 37af1d11a8..9e056dc4d6 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -4,29 +4,17 @@
 	padding: 1px 0;
 	outline: none;
 }
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(../common/img/sprites.png) no-repeat 5px -37px;
 	padding: 1px 0;
 }
 .v-tree-node-caption:focus {
 	outline: none;
 }
-.v-tree div.v-tree-node-leaf {
-	background: transparent;
-}
-.v-tree-connectors div.v-tree-node-leaf {
-	background: transparent url(img/connector-item.png) no-repeat 8px 0;
-}
-.v-tree-connectors div.v-tree-node-leaf-last {
-	background: transparent url(img/connector-item.png) no-repeat 8px bottom;
-}
-.v-tree .v-tree-node-expanded {
-	background: transparent url(../common/img/sprites.png) no-repeat -5px -10px;
-}
-.v-tree-connectors .v-tree-node-children {
-	background: transparent url(img/connector.png) repeat-y 8px bottom;
+.v-tree-node-expanded {
+	background-position: -5px -10px;
 }
-.v-tree-connectors .v-tree-node-children-last {
+div.v-tree-node-leaf {
 	background: transparent;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css
index 3c3c6abdfe..23fe10f52e 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
 	-background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px;
 }
@@ -13,7 +13,7 @@
 	background-position: -14px -30px;
 }
 
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background-position: -28px -14px;
 }
 
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
deleted file mode 100644
index 90a73be23f..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png
deleted file mode 100644
index 744ca30d64..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
deleted file mode 100644
index 8ccaa56edd..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
deleted file mode 100644
index 5087e8e957..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
deleted file mode 100644
index 84c52dbf4c..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
deleted file mode 100644
index 387abf2d4b..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
deleted file mode 100644
index 7980a5aa18..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
deleted file mode 100644
index a7ace8b131..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
deleted file mode 100644
index 31571144df..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png
new file mode 100644
index 0000000000..192c404617
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png
new file mode 100644
index 0000000000..418e951166
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
new file mode 100644
index 0000000000..bac6587c20
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png
new file mode 100644
index 0000000000..92a2b582c5
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
index f3e620353a..e5e337725e 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
@@ -49,4 +49,24 @@
 }
 .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
 	background-image: url(img/submenu-icon-hover.png);
-}
\ No newline at end of file
+}
+
+/* Checkboxes for checkable/checked menu items */
+.v-menubar-submenu-check-column .v-menubar-menuitem {
+	padding-left: 6px;
+}
+.v-menubar-submenu-check-column .v-menubar-menuitem-caption {
+	padding-left: 18px;
+}
+.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { 
+	background: transparent url(img/checked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(img/unchecked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { 
+	background: transparent url(img/checked-selected.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(img/unchecked-selected.png) no-repeat left;
+}
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
index 4f31d43960..3f77bd991d 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.css
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(img/arrows.png) no-repeat 6px -10px;
 }
 .v-ie6 .v-tree-node {
@@ -8,7 +8,7 @@
 .v-ie6 div.v-tree-node-leaf {
 	background: transparent;
 }
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background-position: -7px 5px;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css
index e00e033017..ad1744288a 100644
--- a/WebContent/VAADIN/themes/runo/select/select.css
+++ b/WebContent/VAADIN/themes/runo/select/select.css
@@ -24,7 +24,7 @@
 	border: none;
 	height: 20px;
 	margin: 0;
-	padding: 3px 0 0 2px;
+	padding: 2px 0 1px 2px;
 	font-size: 13px;
 }
 .v-filterselect-prompt .v-filterselect-input {
diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css
index c2458bc0b8..bec3b318dd 100644
--- a/WebContent/VAADIN/themes/runo/tree/tree.css
+++ b/WebContent/VAADIN/themes/runo/tree/tree.css
@@ -1,7 +1,7 @@
-.v-tree .v-tree-node {
+.v-tree-node {
 	background: transparent url(img/collapsed.png) no-repeat 2px 1px;
 }
-.v-tree .v-tree-node-expanded {
+.v-tree-node-expanded {
 	background: transparent url(img/expanded.png) no-repeat 2px 1px;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif
new file mode 100644
index 0000000000..f59714cc62
--- /dev/null
+++ b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif