From 1bebaefff982e4b34e56fa6fd7ed0b16523fcd33 Mon Sep 17 00:00:00 2001
From: Micke Prag <micke.prag@telldus.se>
Date: Thu, 27 Oct 2011 16:33:54 +0200
Subject: [PATCH] Added graphics for sensors. A first version without support
 for edit or remove sensors

---
 telldus-gui/Plugins/Sensors/CMakeLists.txt    |   6 ++
 telldus-gui/Plugins/Sensors/HeaderTitle.qml   |  10 +++
 telldus-gui/Plugins/Sensors/SensorValue.qml   |  32 ++++++++
 telldus-gui/Plugins/Sensors/__init__.js       |  12 +--
 telldus-gui/Plugins/Sensors/header_bg.png     | Bin 0 -> 526 bytes
 telldus-gui/Plugins/Sensors/icon_humidity.png | Bin 0 -> 1684 bytes
 telldus-gui/Plugins/Sensors/icon_temp.png     | Bin 0 -> 1644 bytes
 telldus-gui/Plugins/Sensors/main.qml          |  71 ++++++++++++++++--
 telldus-gui/Plugins/Sensors/qmldir            |   2 +
 telldus-gui/Plugins/Sensors/row_bg.png        | Bin 0 -> 346 bytes
 telldus-gui/Plugins/Sensors/sensorsplugin.cpp |   3 +
 11 files changed, 119 insertions(+), 17 deletions(-)
 create mode 100644 telldus-gui/Plugins/Sensors/HeaderTitle.qml
 create mode 100644 telldus-gui/Plugins/Sensors/SensorValue.qml
 create mode 100644 telldus-gui/Plugins/Sensors/header_bg.png
 create mode 100644 telldus-gui/Plugins/Sensors/icon_humidity.png
 create mode 100644 telldus-gui/Plugins/Sensors/icon_temp.png
 create mode 100644 telldus-gui/Plugins/Sensors/row_bg.png

diff --git a/telldus-gui/Plugins/Sensors/CMakeLists.txt b/telldus-gui/Plugins/Sensors/CMakeLists.txt
index bfd56a32..535ccc85 100644
--- a/telldus-gui/Plugins/Sensors/CMakeLists.txt
+++ b/telldus-gui/Plugins/Sensors/CMakeLists.txt
@@ -24,9 +24,15 @@ SET( Plugin_MOC_HDRS
 SET( Plugin_PATH "com.telldus.sensors" )
 
 SET( Plugin_EXTRA
+	header_bg.png
 	icon.png
+	icon_humidity.png
+	icon_temp.png
 	main.qml
+	HeaderTitle.qml
+	row_bg.png
 	qmldir
+	SensorValue.qml
 )
 
 INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )
diff --git a/telldus-gui/Plugins/Sensors/HeaderTitle.qml b/telldus-gui/Plugins/Sensors/HeaderTitle.qml
new file mode 100644
index 00000000..0d7ae213
--- /dev/null
+++ b/telldus-gui/Plugins/Sensors/HeaderTitle.qml
@@ -0,0 +1,10 @@
+import Qt 4.7
+
+Text {
+	id: headerTitle
+	text: "Name"
+	color: "white"
+	font.weight: Font.Bold
+	height: parent.height
+	verticalAlignment: Text.AlignVCenter
+}
diff --git a/telldus-gui/Plugins/Sensors/SensorValue.qml b/telldus-gui/Plugins/Sensors/SensorValue.qml
new file mode 100644
index 00000000..7198c9ff
--- /dev/null
+++ b/telldus-gui/Plugins/Sensors/SensorValue.qml
@@ -0,0 +1,32 @@
+import Qt 4.7
+
+Item {
+	property alias text: text.text
+	property alias icon: icon.source
+	property date lastUpdated: new Date()
+
+	id: sensorValue
+	width: parent.width
+	height: 40
+	Image {
+		id: icon
+		anchors.verticalCenter: parent.verticalCenter
+	}
+	Text {
+		id: text
+		anchors.left: icon.right
+		anchors.leftMargin: 10
+		anchors.verticalCenter: parent.verticalCenter
+		color: "#004275"
+	}
+	Text {
+		id: timestamp
+		anchors.right: parent.right
+		anchors.rightMargin: 10
+		anchors.verticalCenter: parent.verticalCenter
+		text: Qt.formatDateTime(lastUpdated, Qt.DefaultLocaleShortDate);
+		color: "#004275"
+		font.pointSize: text.font.pointSize - 1
+		font.italic: true
+	}
+}
diff --git a/telldus-gui/Plugins/Sensors/__init__.js b/telldus-gui/Plugins/Sensors/__init__.js
index b6b11054..c20bfb67 100644
--- a/telldus-gui/Plugins/Sensors/__init__.js
+++ b/telldus-gui/Plugins/Sensors/__init__.js
@@ -27,9 +27,8 @@ com.telldus.sensors = function() {
 
 		}
 
-		//com.telldus.core.sensorEvent.connect(sensorEvent);
-		view = new com.telldus.qml.view({
-		});
+		com.telldus.core.sensorEvent.connect(sensorEvent);
+		view = new com.telldus.qml.view({});
 
 		view.setProperty('sensorModel', sensorList);
 		view.load("main.qml");
@@ -63,13 +62,8 @@ com.telldus.sensors = function() {
 			print("Update");
 		}
 
-		if (dataType == com.telldus.core.TELLSTICK_TEMPERATURE) {
-			sensor.temperature = value;
-		} else if (dataType == com.telldus.core.TELLSTICK_HUMIDITY) {
-			sensor.humidity = value;
-		}
-
 		print("Sensor event", protocol, model, id, dataType, value, timestamp);
+		sensor.setValue(dataType, value, timestamp);
 	}
 
 	return { //Public functions
diff --git a/telldus-gui/Plugins/Sensors/header_bg.png b/telldus-gui/Plugins/Sensors/header_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..564a158b5d9c69a045712278b45085512e0474f7
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq000XB001Zm1^@s6D3k!c0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzut`KgRCwCVl|4%XK@f)Dy^q8%jFKXP
zDb-F81hG)G^cPs!2>J)aLLt2t;vW#y(ps?7Lexe~5Cei*7!%YKMm-bF*WIl%r;#8>
zyemZKc-h<AXJ%)YIYvk+!KTk{jL|Sh8YFd-Zb@;{YISXTpBce0feWL3k)^5O9`r`q
z5!6-OKfmGp?it&sX`G}U7Rg~*Xfx{^ac_5iLd`tBB5{*LI#)okVxl>qp|drJ&7&)e
zm~n;=Rwjo=Ov}d3SsIsF14gleD$R9OL8v)^4sy82zU*t{(ch#i*h*X@o_cU1*32S@
z63y9}Y=GfVGV_RwyC)RORk&G+zpGk^VPtZ7@-EYxL?d%x-nwd9Kd~RMZQGFc4`dCN
zpHCwbHQ3>#$H<fj!L~=3qk4|)D-G!<4g8NZeBFkVv!4UPYi&>pQhKfp`7aLWuaJDh
zzf(xRmWJPZmXLq=rzj-Dl(Mc&T_m{XP+&M|n2J+^UkCjr(bUGPafV~(dEL_WfIF;e
zP{L7e6EWqp6U9V03enO|i|WVLH1eE4jv6EGP`I?VAyOA9OFFJ^ZSMjM08uy&f`RU1
Q`v3p{07*qoM6N<$f)*X<_5c6?

literal 0
HcmV?d00001

diff --git a/telldus-gui/Plugins/Sensors/icon_humidity.png b/telldus-gui/Plugins/Sensors/icon_humidity.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b02e26676f112bf67aec6d5438028f90622ed3
GIT binary patch
literal 1684
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

literal 0
HcmV?d00001

diff --git a/telldus-gui/Plugins/Sensors/icon_temp.png b/telldus-gui/Plugins/Sensors/icon_temp.png
new file mode 100644
index 0000000000000000000000000000000000000000..67a720dbebd64cab28dee2ea3589caf58d70375b
GIT binary patch
literal 1644
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

literal 0
HcmV?d00001

diff --git a/telldus-gui/Plugins/Sensors/main.qml b/telldus-gui/Plugins/Sensors/main.qml
index 620403e8..8be6755d 100644
--- a/telldus-gui/Plugins/Sensors/main.qml
+++ b/telldus-gui/Plugins/Sensors/main.qml
@@ -3,17 +3,72 @@ import Qt 4.7
 Item {
 	id: main
 
+	Component {
+		id: sensorView
+		BorderImage {
+			source: "row_bg.png"
+			border.left: 5; border.top: 5
+			border.right: 5; border.bottom: 5
+			height: sensorInfo.height
+			width: parent.width
+
+			Text {
+				anchors.left: parent.left
+				anchors.leftMargin: 15
+				height: 40
+				verticalAlignment: Text.AlignVCenter
+				text: modelData.name;
+				color: "#004275"
+			}
+			Column {
+				id: sensorInfo
+				anchors.right: parent.right
+				width: 250
+				SensorValue {
+					visible: modelData.hasTemperature
+					text: visible ? modelData.sensorValue(1).value + '°C' : ''
+					icon: "icon_temp.png"
+					lastUpdated: visible ? modelData.sensorValue(1).lastUpdated : new Date()
+				}
+				SensorValue {
+					visible: modelData.hasHumidity
+					text: visible ? modelData.sensorValue(2).value + '%' : ''
+					icon: "icon_humidity.png"
+					lastUpdated: visible ? modelData.sensorValue(2).lastUpdated : new Date()
+				}
+			}
+		}
+	}
+
 	Column {
+		spacing: 1
+		BorderImage {
+			id: header
+			source: "header_bg.png"
+			width: parent.width; height: 40
+			border.left: 5; border.top: 5
+			border.right: 5; border.bottom: 5
+
+			HeaderTitle {
+				text: "Name"
+				anchors.left: parent.left
+				anchors.leftMargin: 15
+			}
+			HeaderTitle {
+				text: "Sensor information"
+				width: 150
+				anchors.right: timestampTitle.left
+			}
+			HeaderTitle {
+				id: timestampTitle
+				text: "Last updated"
+				width: 100
+				anchors.right: parent.right
+			}
+		}
 		Repeater {
 			model: sensorModel
-			delegate: Row {
-				spacing: 10
-				Text { text: modelData.name }
-				Text { text: modelData.protocol }
-				Text { text: modelData.model }
-				Text { text: modelData.temperature + '°C'; visible: modelData.hasTemperature }
-				Text { text: modelData.humidity + "%"; visible: modelData.hasHumidity }
-			}
+			delegate: sensorView
 		}
 		anchors.fill: parent
 	}
diff --git a/telldus-gui/Plugins/Sensors/qmldir b/telldus-gui/Plugins/Sensors/qmldir
index e69de29b..19c8cb6f 100644
--- a/telldus-gui/Plugins/Sensors/qmldir
+++ b/telldus-gui/Plugins/Sensors/qmldir
@@ -0,0 +1,2 @@
+HeaderTitle 1.0 HeaderTitle.qml
+SensorValue 1.0 SensorValue.qml
diff --git a/telldus-gui/Plugins/Sensors/row_bg.png b/telldus-gui/Plugins/Sensors/row_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..06f9d82d406405c1137c8672addb67c8054ad975
GIT binary patch
literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy{7FPXRCwBaQ9X-;KoH$s(`b|SB#pfU
z4urIKzbRD;%hdTtDGpK{T3w@9M^4cqAPVX_H*bkY2uU8i{hGILc4j3J2_TN+51zKn
zfVpCxam+jfLGWcn5Jyq8OVgC<x~8t{XdFjs+m@=Tq9jQOap)v3;CS?X-%?5mt+kk@
z$(Tqf%|6RA&6-ce!`|~e3xU4x4cYmhxa7L71>J&&wc|Kq7zX1q*Dya3ux%UDJDitT
z-3xDltk6MxnbSQ3YG5=F|1?b_UV%Gfx(jib=edUaBjCI!3Unh>*M^5>Sqfyp+vggv
s$2sDxJIMz>xM99Af0^I6KlmrW0Ji3+_8HcCGynhq07*qoM6N<$f;s|{CjbBd

literal 0
HcmV?d00001

diff --git a/telldus-gui/Plugins/Sensors/sensorsplugin.cpp b/telldus-gui/Plugins/Sensors/sensorsplugin.cpp
index 51d869c3..4891b7ad 100644
--- a/telldus-gui/Plugins/Sensors/sensorsplugin.cpp
+++ b/telldus-gui/Plugins/Sensors/sensorsplugin.cpp
@@ -1,6 +1,8 @@
 #include "sensorsplugin.h"
 #include "sensor.h"
+#include "sensorvalue.h"
 #include <QScriptEngine>
+#include <QtDeclarative>
 
 QScriptValue SensorCTor(QScriptContext *context, QScriptEngine *engine) {
 	if (!context->isCalledAsConstructor()) {
@@ -12,6 +14,7 @@ QScriptValue SensorCTor(QScriptContext *context, QScriptEngine *engine) {
 SensorsPlugin::SensorsPlugin ( QObject * parent )
 		:QScriptExtensionPlugin( parent )
 {
+	qmlRegisterType<SensorValue>("Telldus", 1, 0, "SensorValue");
 }
 
 SensorsPlugin::~SensorsPlugin() {