Index: sources/gui/qml/dialogs/StatusDialog.qml =================================================================== diff -u -r070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf -r06152733946baf8da998803721e9013f48078f48 --- sources/gui/qml/dialogs/StatusDialog.qml (.../StatusDialog.qml) (revision 070977fbf934ea7ff458bdadc6c1e0b7e7efd3bf) +++ sources/gui/qml/dialogs/StatusDialog.qml (.../StatusDialog.qml) (revision 06152733946baf8da998803721e9013f48078f48) @@ -33,8 +33,17 @@ property var infoLabels : [] property int fontPixelSizeText : Fonts.fontPixelStatusDialogText - width : 300 + width : 350 height : 175 + radius: 5 + CloseButton { id : _closeButton + anchors.top : parent.top + anchors.left : undefined + anchors.right : parent.right + anchors.bottom : undefined + anchors.margins : 10 + onClicked : close() + } Column{ x: 0 @@ -53,37 +62,32 @@ Repeater { id: _infoRepeater // When the model changes, the dialog height is updated to accomodate rows of data - onModelChanged: _root.height = (statusInfo.length + infoLabels.length) * 30 + onModelChanged: _root.height = Math.max(_root.infoLabels.length, _root.statusInfo.length) * 30 + _dialogTitle.height model: [] - Column { + Row { width: _root.width - _closeButton.width - Text { id: _text objectName : _root.textObjectName + index + width : parent.width/2 text : (index < _root.infoLabels.length) ? _root.infoLabels[index] : "" color : Colors.textMain font.pixelSize : fontPixelSizeText font.family : Fonts.fontFamilyFixed + horizontalAlignment: Text.AlignLeft } Text { objectName : _root.textObjectName + "L" + index + width : parent.width/2 text : " " + modelData color : Colors.textMain font.pixelSize : fontPixelSizeText font.family: Fonts.fontFamilyFixed + horizontalAlignment: Text.AlignLeft } } } } - CloseButton { id : _closeButton - anchors.top : undefined - anchors.left : undefined - anchors.right : parent.right - anchors.bottom : parent.bottom - anchors.margins : 10 - onClicked : close() - } }