ModelTweak: tidied up the maximise/restore button

Also moved the images into a seperate directory whilst I was
updating the grow/shrink images.

Change-Id: I55d3aff8a8f25b2a0c3db24d41c6c08555e9878a
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

9 files changed, 27 insertions, 12 deletions

diff --git a/util/qt3d/modeltweak/qml/BlenderValueSlider.qml b/util/qt3d/modeltweak/qml/BlenderValueSlider.qml
index 6e7bc5c0..9895a354 100644
--- a/util/qt3d/modeltweak/qml/BlenderValueSlider.qml
+++ b/util/qt3d/modeltweak/qml/BlenderValueSlider.qml
@@ -65,13 +65,13 @@ Item {
         }
         Image {
             id: plus
-            source: "plus.png"
+            source: "images/plus.png"
             anchors.left: textInput.right
             anchors.verticalCenter: parent.verticalCenter
         }
         Image {
             id: minus
-            source: "minus.png"
+            source: "images/minus.png"
             anchors.right: textInput.left
             anchors.verticalCenter: parent.verticalCenter
         }
diff --git a/util/qt3d/modeltweak/qml/Grow.png b/util/qt3d/modeltweak/qml/Grow.png
deleted file mode 100644
index d928ee3d..00000000
--- a/util/qt3d/modeltweak/qml/Grow.png
+++ /dev/null
diff --git a/util/qt3d/modeltweak/qml/ModelViewport.qml b/util/qt3d/modeltweak/qml/ModelViewport.qml
index c47215b7..3a812cb9 100644
--- a/util/qt3d/modeltweak/qml/ModelViewport.qml
+++ b/util/qt3d/modeltweak/qml/ModelViewport.qml
@@ -2,7 +2,7 @@ import QtQuick 1.0
 import Qt3D 1.0
 
 Rectangle {
-    id: rect
+    id: view
     width: isBig ? parent.width : parent.width/2;
     height: isBig ? parent.height : parent.height/2
 
@@ -125,13 +125,28 @@ Rectangle {
         // clear the current mouse button upon release
         onReleased: { mouseDown = Qt.NoButton }
     }
-    Image {
-        anchors.top: parent.top
-        anchors.right: parent.right
-        source: parent.isBig ? "Shrink.png" : "Grow.png"
-        MouseArea {
-            anchors.fill: parent
-            onClicked: isBig = !isBig
+
+    Rectangle {
+        radius: 4
+        border.width: 1
+        border.color: "#191919"
+        anchors {
+            top: view.top; topMargin: 2;
+            right: view.right; rightMargin: 2;
+        }
+        width: 16 + 2
+        height: 16 + 2
+        color: "#999999"
+
+        Image {
+            id: img
+            source: view.isBig ? "images/shrink.png" : "images/grow.png"
+            x: 2
+            y: 2
+            MouseArea {
+                anchors.fill: parent
+                onClicked: isBig = !isBig
+            }
         }
     }
 }
diff --git a/util/qt3d/modeltweak/qml/Shrink.png b/util/qt3d/modeltweak/qml/Shrink.png
deleted file mode 100644
index 28383486..00000000
--- a/util/qt3d/modeltweak/qml/Shrink.png
+++ /dev/null
diff --git a/util/qt3d/modeltweak/qml/ValueField.qml b/util/qt3d/modeltweak/qml/ValueField.qml
index bc40ce11..b7291583 100644
--- a/util/qt3d/modeltweak/qml/ValueField.qml
+++ b/util/qt3d/modeltweak/qml/ValueField.qml
@@ -51,7 +51,7 @@ FocusScope {
         }
         Image {
             id: plus
-            source: "plus.png"
+            source: "images/plus.png"
             anchors.left: textInput.right
             anchors.verticalCenter: parent.verticalCenter
             MouseArea { id: plusMouseArea; anchors.fill: parent; onPressed: incDelta() }
@@ -64,7 +64,7 @@ FocusScope {
         }
         Image {
             id: minus
-            source: "minus.png"
+            source: "images/minus.png"
             anchors.right: textInput.left
             anchors.verticalCenter: parent.verticalCenter
             MouseArea { id: minusMouseArea; anchors.fill: parent; onPressed: decDelta() }
diff --git a/util/qt3d/modeltweak/qml/images/grow.png b/util/qt3d/modeltweak/qml/images/grow.png
new file mode 100644
index 00000000..df154010
--- /dev/null
+++ b/util/qt3d/modeltweak/qml/images/grow.png
diff --git a/util/qt3d/modeltweak/qml/minus.png b/util/qt3d/modeltweak/qml/images/minus.png
index a93156ea..a93156ea 100644
--- a/util/qt3d/modeltweak/qml/minus.png
+++ b/util/qt3d/modeltweak/qml/images/minus.png
diff --git a/util/qt3d/modeltweak/qml/plus.png b/util/qt3d/modeltweak/qml/images/plus.png
index b1ba3774..b1ba3774 100644
--- a/util/qt3d/modeltweak/qml/plus.png
+++ b/util/qt3d/modeltweak/qml/images/plus.png
diff --git a/util/qt3d/modeltweak/qml/images/shrink.png b/util/qt3d/modeltweak/qml/images/shrink.png
new file mode 100644
index 00000000..285d3a9d
--- /dev/null
+++ b/util/qt3d/modeltweak/qml/images/shrink.png