From 03f00a0fffd8fbe8b762541f599dbaa323988e32 Mon Sep 17 00:00:00 2001 From: Micke Prag Date: Mon, 30 Jan 2012 12:53:07 +0100 Subject: [PATCH] Changed graphics on deletebutton, see #165 --- telldus-gui/Plugins/Sensors/CMakeLists.txt | 1 + telldus-gui/Plugins/Sensors/SensorView.qml | 29 +++++++++--------- .../Plugins/Sensors/btn_action_remove.png | Bin 0 -> 1123 bytes 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 telldus-gui/Plugins/Sensors/btn_action_remove.png diff --git a/telldus-gui/Plugins/Sensors/CMakeLists.txt b/telldus-gui/Plugins/Sensors/CMakeLists.txt index 45371412..92042b57 100644 --- a/telldus-gui/Plugins/Sensors/CMakeLists.txt +++ b/telldus-gui/Plugins/Sensors/CMakeLists.txt @@ -24,6 +24,7 @@ SET( Plugin_MOC_HDRS SET( Plugin_PATH "com.telldus.sensors" ) SET( Plugin_EXTRA + btn_action_remove.png header_bg.png icon.png icon_humidity.png diff --git a/telldus-gui/Plugins/Sensors/SensorView.qml b/telldus-gui/Plugins/Sensors/SensorView.qml index 2a862999..a3626bcb 100644 --- a/telldus-gui/Plugins/Sensors/SensorView.qml +++ b/telldus-gui/Plugins/Sensors/SensorView.qml @@ -40,21 +40,22 @@ Item{ placeholderText: 'Enter a name' onTextChanged: modelData.name = text } - - Text{ - anchors.right: sensorid.left - visible: sensorViewItem.state == "EDIT" + Item { height: 40 - verticalAlignment: Text.AlignVCenter - text: "Delete" - font.underline: true - color: "#004275" - width: 50 - MouseArea{ - anchors.fill: parent - onClicked: { - main.focus = true - confirmDeletion.visible = true; + width: deleteImg.width + anchors.right: sensorid.left + anchors.rightMargin: 15 + visible: sensorViewItem.state == "EDIT" + Image { + id: deleteImg + anchors.centerIn: parent + source: "btn_action_remove.png" + MouseArea{ + anchors.fill: parent + onClicked: { + main.focus = true + confirmDeletion.visible = true; + } } } } diff --git a/telldus-gui/Plugins/Sensors/btn_action_remove.png b/telldus-gui/Plugins/Sensors/btn_action_remove.png new file mode 100644 index 0000000000000000000000000000000000000000..d9e5bf753f9b7134bc75ac749fba154f00515554 GIT binary patch literal 1123 zcmV-p1f2VcP)OH3AX z5cDKIfG3ZF_z*dG6Cc2h4*I>W>yKqwKJWMY zn|4VmV1+-NpPPG3K`)BW>BE!KDd(YN3@M3U9gWA2R{H%Xo-4lX?A%^nS$SiIGcZ(B z(Xd*pOt|Mmi2&tC(?_9llWz$j>dwYBDIz@4l%uZOTfH#{H z;OABhfyJ|Bf=Y<~oDw*p#7}^gCP!ON%J&zSmTuWSbNl=IKQ(kOK}6&v{1|j;eSf0= zC6&`hQC*L^-R`PgUpP28{4LCrc@vr6*_06L)Q*K{bV19$wJY-r3yX#0$f78!Aq5~D zgU>(E<|6 z@}O{vg?z+JiIotP$P6xgk-idUk`Vw2;&|!E%%9Gi7j525+yw|A04f!M#GR>faj^(n zLgJ8zj;NSkWhf>Sp)dcF~2YF-Bkr}uHrK>O5A_>DoNL9 z{CW)dEXN>n*$Tm&)y`KnR}|+`;Ak>oOr{}Bl;WU}@!yPFcP-6!)WzA^b16_9Bk?~} zE0%o}cn4Be^Bnccwd<4+?JdPUY{850|Yl&Bh++1y>zB#i!EOt{vOtg>e-M6!zI zJ52M_(DN2eWTbd5jPvLSP9FarC-QK z-APrA((0CHHadGJb{?P>g>!-Hf>au>p=eQx%`EMrrN+vrf@cJoBUATvt7#fTR7*oPA!$6G=z*kp$eF_^pjiRapTT!RY3G!f zm_+9kx?L{SB&?RUciG&V-sTFnz+yR>{4gIQJ!A#vtdUNkF~`Z>XqJF#st*hZS1kz1 zd?oxhy4#TV#^Exc?)BnX8WpwiWU@%y>GG#Ts zVD3vB8?V=PcX!{G({Wk;8XDdkuQ%4LES8z{UAEpX*zW}% p>wo+uZq0pc?n84Q@R