Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -rbeadb6f68cff8bc50f255f83203ec201a5468dc1 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision beadb6f68cff8bc50f255f83203ec201a5468dc1) @@ -85,7 +85,6 @@ confirmVisible : false notificationMargin : Variables.notificationHeight - bottomMarginContent : Variables.settingsContentBottomMargin - Variables.minVGap function refreshModels() { _usbFolderColumn.clearModel() @@ -147,6 +146,13 @@ isUpdatePanels = false } + Connections { target: _logTypeCombo + + function onCurrentIndexChanged() { + vLocalization.notification = "" + } + } + Connections { target: _GuiView function onSdIsReadyChanged ( vValue ) { _root.updatePanels() } function onDidExportStat ( vIndex, vFileName, vPercent ) { _sdcFolderView.positionViewAtIndex(vIndex, ListView.Center) } @@ -168,15 +174,8 @@ enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels } - Row { id : _contentRect + contentItem: Row { id : _contentRect spacing : Variables.minVGap - anchors.fill : parent - anchors.topMargin : parent. topMarginContent - 25 // move 25 up - anchors.bottomMargin : parent.bottomMarginContent - anchors.rightMargin : parent. sidesMarginContent - anchors.leftMargin : parent. sidesMarginContent - anchors.horizontalCenter : parent.horizontalCenter - readonly property int columnWidthProgress : 375 readonly property int columnWidthFolder : _root.horizontalLayout ? 840 : 725 readonly property int columnWidthFileName : _root.horizontalLayout ? 685 : 575 // best combination @@ -196,67 +195,15 @@ height : _root.headetRowHight spacing : _logTypeCombo.width - _logTypeExportButton.width - // FIXME: This combobox needs to be a global Component - ComboBox { id : _logTypeCombo - onCurrentIndexChanged : { - notificationText = "" - _root.updatePanels(currentIndex) - } - enabled : ! _GuiView.exportRunning && ! isUpdatePanels - currentIndex : 0 - displayText : currentText - font.pixelSize : Fonts.fontPixelTextRectExtra - width : parent.width - height : parent.height - padding : 10 - model : [ + BaseComboBox { id: _logTypeCombo + width : parent.width + height : parent.height + currentIndex : 0 + model : [ _root.typeLabelApplication , _root.typeLabelService , _root.typeLabelTreatment ] - - background : Rectangle { - color : Colors.transparent - border.color : enabled ? Colors.borderButton : Colors.borderDisableButton - radius : Variables.dialogRadius - } - - delegate: ItemDelegate { id : _logTypeDelegate - width : _logTypeCombo.width // + anchors.margins - 2 // 2 is the border width - height : 50 - contentItem: Text { - text : modelData - color : Colors.textMain - font : _logTypeCombo.font - padding : 10 - verticalAlignment : Text.AlignVCenter - } - background : Rectangle { - anchors.fill : parent - anchors.margins : 10 / 2 - visible : _logTypeDelegate.down || _logTypeDelegate.highlighted || _logTypeDelegate.visualFocus - color : _logTypeDelegate.down ? Colors.backgroundButtonSelect : - Colors.backgroundButtonSelectDark - } - highlighted : _logTypeCombo.highlightedIndex === index - } - popup: Popup { - y : _logTypeCombo.height - x : - _logTypeCombo.anchors.leftMargin - width : _logTypeCombo.width + _logTypeCombo.anchors.leftMargin - implicitHeight : contentItem.implicitHeight - contentItem : ListView { - clip : true - implicitHeight : contentHeight - currentIndex : _logTypeCombo.highlightedIndex - model : _logTypeCombo.popup.visible ? _logTypeCombo.delegateModel : null - } - background: Rectangle { - color : Colors.backgroundMain - border.color : Colors.borderButton - radius : Variables.dialogRadius - } - } } } Column {