Index: sources/gui/qml/USBProgressItem.qml =================================================================== diff -u -rccea9f498ece7b6f75e97d85c9312e67b736f98a -r97b77e88de3f6c41504ec5f9f3606a2143d27ff8 --- sources/gui/qml/USBProgressItem.qml (.../USBProgressItem.qml) (revision ccea9f498ece7b6f75e97d85c9312e67b736f98a) +++ sources/gui/qml/USBProgressItem.qml (.../USBProgressItem.qml) (revision 97b77e88de3f6c41504ec5f9f3606a2143d27ff8) @@ -28,64 +28,38 @@ * The ProgressCircle turns red if the amount of free space left is less than defined (15% for now) * The percent value in the circle will show "USB" if the device is not present/ready. */ -Rectangle { id: _root // TEST : USB-Drive not present may need to be handled with better indication(s). - - signal clicked - signal doubleClicked - - readonly property int sizePowers : 1000000 - - readonly property alias totalText : _totalText.text +Rectangle { id: _root readonly property alias total : _progressCircle.maximum readonly property alias avail : _progressCircle.value - readonly property alias percent : _percent.text - property alias thickness : _progressCircle.thickness + readonly property int percent : 100 - _GuiView.usbPercent property bool displayInformation : true - enabled : _GuiView.usbIsReady color : Colors.transparent - anchors { - top : parent.top - right : parent.right - topMargin : 5 - rightMargin : 5 - } - width : 30 - height: width - radius: width + width : 30 + height : width + radius : width + Text { id: _percent - visible : displayInformation - anchors.centerIn: parent - color: ! _GuiView.usbIsReady ? Colors.red : Colors.white - text : ! _GuiView.usbIsReady ? qsTr("USB") : _GuiView.usbPercent - font.pixelSize: 12 - font.bold: true + visible : displayInformation + anchors.centerIn : parent + text : ! _GuiView.usbIsReady ? qsTr("USB") : + ("%1%\n%2") .arg(_root.percent) + .arg(qsTr("Used")) + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelContainerUnitSmall + horizontalAlignment : Text.AlignHCenter + font.weight : Font.Medium } ProgressCircle { id: _progressCircle - anchors.fill: parent - diameter: _root.width - minimum : 0 - maximum : _GuiView.usbTotal / sizePowers // convert to MB since the value in byte is too big for ProgressCircle. - value : _GuiView.usbAvail / sizePowers // convert to MB since the value in byte is too big for ProgressCircle. - color : ! _GuiView.usbIsReady ? "red" : "green" - circleShadowColor: Colors.panelBorderColor + anchors.fill : parent + diameter : _root.width + minimum : 0 + maximum : 100 + value : _root.percent + color : ! _GuiView.usbIsReady ? "red" : Colors.borderButton + circleShadowColor : Colors.panelBorderColor + thickness : 5 } - Text { id: _totalText - visible : _GuiView.usbIsReady && displayInformation - anchors.top: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - color : Colors.white - text : Variables.sizeConverted( _GuiView.usbTotal, _root.sizePowers ) - font.pixelSize: 12 - font.bold: true - } - - MouseArea { id: _mouseArea - anchors.fill : parent - anchors.margins : -20 // since the object visual is so small make the mouseArea bigger for the human finger to easier touch. - onClicked : _root.clicked() - onDoubleClicked : _root.doubleClicked() - } }