diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-04-28 14:58:34 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-04-28 14:58:34 +0900 |
| commit | ccb5fcaf675122fae8ed05e5f1d956d0253ceb2c (patch) | |
| tree | 899f09c7558af1be3f8fd5127b7a36cc893c302d /kdesktop | |
| parent | 4b94b0699746995caa4a02e48bac64f771201a46 (diff) | |
| download | tdebase-ccb5fcaf675122fae8ed05e5f1d956d0253ceb2c.tar.gz tdebase-ccb5fcaf675122fae8ed05e5f1d956d0253ceb2c.zip | |
Enabled Cancel button in "Desktop Session Locked" dialog window.
This allows to press the Cancel button or Esc to start the screensaver.
This resolves bug 1584, but have a look at bug 2038 for further details.
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 163a03e43..30a892ca1 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -150,12 +150,11 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame ); ok = new KPushButton( i18n("Unl&ock"), frame ); cancel = new KPushButton( KStdGuiItem::cancel(), frame ); - if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false); + //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 ); @@ -257,7 +256,7 @@ PasswordDlg::~PasswordDlg() void PasswordDlg::reject() { - if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) + // if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) TQDialog::reject(); } @@ -440,7 +439,7 @@ void PasswordDlg::reapVerify() updateLabel(); mFailedTimerId = startTimer(1500); ok->setEnabled(false); - cancel->setEnabled(false); + //cancel->setEnabled(false); mNewSessButton->setEnabled( false ); return; case AuthAbort: |