Attachment #1355 for bug #1499

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 1499
Collapse All | Expand All




    void slotLock( bool );
    void slotDelaySaverStart( bool );
    void slotUseTSAK( bool );
    void slotVibrateUnlock( bool );
    void slotUseUnmanagedLockWindows( bool );
    void slotHideActiveWindowsFromSaver( bool );
    void processLockouts();

    TQGroupBox   *mSettingsGroup;
    TQCheckBox   *mDelaySaverStartCheckBox;
    TQCheckBox   *mUseTSAKCheckBox;
    TQCheckBox   *mVibrateUnlockCheckBox;
    TQCheckBox   *mUseUnmanagedLockWindowsCheckBox;
    TQCheckBox   *mHideActiveWindowsFromSaverCheckBox;


    bool        mImmutable;
    bool        mDelaySaverStart;
    bool        mUseTSAK;
    bool        mVibrateUnlock;
    bool        mUseUnmanagedLockWindows;
    bool        mHideActiveWindowsFromSaver;


Lines 270-275 Link Here

(-)trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog (+23 lines)
270	settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);	270	settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
271	TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );	271	TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
272		272
		273	mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup );
		274	mVibrateUnlockCheckBox->setEnabled( true );
		275	mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
		276	connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) );
		277	settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
		278	TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
		279
273	// right column	280	// right column
274	TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());	281	TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());
275		282
Lines 429-434 Link Here
429	mLock = config->readBoolEntry("Lock", false);	436	mLock = config->readBoolEntry("Lock", false);
430	mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);	437	mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
431	mUseTSAK = config->readBoolEntry("UseTDESAK", true);	438	mUseTSAK = config->readBoolEntry("UseTDESAK", true);
		439	mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
432	mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);	440	mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
433	mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);	441	mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
434	mSaver = config->readEntry("Saver");	442	mSaver = config->readEntry("Saver");
Lines 481-486 Link Here
481	config->writeEntry("Lock", mLock);	489	config->writeEntry("Lock", mLock);
482	config->writeEntry("DelaySaverStart", mDelaySaverStart);	490	config->writeEntry("DelaySaverStart", mDelaySaverStart);
483	config->writeEntry("UseTDESAK", mUseTSAK);	491	config->writeEntry("UseTDESAK", mUseTSAK);
		492	config->writeEntry("VibrateUnlock", mVibrateUnlock);
484	config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);	493	config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
485	config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);	494	config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
486		495
Lines 688-697 Link Here
688	mUseTSAKCheckBox->setChecked( false );	697	mUseTSAKCheckBox->setChecked( false );
689	}	698	}
690	if (!mUseUnmanagedLockWindows) {	699	if (!mUseUnmanagedLockWindows) {
		700	mVibrateUnlockCheckBox->setEnabled( true );
		701	mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
691	mHideActiveWindowsFromSaverCheckBox->setEnabled( true );	702	mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
692	mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );	703	mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
693	}	704	}
694	else {	705	else {
		706	mVibrateUnlockCheckBox->setEnabled( false );
		707	mVibrateUnlockCheckBox->setChecked( false );
695	mHideActiveWindowsFromSaverCheckBox->setEnabled( false );	708	mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
696	mHideActiveWindowsFromSaverCheckBox->setChecked( false );	709	mHideActiveWindowsFromSaverCheckBox->setChecked( false );
697	}	710	}
Lines 936-941 Link Here
936	processLockouts();	949	processLockouts();
937	mChanged = true;	950	mChanged = true;
938	emit changed(true);	951	emit changed(true);
		952	}
		953
		954	//---------------------------------------------------------------------------
		955	//
		956	void KScreenSaver::slotVibrateUnlock( bool u )
		957	{
		958	if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u;
		959	processLockouts();
		960	mChanged = true;
		961	emit changed(true);
939	}	962	}
940		963
941	//---------------------------------------------------------------------------	964	//---------------------------------------------------------------------------

Lines 60-65 Link Here

(-)trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog (+5 lines)
60	void slotOK();	60	void slotOK();
61	void layoutClicked();	61	void layoutClicked();
62	void slotActivity();	62	void slotActivity();
		63	void moveTimerDone();
63		64
64	protected slots:	65	protected slots:
65	virtual void reject();	66	virtual void reject();
Lines 79-84 Link Here
79	void handleVerify();	80	void handleVerify();
80	void reapVerify();	81	void reapVerify();
81	void cantCheck();	82	void cantCheck();
		83	void movedialog( int _move );
		84	void badPasswordLogin();
82	GreeterPluginHandle *mPlugin;	85	GreeterPluginHandle *mPlugin;
83	KGreeterPlugin *greet;	86	KGreeterPlugin *greet;
84	TQFrame *frame;	87	TQFrame *frame;
Lines 95-100 Link Here
95	int sPid, sFd;	98	int sPid, sFd;
96	TQListView *lv;	99	TQListView *lv;
97	TQDateTime m_lockStartDT;	100	TQDateTime m_lockStartDT;
		101	bool waitMoveDialog;
		102	bool VibrateUnlock;
98	};	103	};
99		104
100	#endif	105	#endif

Lines 55-60 Link Here

(-)trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog (+38 lines)
55	#include <X11/keysym.h>	55	#include <X11/keysym.h>
56	#include <X11/Xatom.h>	56	#include <X11/Xatom.h>
57	#include <fixx11h.h>	57	#include <fixx11h.h>
		58	#include <tdeapplication.h>
58		59
59	#ifndef AF_LOCAL	60	#ifndef AF_LOCAL
60	# define AF_LOCAL AF_UNIX	61	# define AF_LOCAL AF_UNIX
Lines 246-251 Link Here
246	mLayoutButton->hide(); // no kxkb running	247	mLayoutButton->hide(); // no kxkb running
247	}	248	}
248	capsLocked();	249	capsLocked();
		250
		251	TDEConfig* config = new TDEConfig("kdesktoprc");
		252	config->setGroup("ScreenSaver");
		253	VibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
		254	delete config;
249	}	255	}
250		256
251	PasswordDlg::~PasswordDlg()	257	PasswordDlg::~PasswordDlg()
Lines 302-307 Link Here
302	}	308	}
303	}	309	}
304		310
		311	void PasswordDlg::movedialog( int _move )
		312	{
		313	waitMoveDialog = true;
		314	this->move(pos().x()+_move, pos().y());
		315	TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) );
		316	while (waitMoveDialog) {
		317	kapp->processEvents();
		318	}
		319	}
		320
		321	void PasswordDlg::moveTimerDone()
		322	{
		323	waitMoveDialog = false;
		324	}
		325
		326	void PasswordDlg::badPasswordLogin()
		327	{
		328	if ( VibrateUnlock && mUnlockingFailed )
		329	{
		330	for ( int i = 0 ; i<2 ; i++)
		331	{
		332	movedialog( 10 );
		333	movedialog( -20 );
		334	movedialog( 20 );
		335	movedialog( -20 );
		336	movedialog( 20 );
		337	movedialog( -10 );
		338	}
		339	}
		340	}
		341
305	//---------------------------------------------------------------------------	342	//---------------------------------------------------------------------------
306	//	343	//
307	// Handle timer events.	344	// Handle timer events.
Lines 442-447 Link Here
442	ok->setEnabled(false);	479	ok->setEnabled(false);
443	cancel->setEnabled(false);	480	cancel->setEnabled(false);
444	mNewSessButton->setEnabled( false );	481	mNewSessButton->setEnabled( false );
		482	badPasswordLogin();
445	return;	483	return;
446	case AuthAbort:	484	case AuthAbort:
447	return;	485	return;

Return to bug 1499

Lines 58-63 Link Here

(-)trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI (+3 lines)
58	void slotLock( bool );	58	void slotLock( bool );
59	void slotDelaySaverStart( bool );	59	void slotDelaySaverStart( bool );
60	void slotUseTSAK( bool );	60	void slotUseTSAK( bool );
		61	void slotVibrateUnlock( bool );
61	void slotUseUnmanagedLockWindows( bool );	62	void slotUseUnmanagedLockWindows( bool );
62	void slotHideActiveWindowsFromSaver( bool );	63	void slotHideActiveWindowsFromSaver( bool );
63	void processLockouts();	64	void processLockouts();
Lines 101-106 Link Here
101	TQGroupBox *mSettingsGroup;	102	TQGroupBox *mSettingsGroup;
102	TQCheckBox *mDelaySaverStartCheckBox;	103	TQCheckBox *mDelaySaverStartCheckBox;
103	TQCheckBox *mUseTSAKCheckBox;	104	TQCheckBox *mUseTSAKCheckBox;
		105	TQCheckBox *mVibrateUnlockCheckBox;
104	TQCheckBox *mUseUnmanagedLockWindowsCheckBox;	106	TQCheckBox *mUseUnmanagedLockWindowsCheckBox;
105	TQCheckBox *mHideActiveWindowsFromSaverCheckBox;	107	TQCheckBox *mHideActiveWindowsFromSaverCheckBox;
106		108
Lines 119-124 Link Here
119	bool mImmutable;	121	bool mImmutable;
120	bool mDelaySaverStart;	122	bool mDelaySaverStart;
121	bool mUseTSAK;	123	bool mUseTSAK;
		124	bool mVibrateUnlock;
122	bool mUseUnmanagedLockWindows;	125	bool mUseUnmanagedLockWindows;
123	bool mHideActiveWindowsFromSaver;	126	bool mHideActiveWindowsFromSaver;
124		127