Index: sources/gui/qml/components/ExportButton.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac --- sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) @@ -21,30 +21,25 @@ import "qrc:/components" TouchRect { id : _root - width : 155 - height : 50 - property var exportFunction : null + property bool isSmall: false - anchors.margins: 35 + property bool disabled : false + width : isSmall ? 155 : Variables.touchRectWidth + height : isSmall ? 50 : Variables.touchRectHeight + + anchors.margins: 35 text { text: qsTr("Export") - font.pixelSize: Fonts.fontPixelButton * 0.75 + font.pixelSize: Fonts.fontPixelButton * (isSmall ? 0.75 : 1) } - onClicked: { - if ( exportFunction instanceof Function ) { - exportFunction() - } else { - _GuiView.doExportLog() - } - } Connections { target: _GuiView onDidUSBDriveUmount : _root.enabled = false onDidUSBDriveRemove : _root.enabled = false - onDidUSBDriveMount : _root.enabled = true + onDidUSBDriveMount : _root.enabled = true && ! disabled onDidExportLog : _root.enabled = false - onDidExport : _root.enabled = true + onDidExport : _root.enabled = true && ! disabled } }