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

shell: Update to new usage of FormComboBoxDelegate

Browse source
This commit is contained in:
Devin Lin 2022-11-18 17:37:07 -05:00
parent 67b01ec231
commit f4877406e3
2 changed files with 30 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/mobileshell/qml/actiondrawer/ActionDrawerWindow.qml
View file

@ -33,6 +33,10 @@ NanoShell.FullScreenOverlay {
width: Screen.width width: Screen.width
height: Screen.height height: Screen.height
onVisibleChanged: {
blurBackground = visible;
}
color: "transparent" color: "transparent"
onActiveChanged: { onActiveChanged: {

69
shell/contents/configuration/ConfigurationContainmentAppearance.qml
View file

@ -72,32 +72,22 @@ ColumnLayout {
description: i18n("The homescreen layout to use.") description: i18n("The homescreen layout to use.")
visible: model.count > 1 // only show if there are multiple plugins visible: model.count > 1 // only show if there are multiple plugins
currentValue: { model: configDialog.containmentPluginsConfigModel
textRole: "name"
valueRole: "pluginName"
currentIndex: determineCurrentIndex()
onCurrentIndexChanged: {
root.containmentPlugin = configDialog.containmentPluginsConfigModel.get(currentIndex).pluginName;
}
function determineCurrentIndex() {
for (var i = 0; i < configDialog.containmentPluginsConfigModel.count; ++i) { for (var i = 0; i < configDialog.containmentPluginsConfigModel.count; ++i) {
var data = configDialog.containmentPluginsConfigModel.get(i); var data = configDialog.containmentPluginsConfigModel.get(i);
if (configDialog.containmentPlugin === data.pluginName) { if (configDialog.containmentPlugin === data.pluginName) {
return data.name; return i;
}
}
return "";
}
model: configDialog.containmentPluginsConfigModel
dialogDelegate: QQC2.RadioDelegate {
implicitWidth: Kirigami.Units.gridUnit * 16
topPadding: Kirigami.Units.smallSpacing * 2
bottomPadding: Kirigami.Units.smallSpacing * 2
text: model.name
checked: layoutSelectComboBox.currentValue === model.name
onCheckedChanged: {
if (checked) {
layoutSelectComboBox.currentValue = name;
var model = configDialog.containmentPluginsConfigModel.get(index);
root.containmentPlugin = pluginName;
// don't apply configuration immediately
//root.configurationChanged();
} }
} }
return -1;
} }
} }
@ -108,33 +98,26 @@ ColumnLayout {
text: i18nd("plasma_shell_org.kde.plasma.desktop", "Wallpaper Plugin") text: i18nd("plasma_shell_org.kde.plasma.desktop", "Wallpaper Plugin")
description: i18n("The wallpaper plugin to use.") description: i18n("The wallpaper plugin to use.")
currentValue: { model: configDialog.wallpaperConfigModel
textRole: "name"
valueRole: "pluginName"
currentIndex: determineCurrentIndex()
onCurrentIndexChanged: {
var model = configDialog.wallpaperConfigModel.get(currentIndex);
root.currentWallpaper = model.pluginName;
configDialog.currentWallpaper = model.pluginName;
main.sourceFile = model.source;
root.configurationChanged();
}
function determineCurrentIndex() {
for (var i = 0; i < configDialog.wallpaperConfigModel.count; ++i) { for (var i = 0; i < configDialog.wallpaperConfigModel.count; ++i) {
var data = configDialog.wallpaperConfigModel.get(i); var data = configDialog.wallpaperConfigModel.get(i);
if (configDialog.currentWallpaper === data.pluginName) { if (configDialog.currentWallpaper === data.pluginName) {
return data.name; return i;
}
}
return "";
}
model: configDialog.wallpaperConfigModel
dialogDelegate: QQC2.RadioDelegate {
implicitWidth: Kirigami.Units.gridUnit * 16
topPadding: Kirigami.Units.smallSpacing * 2
bottomPadding: Kirigami.Units.smallSpacing * 2
text: model.name
checked: wallpaperPluginSelectComboBox.currentValue === model.name
onCheckedChanged: {
if (checked) {
wallpaperPluginSelectComboBox.currentValue = name;
var model = configDialog.wallpaperConfigModel.get(index);
root.currentWallpaper = pluginName;
configDialog.currentWallpaper = pluginName;
main.sourceFile = source;
root.configurationChanged();
} }
} }
return -1;
} }
} }