diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-06 09:26:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-06 09:26:58 -0500 |
| commit | f94af7a1fe657995015acec33f962815af4580f4 (patch) | |
| tree | e61fdd2a1c04680d104a29795e71fa7d0093b3b1 | |
| parent | d85d82bd00b3a5f49569bf99fd0ad8a3df0dc234 (diff) | |
| download | tdebase-f94af7a1fe657995015acec33f962815af4580f4.tar.gz tdebase-f94af7a1fe657995015acec33f962815af4580f4.zip | |
Hide logout status dialog during Phase1 client interaction
This relates to Bug 760
| -rw-r--r-- | ksmserver/shutdown.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index c519d8b88..8af8f0450 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -477,6 +477,7 @@ void KSMServer::updateLogoutStatusDialog() } if (inPhase2) { if (phase2ClientCount > 0) { + static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->show(); static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Skip Notification (%1)").arg(((KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT - (protectionTimerCounter*1000))/1000)+1)); if (nextClientToKill == "") { static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying remaining applications of logout request (%1/%2)...").arg(phase2ClientCount-waitingClients).arg(phase2ClientCount)); @@ -488,6 +489,7 @@ void KSMServer::updateLogoutStatusDialog() } else { if (pendingInteraction) { + static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->hide(); static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Ignore and Resume Logout")); if (nextClientToKill == "") { static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("An application is requesting attention, logout paused...")); @@ -497,6 +499,7 @@ void KSMServer::updateLogoutStatusDialog() } } else { + static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->show(); static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Skip Notification (%1)").arg(((KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT - (protectionTimerCounter*1000))/1000)+1)); if (nextClientToKill == "") { static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request (%1/%2)...").arg(clients.count()-waitingClients).arg(clients.count())); |