Attachment #2050 for bug #1584

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1584
Collapse All | Expand All




    mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
    mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
    leftColumnLayout->addWidget( mSettingsGroup );
    TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );

    mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);
    mEnabledCheckBox->setChecked(mEnabled);

    settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);
    TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );

    mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup );
    mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
    mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
    connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
    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->setEnabled( true );
    mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
    connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) );
    settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1);
    TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog."));

    // right column
    TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());


    mUseTSAK = config->readBoolEntry("UseTDESAK", true);
    mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
    mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
    mHideCancelButton = config->readBoolEntry("HideCancelButton", false);
    mSaver = config->readEntry("Saver");

    if (mTimeout < 60) mTimeout = 60;

    config->writeEntry("UseTDESAK", mUseTSAK);
    config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
    config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
    config->writeEntry("HideCancelButton", mHideCancelButton);

    if ( !mSaver.isEmpty() )
        config->writeEntry("Saver", mSaver);

//
void KScreenSaver::processLockouts()
{
    bool useSAK = mTDMConfig->readBoolEntry("UseSAK", false);
    mActivateLbl->setEnabled( mEnabled );
    mWaitEdit->setEnabled( mEnabled );
    mLockCheckBox->setEnabled( mEnabled );

        mDelaySaverStartCheckBox->setEnabled( false );
        mDelaySaverStartCheckBox->setChecked( false );
    }
    if (!mUseUnmanagedLockWindows && useSAK) {
        mUseTSAKCheckBox->setEnabled( true );
        mUseTSAKCheckBox->setChecked( mUseTSAK );
    }

        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 );
}


//---------------------------------------------------------------------------
//
void KScreenSaver::slotHideCancelButton( bool h )
{
    if (mHideCancelButtonCheckBox->isEnabled()) mHideCancelButton = h;
    processLockouts();
    mChanged = true;
    emit changed(true);
}

//---------------------------------------------------------------------------
//
void KScreenSaver::slotSetupDone(TDEProcess *)
{
    mPrevSelected = -1;  // see ugly hack in slotPreviewExited()




    void slotUseTSAK( bool );
    void slotUseUnmanagedLockWindows( bool );
    void slotHideActiveWindowsFromSaver( bool );
    void slotHideCancelButton( bool );
    void processLockouts();
    void slotSetupDone(TDEProcess*);
    // when selecting a new screensaver, the old preview will

    TQCheckBox   *mUseTSAKCheckBox;
    TQCheckBox   *mUseUnmanagedLockWindowsCheckBox;
    TQCheckBox   *mHideActiveWindowsFromSaverCheckBox;
    TQCheckBox   *mHideCancelButtonCheckBox;

    int         mSelected;
    int         mPrevSelected;

    bool        mUseTSAK;
    bool        mUseUnmanagedLockWindows;
    bool        mHideActiveWindowsFromSaver;
    bool        mHideCancelButton;

    KSimpleConfig* mTDMConfig;
};




      <default>false</default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:308 -->
      <!--     if(config.readBoolEntry("Lock", false)) -->
    </entry>
    <entry key="LockGrace" type="Int">
      <default>5000</default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:310 -->
      <!--         mLockGrace = config.readNumEntry("LockGrace", LOCK_GRACE_DEFAULT); -->
    </entry>
    <entry key="AutoLogout" type="Bool">
      <default>false</default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:319 -->
      <!--     if (config.readBoolEntry("AutoLogout", false)) -->
    </entry>
    <entry key="AutoLogoutTimeout" type="Int">
      <default>600</default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:322 -->
      <!--         mAutoLogoutTimeout = config.readNumEntry("AutoLogoutTimeout", AUTOLOGOUT_DEFAULT); -->
    </entry>
    <entry key="Priority" type="Int">
      <default>19</default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:332 -->
      <!--     mPriority = config.readNumEntry("Priority", 19); -->
    </entry>
    <entry key="Saver" type="String">
      <default></default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
      <!--     mSaver = config.readEntry("Saver"); -->
    </entry>
    <entry key="UseUnmanagedLockWindows" type="Bool">
      <default>false</default>
      <label></label>
      <whatsthis>When enabled this restores the old style unmanaged window behavior of desktop locking.</whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
      <!--     mSaver = config.readEntry("UseUnmanagedLockWindows"); -->
    </entry>
    <entry key="ShowLockDateTime" type="Bool">
      <default>true</default>
      <label></label>
      <whatsthis>When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure.</whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
      <!--     mSaver = config.readEntry("ShowLockDateTime"); -->
    </entry>
    <entry key="DelaySaverStart" type="Bool">
      <default>true</default>
      <label></label>
      <whatsthis>When disabled the screensaver starts immediately when locking the desktop.</whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
      <!--     mSaver = config.readEntry("DelaySaverStart"); -->
    </entry>
    <entry key="HideActiveWindowsFromSaver" type="Bool">
      <default>true</default>
      <label></label>
      <whatsthis>When enabled all active windows are hidden from the screensaver, showing only the desktop background as a result.</whatsthis>
    </entry>
    <entry key="HideCancelButton" type="Bool">
      <default>false</default>
      <label></label>
      <whatsthis>Hide Cancel button from the "Desktop Session Locked" dialog.</whatsthis>
    </entry>
    <entry key="UseTDESAK" type="Bool">
      <default>true</default>
      <label></label>
      <whatsthis>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.</whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
      <!--     mSaver = config.readEntry("UseTDESAK"); -->
    </entry>
    <entry key="PluginsUnlock" type="StringList">
      <default></default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:342 -->
      <!--     mPlugins = config.readListEntry("PluginsUnlock"); -->
    </entry>
    <entry key="PluginOptions" type="StringList">
      <default></default>
      <label></label>
      <whatsthis></whatsthis>
      <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:345 -->
      <!--     mPluginOptions = config.readListEntry("PluginOptions"); -->
    </entry>
  </group>
  <group name="MiniCli"> 




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;



    mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame );
    ok = new KPushButton( i18n("Unl&ock"), frame );
    ok->setDefault(true);

    bool show_cancel_button = !trinity_desktop_lock_hide_cancel_button || 
                              trinity_desktop_lock_use_sak ||
                              !trinity_desktop_lock_use_system_modal_dialogs;
    if (show_cancel_button)
      cancel = new KPushButton( KStdGuiItem::cancel(), frame );
    else
      cancel = NULL;

    greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null,
              KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock );


    TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
    unlockDialogLayout->addWidget( frame );


    TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
    layButtons->addWidget( mNewSessButton );
    layButtons->addStretch();
    layButtons->addWidget(ok);
    if (show_cancel_button)
      layButtons->addWidget(cancel);

    if (trinity_desktop_lock_use_system_modal_dialogs) {
        KSMModalDialogHeader* theader = new KSMModalDialogHeader( frame );

        frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
    }

    if (show_cancel_button)
    {
      setTabOrder( ok, cancel );
      setTabOrder( cancel, mNewSessButton );
    }
    else
    {
      setTabOrder( ok, mNewSessButton );
    }
    setTabOrder( mNewSessButton, mLayoutButton );

    connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
    if (show_cancel_button)
    { 
      connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
    }
    connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
    connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));



void PasswordDlg::reject()
{
  if (!trinity_desktop_lock_hide_cancel_button || trinity_desktop_lock_use_sak ||   
      !trinity_desktop_lock_use_system_modal_dialogs || trinity_desktop_lock_autohide_lockdlg)
  {
    TQDialog::reject();
  }
} 

void PasswordDlg::layoutClicked()
{

{
    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();
        }
        else
        {
          slotActivity();
        }
    }
    else if (ev->timerId() == mFailedTimerId)

        mUnlockingFailed = false;
        updateLabel();
        ok->setEnabled(true);
        if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak) cancel->setEnabled(true);
        mNewSessButton->setEnabled( true );
        greet->revive();
        greet->start();

                updateLabel();
                mFailedTimerId = startTimer(1500);
                ok->setEnabled(false);
                cancel->setEnabled(false);
                mNewSessButton->setEnabled( false );
                return;
            case AuthAbort:

Lines 154-159 extern bool trinity_desktop_lock_use_system_modal_dialogs; Link Here

(-)a/kdesktop/lock/lockprocess.cc (+1 lines)
154	extern bool trinity_desktop_lock_delay_screensaver_start;	154	extern bool trinity_desktop_lock_delay_screensaver_start;
155	extern bool trinity_desktop_lock_use_sak;	155	extern bool trinity_desktop_lock_use_sak;
156	extern bool trinity_desktop_lock_hide_active_windows;	156	extern bool trinity_desktop_lock_hide_active_windows;
		157	extern bool trinity_desktop_lock_hide_cancel_button;
157	extern bool trinity_desktop_lock_forced;	158	extern bool trinity_desktop_lock_forced;
158		159
159	extern bool argb_visual;	160	extern bool argb_visual;

Lines 70-76 bool trinity_desktop_lock_use_system_modal_dialogs = FALSE; Link Here

(-)a/kdesktop/lock/main.cc (-1 / +2 lines)
70	bool trinity_desktop_lock_delay_screensaver_start = FALSE;	70	bool trinity_desktop_lock_delay_screensaver_start = FALSE;
71	bool trinity_desktop_lock_use_sak = FALSE;	71	bool trinity_desktop_lock_use_sak = FALSE;
72	bool trinity_desktop_lock_hide_active_windows = FALSE;	72	bool trinity_desktop_lock_hide_active_windows = FALSE;
73		73	bool trinity_desktop_lock_hide_cancel_button = FALSE;
74	bool trinity_desktop_lock_forced = FALSE;	74	bool trinity_desktop_lock_forced = FALSE;
75		75
76	bool signalled_forcelock;	76	bool signalled_forcelock;
Lines 445-450 int main( int argc, char **argv ) Link Here
445	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	445	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
446	}	446	}
447	trinity_desktop_lock_hide_active_windows = KDesktopSettings::hideActiveWindowsFromSaver();	447	trinity_desktop_lock_hide_active_windows = KDesktopSettings::hideActiveWindowsFromSaver();
		448	trinity_desktop_lock_hide_cancel_button = KDesktopSettings::hideCancelButton();
448		449
449	delete tdmconfig;	450	delete tdmconfig;
450		451

Return to bug 1584

Lines 177-183 KScreenSaver::KScreenSaver(TQWidget parent, const char name, const TQStringLis Link Here

(-)a/kcontrol/screensaver/scrnsave.cpp (-3 / +31 lines)
177	mSettingsGroup = new TQGroupBox( i18n("Settings"), this );	177	mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
178	mSettingsGroup->setColumnLayout( 0, Qt::Vertical );	178	mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
179	leftColumnLayout->addWidget( mSettingsGroup );	179	leftColumnLayout->addWidget( mSettingsGroup );
180	TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 4, 2, KDialog::spacingHint() );	180	TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );
181		181
182	mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);	182	mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);
183	mEnabledCheckBox->setChecked(mEnabled);	183	mEnabledCheckBox->setChecked(mEnabled);
Lines 264-276 KScreenSaver::KScreenSaver(TQWidget parent, const char name, const TQStringLis Link Here
264	settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);	264	settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);
265	TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );	265	TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );
266		266
267	mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("&Hide active windows from saver"), mSettingsGroup );	267	mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup );
268	mHideActiveWindowsFromSaverCheckBox->setEnabled( true );	268	mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
269	mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );	269	mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
270	connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );	270	connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
271	settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);	271	settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
272	TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );	272	TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
273		273
		274	mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
		275	mHideCancelButtonCheckBox->setEnabled( true );
		276	mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
		277	connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) );
		278	settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1);
		279	TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog."));
		280
274	// right column	281	// right column
275	TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());	282	TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());
276		283
Lines 432-437 void KScreenSaver::readSettings( bool useDefaults ) Link Here
432	mUseTSAK = config->readBoolEntry("UseTDESAK", true);	439	mUseTSAK = config->readBoolEntry("UseTDESAK", true);
433	mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);	440	mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
434	mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);	441	mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
		442	mHideCancelButton = config->readBoolEntry("HideCancelButton", false);
435	mSaver = config->readEntry("Saver");	443	mSaver = config->readEntry("Saver");
436		444
437	if (mTimeout < 60) mTimeout = 60;	445	if (mTimeout < 60) mTimeout = 60;
Lines 484-489 void KScreenSaver::save() Link Here
484	config->writeEntry("UseTDESAK", mUseTSAK);	492	config->writeEntry("UseTDESAK", mUseTSAK);
485	config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);	493	config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
486	config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);	494	config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
		495	config->writeEntry("HideCancelButton", mHideCancelButton);
487		496
488	if ( !mSaver.isEmpty() )	497	if ( !mSaver.isEmpty() )
489	config->writeEntry("Saver", mSaver);	498	config->writeEntry("Saver", mSaver);
Lines 688-693 void KScreenSaver::slotEnable(bool e) Link Here
688	//	697	//
689	void KScreenSaver::processLockouts()	698	void KScreenSaver::processLockouts()
690	{	699	{
		700	bool useSAK = mTDMConfig->readBoolEntry("UseSAK", false);
691	mActivateLbl->setEnabled( mEnabled );	701	mActivateLbl->setEnabled( mEnabled );
692	mWaitEdit->setEnabled( mEnabled );	702	mWaitEdit->setEnabled( mEnabled );
693	mLockCheckBox->setEnabled( mEnabled );	703	mLockCheckBox->setEnabled( mEnabled );
Lines 699-705 void KScreenSaver::processLockouts() Link Here
699	mDelaySaverStartCheckBox->setEnabled( false );	709	mDelaySaverStartCheckBox->setEnabled( false );
700	mDelaySaverStartCheckBox->setChecked( false );	710	mDelaySaverStartCheckBox->setChecked( false );
701	}	711	}
702	if (!mUseUnmanagedLockWindows && mTDMConfig->readBoolEntry("UseSAK", false)) {	712	if (!mUseUnmanagedLockWindows && useSAK) {
703	mUseTSAKCheckBox->setEnabled( true );	713	mUseTSAKCheckBox->setEnabled( true );
704	mUseTSAKCheckBox->setChecked( mUseTSAK );	714	mUseTSAKCheckBox->setChecked( mUseTSAK );
705	}	715	}
Lines 715-720 void KScreenSaver::processLockouts() Link Here
715	mHideActiveWindowsFromSaverCheckBox->setEnabled( false );	725	mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
716	mHideActiveWindowsFromSaverCheckBox->setChecked( false );	726	mHideActiveWindowsFromSaverCheckBox->setChecked( false );
717	}	727	}
		728	if (mUseUnmanagedLockWindows \|\| (useSAK && mUseTSAK)) {
		729	mHideCancelButtonCheckBox->setEnabled( false );
		730	mHideCancelButtonCheckBox->setChecked( false );
		731	}
		732	else {
		733	mHideCancelButtonCheckBox->setEnabled( true );
		734	mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
		735	}
718	mLockLbl->setEnabled( mEnabled && mLock );	736	mLockLbl->setEnabled( mEnabled && mLock );
719	mWaitLockEdit->setEnabled( mEnabled && mLock );	737	mWaitLockEdit->setEnabled( mEnabled && mLock );
720	}	738	}
Lines 980-985 void KScreenSaver::slotHideActiveWindowsFromSaver( bool h ) Link Here
980		998
981	//---------------------------------------------------------------------------	999	//---------------------------------------------------------------------------
982	//	1000	//
		1001	void KScreenSaver::slotHideCancelButton( bool h )
		1002	{
		1003	if (mHideCancelButtonCheckBox->isEnabled()) mHideCancelButton = h;
		1004	processLockouts();
		1005	mChanged = true;
		1006	emit changed(true);
		1007	}
		1008
		1009	//---------------------------------------------------------------------------
		1010	//
983	void KScreenSaver::slotSetupDone(TDEProcess *)	1011	void KScreenSaver::slotSetupDone(TDEProcess *)
984	{	1012	{
985	mPrevSelected = -1; // see ugly hack in slotPreviewExited()	1013	mPrevSelected = -1; // see ugly hack in slotPreviewExited()

Lines 60-65 protected slots: Link Here

(-)a/kcontrol/screensaver/scrnsave.h (+3 lines)
60	void slotUseTSAK( bool );	60	void slotUseTSAK( bool );
61	void slotUseUnmanagedLockWindows( bool );	61	void slotUseUnmanagedLockWindows( bool );
62	void slotHideActiveWindowsFromSaver( bool );	62	void slotHideActiveWindowsFromSaver( bool );
		63	void slotHideCancelButton( bool );
63	void processLockouts();	64	void processLockouts();
64	void slotSetupDone(TDEProcess*);	65	void slotSetupDone(TDEProcess*);
65	// when selecting a new screensaver, the old preview will	66	// when selecting a new screensaver, the old preview will
Lines 103-108 protected: Link Here
103	TQCheckBox *mUseTSAKCheckBox;	104	TQCheckBox *mUseTSAKCheckBox;
104	TQCheckBox *mUseUnmanagedLockWindowsCheckBox;	105	TQCheckBox *mUseUnmanagedLockWindowsCheckBox;
105	TQCheckBox *mHideActiveWindowsFromSaverCheckBox;	106	TQCheckBox *mHideActiveWindowsFromSaverCheckBox;
		107	TQCheckBox *mHideCancelButtonCheckBox;
106		108
107	int mSelected;	109	int mSelected;
108	int mPrevSelected;	110	int mPrevSelected;
Lines 121-126 protected: Link Here
121	bool mUseTSAK;	123	bool mUseTSAK;
122	bool mUseUnmanagedLockWindows;	124	bool mUseUnmanagedLockWindows;
123	bool mHideActiveWindowsFromSaver;	125	bool mHideActiveWindowsFromSaver;
		126	bool mHideCancelButton;
124		127
125	KSimpleConfig* mTDMConfig;	128	KSimpleConfig* mTDMConfig;
126	};	129	};

Lines 66-71 extern bool trinity_desktop_lock_autohide_lockdlg; Link Here

(-)a/kdesktop/lock/lockdlg.cc (-17 / +39 lines)
66	extern bool trinity_desktop_lock_delay_screensaver_start;	66	extern bool trinity_desktop_lock_delay_screensaver_start;
67	extern bool trinity_desktop_lock_use_system_modal_dialogs;	67	extern bool trinity_desktop_lock_use_system_modal_dialogs;
68	extern bool trinity_desktop_lock_use_sak;	68	extern bool trinity_desktop_lock_use_sak;
		69	extern bool trinity_desktop_lock_hide_cancel_button;
69		70
70	int dialogHideTimeout = 10*1000;	71	int dialogHideTimeout = 10*1000;
71		72
Lines 149-161 void PasswordDlg::init(GreeterPluginHandle *plugin) Link Here
149		150
150	mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame );	151	mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame );
151	ok = new KPushButton( i18n("Unl&ock"), frame );	152	ok = new KPushButton( i18n("Unl&ock"), frame );
152	cancel = new KPushButton( KStdGuiItem::cancel(), frame );	153	ok->setDefault(true);
153	if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false);	154
		155	bool show_cancel_button = !trinity_desktop_lock_hide_cancel_button \|\|
		156	trinity_desktop_lock_use_sak \|\|
		157	!trinity_desktop_lock_use_system_modal_dialogs;
		158	if (show_cancel_button)
		159	cancel = new KPushButton( KStdGuiItem::cancel(), frame );
		160	else
		161	cancel = NULL;
154		162
155	greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null,	163	greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null,
156	KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock );	164	KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock );
157		165
158
159	TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );	166	TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
160	unlockDialogLayout->addWidget( frame );	167	unlockDialogLayout->addWidget( frame );
161		168
Lines 166-173 void PasswordDlg::init(GreeterPluginHandle *plugin) Link Here
166	TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());	173	TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
167	layButtons->addWidget( mNewSessButton );	174	layButtons->addWidget( mNewSessButton );
168	layButtons->addStretch();	175	layButtons->addStretch();
169	layButtons->addWidget( ok );	176	layButtons->addWidget(ok);
170	layButtons->addWidget( cancel );	177	if (show_cancel_button)
		178	layButtons->addWidget(cancel);
171		179
172	if (trinity_desktop_lock_use_system_modal_dialogs) {	180	if (trinity_desktop_lock_use_system_modal_dialogs) {
173	KSMModalDialogHeader* theader = new KSMModalDialogHeader( frame );	181	KSMModalDialogHeader* theader = new KSMModalDialogHeader( frame );
Lines 202-213 void PasswordDlg::init(GreeterPluginHandle *plugin) Link Here
202	frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );	210	frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
203	}	211	}
204		212
205	setTabOrder( ok, cancel );	213	if (show_cancel_button)
206	setTabOrder( cancel, mNewSessButton );	214	{
		215	setTabOrder( ok, cancel );
		216	setTabOrder( cancel, mNewSessButton );
		217	}
		218	else
		219	{
		220	setTabOrder( ok, mNewSessButton );
		221	}
207	setTabOrder( mNewSessButton, mLayoutButton );	222	setTabOrder( mNewSessButton, mLayoutButton );
208		223
209	connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));	224	connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
210	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));	225	if (show_cancel_button)
		226	{
		227	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
		228	}
211	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));	229	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
212	connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));	230	connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
213		231
Lines 257-265 PasswordDlg::~PasswordDlg() Link Here
257		275
258	void PasswordDlg::reject()	276	void PasswordDlg::reject()
259	{	277	{
260	if (trinity_desktop_lock_autohide_lockdlg \|\| trinity_desktop_lock_use_sak)	278	if (!trinity_desktop_lock_hide_cancel_button \|\| trinity_desktop_lock_use_sak \|\|
261	TQDialog::reject();	279	!trinity_desktop_lock_use_system_modal_dialogs \|\| trinity_desktop_lock_autohide_lockdlg)
262	}	280	{
		281	TQDialog::reject();
		282	}
		283	}
263		284
264	void PasswordDlg::layoutClicked()	285	void PasswordDlg::layoutClicked()
265	{	286	{
Lines 310-320 void PasswordDlg::timerEvent(TQTimerEvent *ev) Link Here
310	{	331	{
311	if (ev->timerId() == mTimeoutTimerId)	332	if (ev->timerId() == mTimeoutTimerId)
312	{	333	{
313	if (trinity_desktop_lock_autohide_lockdlg) {	334	if (trinity_desktop_lock_autohide_lockdlg)
314	reject();	335	{
		336	// Force dialog rejection regardless of the value of trinity_desktop_lock_hide_cancel_button
		337	TQDialog::reject();
315	}	338	}
316	else {	339	else
317	slotActivity();	340	{
		341	slotActivity();
318	}	342	}
319	}	343	}
320	else if (ev->timerId() == mFailedTimerId)	344	else if (ev->timerId() == mFailedTimerId)
Lines 325-331 void PasswordDlg::timerEvent(TQTimerEvent *ev) Link Here
325	mUnlockingFailed = false;	349	mUnlockingFailed = false;
326	updateLabel();	350	updateLabel();
327	ok->setEnabled(true);	351	ok->setEnabled(true);
328	if (trinity_desktop_lock_autohide_lockdlg \|\| trinity_desktop_lock_use_sak) cancel->setEnabled(true);
329	mNewSessButton->setEnabled( true );	352	mNewSessButton->setEnabled( true );
330	greet->revive();	353	greet->revive();
331	greet->start();	354	greet->start();
Lines 440-446 void PasswordDlg::reapVerify() Link Here
440	updateLabel();	463	updateLabel();
441	mFailedTimerId = startTimer(1500);	464	mFailedTimerId = startTimer(1500);
442	ok->setEnabled(false);	465	ok->setEnabled(false);
443	cancel->setEnabled(false);
444	mNewSessButton->setEnabled( false );	466	mNewSessButton->setEnabled( false );
445	return;	467	return;
446	case AuthAbort:	468	case AuthAbort:

Lines 271-362 Link Here

(-)a/kdesktop/kdesktop.kcfg (-26 / +5 lines)
271	<default>false</default>	271	<default>false</default>
272	<label></label>	272	<label></label>
273	<whatsthis></whatsthis>	273	<whatsthis></whatsthis>
274	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:308 -->
275	<!-- if(config.readBoolEntry("Lock", false)) -->
276	</entry>	274	</entry>
277	<entry key="LockGrace" type="Int">	275	<entry key="LockGrace" type="Int">
278	<default>5000</default>	276	<default>5000</default>
279	<label></label>	277	<label></label>
280	<whatsthis></whatsthis>	278	<whatsthis></whatsthis>
281	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:310 -->
282	<!-- mLockGrace = config.readNumEntry("LockGrace", LOCK_GRACE_DEFAULT); -->
283	</entry>	279	</entry>
284	<entry key="AutoLogout" type="Bool">	280	<entry key="AutoLogout" type="Bool">
285	<default>false</default>	281	<default>false</default>
286	<label></label>	282	<label></label>
287	<whatsthis></whatsthis>	283	<whatsthis></whatsthis>
288	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:319 -->
289	<!-- if (config.readBoolEntry("AutoLogout", false)) -->
290	</entry>	284	</entry>
291	<entry key="AutoLogoutTimeout" type="Int">	285	<entry key="AutoLogoutTimeout" type="Int">
292	<default>600</default>	286	<default>600</default>
293	<label></label>	287	<label></label>
294	<whatsthis></whatsthis>	288	<whatsthis></whatsthis>
295	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:322 -->
296	<!-- mAutoLogoutTimeout = config.readNumEntry("AutoLogoutTimeout", AUTOLOGOUT_DEFAULT); -->
297	</entry>	289	</entry>
298	<entry key="Priority" type="Int">	290	<entry key="Priority" type="Int">
299	<default>19</default>	291	<default>19</default>
300	<label></label>	292	<label></label>
301	<whatsthis></whatsthis>	293	<whatsthis></whatsthis>
302	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:332 -->
303	<!-- mPriority = config.readNumEntry("Priority", 19); -->
304	</entry>	294	</entry>
305	<entry key="Saver" type="String">	295	<entry key="Saver" type="String">
306	<default></default>	296	<default></default>
307	<label></label>	297	<label></label>
308	<whatsthis></whatsthis>	298	<whatsthis></whatsthis>
309	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
310	<!-- mSaver = config.readEntry("Saver"); -->
311	</entry>	299	</entry>
312	<entry key="UseUnmanagedLockWindows" type="Bool">	300	<entry key="UseUnmanagedLockWindows" type="Bool">
313	<default>false</default>	301	<default>false</default>
314	<label></label>	302	<label></label>
315	<whatsthis>When enabled this restores the old style unmanaged window behavior of desktop locking.</whatsthis>	303	<whatsthis>When enabled this restores the old style unmanaged window behavior of desktop locking.</whatsthis>
316	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
317	<!-- mSaver = config.readEntry("UseUnmanagedLockWindows"); -->
318	</entry>	304	</entry>
319	<entry key="ShowLockDateTime" type="Bool">	305	<entry key="ShowLockDateTime" type="Bool">
320	<default>true</default>	306	<default>true</default>
321	<label></label>	307	<label></label>
322	<whatsthis>When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure.</whatsthis>	308	<whatsthis>When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure.</whatsthis>
323	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
324	<!-- mSaver = config.readEntry("ShowLockDateTime"); -->
325	</entry>	309	</entry>
326	<entry key="DelaySaverStart" type="Bool">	310	<entry key="DelaySaverStart" type="Bool">
327	<default>true</default>	311	<default>true</default>
328	<label></label>	312	<label></label>
329	<whatsthis>When disabled the screensaver starts immediately when locking the desktop.</whatsthis>	313	<whatsthis>When disabled the screensaver starts immediately when locking the desktop.</whatsthis>
330	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
331	<!-- mSaver = config.readEntry("DelaySaverStart"); -->
332	</entry>	314	</entry>
333	<entry key="HideActiveWindowsFromSaver" type="Bool">	315	<entry key="HideActiveWindowsFromSaver" type="Bool">
334	<default>true</default>	316	<default>true</default>
335	<label></label>	317	<label></label>
336	<whatsthis>When enabled all active windows are hidden from the screensaver, showing only the desktop background as a result.</whatsthis>	318	<whatsthis>When enabled all active windows are hidden from the screensaver, showing only the desktop background as a result.</whatsthis>
337	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->	319	</entry>
338	<!-- mSaver = config.readEntry("HideActiveWindowsFromSaver"); -->	320	<entry key="HideCancelButton" type="Bool">
		321	<default>false</default>
		322	<label></label>
		323	<whatsthis>Hide Cancel button from the "Desktop Session Locked" dialog.</whatsthis>
339	</entry>	324	</entry>
340	<entry key="UseTDESAK" type="Bool">	325	<entry key="UseTDESAK" type="Bool">
341	<default>true</default>	326	<default>true</default>
342	<label></label>	327	<label></label>
343	<whatsthis>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.</whatsthis>	328	<whatsthis>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.</whatsthis>
344	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
345	<!-- mSaver = config.readEntry("UseTDESAK"); -->
346	</entry>	329	</entry>
347	<entry key="PluginsUnlock" type="StringList">	330	<entry key="PluginsUnlock" type="StringList">
348	<default></default>	331	<default></default>
349	<label></label>	332	<label></label>
350	<whatsthis></whatsthis>	333	<whatsthis></whatsthis>
351	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:342 -->
352	<!-- mPlugins = config.readListEntry("PluginsUnlock"); -->
353	</entry>	334	</entry>
354	<entry key="PluginOptions" type="StringList">	335	<entry key="PluginOptions" type="StringList">
355	<default></default>	336	<default></default>
356	<label></label>	337	<label></label>
357	<whatsthis></whatsthis>	338	<whatsthis></whatsthis>
358	<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:345 -->
359	<!-- mPluginOptions = config.readListEntry("PluginOptions"); -->
360	</entry>	339	</entry>
361	</group>	340	</group>
362	<group name="MiniCli">	341	<group name="MiniCli">