marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 01:34:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

instant apply

Browse source
This commit is contained in:
Marco Martin 2014-11-20 15:19:37 +01:00
parent 87f8ef61b7
commit ee4defd92f
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
shell/contents/configuration/AppletConfiguration.qml
View file

@ -91,7 +91,11 @@ Rectangle {
} }
function settingValueChanged() { function settingValueChanged() {
applyButton.enabled = true; if (main.currentItem.saveConfig !== undefined) {
main.currentItem.saveConfig();
} else {
root.saveConfig();
}
} }
//END functions //END functions
@ -221,7 +225,6 @@ Rectangle {
if (currentItem["configurationChanged"]) { if (currentItem["configurationChanged"]) {
currentItem["configurationChanged"].connect(root.settingValueChanged) currentItem["configurationChanged"].connect(root.settingValueChanged)
} }
applyButton.enabled = false;
/* /*
* This is not needed on a desktop shell that has ok/apply/cancel buttons, i'll leave it here only for future reference until we have a prototype for the active shell. * This is not needed on a desktop shell that has ok/apply/cancel buttons, i'll leave it here only for future reference until we have a prototype for the active shell.
* root.pageChanged will start a timer, that in turn will call saveConfig() when triggered * root.pageChanged will start a timer, that in turn will call saveConfig() when triggered
@ -308,21 +311,10 @@ Rectangle {
RowLayout { RowLayout {
id: buttonsRow id: buttonsRow
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
QtControls.Button { QtControls.Button {
iconName: "dialog-ok" iconName: "window-close"
text: i18nd("plasma_shell_org.kde.plasma.desktop", "OK") text: i18nd("plasma_shell_org.kde.plasma.desktop", "Close")
onClicked: acceptAction.trigger()
}
QtControls.Button {
id: applyButton
enabled: false
iconName: "dialog-ok-apply"
text: i18nd("plasma_shell_org.kde.plasma.desktop", "Apply")
onClicked: applyAction.trigger()
}
QtControls.Button {
iconName: "dialog-cancel"
text: i18nd("plasma_shell_org.kde.plasma.desktop", "Cancel")
onClicked: cancelAction.trigger() onClicked: cancelAction.trigger()
} }
} }

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

@ -81,5 +81,6 @@ ColumnLayout {
break; break;
} }
} }
root.restoreConfig()
} }
} }