summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/smserver/kcmsmserver.cpp3
-rw-r--r--kcontrol/smserver/smserverconfigdlg.ui72
2 files changed, 55 insertions, 20 deletions
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index b81e41c77..99f1b729a 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -94,7 +94,9 @@ void SMServerConfig::load(bool useDefaults )
c->setGroup("Logout");
dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+ dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
+ dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
delete c;
@@ -124,6 +126,7 @@ void SMServerConfig::save()
c->writeEntry("excludeApps", dialog->excludeLineedit->text());
c->setGroup("Logout");
c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
+ c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked());
c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked());
c->sync();
delete c;
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index d222fefa8..654156f20 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -55,18 +55,32 @@
</property>
</widget>
<widget class="TQCheckBox">
- <property name="name">
- <cstring>showFancyFadeAway</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Show fancy &amp;logout fadeaway</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
- </property>
+ <property name="name">
+ <cstring>showFadeAway</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Show &amp;logout fadeaway</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>showFancyFadeAway</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Sho&amp;w fancy logout fadeaway</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
+ </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -235,16 +249,34 @@
<slot>configChanged()</slot>
</connection>
<connection>
- <sender>confirmLogoutCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>showFancyFadeAway</receiver>
- <slot>setEnabled(bool)</slot>
+ <sender>confirmLogoutCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>showFadeAway</receiver>
+ <slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>showFancyFadeAway</sender>
- <signal>toggled(bool)</signal>
- <receiver>SMServerConfigDlg</receiver>
- <slot>configChanged()</slot>
+ <sender>confirmLogoutCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>showFancyFadeAway</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>showFadeAway</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>showFancyFadeAway</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>showFadeAway</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>SMServerConfigDlg</receiver>
+ <slot>configChanged()</slot>
+ </connection>
+ <connection>
+ <sender>showFancyFadeAway</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>SMServerConfigDlg</receiver>
+ <slot>configChanged()</slot>
</connection>
<connection>
<sender>showLogoutStatusDialog</sender>