Merge branch 'refs/heads/linuxero'

Gui/AddNewObject.qml

@@ -114,6 +114,7 @@ GridLayout
         from: 1
         to: 100
         value: 1
+        editable: true
     }
 
     Label
@@ -130,6 +131,7 @@ GridLayout
         from: 1
         to: 100
         value: 1
+        editable: true
     }
 
     // New grid row
@@ -185,13 +187,11 @@ GridLayout
         text: qsTr("Besonderheiten")
         Layout.alignment: Qt.AlignRight
     }
-    ComboBox
+    TextField
     {
         property string name: "remarks"
         id: remarks
         Layout.fillWidth: true
-        editable: false
-        textRole: "display"
     }
 
     //// New grid row

Gui/ObjectAddOnContactPerson.qml

@@ -9,7 +9,7 @@ GridLayout
     Layout.fillWidth: true
     Label
     {
-        text: qsTr("Kontaktdaten")
+        text: qsTr("Position")
         Layout.alignment: Qt.AlignRight | Qt.AlignTop
     }
 
@@ -19,7 +19,7 @@ GridLayout
         id: contacttype
         Layout.fillWidth: true
         editable: false
-        model: [qsTr("Beirat"), qsTr("Hausmeister")]
+        model: [qsTr("Beirat"), qsTr("Hausmeister"), qsTr("Hausbewohner"), qsTr("Sonstiges")]
     }
 
     Label
@@ -88,18 +88,18 @@ GridLayout
 
 
     }
-    Label
-    {
-        text: qsTr("Position")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        id: posizion
-        Layout.fillWidth: true
-        placeholderText: "Pflichtfeld"
-        placeholderTextColor: "red"
-    }
+    // Label
+    // {
+    //     text: qsTr("Position")
+    //     Layout.alignment: Qt.AlignRight
+    // }
+    // TextField
+    // {
+    //     id: posizion
+    //     Layout.fillWidth: true
+    //     placeholderText: "Pflichtfeld"
+    //     placeholderTextColor: "red"
+    // }
 
     RowLayout
     {