Index: sources/gui/qml/components/TextEntry.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -raef40c25aa724a8fc249346de0cfc91bc63df8d4
--- sources/gui/qml/components/TextEntry.qml	(.../TextEntry.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/components/TextEntry.qml	(.../TextEntry.qml)	(revision aef40c25aa724a8fc249346de0cfc91bc63df8d4)
@@ -33,7 +33,7 @@
     property alias      validator   : _input.validator
     property var        nextInput   : undefined
     property alias      text        : _input.text
-    property bool       hasCarret   : false
+    property bool       hasCursor   : true
 
     readonly property alias isValid : _input.acceptableInput
 
@@ -53,7 +53,7 @@
 
     function doFocus( vFocus ) {
         if ( vFocus ) {
-            if ( ! _root.hasCarret ) {
+            if ( ! _root.hasCursor ) {
                 _input.selectAll()
             }
             _keyboard.setVisible(true)
@@ -69,6 +69,7 @@
     }
 
     TextInput { id          : _input
+        enabled             : hasCursor
         height              : parent.height
         width               : TextEntry.InputWidth
         text                : ""
@@ -86,6 +87,7 @@
     }
 
     Line { id       : _line
+        visible     : hasCursor
         color       : Colors.borderButtonHalfDarker
         width       : _input.width
         anchors.top : _input.bottom
@@ -94,7 +96,7 @@
     }
 
     MouseArea {
-        visible     : ! hasCarret
+        visible     : ! hasCursor
         anchors.fill: parent
         propagateComposedEvents: true
         onClicked: {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -r2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43 -raef40c25aa724a8fc249346de0cfc91bc63df8d4
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision aef40c25aa724a8fc249346de0cfc91bc63df8d4)
@@ -65,7 +65,7 @@
             property int topMarginContent   : 200
 
             clip                : true
-            hasCarret           : true
+            hasCursor           : true
             textInput   .width  : 450
             text                : vTreatmentCreate.patientID
             anchors {
Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r081df84b4b81ab39296f42c3c7e91deb021b8979 -raef40c25aa724a8fc249346de0cfc91bc63df8d4
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 081df84b4b81ab39296f42c3c7e91deb021b8979)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision aef40c25aa724a8fc249346de0cfc91bc63df8d4)
@@ -67,43 +67,40 @@
         anchors.leftMargin  : _root.leftMargin
 
         TextEntry { id      : _ipAddress
-            // nextInput       : _gateway // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.ipAddress
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
-            hasCarret       : true
+            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetIPAddress(textInput.text)
             }
         }
 
         TextEntry { id      : _gateway
-            // nextInput       : _subnetmask // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _subnetmask // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.gateway
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
-            hasCarret       : true
+            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetGateway(textInput.text)
             }
         }
 
         TextEntry { id      : _subnetmask
-            // nextInput       : _dns // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _dns // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.subnetMask
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
-            hasCarret       : true
+            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetSubnetMask(textInput.text)
             }
         }
@@ -113,10 +110,9 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
-            hasCarret       : true
+            // hasCursor       : true // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetDNS(textInput.text)
             }
         }