Index: leahi.qrc
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- leahi.qrc (.../leahi.qrc) (revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ leahi.qrc (.../leahi.qrc) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -15,7 +15,6 @@
sources/gui/qml/pages/settings/SettingsDGCleaning.qml
sources/gui/qml/pages/settings/SettingsDGScheduling.qml
sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml
- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml
sources/gui/qml/pages/settings/SettingsExportLogs.qml
sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
sources/gui/qml/pages/settings/SettingsInformation.qml
@@ -80,7 +79,6 @@
resources/images/EjectEnabled.png
resources/images/EjectDisabled.png
resources/images/eye.png
- resources/images/Omron-bp7000.png
resources/images/chevron-left.png
resources/images/chevron-right.png
resources/images/DenaliDevice.png
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r9048646630717f980a852df54349805ba63773e0 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 9048646630717f980a852df54349805ba63773e0)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -7,6 +7,7 @@
property alias menuHidden : _headerMenu.hidden
property alias headerMenuIndex : _headerMenu.index
+ property alias titleText : _title.text
width : Variables.applicationWidth
height : Variables.headerHeight
@@ -36,6 +37,14 @@
}
}
+ Text { id: _title
+ color : Colors.textMain
+ anchors.centerIn : parent
+ horizontalAlignment : Text.AlignHCenter
+ verticalAlignment : Text.AlignVCenter
+ font.pixelSize : 40
+ }
+
Item { id: _dateTimeItem
width : Variables.headerBarDateTimeWidth
anchors {
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -157,7 +157,6 @@
readonly property int settingsInputWidth : 225
readonly property int settingsNotificationMargin : 10
- readonly property int settingsContentSidesMargin : headerButtonsMargin
readonly property int settingsContentBottomMargin : mainMenuHeight + // Alarm Bar height
notificationHeight + // notification Bar height
minVGap // Min Gap to give content the min border
Index: sources/gui/qml/pages/UserConfirmation.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/UserConfirmation.qml (.../UserConfirmation.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/UserConfirmation.qml (.../UserConfirmation.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -48,23 +48,17 @@
firstFocusInput : isPassword ? _passwordCurrent : undefined
- Column {
+ contentItem: Column {
visible: isPassword
- anchors {
- top : parent.top
- horizontalCenter : parent.horizontalCenter
- topMargin : passwordChangeMode ? 0 : 120
- }
-
PasswordEntry { id: _passwordCurrent
label.text : ! passwordChangeMode ? "" : qsTr("Current")
label.width : ! passwordChangeMode ? 0 : labelWidth
lengthMax : passwordLengthMax
nextInput : _passwordUpdated
anchors {
top : parent.top
- topMargin : topMarginContent
+ topMargin : Variables.defaultMargin * 5
horizontalCenter : parent.horizontalCenter
}
}
@@ -131,9 +125,9 @@
text : "Do you ... ?"
color : Colors.textMain
font.pixelSize : Fonts.fontPixelTitle
- anchors.topMargin : topMarginContent
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter : parent.verticalCenter
+ anchors.verticalCenterOffset: Variables.defaultMargin * 5 * -1
horizontalAlignment : Text.AlignHCenter
verticalAlignment : Text.AlignVCenter
}
Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
===================================================================
diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2)
+++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -53,7 +53,7 @@
TouchRect { id: _enterBluetoothScreen
visible : vBluetooth.pairedAddr == "" // empty pairedAddr indicate not paired
text.text : qsTr("CONNECTION")
- onClicked : page(_settingsBluetoothPage)
+// onClicked : page(_settingsBluetoothPage)
width : _bphrEntry.width/2
anchors.top : _bphrEntry.bottom
anchors.topMargin : Variables.notificationHeight + Variables.minVGap
@@ -89,11 +89,11 @@
}
}
- SettingsBluetoothCuff { id: _settingsBluetoothPage
- property var itemsText : [qsTr("Bluetooth Cuff")]
- itemIndex : 0 // set to zero for itemsText access of array
- onBackClicked : page(_settingsBluetoothPage)
- }
+// SettingsBluetoothCuff { id: _settingsBluetoothPage
+// property var itemsText : [qsTr("Bluetooth Cuff")]
+// itemIndex : 0 // set to zero for itemsText access of array
+// onBackClicked : page(_settingsBluetoothPage)
+// }
PreTreatmentUltrafiltration { id: _preTreatmentUltrafiltration
header.stepIndex : 6
Index: sources/gui/qml/pages/settings/SettingsBase.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -27,17 +27,14 @@
ScreenItem { id: _root
objectName: "_SettingsBase"
+ property Item contentItem : null
+ property alias contentArea : _contentArea
+
property int labelWidth : 200
property int entryWidth : 100
property var firstFocusInput : undefined
- readonly
- property int topMarginTitle : 100
- property int topMarginContent : 200
- property int bottomMarginContent : Variables.settingsContentBottomMargin
- property int sidesMarginContent : Variables.settingsContentSidesMargin
-
property int itemIndex : 0
property alias title : _titleText.text
@@ -70,6 +67,7 @@
}
onClicked: {
_root.backClicked()
+ _headerBar.titleText = settingsTitle
pop()
}
}
@@ -87,15 +85,26 @@
Text { id: _titleText
anchors {
top : _root.top
- topMargin : topMarginTitle
+ topMargin : Variables.defaultMargin * 5
horizontalCenter: parent.horizontalCenter
}
horizontalAlignment : Text.AlignHCenter
- text : itemsText[itemIndex]
- color : Colors.textMain
- font.pixelSize : Fonts.fontPixelTitle
+ color : Colors.textMain
+ font.pixelSize : Fonts.fontPixelTitle
}
+ ContentArea { id : _contentArea
+ anchors {
+ fill : _root
+ topMargin : Variables.defaultMargin * 6
+ leftMargin : Variables.defaultMargin * 2
+ rightMargin : Variables.defaultMargin * 2
+ bottomMargin: Variables.settingsContentBottomMargin
+ }
+
+ contentItem: _root.contentItem
+ }
+
// this meant to be used specifically as current state notification mostly for the message respose back reasons.
NotificationBarSmall { id: _information
visible : text
Fisheye: Tag 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f refers to a dead (removed) revision in file `sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -31,9 +31,9 @@
SettingsBase { id: _root
confirmVisible : false
- TouchGrid {
- anchors.horizontalCenter: parent.horizontalCenter
+ contentArea.anchors.topMargin: Variables.defaultMargin * 5 * -1
+ contentItem: TouchGrid {
colCount : 1
colSpacing : 0
rowCount : 6
Index: sources/gui/qml/pages/settings/SettingsDGScheduling.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsDGScheduling.qml (.../SettingsDGScheduling.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsDGScheduling.qml (.../SettingsDGScheduling.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -78,12 +78,11 @@
if ( ! visible ) _root.notificationText = ""
}
- Row { id: _container
+ contentArea.anchors.leftMargin : _root.width / 4
+
+ contentItem: Row { id: _container
spacing: 25
- y : Qt.inputMethod.visible && _keyboard.visible ? topMarginContent : ( (_root.height - _container.height) / 2 )
Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } }
- anchors.horizontalCenter: parent.horizontalCenter
-
Column {
spacing : 25
leftPadding : titleIndent
Index: sources/gui/qml/pages/settings/SettingsDateTime.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -60,14 +60,13 @@
_minutes.textInput.text = vDateTime.minute
}
- Column { id: _container
+ contentItem: 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
spacing: 5
+ anchors.horizontalCenter: parent.horizontalCenter
Text { id: _timeLabel
width: labelWidth
text: qsTr("Time (HH:MM)")
@@ -104,6 +103,8 @@
Row { // date
spacing: 5
+ anchors.horizontalCenter: parent.horizontalCenter
+
Text { id : _dateLabel
width : labelWidth
text : qsTr("Date (MM/DD/YYYY)")
Index: sources/gui/qml/pages/settings/SettingsDecommission.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -26,7 +26,7 @@
* which asks for confirmation of performing a factory reset and doing it if confirmed
*/
UserConfirmation { id : _root
- message : vDevice.decommissionEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+ message : vDevice.decommissionEnabled ? qsTr("Do you want to perform the decommissioning?")
: qsTr("Please wait ...")
itemIndex : SettingsStack.Decommission
notificationText : vDevice.status
Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
===================================================================
diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision d862dfcd402206e33b314c458e41c13b684a4565)
+++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -39,7 +39,7 @@
readonly property int spacing : 20
readonly property int leftMargin : 100
readonly property int rightMargin : 150
- readonly property int topMargin : topMarginContent
+ readonly property int topMargin : 200
readonly property int separatorGap : 40
readonly property string separatorText : ":"
@@ -52,11 +52,9 @@
if ( visible ) vAdjustmentVersions .doAdjustment()
}
- Column { id : _column
+ contentItem: Column { id : _column
spacing : _root.spacing
- y : _root.topMargin
- anchors.left : parent.left
- anchors.leftMargin : _root.leftMargin
+ anchors.fill: parent
TextEntry { id : _version_UI
textInput.clip : true
@@ -68,6 +66,7 @@
separator.width : _root.separatorGap
textInput.width : _root.entryWidth
label.width : _root.labelWidth
+ anchors.horizontalCenter: parent.horizontalCenter
}
TextEntry { id : _serial_TD
@@ -80,6 +79,7 @@
separator.width : _root.separatorGap
textInput.width : _root.entryWidth
label.width : _root.labelWidth
+ anchors.horizontalCenter: parent.horizontalCenter
}
TextEntry { id : _serial_DD
@@ -92,6 +92,7 @@
separator.width : _root.separatorGap
textInput.width : _root.entryWidth
label.width : _root.labelWidth
+ anchors.horizontalCenter: parent.horizontalCenter
}
TextEntry { id : _ipAddress_wlan0
@@ -105,6 +106,7 @@
textInput.width : _root.entryWidth
label.width : _root.labelWidth
validator : _root.ipValidator
+ anchors.horizontalCenter: parent.horizontalCenter
}
TextEntry { id : _ipAddress_eth0
@@ -118,6 +120,7 @@
textInput.width : _root.entryWidth
label.width : _root.labelWidth
validator : _root.ipValidator
+ anchors.horizontalCenter: parent.horizontalCenter
}
}
Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml
===================================================================
diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
+++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -85,7 +85,6 @@
confirmVisible : false
notificationMargin : Variables.notificationHeight
- bottomMarginContent : Variables.settingsContentBottomMargin - Variables.minVGap
function refreshModels() {
_usbFolderColumn.clearModel()
@@ -168,15 +167,8 @@
enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels
}
- Row { id : _contentRect
+ contentItem: Row { id : _contentRect
spacing : Variables.minVGap
- anchors.fill : parent
- anchors.topMargin : parent. topMarginContent - 25 // move 25 up
- anchors.bottomMargin : parent.bottomMarginContent
- anchors.rightMargin : parent. sidesMarginContent
- anchors.leftMargin : parent. sidesMarginContent
- anchors.horizontalCenter : parent.horizontalCenter
-
readonly property int columnWidthProgress : 375
readonly property int columnWidthFolder : _root.horizontalLayout ? 840 : 725
readonly property int columnWidthFileName : _root.horizontalLayout ? 685 : 575 // best combination
Index: sources/gui/qml/pages/settings/SettingsFactoryReset.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsFactoryReset.qml (.../SettingsFactoryReset.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsFactoryReset.qml (.../SettingsFactoryReset.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -26,7 +26,7 @@
* which asks for confirmation of performing a factory reset and doing it if confirmed
*/
UserConfirmation { id : _root
- message : vDevice.factoryResetEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+ message : vDevice.factoryResetEnabled ? qsTr("Do you want to perform the factory reset?")
: qsTr("Please wait ...")
itemIndex : SettingsStack.FactoryReset
notificationText : vDevice.status
Index: sources/gui/qml/pages/settings/SettingsHome.qml
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -37,8 +37,9 @@
signal itemClicked(int vIndex)
- TouchGrid { id: _settingItems
- anchors.centerIn: _root
+ contentArea.anchors.topMargin: Variables.defaultMargin * 4 * -1
+
+ contentItem: TouchGrid { id: _settingItems
onItemClicked : _root.itemClicked(vIndex)
rowCount : _root.rowCount
colCount : _root.colCount
@@ -52,7 +53,7 @@
// So it overrides the parent logic.
onVisibleChanged: {
if (visible) {
- _mainMenu.hidden = serviceMode
+ _mainMenu.hidden = false
}
}
}
Index: sources/gui/qml/pages/settings/SettingsInformation.qml
===================================================================
diff -u -r043444312576c91f100c68ad080cd0f594bf6183 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 043444312576c91f100c68ad080cd0f594bf6183)
+++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -27,15 +27,10 @@
* and display them
*/
SettingsBase { id: _root
- itemIndex : SettingsStack.Information
+ itemIndex : SettingsStack.Information
+ confirmVisible : false
- confirmVisible : false
-
- TouchGrid {
- anchors.top : parent.top
- anchors.topMargin : 50
- anchors.horizontalCenter: parent.horizontalCenter
-
+ contentItem: TouchGrid {
colCount : 2
colSpacing : 50
rowCount : 12 // this number indicates when to move to the next column
@@ -45,16 +40,16 @@
touchable : false
itemsHasLine: [
0, // title C1
- 1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,
0,0,0,
- 0, // title C2
+ 0,// title C2
1,1,1,1,
0, // title C2B
1,1,1,1
]
itemsHasIndent: [
0, // title C1
- 1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,
0,0,0,
0, // title C2
1,1,1,1,
Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -27,15 +27,12 @@
* and display them
*/
SettingsBase { id: _root
+ itemIndex : SettingsStack.InstitutionalRecord
+ confirmVisible : false
+ contentArea.anchors.topMargin : Variables.defaultMargin * -1
- itemIndex : SettingsStack.InstitutionalRecord
+ contentItem: TouchGrid {
- confirmVisible : false
- TouchGrid {
- anchors.top : parent.top
- anchors.topMargin : 50
- anchors.horizontalCenter: parent.horizontalCenter
-
colCount : 2
colSpacing : 50
rowCount : 7 // this number indicates when to move to the next column
Index: sources/gui/qml/pages/settings/SettingsLocalization.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsLocalization.qml (.../SettingsLocalization.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsLocalization.qml (.../SettingsLocalization.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -30,22 +30,13 @@
confirmVisible : true
notificationText: vLocalization.notification
+ contentArea.anchors.topMargin: Variables.defaultMargin * 10
- Row { id: _settingsRoInputRow
- anchors.centerIn: parent
+ contentItem: Item { id: _settingsRoInputItem
- Text { id : _settingsLanguageLabel
- text : qsTr("Language")
- width : 150
- height : _settingsLanguageCombo.height
- color : Colors.white
- font.pixelSize : Fonts.fontPixelTextRectTitle
- verticalAlignment : Text.AlignVCenter
- horizontalAlignment : Text.AlignLeft
- }
-
// FIXME: This combobox needs to be a global Component
ComboBox { id : _settingsLanguageCombo
+ anchors.horizontalCenter : parent.horizontalCenter
currentIndex : vLocalization.languageIndex
displayText : currentText
font.pixelSize : Fonts.fontPixelTextRectTitle
Index: sources/gui/qml/pages/settings/SettingsROInput.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -30,21 +30,22 @@
confirmVisible : false
- Row { id: _settingsRoInputRow
- anchors.centerIn: parent
+ contentItem: Item { id: _settingsRoInputItem
Text { id : _settingsRoInputLabel
text : qsTr("Pure Water Mode")
width : 300
height : _settingsRoInputSwitch.height
color : Colors.white
- font.pixelSize: Fonts.fontPixelButton
+ font.pixelSize : Fonts.fontPixelButton
verticalAlignment : Text.AlignVCenter
horizontalAlignment : Text.AlignLeft
+ anchors.horizontalCenter: parent.horizontalCenter
}
Switch { id: _settingsRoInputSwitch
property bool active: true
+ anchors.left : _settingsRoInputLabel.right
checked : vDuetRoWaterDG.status
Index: sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -32,9 +32,11 @@
confirmVisible : false
- Column {
- anchors.centerIn: parent
+ contentItem: Column {
+
Row { id: _settingsRootSSHAccess_SSHDRow
+ anchors.horizontalCenter: parent.horizontalCenter
+
Text { id: _settingsRootSSHAccess_SSHDLabel
text : qsTr("Enable SSH Login")
width : 300
@@ -85,6 +87,8 @@
}
Row { id: _settingsRootSSHAccess_RootRow
+ anchors.horizontalCenter: parent.horizontalCenter
+
Text { id: _settingsRootSSHAccess_RootLabel
text : qsTr("Enable Root Login")
width : 300
Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml (.../SettingsServicePassword.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml (.../SettingsServicePassword.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -33,7 +33,7 @@
isPassword : true
backVisible : ! _GuiView.manufactSetup
passwordChangeMode : isDefaultServicePassword && _GuiView.manufactSetup
- title : passwordChangeMode ? qsTr("Set Service Password") : qsTr("Service Password")
+ title : passwordChangeMode ? qsTr("Set Password") : qsTr("Enter Password")
onBackClicked : {
clearPasswords()
@@ -64,6 +64,7 @@
if ( vTDOpMode.service ) gotoServiceMode(true)
}
+ // TODO: Add logic here to check for which user is trying to log in
function checkPassword() {
if ( ! vSettings.isServicePasswordMatch( passwordCurrent ) ) { _root.notificationText = qsTr("Incorrect password" ); return false }
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -53,7 +53,6 @@
readonly property bool visibleInformation : true
readonly property bool visibleVolumeBrightness : ! onlyUpdating // same as service password, on application execution in updating, on mount files will be moved.
readonly property bool visibleWiFi : true
- readonly property bool visibleBluetooth : true
readonly property bool visibleExportLogs : true
// during the update we cannot enable the servce menu since the current set password is in ~denali folder
@@ -72,12 +71,14 @@
readonly property bool visibleInstitutionalRecord : true
readonly property bool visibleLocalization : true // loggedIn TODO:
+ readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode
+ ? qsTr("Service") : _GuiView.updateSetup
+ ? qsTr("Software Update") : qsTr("Device Settings")
enum ItemsIndex {
Information ,
VolumeBrightness ,
WiFi ,
- Bluetooth ,
DGCleaning ,
DGScheduling ,
ServicePassword ,
@@ -98,7 +99,6 @@
qsTr("Information" ), // Information
qsTr("Volume And Brightness" ), // VolumeBrightness
qsTr("Wi-Fi" ), // WiFi
- qsTr("Bluetooth Cuff" ), // Bluetooth
qsTr("DG Cleaning" ), // DGCleaning
qsTr("DG Scheduling" ), // DGScheduling
qsTr("Service" ), // servicePassword
@@ -119,7 +119,6 @@
true , // Information
true , // VolumeBrightness
true , // WiFi
- true , // Bluetooth
true , // DGCleaning
true , // DGScheduling
true , // ServicePassword
@@ -140,7 +139,6 @@
visibleInformation , // Information
visibleVolumeBrightness , // VolumeBrightness
visibleWiFi , // WiFi
- visibleBluetooth , // Bluetooth
visibleDGCleaning , // DGCleaning
visibleDGScheduling , // DGScheduling
visibleServicePassword , // ServicePassword
@@ -159,7 +157,6 @@
]
SettingsHome { id : _settingsHome
- title : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode ? qsTr("Service") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings")
backVisible : false
//TODO on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination
// and needs to be distinguished between the QUIT or SHUTDOWN touch,
@@ -179,6 +176,7 @@
itemsVisible : _root.itemsVisible
onItemClicked : {
vDevice.status = ""
+ _headerBar.titleText = itemsText[vIndex]
switch (vIndex) {
case SettingsStack.Information:
vAdjustmentVersions .doAdjustment()
@@ -197,10 +195,6 @@
push( _settingsWiFi )
break
- case SettingsStack.Bluetooth:
- push( _settingsBluetooth )
- break
-
case SettingsStack.DGCleaning:
push( _settingsDGCleaning )
break
@@ -268,7 +262,6 @@
SettingsInformation { id: _settingsInformation }
SettingsVolumeBrightness { id: _settingsVolumeBrightness }
SettingsWiFi { id: _settingsWiFi }
- SettingsBluetoothCuff { id: _settingsBluetooth }
SettingsDGCleaning { id: _settingsDGCleaning }
SettingsDGScheduling { id: _settingsDGScheduling }
SettingsServicePassword { id: _servicePassword }
@@ -287,11 +280,8 @@
//DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
if ( ! _servicePassword.isPassword_Accepted ) return
serviceMode = vservice
- if ( vservice )
- _mainMenu.hidden = true
- else
- if ( _settingsHome.visible )
- _mainMenu.hidden = false
+ if ( _settingsHome.visible )
+ _mainMenu.hidden = false
}
Connections { target: vAdjustmentServiceMode
@@ -352,10 +342,13 @@
onVisibleChanged: {
if (visible) {
- _mainMenu.hidden = serviceMode || _GuiView.manufactSetup
+ _mainMenu.hidden = _GuiView.manufactSetup
+ _headerBar.titleText = _root.settingsTitle
}
else {
stackView.initialItem = null
+ _headerBar.titleText = ""
+ serviceMode = false
}
}
}
Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -30,15 +30,17 @@
SettingsBase { id: _root
itemIndex : SettingsStack.VolumeBrightness
- readonly property int spacing: 50
+ readonly property int spacing: 100
confirmVisible : false
notificationText: ""
- Column {
+ contentArea.anchors.topMargin: Variables.defaultMargin * 10
+
+ contentItem: Column {
spacing : _root.spacing
- anchors.centerIn: parent
+
Row {
spacing : _root.spacing
anchors.horizontalCenter: parent.horizontalCenter
Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r4d5e0940480dc376ea5631ad0514c733fae92668 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 4d5e0940480dc376ea5631ad0514c733fae92668)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -41,7 +41,7 @@
readonly property int spacing : 20
readonly property int leftMargin : 50
readonly property int rightMargin : 50
- readonly property int topMargin : topMarginContent - 40 // moved up to top of the keyboard
+ readonly property int topMargin : 160
readonly property bool isValid :