feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use new controls in UrlChooser

Browse Source 
Change-Id: I07e6110f4e2d2c7458860db0432fb58afacf7015
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2019-06-06 17:36:32 +02:00
parent 9f0a0cd8c6
commit cd42ebb840
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
View File

@@ -25,7 +25,7 @@
import QtQuick 2.1 import QtQuick 2.1
import HelperWidgets 2.0 import HelperWidgets 2.0
import QtQuick.Controls 1.1 as Controls import StudioControls 1.0 as StudioControls
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
@@ -49,14 +49,16 @@ RowLayout {
backendValue: urlChooser.backendValue backendValue: urlChooser.backendValue
} }
Controls.ComboBox { StudioControls.ComboBox {
id: comboBox id: comboBox
ExtendedFunctionButton { actionIndicator.icon.color: extFuncLogic.color
x: 2 actionIndicator.icon.text: extFuncLogic.glyph
anchors.verticalCenter: parent.verticalCenter actionIndicator.onClicked: extFuncLogic.show()
backendValue: urlChooser.backendValue
visible: urlChooser.enabled ExtendedFunctionLogic {
id: extFuncLogic
backendValue: comboBox.backendValue
} }
property bool isComplete: false property bool isComplete: false
@@ -86,9 +88,6 @@ RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
editable: true editable: true
style: CustomComboBoxStyle {
textColor: urlChooser.textColor
}
model: fileModel.fileModel model: fileModel.fileModel