From 0c6d35949ce3b58468771a375fb55d3785d58d09 Mon Sep 17 00:00:00 2001 From: Patrick Burke Date: Tue, 15 Nov 2011 17:34:39 +1000 Subject: 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 --- util/qt3d/modeltweak/qml/BlenderValueSlider.qml | 4 +-- util/qt3d/modeltweak/qml/Grow.png | Bin 256 -> 0 bytes util/qt3d/modeltweak/qml/ModelViewport.qml | 31 ++++++++++++++++++------ util/qt3d/modeltweak/qml/Shrink.png | Bin 253 -> 0 bytes util/qt3d/modeltweak/qml/ValueField.qml | 4 +-- util/qt3d/modeltweak/qml/images/grow.png | Bin 0 -> 252 bytes util/qt3d/modeltweak/qml/images/minus.png | Bin 0 -> 224 bytes util/qt3d/modeltweak/qml/images/plus.png | Bin 0 -> 224 bytes util/qt3d/modeltweak/qml/images/shrink.png | Bin 0 -> 249 bytes util/qt3d/modeltweak/qml/minus.png | Bin 224 -> 0 bytes util/qt3d/modeltweak/qml/plus.png | Bin 224 -> 0 bytes 11 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 util/qt3d/modeltweak/qml/Grow.png delete mode 100644 util/qt3d/modeltweak/qml/Shrink.png create mode 100644 util/qt3d/modeltweak/qml/images/grow.png create mode 100644 util/qt3d/modeltweak/qml/images/minus.png create mode 100644 util/qt3d/modeltweak/qml/images/plus.png create mode 100644 util/qt3d/modeltweak/qml/images/shrink.png delete mode 100644 util/qt3d/modeltweak/qml/minus.png delete mode 100644 util/qt3d/modeltweak/qml/plus.png 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 Binary files a/util/qt3d/modeltweak/qml/Grow.png and /dev/null differ 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 Binary files a/util/qt3d/modeltweak/qml/Shrink.png and /dev/null differ 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 Binary files /dev/null and b/util/qt3d/modeltweak/qml/images/grow.png differ diff --git a/util/qt3d/modeltweak/qml/images/minus.png b/util/qt3d/modeltweak/qml/images/minus.png new file mode 100644 index 00000000..a93156ea Binary files /dev/null and b/util/qt3d/modeltweak/qml/images/minus.png differ diff --git a/util/qt3d/modeltweak/qml/images/plus.png b/util/qt3d/modeltweak/qml/images/plus.png new file mode 100644 index 00000000..b1ba3774 Binary files /dev/null and b/util/qt3d/modeltweak/qml/images/plus.png differ 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 Binary files /dev/null and b/util/qt3d/modeltweak/qml/images/shrink.png differ diff --git a/util/qt3d/modeltweak/qml/minus.png b/util/qt3d/modeltweak/qml/minus.png deleted file mode 100644 index a93156ea..00000000 Binary files a/util/qt3d/modeltweak/qml/minus.png and /dev/null differ diff --git a/util/qt3d/modeltweak/qml/plus.png b/util/qt3d/modeltweak/qml/plus.png deleted file mode 100644 index b1ba3774..00000000 Binary files a/util/qt3d/modeltweak/qml/plus.png and /dev/null differ -- cgit v1.2.3