Attachment #627 for bug #681

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 681
Collapse All | Expand All

Lines 92-97 Link Here

(-)tdebase/kcontrol/smserver/kcmsmserver.cpp (+6 lines)
92	}	92	}
93	dialog->excludeLineedit->setText( c->readEntry("excludeApps"));	93	dialog->excludeLineedit->setText( c->readEntry("excludeApps"));
94		94
		95	c->setGroup("Logout");
		96	dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
		97
95	delete c;	98	delete c;
96		99
97	emit changed(useDefaults);	100	emit changed(useDefaults);
Lines 103-108 Link Here
103	c->setGroup("General");	106	c->setGroup("General");
104	c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());	107	c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());
105	c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());	108	c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());
		109
106	TQString s = "restorePreviousLogout";	110	TQString s = "restorePreviousLogout";
107	if ( dialog->emptySessionRadio->isChecked() )	111	if ( dialog->emptySessionRadio->isChecked() )
108	s = "default";	112	s = "default";
Lines 117-122 Link Here
117	int(KApplication::ShutdownTypeReboot) :	121	int(KApplication::ShutdownTypeReboot) :
118	int(KApplication::ShutdownTypeNone));	122	int(KApplication::ShutdownTypeNone));
119	c->writeEntry("excludeApps", dialog->excludeLineedit->text());	123	c->writeEntry("excludeApps", dialog->excludeLineedit->text());
		124	c->setGroup("Logout");
		125	c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
120	c->sync();	126	c->sync();
121	delete c;	127	delete c;
122		128

Lines 62-67 Link Here

(-)tdebase/kcontrol/smserver/smserverconfigdlg.ui (+17 lines)
62	<string>O&ffer shutdown options</string>	62	<string>O&ffer shutdown options</string>
63	</property>	63	</property>
64	</widget>	64	</widget>
		65	<widget class="TQCheckBox">
		66	<property name="name">
		67	<cstring>showLogoutStatusDialog</cstring>
		68	</property>
		69	<property name="text">
		70	<string>Show logout stat&us dialog</string>
		71	</property>
		72	<property name="whatsThis" stdset="0">
		73	<string>Check this option if you want to see a dialog box showing the logout status.</string>
		74	</property>
		75	</widget>
65	</vbox>	76	</vbox>
66	</widget>	77	</widget>
67	<widget class="TQButtonGroup">	78	<widget class="TQButtonGroup">
Lines 205-210 Link Here
205	<signal>toggled(bool)</signal>	216	<signal>toggled(bool)</signal>
206	<receiver>SMServerConfigDlg</receiver>	217	<receiver>SMServerConfigDlg</receiver>
207	<slot>configChanged()</slot>	218	<slot>configChanged()</slot>
		219	</connection>
		220	<connection>
		221	<sender>showLogoutStatusDialog</sender>
		222	<signal>toggled(bool)</signal>
		223	<receiver>SMServerConfigDlg</receiver>
		224	<slot>configChanged()</slot>
208	</connection>	225	</connection>
209	<connection>	226	<connection>
210	<sender>loginGroup</sender>	227	<sender>loginGroup</sender>




    if (sdmode == KApplication::ShutdownModeDefault)
        sdmode = KApplication::ShutdownModeInteractive;

    // shall we show a logout status dialog box?
    bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);

    if (showLogoutStatusDlg) {
        KSMShutdownIPFeedback::start();
    }



        // Set the real desktop background to black so that exit looks
        // clean regardless of what was on "our" desktop.
        if (!showLogoutStatusDlg) {
            TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
        }
        state = Shutdown;

            completeShutdownOrCheckpoint();
    }
    else {
       if (showLogoutStatusDlg) {
           KSMShutdownIPFeedback::stop();
       }
    }

    if ( waitForPhase2 )
        return;

    bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
    if (showLogoutStatusDlg) {
        KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
        shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
        while (!KSMShutdownIPFeedback::ispainted()) {

Return to bug 681

Lines 160-169 Link Here

(-)tdebase/ksmserver/shutdown.cpp (-7 / +7 lines)
160	if (sdmode == KApplication::ShutdownModeDefault)	160	if (sdmode == KApplication::ShutdownModeDefault)
161	sdmode = KApplication::ShutdownModeInteractive;	161	sdmode = KApplication::ShutdownModeInteractive;
162		162
163	// shall we show a nice fancy logout screen?	163	// shall we show a logout status dialog box?
164	bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);	164	bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
165		165
166	if (showFancyLogout) {	166	if (showLogoutStatusDlg) {
167	KSMShutdownIPFeedback::start();	167	KSMShutdownIPFeedback::start();
168	}	168	}
169		169
Lines 194-200 Link Here
194		194
195	// Set the real desktop background to black so that exit looks	195	// Set the real desktop background to black so that exit looks
196	// clean regardless of what was on "our" desktop.	196	// clean regardless of what was on "our" desktop.
197	if (!showFancyLogout) {	197	if (!showLogoutStatusDlg) {
198	TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );	198	TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
199	}	199	}
200	state = Shutdown;	200	state = Shutdown;
Lines 234-240 Link Here
234	completeShutdownOrCheckpoint();	234	completeShutdownOrCheckpoint();
235	}	235	}
236	else {	236	else {
237	if (showFancyLogout) {	237	if (showLogoutStatusDlg) {
238	KSMShutdownIPFeedback::stop();	238	KSMShutdownIPFeedback::stop();
239	}	239	}
240	}	240	}
Lines 484-491 Link Here
484	if ( waitForPhase2 )	484	if ( waitForPhase2 )
485	return;	485	return;
486		486
487	bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);	487	bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
488	if (showFancyLogout) {	488	if (showLogoutStatusDlg) {
489	KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user	489	KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
490	shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();	490	shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
491	while (!KSMShutdownIPFeedback::ispainted()) {	491	while (!KSMShutdownIPFeedback::ispainted()) {