marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify QuickSettings

Browse source
This commit is contained in:
Jonah Brüchert 2020-10-23 10:55:18 +02:00
parent 162f93a41d
commit 4dbf4dba42
No known key found for this signature in database
GPG key ID: A81E075ABEC80A7E
2 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
containments/panel/package/contents/ui/quicksettings/Delegate.qml
View file

@ -31,13 +31,11 @@ ColumnLayout {
signal panelClosed signal panelClosed
// Model interface // Model interface
required property string text; required property string text
required property string icon; required property string icon
required property bool enabled; required property bool enabled
required property string settingsCommand; required property string settingsCommand
required property var toggleFunction; required property var toggleFunction
required property string delegate;
required property QtObject applet;
Rectangle { Rectangle {
Layout.preferredWidth: units.iconSizes.large + units.smallSpacing Layout.preferredWidth: units.iconSizes.large + units.smallSpacing

25
containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
View file

@ -93,15 +93,6 @@ Item {
return service.startOperationCall(operation); return service.startOperationCall(operation);
} }
function addPlasmoid(applet) {
settingsModel.append({"icon": applet.icon,
"text": applet.title,
"enabled": false,
"applet": applet,
"settingsCommand": "",
"toggleFunction": ""});
}
signal plasmoidTriggered(var applet, var id) signal plasmoidTriggered(var applet, var id)
Layout.minimumHeight: flow.implicitHeight + units.largeSpacing*2 Layout.minimumHeight: flow.implicitHeight + units.largeSpacing*2
@ -159,7 +150,6 @@ Item {
"enabled": false, "enabled": false,
"settingsCommand": "plasma-settings", "settingsCommand": "plasma-settings",
"toggleFunction": "", "toggleFunction": "",
"delegate": "",
"applet": null "applet": null
}); });
settingsModel.append({ settingsModel.append({
@ -167,7 +157,6 @@ Item {
"icon": "network-wireless-signal", "icon": "network-wireless-signal",
"settingsCommand": "plasma-settings -m kcm_mobile_wifi", "settingsCommand": "plasma-settings -m kcm_mobile_wifi",
"toggleFunction": "toggleWifi", "toggleFunction": "toggleWifi",
"delegate": "",
"enabled": enabledConnections.wirelessEnabled, "enabled": enabledConnections.wirelessEnabled,
"applet": null "applet": null
}); });
@ -185,7 +174,6 @@ Item {
"icon": "network-modem", "icon": "network-modem",
"settingsCommand": "plasma-settings -m kcm_mobile_broadband", "settingsCommand": "plasma-settings -m kcm_mobile_broadband",
"toggleFunction": "toggleWwan", "toggleFunction": "toggleWwan",
"delegate": "",
"enabled": enabledConnections.wwanEnabled, "enabled": enabledConnections.wwanEnabled,
"applet": null "applet": null
}); });
@ -195,7 +183,6 @@ Item {
"enabled": false, "enabled": false,
"settingsCommand": "plasma-settings -m kcm_mobile_power", "settingsCommand": "plasma-settings -m kcm_mobile_power",
"toggleFunction": "", "toggleFunction": "",
"delegate": "",
"applet": null "applet": null
}); });
settingsModel.append({ settingsModel.append({
@ -204,7 +191,6 @@ Item {
"enabled": false, "enabled": false,
"settingsCommand": "plasma-settings -m kcm_pulseaudio", "settingsCommand": "plasma-settings -m kcm_pulseaudio",
"toggleFunction": "", "toggleFunction": "",
"delegate": "",
"applet": null "applet": null
}); });
settingsModel.append({ settingsModel.append({
@ -260,19 +246,20 @@ Item {
spacing: 0 spacing: 0
Repeater { Repeater {
model: settingsModel model: settingsModel
delegate: Loader { delegate: Delegate {
id: loader id: delegateItem
//FIXME: why this is needed? //FIXME: why this is needed?
width: flow.columnWidth width: flow.columnWidth
height: item ? item.implicitHeight : 0 height: item ? item.implicitHeight : 0
source: Qt.resolvedUrl((model.delegate ? model.delegate : "Delegate") + ".qml")
Connections { Connections {
target: loader.item target: delegateItem
onCloseRequested: root.closeRequested(); onCloseRequested: root.closeRequested();
} }
Connections { Connections {
target: root target: root
onClosed: loader.item.panelClosed(); onClosed: delegateItem.panelClosed();
} }
} }
} }