Attachment #522 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->showFeedbackDialog->setChecked(c->readBoolEntry("showFeedbackDlg", 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( "showFeedbackDlg", dialog->showFeedbackDialog->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>showFeedbackDialog</cstring>
		68	</property>
		69	<property name="text">
		70	<string>Show feed&back dialog</string>
		71	</property>
		72	<property name="whatsThis" stdset="0">
		73	<string>Check this option if you want to see a feedback dialog box.</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>showFeedbackDialog</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 feedback dialog box?
    bool showFeedbackDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFeedbackDlg", true);

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


        // shall we save the session on logout?
        saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );

        if (showFeedbackDlg) {
            KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
            shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
            while (!KSMShutdownIPFeedback::ispainted()) {


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

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

Return to bug 681

Lines 160-169 Link Here

(-)tdebase/ksmserver/shutdown.cpp (-6 / +6 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 feedback dialog box?
164	bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);	164	bool showFeedbackDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFeedbackDlg", true);
165		165
166	if (showFancyLogout) {	166	if (showFeedbackDlg) {
167	KSMShutdownIPFeedback::start();	167	KSMShutdownIPFeedback::start();
168	}	168	}
169		169
Lines 189-195 Link Here
189	// shall we save the session on logout?	189	// shall we save the session on logout?
190	saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );	190	saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );
191		191
192	if (showFancyLogout) {	192	if (showFeedbackDlg) {
193	KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user	193	KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
194	shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();	194	shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
195	while (!KSMShutdownIPFeedback::ispainted()) {	195	while (!KSMShutdownIPFeedback::ispainted()) {
Lines 212-218 Link Here
212		212
213	// Set the real desktop background to black so that exit looks	213	// Set the real desktop background to black so that exit looks
214	// clean regardless of what was on "our" desktop.	214	// clean regardless of what was on "our" desktop.
215	if (!showFancyLogout) {	215	if (!showFeedbackDlg) {
216	TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );	216	TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
217	}	217	}
218	state = Shutdown;	218	state = Shutdown;
Lines 252-258 Link Here
252	completeShutdownOrCheckpoint();	252	completeShutdownOrCheckpoint();
253	}	253	}
254	else {	254	else {
255	if (showFancyLogout) {	255	if (showFeedbackDlg) {
256	KSMShutdownIPFeedback::stop();	256	KSMShutdownIPFeedback::stop();
257	}	257	}
258	}	258	}