diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-02 11:53:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-02 11:53:32 +0900 |
| commit | 868c510ed63f27464d74b0c5e8f71f765c02f563 (patch) | |
| tree | 00965df32d31204b2fef54a8b532f08de27ba071 /kcontrol | |
| parent | a6fbc0f1e09859de2a8414b00c8b39082b0f974e (diff) | |
| download | tdebase-868c510ed63f27464d74b0c5e8f71f765c02f563.tar.gz tdebase-868c510ed63f27464d74b0c5e8f71f765c02f563.zip | |
"Hide Cancel button" functionality in kdesktop_lock is now fully working
also on SAK available and enabled systems.
This (finally!) fully solves bug 1584.
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/screensaver/scrnsave.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 18925e889..a0b26ae46 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -271,7 +271,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1); TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") ); - mHideCancelButtonCheckBox = new TQCheckBox( i18n("&Hide Cancel &button"), mSettingsGroup ); + mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup ); mHideCancelButtonCheckBox->setEnabled( true ); mHideCancelButtonCheckBox->setChecked( mHideCancelButton ); connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) ); @@ -697,6 +697,7 @@ void KScreenSaver::slotEnable(bool e) // void KScreenSaver::processLockouts() { + bool useSAK = mTDMConfig->readBoolEntry("UseSAK", false); mActivateLbl->setEnabled( mEnabled ); mWaitEdit->setEnabled( mEnabled ); mLockCheckBox->setEnabled( mEnabled ); @@ -708,7 +709,7 @@ void KScreenSaver::processLockouts() mDelaySaverStartCheckBox->setEnabled( false ); mDelaySaverStartCheckBox->setChecked( false ); } - if (!mUseUnmanagedLockWindows && mTDMConfig->readBoolEntry("UseSAK", false)) { + if (!mUseUnmanagedLockWindows && useSAK) { mUseTSAKCheckBox->setEnabled( true ); mUseTSAKCheckBox->setChecked( mUseTSAK ); } @@ -724,6 +725,14 @@ void KScreenSaver::processLockouts() mHideActiveWindowsFromSaverCheckBox->setEnabled( false ); mHideActiveWindowsFromSaverCheckBox->setChecked( false ); } + if (mUseUnmanagedLockWindows || (useSAK && mUseTSAK)) { + mHideCancelButtonCheckBox->setEnabled( false ); + mHideCancelButtonCheckBox->setChecked( false ); + } + else { + mHideCancelButtonCheckBox->setEnabled( true ); + mHideCancelButtonCheckBox->setChecked( mHideCancelButton ); + } mLockLbl->setEnabled( mEnabled && mLock ); mWaitLockEdit->setEnabled( mEnabled && mLock ); } |