summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@theqtcompany.com>2015-12-16 12:35:11 +0200
committerKatja Marttila <katja.marttila@theqtcompany.com>2015-12-18 06:57:05 +0000
commitfe0eacbd887e2e7b9a59b71725e9f9616cbda7fc (patch)
treeb9bbc9fa103317ad37437064dd9292310c1a790f
parent43b42cb70b1555ee5baa0666b4fa22bf8f2fae48 (diff)
Replace close button
Change-Id: I9270d39c4abb2b93edd8062dd9b2f3de50bca97a Task-number: QTRD-3770 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
-rw-r--r--qml/Main.qml28
-rw-r--r--qml/images/close-button.pngbin0 -> 5091 bytes
-rw-r--r--resources.qrc1
3 files changed, 4 insertions, 25 deletions
diff --git a/qml/Main.qml b/qml/Main.qml
index 9974653..662df6e 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -212,33 +212,11 @@ Window {
engine.state = "app-running";
}
- Rectangle {
- id: applicationCloseButton;
-
+ Image {
+ id: applicationCloseButton
+ source: "images/close-button.png"
anchors.horizontalCenter: parent.horizontalCenter
anchors.horizontalCenterOffset: parent.width / 4
- y: -height / 2;
-
- width: closeLabel.width + engine.centimeter() * 2
- height: engine.fontSize() * 3;
- radius: height / 2;
-
- gradient: Gradient {
- GradientStop { position: 0.5; color: "gray" }
- GradientStop { position: 1; color: "black"; }
- }
-
- // border.color: "gray"
-
- Text {
- id: closeLabel
- color: "white"
- text: "Close"
- anchors.centerIn: parent
- anchors.verticalCenterOffset: parent.height / 4;
- font.pixelSize: engine.fontSize();
- }
-
enabled: engine.state == "app-running"
MouseArea {
anchors.fill: parent
diff --git a/qml/images/close-button.png b/qml/images/close-button.png
new file mode 100644
index 0000000..edcbe15
--- /dev/null
+++ b/qml/images/close-button.png
Binary files differ
diff --git a/resources.qrc b/resources.qrc
index ff656fa..d3c0afc 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -15,5 +15,6 @@
<file>qml/images/play.png</file>
<file>qml/images/particle_star2.png</file>
<file>qml/images/Play_btn.png</file>
+ <file>qml/images/close-button.png</file>
</qresource>
</RCC>