feedc0de/scheincommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor improvements on icon selector

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-02-19 02:59:19 +01:00
parent e627f8ebca
commit 5334a5a46b
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DeviceTypesSettingsPage.qml
View File

@@ -99,6 +99,12 @@ ColumnLayout {
model: iconsModel model: iconsModel
currentIndex: listView.currentData ? iconComboBox.indexOfValue(listView.currentData.iconName) : -1 currentIndex: listView.currentData ? iconComboBox.indexOfValue(listView.currentData.iconName) : -1
Component.onCompleted: {
iconsModel.onRowCountChanged.connect(function(){
currentIndex = Qt.binding(function() { return listView.currentData ? iconComboBox.indexOfValue(listView.currentData.iconName) : -1});
});
}
onActivated: { onActivated: {
console.log(currentValue); console.log(currentValue);
if (listView.currentData) listView.currentData.iconName = currentValue; else console.warn('discarded'); if (listView.currentData) listView.currentData.iconName = currentValue; else console.warn('discarded');

25
IconComboBox.qml
View File

@@ -1,12 +1,24 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Controls.Material import QtQuick.Controls.Material
import Qt.labs.folderlistmodel 2.4
ComboBox { ComboBox {
id: comboBox id: comboBox
property string iconSourceRole property string iconSourceRole
property bool hasTwoArgumentGetter: model instanceof FolderListModel
function getIconUrl(index) {
if (!comboBox.model)
return '';
if (hasTwoArgumentGetter)
return model.get(index, iconSourceRole);
else
return model.get(index)[iconSourceRole];
}
delegate: ItemDelegate { delegate: ItemDelegate {
height: 64 height: 64
anchors.left: parent.left anchors.left: parent.left
@@ -15,18 +27,11 @@ ComboBox {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
text: model[comboBox.textRole] text: model[comboBox.textRole]
iconSource: model[comboBox.iconSourceRole] iconSource: comboBox.getIconUrl(index)
} }
} }
contentItem: IconChooserDelegateLayout { contentItem: IconChooserDelegateLayout {
text: comboBox.currentText text: comboBox.displayText
iconSource: { iconSource: comboBox.currentIndex >= 0 ? comboBox.getIconUrl(comboBox.currentIndex) : ""
if (!comboBox.model)
return '';
const url = comboBox.model.get(comboBox.currentIndex, "fileUrl");
if (!url)
return '';
return url;
}
} }
} }