Index: denali.pro.user =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- denali.pro.user (.../denali.pro.user) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ denali.pro.user (.../denali.pro.user) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/Keyboard.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/Keyboard.qml (.../Keyboard.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/Keyboard.qml (.../Keyboard.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -28,11 +28,12 @@ */ InputPanel { id : _root function setVisible(vVisible) { - active = vVisible + visible = vVisible } - y: Qt.inputMethod.visible ? parent.height - _root.height : parent.height - anchors.left: parent.left - anchors.right: parent.right + active : false // if active set to true then in the TextInput section handlers will show up, which is not nice. + y : Qt.inputMethod.visible ? parent.height - _root.height : parent.height + anchors.left : parent.left + anchors.right : parent.right Behavior on y { NumberAnimation { duration: 250 } } } Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -18,6 +18,7 @@ // Project import Gui.Actions 0.1 + // Qml imports import "qrc:/globals" Index: sources/gui/qml/components/TextEntry.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -62,23 +62,14 @@ horizontalAlignment: TextInput.AlignHCenter inputMethodHints: Qt.ImhDigitsOnly selectedTextColor: acceptableInput ? Colors.textMain : Colors.red + selectByMouse: true activeFocusOnPress: true - onPreeditTextChanged: { - console.debug(preeditText) - } - onFocusChanged: { if (focus) { selectAll() - _keyboard.active = false + _keyboard.setVisible(true) } } - Keys.onPressed: { - if (! acceptableInput) { - event - } - } - onAccepted: { _root.enterPressed() } Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r066258b65a1c41afe3828c92d2606d2642505d72 -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 066258b65a1c41afe3828c92d2606d2642505d72) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -36,12 +36,12 @@ property color textColor : Colors.textButton property color borderColor : Colors.borderButton property color backgroundColor : Colors.backgroundButtonNormal - property color defaultColor : // Colors.backgroundButtonSelect + property color defaultColor : backgroundColor == Colors.transparent ? Colors.backgroundButtonSelect : Qt.lighter(_root.backgroundColor, 1.15) - property color selectColor : // Colors.backgroundButtonSelectDark + property color selectColor : backgroundColor == Colors.transparent ? Colors.backgroundButtonSelectDark : Qt.darker (_root.backgroundColor, 1.15) Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r066258b65a1c41afe3828c92d2606d2642505d72 -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 066258b65a1c41afe3828c92d2606d2642505d72) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -17,8 +17,10 @@ pragma Singleton import QtQuick 2.12 -import Gui.Actions 0.1 +// Project +import Gui.Actions 0.1 + /*! * \brief * Colors.qml file includes all the colors definitions Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -17,8 +17,8 @@ import QtQuick 2.12 // Project -import Gui.Actions 0.1; -import Gui.VEventSpy 0.1; +import Gui.Actions 0.1 +import Gui.VEventSpy 0.1 // Qml imports import "qrc:/globals" Index: sources/gui/qml/pages/settings/SettingsBase.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -68,7 +68,10 @@ top : parent.top right : parent.right } - onClicked: _root.confirmClicked() + onClicked: { + _root.confirmClicked() + _keyboard.setVisible(false) + } } Text { id: _titleText @@ -81,15 +84,14 @@ color : Colors.textMain font.pixelSize : Fonts.fontPixelTitle } - // this notification shall not be confused with the _notification in the parent ModalDailog - // this meant to be used specifically as current state notification like paused/off in UF - // it is also available in TreatmentAdjustmentFlow and TreatmentAdjustmentDuration but not used. + + // this meant to be used specifically as current state notification mostrly for the message respose back reasons. NotificationBarSmall { id: _information - visible : true // false + visible : text color : Colors.transparent textColor : Colors.white imageSource : "" - text : "Test Notification" + text : "" anchors.bottomMargin: Variables.mainMenuHeight + Variables.minVGap } } Index: sources/gui/qml/pages/settings/SettingsDateTime.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -162,7 +162,7 @@ } onEnterPressed: { if (textInput.acceptableInput) { - _keyboard.setVisible(false) + _keyboard.setVisible(true) } } } Index: sources/gui/qml/pages/settings/SettingsHome.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rf7392d985121b21e9f9814e444b0810cd1d00b18 --- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18) @@ -16,6 +16,9 @@ // Qt import QtQuick 2.12 +// Project +import Gui.Actions 0.1 + // Qml imports import "qrc:/globals" import "qrc:/components"