Index: sources/gui/qml/pages/settings/SettingsDateTime.qml =================================================================== diff -u -rf7392d985121b21e9f9814e444b0810cd1d00b18 -r65558208e4968de9a5470ff5fda1ee2a9d00c793 --- sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) +++ sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) @@ -31,36 +31,36 @@ property int labelWidth : 275 readonly property bool isValid : - _hours .textInput.acceptableInput && - _minutes.textInput.acceptableInput && _year .textInput.acceptableInput && _month .textInput.acceptableInput && - _day .textInput.acceptableInput + _day .textInput.acceptableInput && + _hours .textInput.acceptableInput && + _minutes.textInput.acceptableInput confirmEnabled: isValid notificationText: vDateTime.status onConfirmClicked: { vDateTime.doConfirm( - _hours .textInput.text , - _minutes.textInput.text , _year .textInput.text , _month .textInput.text , - _day .textInput.text ) + _day .textInput.text , + _hours .textInput.text , + _minutes.textInput.text ) } onVisibleChanged: { // it seems entering in the TextInput by keyboard breaks the binding - _hours .textInput.text = vDateTime.hour - _minutes.textInput.text = vDateTime.minute + _year .textInput.text = vDateTime.year _month .textInput.text = vDateTime.month _day .textInput.text = vDateTime.day - _year .textInput.text = vDateTime.year + _hours .textInput.text = vDateTime.hour + _minutes.textInput.text = vDateTime.minute } - Column { - spacing: 75 - anchors.top: parent.top - anchors.topMargin: topMarginContent + Column { id: _container + spacing: 70 + y : Qt.inputMethod.visible && _keyboard.visible ? topMarginContent : ( (_root.height - _container.height) / 2 ) + Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } anchors.horizontalCenter: parent.horizontalCenter Row { // time