Add secondary logout fadeaway control

This resolves Bug 1999
This relates to Bug 258

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;

kcontrol/smserver/smserverconfigdlg.ui

@@ -54,6 +54,20 @@
                         <string>Check this option if you want the session manager to display a logout confirmation dialog box.</string>
                     </property>
                 </widget>
+                <widget class="TQCheckBox">
+                  <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>
@@ -62,7 +76,7 @@
                     <bool>false</bool>
                   </property>
                   <property name="text">
-                        <string>Show fancy &amp;logout fadeaway</string>
+                    <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>
@@ -234,12 +248,30 @@
         <receiver>SMServerConfigDlg</receiver>
         <slot>configChanged()</slot>
     </connection>
+    <connection>
+      <sender>confirmLogoutCheck</sender>
+      <signal>toggled(bool)</signal>
+      <receiver>showFadeAway</receiver>
+      <slot>setEnabled(bool)</slot>
+    </connection>
     <connection>
       <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>

ksmserver/shutdowndlg.cpp

@@ -113,7 +113,8 @@ void KSMShutdownFeedback::fadeBack( void )
 void KSMShutdownFeedback::slotPaintEffect()
 {
 	// determine which fade to use
-	if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) {
+	if ( (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) &&
+	     (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) ) {
 		// fancy logout fade
 		float doFancyLogoutAdditionalDarkness  = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
 		float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
@@ -363,6 +364,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 		}
 	}
 	else {
+		if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) {
 			// standard logout fade
 			 if (kapp->isX11CompositionAvailable()) {
 				// We can do this in a different (simpler) manner because we have compositing support!
@@ -508,6 +510,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 				TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
 			}
 		}
+	}
 
 }