Implement logout menu option in secure dialog

Ensure that cursor is not set to busy status on lock from secure dialog
pull/2/head
Timothy Pearson 12 years ago
parent 30617b6fb7
commit 4d538e4047

@ -674,6 +674,8 @@ void LockProcess::startSecureDialog()
// the screensaver kicks in because the user moved the mouse after // the screensaver kicks in because the user moved the mouse after
// selecting "lock screen", that looks really untidy. // selecting "lock screen", that looks really untidy.
mBusy = true; mBusy = true;
// Make sure the cursor is not showing busy status
setCursor( tqarrowCursor );
if (startLock()) if (startLock())
{ {
if (trinity_desktop_lock_delay_screensaver_start) { if (trinity_desktop_lock_delay_screensaver_start) {
@ -694,8 +696,13 @@ void LockProcess::startSecureDialog()
} }
kapp->quit(); kapp->quit();
} }
if (ret == 3) {
trinity_desktop_lock_closing_windows = 1;
DCOPRef("ksmserver","ksmserver").send("logout", -1, 0, 1);
kapp->quit();
}
// FIXME // FIXME
// Handle remaining two cases (logoff menu and switch user) // Handle remaining case (switch user)
if (forcecontdisp) { if (forcecontdisp) {
ENABLE_CONTINUOUS_LOCKDLG_DISPLAY ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
} }

@ -102,7 +102,6 @@ SecureDlg::SecureDlg(LockProcess *parent)
mShutdownButton = new TQPushButton( frame ); mShutdownButton = new TQPushButton( frame );
mShutdownButton->setText(i18n("Logoff Menu")); mShutdownButton->setText(i18n("Logoff Menu"));
mShutdownButton->setEnabled(false); // FIXME
mSwitchButton = new TQPushButton( frame ); mSwitchButton = new TQPushButton( frame );
mSwitchButton->setText(i18n("Switch User")); mSwitchButton->setText(i18n("Switch User"));

Loading…
Cancel
Save