From 66faad37caa38d4ffd4dcc4d227b7f7131b31977 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 1 May 2014 13:04:21 +0900 Subject: Temporarily reverted commits ccb5fca, 59ef38d, 710fc43. The code for these commits will be pushed again later once a fix for SAK-enabled systems has been developed and tested. This relates to bug 1584. --- kdesktop/kdesktop.kcfg | 31 ++++++++++++++++++++---- kdesktop/lock/lockdlg.cc | 56 +++++++++++++------------------------------- kdesktop/lock/lockprocess.cc | 1 - kdesktop/lock/main.cc | 3 +-- 4 files changed, 43 insertions(+), 48 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index f2226f79d..2298e16c5 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -271,71 +271,92 @@ false + + 5000 + + false + + 600 + + 19 + + + + false When enabled this restores the old style unmanaged window behavior of desktop locking. + + true When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure. + + true When disabled the screensaver starts immediately when locking the desktop. + + true When enabled all active windows are hidden from the screensaver, showing only the desktop background as a result. - - - false - - Hide Cancel button from the "Desktop Session Locked" dialog. + + true When enabled, the Trinity Secure Attention Key (TSAK) system will be used to secure the screen locker. This requires system wide TSAK support to be enabled prior to use. + + + + + + diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 847e018d1..163a03e43 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -66,7 +66,6 @@ extern bool trinity_desktop_lock_autohide_lockdlg; extern bool trinity_desktop_lock_delay_screensaver_start; extern bool trinity_desktop_lock_use_system_modal_dialogs; extern bool trinity_desktop_lock_use_sak; -extern bool trinity_desktop_lock_hide_cancel_button; int dialogHideTimeout = 10*1000; @@ -150,17 +149,13 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame ); ok = new KPushButton( i18n("Unl&ock"), frame ); - ok->setDefault(true); - - if (!trinity_desktop_lock_hide_cancel_button) - { - cancel = new KPushButton( KStdGuiItem::cancel(), frame ); - // if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false); - } + cancel = new KPushButton( KStdGuiItem::cancel(), frame ); + if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false); greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null, KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock ); + TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); @@ -171,11 +166,8 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); layButtons->addWidget( mNewSessButton ); layButtons->addStretch(); - layButtons->addWidget(ok); - if (!trinity_desktop_lock_hide_cancel_button) - { - layButtons->addWidget(cancel); - } + layButtons->addWidget( ok ); + layButtons->addWidget( cancel ); if (trinity_desktop_lock_use_system_modal_dialogs) { KSMModalDialogHeader* theader = new KSMModalDialogHeader( frame ); @@ -211,17 +203,11 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) } setTabOrder( ok, cancel ); - if (!trinity_desktop_lock_hide_cancel_button) - { - setTabOrder( cancel, mNewSessButton ); - } + setTabOrder( cancel, mNewSessButton ); setTabOrder( mNewSessButton, mLayoutButton ); connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked())); - if (!trinity_desktop_lock_hide_cancel_button) - { - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - } + connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser())); @@ -271,12 +257,9 @@ PasswordDlg::~PasswordDlg() void PasswordDlg::reject() { - if (!trinity_desktop_lock_hide_cancel_button || trinity_desktop_lock_autohide_lockdlg || - trinity_desktop_lock_use_sak) - { - TQDialog::reject(); - } -} + if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) + TQDialog::reject(); +} void PasswordDlg::layoutClicked() { @@ -327,14 +310,11 @@ void PasswordDlg::timerEvent(TQTimerEvent *ev) { if (ev->timerId() == mTimeoutTimerId) { - if (trinity_desktop_lock_autohide_lockdlg) - { - // Force dialog rejection regardless of the value of trinity_desktop_lock_hide_cancel_button - TQDialog::reject(); + if (trinity_desktop_lock_autohide_lockdlg) { + reject(); } - else - { - slotActivity(); + else { + slotActivity(); } } else if (ev->timerId() == mFailedTimerId) @@ -345,11 +325,7 @@ void PasswordDlg::timerEvent(TQTimerEvent *ev) mUnlockingFailed = false; updateLabel(); ok->setEnabled(true); - if (!trinity_desktop_lock_hide_cancel_button) - // if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) - { - cancel->setEnabled(true); - } + if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) cancel->setEnabled(true); mNewSessButton->setEnabled( true ); greet->revive(); greet->start(); @@ -464,7 +440,7 @@ void PasswordDlg::reapVerify() updateLabel(); mFailedTimerId = startTimer(1500); ok->setEnabled(false); - //cancel->setEnabled(false); + cancel->setEnabled(false); mNewSessButton->setEnabled( false ); return; case AuthAbort: diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 773a0710a..f7dc1c25a 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -154,7 +154,6 @@ extern bool trinity_desktop_lock_use_system_modal_dialogs; extern bool trinity_desktop_lock_delay_screensaver_start; extern bool trinity_desktop_lock_use_sak; extern bool trinity_desktop_lock_hide_active_windows; -extern bool trinity_desktop_lock_hide_cancel_button; extern bool trinity_desktop_lock_forced; extern bool argb_visual; diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 2a8a6657d..c90c2ef6b 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -70,7 +70,7 @@ bool trinity_desktop_lock_use_system_modal_dialogs = FALSE; bool trinity_desktop_lock_delay_screensaver_start = FALSE; bool trinity_desktop_lock_use_sak = FALSE; bool trinity_desktop_lock_hide_active_windows = FALSE; -bool trinity_desktop_lock_hide_cancel_button = FALSE; + bool trinity_desktop_lock_forced = FALSE; bool signalled_forcelock; @@ -445,7 +445,6 @@ int main( int argc, char **argv ) trinity_desktop_lock_delay_screensaver_start = false; // If trinity_desktop_lock_delay_screensaver_start is true with unmanaged windows, the lock dialog may never appear } trinity_desktop_lock_hide_active_windows = KDesktopSettings::hideActiveWindowsFromSaver(); - trinity_desktop_lock_hide_cancel_button = KDesktopSettings::hideCancelButton(); delete tdmconfig; -- cgit v1.2.3