#4125 MenuBar supports selectable items

svn changeset:19348/svn branch:6.6

8 files changed, 33 insertions, 2 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/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/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