Attachment #1251 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




#include "themer/kdmthemer.h"
#include "themer/kdmitem.h"

#include <kglobal.h>
#include <klocale.h>
#include <klineedit.h>
#include <kpassdlg.h>
#include <kuser.h>

#include <tqregexp.h>
#include <tqlayout.h>
#include <tqlabel.h>

class KDMPasswordEdit : public KLineEdit {
public:
    KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent ) 
    {
        setEchoMode(TQLineEdit::Password);
    }

    KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
    {
        setEchoMode(echoMode);
    }


protected:
    virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};

static int echoMode;

			grid->addWidget( loginLabel, line, 0 );
			grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
		}
		if (echoMode == -1) {
			passwdEdit = new KDMPasswordEdit( parent );
		} else {
			passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
		}
		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
		         TQT_SLOT(slotActivity()) );
		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );

	}
	if (func != Authenticate) {
		if (echoMode == -1) {
			passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
			passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
		} else {
			passwd1Edit = new KDMPasswordEdit( parent );
			passwd2Edit = new KDMPasswordEdit( parent );

		                          KGreeterPluginHandler::IsUser );
		break;
	case 1:
		handler->gplugReturnText( passwdEdit->text().utf8(),
		                          KGreeterPluginHandler::IsPassword |
		                          KGreeterPluginHandler::IsSecret );
		break;
	case 2:
		handler->gplugReturnText( passwd1Edit->text().utf8(),
		                          KGreeterPluginHandler::IsSecret );
		break;
	default: // case 3:
		handler->gplugReturnText( passwd2Edit->text().utf8(),
		                          KGreeterPluginHandler::IsNewPassword |
		                          KGreeterPluginHandler::IsSecret );
		break;

	// assert( !running );
	setActive2( true );
	if (authTok) {
		passwd1Edit->clear();
		passwd2Edit->clear();
		passwd1Edit->setFocus();
	} else {
		passwdEdit->clear();
		if (loginEdit && loginEdit->isEnabled())
			passwdEdit->setEnabled( true );
		else {

KClassicGreeter::clear()
{
	// assert( !running && !passwd1Edit );
	passwdEdit->clear();
	if (loginEdit) {
		loginEdit->clear();
		loginEdit->setFocus();

                  TQVariant (*getConf)( void *, const char *, const TQVariant & ),
                  void *ctx )
{
    echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
    switch (echoMode)
    {
        case (0):
        case (1):
            echoMode = TQLineEdit::Password;
            break;

        case (2):
            echoMode = TQLineEdit::NoEcho;
            break;

        default:
            echoMode = TQLineEdit::Password;
    }

    KGlobal::locale()->insertCatalogue( "kgreet_classic" );
    return true;
}

static void done( void )

Lines 31-37 Link Here

(-)./kdmlib/kgreet_classic.h.ORI (-2 / +1 lines)
31	#include <tqobject.h>	31	#include <tqobject.h>
32		32
33	class KLineEdit;	33	class KLineEdit;
34	class KPasswordEdit;
35	class KSimpleConfig;	34	class KSimpleConfig;
36	class TQGridLayout;	35	class TQGridLayout;
37	class TQLabel;	36	class TQLabel;
Lines 76-82 Link Here
76		75
77	TQLabel loginLabel, passwdLabel, passwd1Label, passwd2Label;	76	TQLabel loginLabel, passwdLabel, passwd1Label, passwd2Label;
78	KLineEdit *loginEdit;	77	KLineEdit *loginEdit;
79	KPasswordEdit passwdEdit, passwd1Edit, *passwd2Edit;	78	KLineEdit passwdEdit, passwd1Edit, *passwd2Edit;
80	KSimpleConfig *stsFile;	79	KSimpleConfig *stsFile;
81	TQString fixedUser, curUser;	80	TQString fixedUser, curUser;
82	Function func;	81	Function func;




#include "themer/kdmthemer.h"
#include "themer/kdmitem.h"

#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
#include <kcombobox.h>
#include <klineedit.h>
#include <kpassdlg.h>
#include <kuser.h>
#include <kprocio.h>



#include <stdlib.h>

class KDMPasswordEdit : public KLineEdit {
public:
    KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent )
    {
        setEchoMode(TQLineEdit::Password);
    }
    KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
    {
        setEchoMode(echoMode);
    }

protected:
	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};

		if (echoMode == -1)
			passwdEdit = new KDMPasswordEdit( parent );
		else
			passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode,
			                                  parent );
		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
		         TQT_SLOT(slotActivity()) );

	}
	if (func != Authenticate) {
		if (echoMode == -1) {
			passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
			passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
		} else {
			passwd1Edit = new KDMPasswordEdit( parent );
			passwd2Edit = new KDMPasswordEdit( parent );

		                          KGreeterPluginHandler::IsUser );
		break;
	case 1:
		handler->gplugReturnText( passwdEdit->text().utf8(),
		                          KGreeterPluginHandler::IsPassword |
		                          KGreeterPluginHandler::IsSecret );
		break;
	case 2:
		handler->gplugReturnText( passwd1Edit->text().utf8(),
		                          KGreeterPluginHandler::IsSecret );
		break;
	default: // case 3:
		handler->gplugReturnText( passwd2Edit->text().utf8(),
		                          KGreeterPluginHandler::IsNewPassword |
		                          KGreeterPluginHandler::IsSecret );
		break;

	// assert( !running );
	setActive2( true );
	if (authTok) {
		passwd1Edit->clear();
		passwd2Edit->clear();
		passwd1Edit->setFocus();
	} else {
		passwdEdit->clear();
		if (loginEdit && loginEdit->isEnabled())
			passwdEdit->setEnabled( true );
		else {

KWinbindGreeter::clear()
{
	// assert( !running && !passwd1Edit );
	passwdEdit->clear();
	if (loginEdit) {
		domainCombo->setCurrentItem( defaultDomain );
		slotChangedDomain( defaultDomain );

                  void *ctx )
{
	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
	switch (echoMode)
	{
		case (0):
		case (1):
			echoMode = TQLineEdit::Password;
			break;

		case (2):
			echoMode = TQLineEdit::NoEcho;
			break;
		
		default:
			echoMode = TQLineEdit::Password;
	}

	staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
	if (!staticDomains.contains("<local>"))
		staticDomains << "<local>";

Lines 33-39 Link Here

(-)./kdmlib/kgreet_winbind.h.ORI (-2 / +1 lines)
33		33
34	class KComboBox;	34	class KComboBox;
35	class KLineEdit;	35	class KLineEdit;
36	class KPasswordEdit;
37	class KSimpleConfig;	36	class KSimpleConfig;
38	class TQGridLayout;	37	class TQGridLayout;
39	class TQLabel;	38	class TQLabel;
Lines 85-91 Link Here
85	TQLabel domainLabel, loginLabel, passwdLabel, passwd1Label, *passwd2Label;	84	TQLabel domainLabel, loginLabel, passwdLabel, passwd1Label, *passwd2Label;
86	KComboBox *domainCombo;	85	KComboBox *domainCombo;
87	KLineEdit *loginEdit;	86	KLineEdit *loginEdit;
88	KPasswordEdit passwdEdit, passwd1Edit, *passwd2Edit;	87	KLineEdit passwdEdit, passwd1Edit, *passwd2Edit;
89	KSimpleConfig *stsFile;	88	KSimpleConfig *stsFile;
90	TQString fixedDomain, fixedUser, curUser;	89	TQString fixedDomain, fixedUser, curUser;
91	TQStringList allUsers, mDomainListing;	90	TQStringList allUsers, mDomainListing;

Return to bug 1499

Lines 26-46 Link Here

(-)./kdmlib/kgreet_classic.cpp.ORI (-21 / +45 lines)
26	#include "themer/kdmthemer.h"	26	#include "themer/kdmthemer.h"
27	#include "themer/kdmitem.h"	27	#include "themer/kdmitem.h"
28		28
		29	#include <kglobal.h>
29	#include <klocale.h>	30	#include <klocale.h>
30	#include <klineedit.h>	31	#include <klineedit.h>
31	#include <kpassdlg.h>
32	#include <kuser.h>	32	#include <kuser.h>
33		33
34	#include <tqregexp.h>	34	#include <tqregexp.h>
35	#include <tqlayout.h>	35	#include <tqlayout.h>
36	#include <tqlabel.h>	36	#include <tqlabel.h>
37		37
38	class KDMPasswordEdit : public KPasswordEdit {	38	class KDMPasswordEdit : public KLineEdit {
39	public:	39	public:
40	KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}	40	KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent )
41	KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}	41	{
		42	setEchoMode(TQLineEdit::Password);
		43	}
		44
		45	KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
		46	{
		47	setEchoMode(echoMode);
		48	}
		49
		50
42	protected:	51	protected:
43	virtual void contextMenuEvent( TQContextMenuEvent * ) {}	52	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
44	};	53	};
45		54
46	static int echoMode;	55	static int echoMode;
Lines 104-114 Link Here
104	grid->addWidget( loginLabel, line, 0 );	113	grid->addWidget( loginLabel, line, 0 );
105	grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );	114	grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
106	}	115	}
107	if (echoMode == -1)	116	if (echoMode == -1) {
108	passwdEdit = new KDMPasswordEdit( parent );	117	passwdEdit = new KDMPasswordEdit( parent );
109	else	118	} else {
110	passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,	119	passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
111	parent );	120	}
112	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),	121	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
113	TQT_SLOT(slotActivity()) );	122	TQT_SLOT(slotActivity()) );
114	connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );	123	connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
Lines 135-142 Link Here
135	}	144	}
136	if (func != Authenticate) {	145	if (func != Authenticate) {
137	if (echoMode == -1) {	146	if (echoMode == -1) {
138	passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );	147	passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
139	passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );	148	passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
140	} else {	149	} else {
141	passwd1Edit = new KDMPasswordEdit( parent );	150	passwd1Edit = new KDMPasswordEdit( parent );
142	passwd2Edit = new KDMPasswordEdit( parent );	151	passwd2Edit = new KDMPasswordEdit( parent );
Lines 247-262 Link Here
247	KGreeterPluginHandler::IsUser );	256	KGreeterPluginHandler::IsUser );
248	break;	257	break;
249	case 1:	258	case 1:
250	handler->gplugReturnText( passwdEdit->password(),	259	handler->gplugReturnText( passwdEdit->text().utf8(),
251	KGreeterPluginHandler::IsPassword \|	260	KGreeterPluginHandler::IsPassword \|
252	KGreeterPluginHandler::IsSecret );	261	KGreeterPluginHandler::IsSecret );
253	break;	262	break;
254	case 2:	263	case 2:
255	handler->gplugReturnText( passwd1Edit->password(),	264	handler->gplugReturnText( passwd1Edit->text().utf8(),
256	KGreeterPluginHandler::IsSecret );	265	KGreeterPluginHandler::IsSecret );
257	break;	266	break;
258	default: // case 3:	267	default: // case 3:
259	handler->gplugReturnText( passwd2Edit->password(),	268	handler->gplugReturnText( passwd2Edit->text().utf8(),
260	KGreeterPluginHandler::IsNewPassword \|	269	KGreeterPluginHandler::IsNewPassword \|
261	KGreeterPluginHandler::IsSecret );	270	KGreeterPluginHandler::IsSecret );
262	break;	271	break;
Lines 405-415 Link Here
405	// assert( !running );	414	// assert( !running );
406	setActive2( true );	415	setActive2( true );
407	if (authTok) {	416	if (authTok) {
408	passwd1Edit->erase();	417	passwd1Edit->clear();
409	passwd2Edit->erase();	418	passwd2Edit->clear();
410	passwd1Edit->setFocus();	419	passwd1Edit->setFocus();
411	} else {	420	} else {
412	passwdEdit->erase();	421	passwdEdit->clear();
413	if (loginEdit && loginEdit->isEnabled())	422	if (loginEdit && loginEdit->isEnabled())
414	passwdEdit->setEnabled( true );	423	passwdEdit->setEnabled( true );
415	else {	424	else {
Lines 426-432 Link Here
426	KClassicGreeter::clear()	435	KClassicGreeter::clear()
427	{	436	{
428	// assert( !running && !passwd1Edit );	437	// assert( !running && !passwd1Edit );
429	passwdEdit->erase();	438	passwdEdit->clear();
430	if (loginEdit) {	439	if (loginEdit) {
431	loginEdit->clear();	440	loginEdit->clear();
432	loginEdit->setFocus();	441	loginEdit->setFocus();
Lines 484-492 Link Here
484	TQVariant (getConf)( void , const char *, const TQVariant & ),	493	TQVariant (getConf)( void , const char *, const TQVariant & ),
485	void *ctx )	494	void *ctx )
486	{	495	{
487	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();	496	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
488	KGlobal::locale()->insertCatalogue( "kgreet_classic" );	497	switch (echoMode)
489	return true;	498	{
		499	case (0):
		500	case (1):
		501	echoMode = TQLineEdit::Password;
		502	break;
		503
		504	case (2):
		505	echoMode = TQLineEdit::NoEcho;
		506	break;
		507
		508	default:
		509	echoMode = TQLineEdit::Password;
		510	}
		511
		512	KGlobal::locale()->insertCatalogue( "kgreet_classic" );
		513	return true;
490	}	514	}
491		515
492	static void done( void )	516	static void done( void )

Lines 26-36 Link Here

(-)./kdmlib/kgreet_winbind.cpp.ORI (-14 / +36 lines)
26	#include "themer/kdmthemer.h"	26	#include "themer/kdmthemer.h"
27	#include "themer/kdmitem.h"	27	#include "themer/kdmitem.h"
28		28
		29	#include <kglobal.h>
29	#include <klocale.h>	30	#include <klocale.h>
30	#include <kdebug.h>	31	#include <kdebug.h>
31	#include <kcombobox.h>	32	#include <kcombobox.h>
32	#include <klineedit.h>	33	#include <klineedit.h>
33	#include <kpassdlg.h>
34	#include <kuser.h>	34	#include <kuser.h>
35	#include <kprocio.h>	35	#include <kprocio.h>
36		36
Lines 40-49 Link Here
40		40
41	#include <stdlib.h>	41	#include <stdlib.h>
42		42
43	class KDMPasswordEdit : public KPasswordEdit {	43	class KDMPasswordEdit : public KLineEdit {
44	public:	44	public:
45	KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}	45	KDMPasswordEdit( TQWidget *parent ) : KLineEdit( parent )
46	KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}	46	{
		47	setEchoMode(TQLineEdit::Password);
		48	}
		49	KDMPasswordEdit( TQLineEdit::EchoMode echoMode, TQWidget *parent ) : KLineEdit( parent )
		50	{
		51	setEchoMode(echoMode);
		52	}
		53
47	protected:	54	protected:
48	virtual void contextMenuEvent( TQContextMenuEvent * ) {}	55	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
49	};	56	};
Lines 150-156 Link Here
150	if (echoMode == -1)	157	if (echoMode == -1)
151	passwdEdit = new KDMPasswordEdit( parent );	158	passwdEdit = new KDMPasswordEdit( parent );
152	else	159	else
153	passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,	160	passwdEdit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode,
154	parent );	161	parent );
155	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),	162	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
156	TQT_SLOT(slotActivity()) );	163	TQT_SLOT(slotActivity()) );
Lines 180-187 Link Here
180	}	187	}
181	if (func != Authenticate) {	188	if (func != Authenticate) {
182	if (echoMode == -1) {	189	if (echoMode == -1) {
183	passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );	190	passwd1Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
184	passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );	191	passwd2Edit = new KDMPasswordEdit( (TQLineEdit::EchoMode)echoMode, parent );
185	} else {	192	} else {
186	passwd1Edit = new KDMPasswordEdit( parent );	193	passwd1Edit = new KDMPasswordEdit( parent );
187	passwd2Edit = new KDMPasswordEdit( parent );	194	passwd2Edit = new KDMPasswordEdit( parent );
Lines 328-343 Link Here
328	KGreeterPluginHandler::IsUser );	335	KGreeterPluginHandler::IsUser );
329	break;	336	break;
330	case 1:	337	case 1:
331	handler->gplugReturnText( passwdEdit->password(),	338	handler->gplugReturnText( passwdEdit->text().utf8(),
332	KGreeterPluginHandler::IsPassword \|	339	KGreeterPluginHandler::IsPassword \|
333	KGreeterPluginHandler::IsSecret );	340	KGreeterPluginHandler::IsSecret );
334	break;	341	break;
335	case 2:	342	case 2:
336	handler->gplugReturnText( passwd1Edit->password(),	343	handler->gplugReturnText( passwd1Edit->text().utf8(),
337	KGreeterPluginHandler::IsSecret );	344	KGreeterPluginHandler::IsSecret );
338	break;	345	break;
339	default: // case 3:	346	default: // case 3:
340	handler->gplugReturnText( passwd2Edit->password(),	347	handler->gplugReturnText( passwd2Edit->text().utf8(),
341	KGreeterPluginHandler::IsNewPassword \|	348	KGreeterPluginHandler::IsNewPassword \|
342	KGreeterPluginHandler::IsSecret );	349	KGreeterPluginHandler::IsSecret );
343	break;	350	break;
Lines 486-496 Link Here
486	// assert( !running );	493	// assert( !running );
487	setActive2( true );	494	setActive2( true );
488	if (authTok) {	495	if (authTok) {
489	passwd1Edit->erase();	496	passwd1Edit->clear();
490	passwd2Edit->erase();	497	passwd2Edit->clear();
491	passwd1Edit->setFocus();	498	passwd1Edit->setFocus();
492	} else {	499	} else {
493	passwdEdit->erase();	500	passwdEdit->clear();
494	if (loginEdit && loginEdit->isEnabled())	501	if (loginEdit && loginEdit->isEnabled())
495	passwdEdit->setEnabled( true );	502	passwdEdit->setEnabled( true );
496	else {	503	else {
Lines 507-513 Link Here
507	KWinbindGreeter::clear()	514	KWinbindGreeter::clear()
508	{	515	{
509	// assert( !running && !passwd1Edit );	516	// assert( !running && !passwd1Edit );
510	passwdEdit->erase();	517	passwdEdit->clear();
511	if (loginEdit) {	518	if (loginEdit) {
512	domainCombo->setCurrentItem( defaultDomain );	519	domainCombo->setCurrentItem( defaultDomain );
513	slotChangedDomain( defaultDomain );	520	slotChangedDomain( defaultDomain );
Lines 632-637 Link Here
632	void *ctx )	639	void *ctx )
633	{	640	{
634	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();	641	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
		642	switch (echoMode)
		643	{
		644	case (0):
		645	case (1):
		646	echoMode = TQLineEdit::Password;
		647	break;
		648
		649	case (2):
		650	echoMode = TQLineEdit::NoEcho;
		651	break;
		652
		653	default:
		654	echoMode = TQLineEdit::Password;
		655	}
		656
635	staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );	657	staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
636	if (!staticDomains.contains("<local>"))	658	if (!staticDomains.contains("<local>"))
637	staticDomains << "<local>";	659	staticDomains << "<local>";