From 78d96bd2009b8741564df4778b63d3091610dbd7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 24 Mar 2024 23:22:16 +0900 Subject: Add GUI option to choose between standard and Ubuntu-style shutdown dialog. Signed-off-by: Michele Calgaro --- kcontrol/smserver/kcmsmserver.cpp | 2 ++ kcontrol/smserver/smserverconfigdlg.ui | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 5bf35dbac..3d165a577 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults ) c->setGroup("Logout"); dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); + dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false)); dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()), @@ -126,6 +127,7 @@ void SMServerConfig::save() c->writeEntry("excludeApps", dialog->excludeLineedit->text()); c->setGroup("Logout"); c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); + c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked()); c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked()); c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked()); c->sync(); diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 574422bc3..9179722c7 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -104,6 +104,17 @@ Check this option if you want to see a dialog box showing the logout status. + + + showUbuntuStyleDialog + + + Use &alternative shutdown dialog layout + + + Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog. + + @@ -266,6 +277,12 @@ SMServerConfigDlg configChanged() + + showUbuntuStyleDialog + toggled(bool) + SMServerConfigDlg + configChanged() + loginGroup clicked(int) -- cgit v1.2.1