Index: denali.pro.user =================================================================== diff -u -readda1cc1ad9d62aecf6b0a8e64330fad438ee0d -r3a23968a5d2584f5cd036402064284295c9d46a1 --- denali.pro.user (.../denali.pro.user) (revision eadda1cc1ad9d62aecf6b0a8e64330fad438ee0d) +++ denali.pro.user (.../denali.pro.user) (revision 3a23968a5d2584f5cd036402064284295c9d46a1) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings Index: sources/gui/qml/dialogs/VitalsEntry.qml =================================================================== diff -u -r33b33328479f58fa1d6bd16b569839b9bab8c27c -r3a23968a5d2584f5cd036402064284295c9d46a1 --- sources/gui/qml/dialogs/VitalsEntry.qml (.../VitalsEntry.qml) (revision 33b33328479f58fa1d6bd16b569839b9bab8c27c) +++ sources/gui/qml/dialogs/VitalsEntry.qml (.../VitalsEntry.qml) (revision 3a23968a5d2584f5cd036402064284295c9d46a1) @@ -36,7 +36,7 @@ width: _root.width; radius: _root.radius; - Text { id: _alert + Text { id: _titleBarText color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle text: qsTr("Vitals Entry") @@ -48,9 +48,10 @@ anchors { top: _titleBar.bottom topMargin: Variables.vitalsTopMargin + right: parent.horizontalCenter } - textInput.height: Variables.vitalsInputFieldHeight - width: parent.width + textInput.height: Variables.vitalsFieldInputHeight + width: Variables.vitalsFieldInputWidth margin: Variables.vitalsMargin validator: IntValidator{ bottom: 0; top: 500;} labelText: "Blood Pressure (Systolic)" @@ -60,9 +61,10 @@ anchors { top: _systolic.bottom topMargin: Variables.vitalsTopMargin + right: parent.horizontalCenter } - textInput.height: Variables.vitalsInputFieldHeight - width: parent.width + textInput.height: Variables.vitalsFieldInputHeight + width: Variables.vitalsFieldInputWidth margin: Variables.vitalsMargin validator: IntValidator{ bottom: 0; top: 500;} labelText: "Blood Pressure (Diastolic)" @@ -72,9 +74,10 @@ anchors { top: _diastolic.bottom topMargin: Variables.vitalsTopMargin + right: parent.horizontalCenter } - textInput.height: Variables.vitalsInputFieldHeight - width: parent.width + textInput.height: Variables.vitalsFieldInputHeight + width: Variables.vitalsFieldInputWidth margin: Variables.vitalsMargin validator: IntValidator{ bottom: 0; top: 500;} labelText: "Heart Rate (BPM)" @@ -84,9 +87,13 @@ width: Variables.vitalsKeyboardWidth visible: false z: 1 - anchors.top: _pulse.bottom - anchors.horizontalCenter: _pulse.horizontalCenter + anchors { + left: _titleBar.horizontalCenter + leftMargin: _titleBarText.width / 2 + top: _titleBar.verticalCenter + } + onActiveChanged: { visible = !visible } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rb287d600f875018ca1e9309fb3e0008f2e69310d -r3a23968a5d2584f5cd036402064284295c9d46a1 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b287d600f875018ca1e9309fb3e0008f2e69310d) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 3a23968a5d2584f5cd036402064284295c9d46a1) @@ -124,9 +124,9 @@ readonly property int vitalsTopMargin : 30 readonly property int vitalsMargin : 50 - readonly property int vitalsInputFieldWidth : 150 - readonly property int vitalsInputFieldHeight : 50 - readonly property int vitalsKeyboardWidth : 800 + readonly property int vitalsFieldInputWidth : 300 + readonly property int vitalsFieldInputHeight : 50 + readonly property int vitalsKeyboardWidth : 400 // ---------- < PRS > Related Section ---------- Index: sources/gui/qml/keyboard/style.qml =================================================================== diff -u -r33b33328479f58fa1d6bd16b569839b9bab8c27c -r3a23968a5d2584f5cd036402064284295c9d46a1 --- sources/gui/qml/keyboard/style.qml (.../style.qml) (revision 33b33328479f58fa1d6bd16b569839b9bab8c27c) +++ sources/gui/qml/keyboard/style.qml (.../style.qml) (revision 3a23968a5d2584f5cd036402064284295c9d46a1) @@ -30,6 +30,7 @@ import QtQuick 2.7 import QtQuick.VirtualKeyboard 2.1 import QtQuick.VirtualKeyboard.Styles 2.1 +import "qrc:/globals" KeyboardStyle { id: currentStyle @@ -51,30 +52,26 @@ inputLocaleIndicatorHighlightTimer.restart() } - keyboardDesignWidth: 2560 + keyboardDesignWidth: 800 keyboardDesignHeight: 800 - keyboardRelativeLeftMargin: 114 / keyboardDesignWidth - keyboardRelativeRightMargin: 114 / keyboardDesignWidth - keyboardRelativeTopMargin: 13 / keyboardDesignHeight - keyboardRelativeBottomMargin: 86 / keyboardDesignHeight keyboardBackground: Rectangle { - color: "black" + color: Colors.backgroundButtonSelectDark } keyPanel: KeyPanel { id: keyPanel Rectangle { id: keyBackground radius: 5 - color: "#383533" + color: Colors.backgroundRangeRect anchors.fill: keyPanel anchors.margins: keyBackgroundMargin Text { id: keySmallText text: control.smallText visible: control.smallTextVisible - color: "gray" + color: Colors.textMain anchors.right: parent.right anchors.top: parent.top anchors.margins: keyContentMargin / 3 @@ -88,7 +85,7 @@ Text { id: keyText text: control.displayText - color: "white" + color: Colors.textMain horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter anchors.fill: parent @@ -137,7 +134,7 @@ Rectangle { id: backspaceKeyBackground radius: 5 - color: "#23211E" + color: Colors.backgroundRangeRect anchors.fill: backspaceKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -182,7 +179,7 @@ Rectangle { id: languageKeyBackground radius: 5 - color: "#35322f" + color: Colors.backgroundRangeRect anchors.fill: languageKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -227,7 +224,7 @@ Rectangle { id: enterKeyBackground radius: 5 - color: "#1e1b18" + color: Colors.backgroundRangeRect anchors.fill: enterKeyPanel anchors.margins: keyBackgroundMargin Image { @@ -324,7 +321,7 @@ Rectangle { id: hideKeyBackground radius: 5 - color: "#1e1b18" + color: Colors.backgroundRangeRect anchors.fill: hideKeyPanel anchors.margins: keyBackgroundMargin Image {