Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -rad3f3812cdfb38c423be5ace9a1d6f7acb4b68ee -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision ad3f3812cdfb38c423be5ace9a1d6f7acb4b68ee) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) @@ -34,9 +34,9 @@ property bool isTouchRect : false property bool isOpened : false - width : _column.implicitWidth + width : isTouchRect ? _column.implicitWidth : 258 height : isTouchRect || isOpened ? _column.implicitHeight + 10 : _column.headerHeight - radius : 12 + radius : 5 color : Colors.panelBackgroundColor clip : true @@ -55,11 +55,13 @@ Column { id: _column property alias headerHeight: _header.height + width: parent.width + Rectangle { id: _header width : _column.width height : _title.implicitHeight + 10 color : "#3A5A7B" - radius : 6 + radius : 5 visible : _title.text.length > 0 border { @@ -97,9 +99,11 @@ height : implicitHeight horizontalAlignment : _root.horizontalAlignmentText color : Colors.offWhite - font.pixelSize : fontPixelSizeText - font.family : Fonts.fontFamilyFixed - font.weight : Font.Light + font { + pixelSize : isTouchRect ? 23 : fontPixelSizeText + family : Fonts.fontFamilyFixed + weight : Font.Light + } verticalAlignment : Text.AlignTop elide : Text.ElideRight } @@ -109,9 +113,12 @@ text : (index < _root.label.length) ? _root.label[index] : "" color : Colors.offWhite height : _value.implicitHeight - font.pixelSize : fontPixelSizeLabel horizontalAlignment : Text.AlignLeft - font.family : Fonts.fontFamilyFixed + font { + pixelSize : fontPixelSizeLabel + family : Fonts.fontFamilyFixed + weight : Font.Light + } verticalAlignment : Text.AlignVCenter } } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r81aec0b1316a43c46f8c27c773d8f95e695ec273 -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) @@ -529,11 +529,10 @@ width : _DDVersionsColumn.width height : _DDVersionsColumn.height onClicked : vAdjustmentVersions.doAdjustment() - radius : 10 + radius : 5 anchors { bottom : parent.bottom right : parent.right - rightMargin : Variables.defaultMargin } DebugDataColumn { id: _DDVersionsColumn Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -rad3f3812cdfb38c423be5ace9a1d6f7acb4b68ee -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision ad3f3812cdfb38c423be5ace9a1d6f7acb4b68ee) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) @@ -227,11 +227,10 @@ width : _FPVersionsColumn.width height : _FPVersionsColumn.height onClicked : vAdjustmentVersions.doAdjustment() - radius : 10 + radius : 5 anchors { bottom : parent.bottom right : parent.right - rightMargin : Variables.defaultMargin } DebugDataColumn { id: _FPVersionsColumn Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r81aec0b1316a43c46f8c27c773d8f95e695ec273 -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) @@ -180,9 +180,9 @@ textObjectName :"_TDSwitchesData" title : qsTr(" Switches ") anchors { - top : parent.top - left : _TDEjectorColumn.right - leftMargin : spacing + top : _TDVoltageCoulumn.bottom + topMargin : spacing + left : parent.left } model: [ vTDSwitches.door , @@ -197,7 +197,7 @@ title : qsTr(" Opmode ") anchors { top : parent.top - left : _TDSwitchesColumn.right + left : _TDEjectorColumn.right leftMargin : spacing } model: [ @@ -217,8 +217,7 @@ anchors { top : _TDOpModeColumn.bottom topMargin : spacing - left : _TDSwitchesColumn.right - leftMargin : spacing + left : _TDOpModeColumn.left } model: [ @@ -361,11 +360,10 @@ width : _TDVersionsColumn.width height : _TDVersionsColumn.height onClicked : vAdjustmentVersions.doAdjustment() - radius : 10 + radius : 5 anchors { bottom : parent.bottom right : parent.right - rightMargin : Variables.defaultMargin } DebugDataColumn { id: _TDVersionsColumn textObjectName :"_TDVersionsData"