Index: sources/gui/qml/components/Background.qml =================================================================== diff -u -r577ab4647b2584d4e32b26797281ec1543d2e1aa -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/Background.qml (.../Background.qml) (revision 577ab4647b2584d4e32b26797281ec1543d2e1aa) +++ sources/gui/qml/components/Background.qml (.../Background.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -21,6 +21,6 @@ Rectangle { id: _root anchors.fill: parent - color: Colors.backgroundMain - radius: 5 + color : Colors.backgroundMain + radius : Variables.dialogRadius } Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -r577ab4647b2584d4e32b26797281ec1543d2e1aa -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 577ab4647b2584d4e32b26797281ec1543d2e1aa) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -31,7 +31,7 @@ width: parent.width height: Variables.createTreatmentHeaderHeight color: "transparent" - radius: 5 + radius: Variables.dialogRadius Rectangle { id: _treatment_profile_id @@ -43,7 +43,7 @@ anchors.topMargin: Variables.createTreatmentMargin anchors.leftMargin: Variables.createTreatmentMargin color: Colors.createTrProfileID - radius: 5 + radius: Variables.dialogRadius Text { id: _treatment_profile_id_text Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -66,7 +66,7 @@ selectable : true height : _root.buttonHeight width : _root.buttonWidth - radius : 5 + radius : Variables.dialogRadius Binding on selected { when : _root.selectedIndex > -1 value : index === _root.selectedIndex Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -rc71946746586d5a4061ad866ce7dbbaf74b9798a -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -35,7 +35,7 @@ visible : _text.text height : Variables.notificationHeight color : Colors.textNotificationNoneBg - radius : Variables.dialogRadiusHalf + radius : Variables.dialogRadius anchors { bottom : parent.bottom left : parent.left Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -50,10 +50,10 @@ height : parent.height width : ((parent.width * (upperBound - lowerBound)) / (parent.maximum - parent.minimum)) - radius: 0 - decimal: _root.decimal - minimum: lowerBound - maximum: upperBound + radius : 0 + decimal : _root.decimal + minimum : lowerBound + maximum : upperBound minText.visible: true maxText.visible: true Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r2fcd1a1722285e5e741b89176ad21989eb0f56f5 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 2fcd1a1722285e5e741b89176ad21989eb0f56f5) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -252,8 +252,8 @@ width : minmaxDiff ? ((parent.width * (upperBound - lowerBound )) / minmaxDiff) : minmaxDiff height : parent.height - radius: 0 - decimal: _root.decimal + radius : 0 + decimal : _root.decimal minText { visible: false Index: sources/gui/qml/components/ScrollBar.qml =================================================================== diff -u -r577ab4647b2584d4e32b26797281ec1543d2e1aa -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/ScrollBar.qml (.../ScrollBar.qml) (revision 577ab4647b2584d4e32b26797281ec1543d2e1aa) +++ sources/gui/qml/components/ScrollBar.qml (.../ScrollBar.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -39,8 +39,8 @@ right : _root.right rightMargin : _root.scrollMargin } - width : 5 - radius : width + width : Variables.dialogRadius + radius : Variables.dialogRadius y : ( flickable instanceof Flickable) ? flickable.height * flickable.visibleArea.yPosition : 0 height : ( flickable instanceof Flickable) ? flickable.height * flickable.visibleArea.heightRatio : 0 color : "#80696969" // half transparent dimgray Index: sources/gui/qml/components/TextEntry.qml =================================================================== diff -u -r840b91f4f72d599bb523050dda2183a6611017b5 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 840b91f4f72d599bb523050dda2183a6611017b5) +++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -22,23 +22,21 @@ Item { id: _root enum Constants { - TextInputWidth = 350 , - TextInputHeight = 50 , - TextInputLineWidth = 100 + EntryWidth = 350 , + EntryHeight = 50 , + InputWidth = 100 } property alias textInput : _input property alias line : _line property alias label : _label - property alias labelText : _label.text property alias validator : _input.validator - property alias labelVisible : _label.visible property var nextInput : undefined signal enterPressed() - width : TextEntry.TextInputWidth - height : TextEntry.TextInputHeight + width : TextEntry.EntryWidth + height : TextEntry.EntryHeight onEnterPressed : { if (nextInput) { @@ -48,48 +46,39 @@ } } - Text { id: _label - anchors { - left: parent.left - top: parent.top - } - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTextRectExtra + Text { id : _label + anchors.left : parent.left + anchors.top : parent.top + color : Colors.textMain + font.pixelSize : Fonts.fontPixelTextRectExtra } - TextInput { id: _input - anchors { - left: _label.right - } - - color: acceptableInput ? Colors.textMain : Colors.red - text: "" - font.pixelSize: Fonts.fontPixelTextRectExtra - selectionColor: Colors.borderButtonHalfDarker - height: parent.height - width: TextEntry.TextInputLineWidth - horizontalAlignment: TextInput.AlignHCenter - inputMethodHints: Qt.ImhDigitsOnly - selectedTextColor: acceptableInput ? Colors.textMain : Colors.red - selectByMouse: true - activeFocusOnPress: true - onFocusChanged: { + TextInput { id : _input + height : parent.height + width : TextEntry.InputWidth + text : "" + font.pixelSize : Fonts.fontPixelTextRectExtra + color : acceptableInput ? Colors.textMain : Colors.red + selectionColor : Colors.borderButtonHalfDarker + selectedTextColor : acceptableInput ? Colors.textMain : Colors.red + anchors.left : _label.right + horizontalAlignment : TextInput.AlignHCenter + inputMethodHints : Qt.ImhDigitsOnly + selectByMouse : true + activeFocusOnPress : true + onAccepted : _root.enterPressed() + onFocusChanged : { if (focus) { selectAll() _keyboard.setVisible(true) } } - onAccepted: { - _root.enterPressed() - } } - Line { id: _line - color: Colors.borderButtonHalfDarker - width: TextEntry.TextInputLineWidth - anchors { - top: _input.bottom - left: _input.left - } + Line { id : _line + color : Colors.borderButtonHalfDarker + width : _input.width + anchors.top : _input.bottom + anchors.left: _input.left } } Index: sources/gui/qml/compounds/InstructionView.qml =================================================================== diff -u -r94fc1cd187816ecbf176df26f9dc5601bf379f13 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 94fc1cd187816ecbf176df26f9dc5601bf379f13) +++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -42,8 +42,8 @@ readonly property int chevronWidth : 25 readonly property int chevronHeight : 35 readonly property int chevronMargin : ( _root.frameHGap - _root.chevronWidth ) / 2 - readonly property int outerRadius : 10 - readonly property int innerRadius : 5 + readonly property int outerRadius : Variables.dialogRadius * 2 + readonly property int innerRadius : Variables.dialogRadius signal leftClicked () signal rightClicked() Index: sources/gui/qml/compounds/TouchGrid.qml =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -78,7 +78,7 @@ border.width : 0 height : _root.itemHeight width : _root.itemWidth - radius : 5 + radius : Variables.dialogRadius enabled : undef( _root.itemsEnabled[index], true ) onClicked : _root.itemClicked(index) Text { id : _itemsValue Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -35,7 +35,7 @@ property alias timeout : _muteButton.timeout property int alarmID : -1 - radius : Variables.dialogRadiusHalf + radius : Variables.dialogRadius signal muteClicked() signal minimizeClicked() Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r99a56ec30f1ca4f401e744766bde4f6fac291752 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -46,7 +46,7 @@ // then if the silence is set minimize it immediately // this behaviour doesn't look nice on the screen and it bounces visible : description && ! isSilenced - radius : Variables.dialogRadiusHalf + radius : Variables.dialogRadius signal muteClicked() signal minimizeClicked() Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r840b91f4f72d599bb523050dda2183a6611017b5 -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 840b91f4f72d599bb523050dda2183a6611017b5) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -60,8 +60,7 @@ readonly property int dialogMargin : mainMenuHeight * 2 readonly property int dialogWidth : applicationWidth - dialogMargin readonly property int dialogHeight : applicationHeight - dialogMargin - readonly property int dialogRadius : 10 - readonly property int dialogRadiusHalf : 5 + readonly property int dialogRadius : 5 readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 Index: sources/gui/qml/pages/endtreatment/end/EndTreatmentEnd.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/end/EndTreatmentEnd.qml (.../EndTreatmentEnd.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/end/EndTreatmentEnd.qml (.../EndTreatmentEnd.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -66,7 +66,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors.centerIn: parent Text { id: _visualAID anchors.centerIn: parent Index: sources/gui/qml/pages/endtreatment/end/EndTreatmentEndPause.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/end/EndTreatmentEndPause.qml (.../EndTreatmentEndPause.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/end/EndTreatmentEndPause.qml (.../EndTreatmentEndPause.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -64,7 +64,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors.centerIn: parent Text { id: _visualAID anchors.centerIn: parent Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculate.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculate.qml (.../EndTreatmentRecirculate.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculate.qml (.../EndTreatmentRecirculate.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -69,7 +69,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors.centerIn: parent Text { id: _visualAID anchors.centerIn: parent Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentReconnect.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentReconnect.qml (.../EndTreatmentReconnect.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentReconnect.qml (.../EndTreatmentReconnect.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -69,7 +69,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius : 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter left: parent.left @@ -102,7 +102,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter right: parent.right Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -88,7 +88,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter left: parent.left @@ -121,7 +121,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter right: parent.right Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2230a5b1b891f47b64165164710aa680ddfc7040 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) @@ -70,7 +70,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter left: parent.left @@ -103,7 +103,7 @@ height : _private.sectionHeight border.width: 2 border.color: Colors.borderDisableButton - radius: 10 + radius : Variables.dialogRadius anchors { verticalCenter: parent.verticalCenter right: parent.right