Attachment #1651 for bug #1667

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 1667
Collapse All | Expand All

Lines 817-827 Link Here

(-)ori/tdebase/ksmserver/shutdown.cpp (-5 / +11 lines)
817	}	817	}
818	}	818	}
819	}	819	}
		820	KSMShutdownIPDlg shutdownNotifierDlg=static_cast<KSMShutdownIPDlg>(shutdownNotifierIPDlg);
		821	shutdownNotifierDlg->setProgressBarTotalSteps(initialClientCount);
		822	shutdownNotifierDlg->setProgressBarProgress(initialClientCount-clients.count());
820	if (nextClientToKill == "") {	823	if (nextClientToKill == "") {
821	static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Closing applications (%1/%2)...").arg(initialClientCount-clients.count()).arg(initialClientCount));	824	shutdownNotifierDlg->setStatusMessage(i18n("Closing applications (%1/%2)...").arg(initialClientCount-clients.count()).arg(initialClientCount));
822	}	825	}
823	else {	826	else {
824	static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Closing applications (%1/%2, %3)...").arg(initialClientCount-clients.count()).arg(initialClientCount).arg(nextClientToKill));	827	shutdownNotifierDlg->setStatusMessage(i18n("Closing applications (%1/%2, %3)...").arg(initialClientCount-clients.count()).arg(initialClientCount).arg(nextClientToKill));
825	}	828	}
826	}	829	}
827	if( waitForKNotify ) {	830	if( waitForKNotify ) {
Lines 886-897 Link Here
886	}	889	}
887	if( wait ) {	890	if( wait ) {
888	if (shutdownNotifierIPDlg) {	891	if (shutdownNotifierIPDlg) {
889	static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->show();	892	KSMShutdownIPDlg shutdownNotifierDlg=static_cast<KSMShutdownIPDlg>(shutdownNotifierIPDlg);
		893	shutdownNotifierDlg->setProgressBarTotalSteps(initialClientCount);
		894	shutdownNotifierDlg->setProgressBarProgress(initialClientCount-clients.count());
		895	shutdownNotifierDlg->show();
890	if (nextClientToKill == "") {	896	if (nextClientToKill == "") {
891	static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Closing applications (%1/%2)...").arg(initialClientCount-clients.count()).arg(initialClientCount));	897	shutdownNotifierDlg->setStatusMessage(i18n("Closing applications (%1/%2)...").arg(initialClientCount-clients.count()).arg(initialClientCount));
892	}	898	}
893	else {	899	else {
894	static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Closing applications (%1/%2, %3)...").arg(initialClientCount-clients.count()).arg(initialClientCount).arg(nextClientToKill));	900	shutdownNotifierDlg->setStatusMessage(i18n("Closing applications (%1/%2, %3)...").arg(initialClientCount-clients.count()).arg(initialClientCount).arg(nextClientToKill));
895	}	901	}
896	}	902	}
897	return;	903	return;




	m_button1->setText(text);
}

void KSMShutdownIPDlg::setProgressBarTotalSteps(int total_steps)
{
  m_progressbar->setTotalSteps(total_steps);
}

void KSMShutdownIPDlg::setProgressBarProgress(int step)
{
  m_progressbar->setProgress(step);
}

KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
  : KSMModalDialog( parent )

{
  m_progressbar = new TQProgressBar(this);
  m_progressbar->show();
  m_gridlayout->expand(4,3);
  m_gridlayout->addMultiCellWidget( m_progressbar, 3, 3, 0, 2);
  setFixedSize(sizeHint());
  
  setStatusMessage(i18n("Saving your settings..."));

	setNotificationActionButtonsSkipText(i18n("Skip Notification"));
	m_button2->setText(i18n("Abort Logout"));

Lines 18-23 Link Here

(-)ori/tdebase/ksmserver/shutdowndlg.h (+5 lines)
18	#include <kguiitem.h>	18	#include <kguiitem.h>
19	#include <tqtoolbutton.h>	19	#include <tqtoolbutton.h>
20	#include <krootpixmap.h>	20	#include <krootpixmap.h>
		21	#include <ntqprogressbar.h>
21		22
22	class TQPushButton;	23	class TQPushButton;
23	class TQVButtonGroup;	24	class TQVButtonGroup;
Lines 175-180 Link Here
175	void showNotificationActionButtons();	176	void showNotificationActionButtons();
176	void hideNotificationActionButtons();	177	void hideNotificationActionButtons();
177	void setNotificationActionButtonsSkipText(TQString text);	178	void setNotificationActionButtonsSkipText(TQString text);
		179	void setProgressBarTotalSteps(int total_steps);
		180	void setProgressBarProgress(int step);
178		181
179	signals:	182	signals:
180	void abortLogoutClicked();	183	void abortLogoutClicked();
Lines 185-190 Link Here
185		188
186	private:	189	private:
187	KSMShutdownIPDlg( TQWidget* parent );	190	KSMShutdownIPDlg( TQWidget* parent );
		191
		192	TQProgressBar *m_progressbar;
188	};	193	};
189		194
190	class KSMDelayedPushButton : public KPushButton	195	class KSMDelayedPushButton : public KPushButton

Return to bug 1667

Lines 1250-1260 Link Here

(-)ori/tdebase/ksmserver/shutdowndlg.cpp (-1 / +17 lines)
1250	m_button1->setText(text);	1250	m_button1->setText(text);
1251	}	1251	}
1252		1252
		1253	void KSMShutdownIPDlg::setProgressBarTotalSteps(int total_steps)
		1254	{
		1255	m_progressbar->setTotalSteps(total_steps);
		1256	}
		1257
		1258	void KSMShutdownIPDlg::setProgressBarProgress(int step)
		1259	{
		1260	m_progressbar->setProgress(step);
		1261	}
		1262
1253	KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)	1263	KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
1254	: KSMModalDialog( parent )	1264	: KSMModalDialog( parent )
1255		1265
1256	{	1266	{
1257	setStatusMessage(i18n("Saving your settings..."));	1267	m_progressbar = new TQProgressBar(this);
		1268	m_progressbar->show();
		1269	m_gridlayout->expand(4,3);
		1270	m_gridlayout->addMultiCellWidget( m_progressbar, 3, 3, 0, 2);
		1271	setFixedSize(sizeHint());
		1272
		1273	setStatusMessage(i18n("Saving your settings..."));
1258		1274
1259	setNotificationActionButtonsSkipText(i18n("Skip Notification"));	1275	setNotificationActionButtonsSkipText(i18n("Skip Notification"));
1260	m_button2->setText(i18n("Abort Logout"));	1276	m_button2->setText(i18n("Abort Logout"));