# HG changeset patch # User unc0rr # Date 1417555221 -10800 # Node ID b85759f2ba185cc99bc07ec478a2dd7b76f8b447 # Parent 8e95911cb86b764e5ae89647b420aeda6aa54d16 Some more progress at custom combobox diff -r 8e95911cb86b -r b85759f2ba18 qmlFrontend/qml/qmlFrontend/GameConfig.qml --- a/qmlFrontend/qml/qmlFrontend/GameConfig.qml Wed Dec 03 00:07:33 2014 +0300 +++ b/qmlFrontend/qml/qmlFrontend/GameConfig.qml Wed Dec 03 00:20:21 2014 +0300 @@ -38,6 +38,7 @@ } HWComboBox { + id: cbTheme x: 320 y: 16 width: 100 @@ -48,13 +49,15 @@ height: 25 width: 100 color: "transparent" - Text {id: themeName; text: modelData } + Row { + Image {width: height; height: parent.height; source: "image://theme/" + modelData} + Text {id: themeName; text: modelData } + } MouseArea { z: 1 anchors.fill: parent onClicked: { - themeImage.source = "image://theme/" + themeName.text - model.currentIndex = index + cbTheme.currentIndex = index HWEngine.setTheme(themeName.text) } } diff -r 8e95911cb86b -r b85759f2ba18 qmlFrontend/qml/qmlFrontend/HWComboBox.qml --- a/qmlFrontend/qml/qmlFrontend/HWComboBox.qml Wed Dec 03 00:07:33 2014 +0300 +++ b/qmlFrontend/qml/qmlFrontend/HWComboBox.qml Wed Dec 03 00:20:21 2014 +0300 @@ -4,6 +4,7 @@ HWButton { property alias model: itemsList.model property alias delegate: itemsList.delegate + property alias currentIndex: itemsList.currentIndex Window { id: selection