Index: sources/gui/qml/pages/UserConfirmation.qml =================================================================== diff -u -r09a43d162e61ae02c73364e050d90957d736f322 -r4696b5fa37cc2ee744582fc70228736cad55ca63 --- sources/gui/qml/pages/UserConfirmation.qml (.../UserConfirmation.qml) (revision 09a43d162e61ae02c73364e050d90957d736f322) +++ sources/gui/qml/pages/UserConfirmation.qml (.../UserConfirmation.qml) (revision 4696b5fa37cc2ee744582fc70228736cad55ca63) @@ -32,11 +32,11 @@ property bool isPassword : false property bool showPasswordReEntryField : false readonly property string password : _password.textInput.text - readonly property string passwordReEntry : _passwordReEntryField.textInput.text + readonly property string passwordReEntry : _passwordReEntry.textInput.text property alias message : _message.text function clearPasswordReEntry() { - _passwordReEntryField.textInput.text = "" + _passwordReEntry.textInput.text = "" } function clearPassword() { @@ -52,12 +52,11 @@ top : parent.top topMargin : { if(_root.showPasswordReEntryField) { - return topMarginContent + 120 - _passwordReEntryField.height + return topMarginContent + 120 - _passwordReEntry.height } else { return topMarginContent + 120 // moved a little down to be more on center and close to keyboard top edge. } } - horizontalCenter: parent.horizontalCenter } textInput.inputMethodHints : Qt.ImhNone @@ -81,7 +80,7 @@ onReleased : _password.textInput.echoMode = TextInput.Password } - TextEntry { id : _passwordReEntryField + TextEntry { id : _passwordReEntry clip : true visible : _root.showPasswordReEntryField textInput .width : 450 @@ -95,10 +94,10 @@ } Image { id : _showPasswordReEntryImage - visible : _passwordReEntryField.visible - anchors.left : _passwordReEntryField.right + visible : _passwordReEntry.visible + anchors.left : _passwordReEntry.right anchors.leftMargin : Variables.minVGap - anchors.verticalCenter : _passwordReEntryField.verticalCenter + anchors.verticalCenter : _passwordReEntry.verticalCenter width : Variables.iconsDiameter height : Variables.iconsDiameter source : "qrc:/images/iEye" @@ -107,8 +106,8 @@ MouseArea { anchors.fill: _showPasswordReEntryImage anchors.margins: -20 - onPressed : _passwordReEntryField.textInput.echoMode = TextInput.Normal - onReleased : _passwordReEntryField.textInput.echoMode = TextInput.Password + onPressed : _passwordReEntry.textInput.echoMode = TextInput.Normal + onReleased : _passwordReEntry.textInput.echoMode = TextInput.Password } Text { id : _message