Changeset 99c2b0

Timestamp:

01/13/12 16:47:20 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

1e650c7142f7844537be880bdfa4b4229880b6ad

Parents:

64e2b354af0c1166afff3ea763e1c12b6b1be779

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-13 16:47:20+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-13 16:47:20+01:00

Message:

Convert the textbox to qt-components as well

Location:

telldus-gui/Plugins/Sensors

Files:

• SensorView.qml (modified) (2 diffs)
• sensor.cpp (modified) (1 diff)

telldus-gui/Plugins/Sensors/SensorView.qml

@@ -9 +9 @@
                 height: childrenRect.height
                 width: parent.width
+
+                property string state: main.state
+                onStateChanged: {
+                        if (state != "EDIT") {
+                                modelData.setName(nameEdit.text)
+                        }
+                }
 
                 BorderImage {
@@ -23 +30 @@
                                 height: 40
                                 verticalAlignment: Text.AlignVCenter
-                                text: modelData.name;
+                                text: modelData.name == '' ? '<unnamed>' : modelData.name;
                                 color: "#004275"
                         }
-                        Rectangle{
-                                color: "white"
+                        TextField {
+                                id: nameEdit
                                 visible: main.state == "EDIT"
                                 anchors.left: parent.left
                                 anchors.leftMargin: 15
-                                width: nameEdit.width + 4
-                                height: 22
-                                TextInput{
-                                        id: nameEdit
-                                        anchors.centerIn: parent
-                                        text: modelData.name;
-                                        color: "#004275"
-
-                                        onActiveFocusChanged: {
-                                                if(!activeFocus){
-                                                        //todo other way?
-                                                        modelData.setName(nameEdit.text);
-                                                }
-                                        }
-                                        onAccepted: {
-                                                modelData.setName(nameEdit.text);
-                                        }
-                                }
+                                anchors.top: parent.top
+                                anchors.topMargin: (40-nameEdit.height)/2
+                                text: modelData.name;
+                                placeholderText: 'Enter a name'
                         }
                         Text{

telldus-gui/Plugins/Sensors/sensor.cpp

@@ -47 +47 @@
 
 QString Sensor::name() const {
-        //return QString("%1 %2").arg(this->protocol()).arg(this->id()); //TODO: Remove when name is fully implemented
-        if(d->name == ""){
-                return "<unnamed>";
-        }
         return d->name;
 }