Update FlowView

Change-Id: I16e5fdc1d875ba07777bbe93d7666db1f9b291ff
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

3 files changed, 26 insertions, 49 deletions

diff --git a/examples/imports/FlowView/FlowActionArea.qml b/examples/imports/FlowView/FlowActionArea.qml
index da019e0..822230f 100644
--- a/examples/imports/FlowView/FlowActionArea.qml
+++ b/examples/imports/FlowView/FlowActionArea.qml
@@ -30,8 +30,8 @@
 import QtQuick 2.10
 
 MouseArea {
-    width: 40
-    height: 20
+    width: 80
+    height: 40
 
     id: root
 
diff --git a/examples/imports/FlowView/FlowView.qml b/examples/imports/FlowView/FlowView.qml
index 08a976e..bae3b53 100644
--- a/examples/imports/FlowView/FlowView.qml
+++ b/examples/imports/FlowView/FlowView.qml
@@ -159,6 +159,14 @@ Item {
             t.transitionView = root
         }
 
+        for (i = 0; i < root.flowTransitions.length; ++i) {
+            var t = root.flowTransitions[i]
+            if (root.checkInclude(t.from, root))
+                root.currentItem = t.to[0]
+        }
+
+        root.resetCurrentIndex()
+
         __setupCurrentItem()
         __isCompleted = true
     }
diff --git a/examples/imports/FlowView/designer/FlowItemSpecifics.qml b/examples/imports/FlowView/designer/FlowItemSpecifics.qml
index 2d2ae75..fc40148 100644
--- a/examples/imports/FlowView/designer/FlowItemSpecifics.qml
+++ b/examples/imports/FlowView/designer/FlowItemSpecifics.qml
@@ -38,53 +38,22 @@ Column {
     Section {
         anchors.left: parent.left
         anchors.right: parent.right
-        caption: qsTr("Outline Color")
-
-        ColorEditor {
-            backendValue: backendValues.color__AUX
-            supportGradient: false
-        }
-   }
-   Section {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        caption: qsTr("Fill Color")
-
-        ColorEditor {
-            backendValue: backendValues.fillColor__AUX
-            supportGradient: false
+        caption: qsTr("Flow Item")
+
+        SectionLayout {
+            rows: 4
+            columns: 2
+
+            Label {
+                text: qsTr("Join Connections")
+                tooltip: qsTr("Join connections")
+            }
+            CheckBox {
+                backendValue: backendValues.joinConnection__AUX
+                Layout.fillWidth: true
+                text: backendValues.enabled
+            }
         }
-   }
-    Section {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        caption: qsTr("Transition Parameters")
-
-         SectionLayout {
-             rows: 4
-             columns: 2
-
-             Label {
-                 text: qsTr("Line Width")
-                 tooltip: qsTr("Sets the margin, in pixels, around the text in the TextEdit..")
-             }
-             SpinBox {
-                 backendValue: backendValues.width__AUX
-                 maximumValue: 22
-                 minimumValue: 1
-             }
-
-             Label {
-                 visible: !textInputSection.isTextInput
-                 text: qsTr("Enabled")
-                 tooltip: qsTr("Sets the margin, in pixels, around the text in the TextEdit..")
-             }
-             CheckBox {
-                 Layout.fillWidth: true
-                 text: backendValues.enabled
-                 backendValue: backendValues.enabled
-             }
 
-         }
-   }
+    }
 }