From 5ffcea07a2d6368455694a90977c441b00afebe8 Mon Sep 17 00:00:00 2001
From: Mark Janes <mark.a.janes@intel.com>
Date: Tue, 31 Oct 2017 14:06:15 -0700
Subject: State: Use a public domain icon for the collapse arrow

---
 retrace/daemon/ui/qml/StateControl.qml             |  21 ++++++++++++++-------
 retrace/daemon/ui/qml/images/README.txt            |   2 ++
 .../daemon/ui/qml/images/if_next_right_82215.png   | Bin 0 -> 290 bytes
 retrace/daemon/ui/resources.qrc                    |   1 +
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 retrace/daemon/ui/qml/images/README.txt
 create mode 100644 retrace/daemon/ui/qml/images/if_next_right_82215.png

diff --git a/retrace/daemon/ui/qml/StateControl.qml b/retrace/daemon/ui/qml/StateControl.qml
index 4e349f62..1e79f01f 100644
--- a/retrace/daemon/ui/qml/StateControl.qml
+++ b/retrace/daemon/ui/qml/StateControl.qml
@@ -16,29 +16,34 @@ Item {
                 Row {
                     visible: modelData.visible
                     height: modelData.visible ? combo.height : 0
+                    spacing: 10
                     Rectangle {
                         id: indent
                         width: nameText.height * modelData.indent
                         height: 1
                         opacity: 0.0
                     }
-                    Rectangle {
+                    Image {
                         id: collapse
-                        anchors.bottom: nameText.bottom
-                        width: nameText.height
-                        height: nameText.height
+                        anchors.verticalCenter: nameText.verticalCenter
+                        width: nameText.height * 0.75
+                        height: nameText.height * 0.75
+                        source: "qrc:///qml/images/if_next_right_82215.png"
                         visible: (modelData.valueType == QStateValue.KglDirectory)
                         property var collapsed: false
-                        color: collapse.collapsed ? "red" : "green"
+                        transform: Rotation {
+                            origin.x: collapse.width / 2
+                            origin.y: collapse.width / 2
+                            angle: collapse.collapsed ? 0 : 90
+                        }
+
                         MouseArea {
                             anchors.fill: parent
                             onClicked: {
                                 if (collapse.collapsed) {
-                                    collapse.color = "green";
                                     stateModel.expand(modelData.path);
                                     collapse.collapsed = false
                                 } else {
-                                    collapse.color = "red";
                                     stateModel.collapse(modelData.path);
                                     collapse.collapsed = true
                                 }
@@ -51,6 +56,8 @@ Item {
                         text: modelData.name + " : "
                     }
                     Row {
+                        anchors.verticalCenter: parent.verticalCenter
+                        spacing: 10
                         visible: (modelData.valueType == QStateValue.KglColor)
                         Text{
                             text: "Red: "
diff --git a/retrace/daemon/ui/qml/images/README.txt b/retrace/daemon/ui/qml/images/README.txt
new file mode 100644
index 00000000..088757ef
--- /dev/null
+++ b/retrace/daemon/ui/qml/images/README.txt
@@ -0,0 +1,2 @@
+if_next_right_82215.png was taken from https://www.iconfinder.com/iconsets/mimiGlyphs
+License as documented on that page: Free for commercial use 
diff --git a/retrace/daemon/ui/qml/images/if_next_right_82215.png b/retrace/daemon/ui/qml/images/if_next_right_82215.png
new file mode 100644
index 00000000..43bd6e2a
Binary files /dev/null and b/retrace/daemon/ui/qml/images/if_next_right_82215.png differ
diff --git a/retrace/daemon/ui/resources.qrc b/retrace/daemon/ui/resources.qrc
index 9574d8c0..59a3af94 100644
--- a/retrace/daemon/ui/resources.qrc
+++ b/retrace/daemon/ui/resources.qrc
@@ -7,6 +7,7 @@
         <file>qml/RefreshControl.qml</file>
         <file>qml/images/retracer_icon.png</file>
         <file>qml/images/no_render_target.png</file>
+        <file>qml/images/if_next_right_82215.png</file>
         <file>qml/RenderShadersControl.qml</file>
         <file>qml/ApiControl.qml</file>
         <file>qml/BatchControl.qml</file>
-- 
cgit v1.2.3