Convert the textbox to qt-components as well

telldus-gui/Plugins/Sensors/SensorView.qml

@@ -9,6 +9,13 @@ Component {
 		height: childrenRect.height
 		width: parent.width
 
+		property string state: main.state
+		onStateChanged: {
+			if (state != "EDIT") {
+				modelData.setName(nameEdit.text)
+			}
+		}
+
 		BorderImage {
 			source: "row_bg.png"
 			border.left: 5; border.top: 5
@@ -22,32 +29,18 @@ Component {
 				anchors.leftMargin: 15
 				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{
 				anchors.right: model.left

telldus-gui/Plugins/Sensors/sensor.cpp

@@ -46,10 +46,6 @@ void Sensor::setModel(const QString &model) {
 }
 
 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;
 }