Barebones fix for #6745: Connectors for Tree, i.e. ugly but works. We can make it more pretty in future releases if necessary.

Includes TestBench test for the feature.

svn changeset:20577/svn branch:6.7

11 files changed, 25 insertions, 2 deletions

diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png b/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png
new file mode 100644
index 0000000000..2eb04a32fd
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
new file mode 100644
index 0000000000..5f88fe1bef
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png
new file mode 100644
index 0000000000..2844bba731
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/tree/img/connector.png
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index 9e056dc4d6..593771a49c 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -11,10 +11,24 @@
 .v-tree-node-caption:focus {
 	outline: none;
 }
+div.v-tree-node-leaf {
+	background: transparent;
+}
+.v-tree-connectors .v-tree-node-leaf,
+.v-tree-connectors .v-tree-node-leaf:hover {
+	background: transparent url(img/connector-item.png) no-repeat 8px 0;
+}
+.v-tree-connectors .v-tree-node-leaf-last,
+.v-tree-connectors .v-tree-node-leaf-last:hover {
+	background: transparent url(img/connector-item-last.png) no-repeat 8px 0;
+}
 .v-tree-node-expanded {
-	background-position: -5px -10px;
+	background: transparent url(../common/img/sprites.png) no-repeat -5px -10px;
 }
-div.v-tree-node-leaf {
+.v-tree-connectors .v-tree-node-children {
+	background: transparent url(img/connector.png) repeat-y 8px bottom;
+}
+.v-tree-connectors .v-tree-node-children-last {
 	background: transparent;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
index 3f77bd991d..d33985f713 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.css
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -11,6 +11,15 @@
 .v-tree-node-expanded {
 	background-position: -7px 5px;
 }
+.v-tree-connectors .v-tree-node-leaf {
+	background-position: 8px -1px;
+}
+.v-ie6 .v-tree-connectors div.v-tree-node-leaf {
+	background: transparent url(../../base/tree/img/connector-item.png) no-repeat 8px -1px;
+}
+.v-ie6 .v-tree-connectors div.v-tree-node-leaf-last {
+	background: transparent url(../../base/tree/img/connector-item-last.png) no-repeat 8px -1px;
+}
 .v-tree-node-caption {
 	margin-left: 16px;
 	padding-bottom: 1px;
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
new file mode 100644
index 0000000000..28b3626d79
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png
new file mode 100644
index 0000000000..db4d41cccd
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png
new file mode 100644
index 0000000000..b4d0d7aa56
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png
new file mode 100644
index 0000000000..a93f458787
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
new file mode 100644
index 0000000000..504b715122
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png
new file mode 100644
index 0000000000..5c036ed038
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png