1 files changed, 13 insertions, 1 deletions

diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 32f98f3..73c2cbe 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -26,101 +26,107 @@
 */
 #include <qpe/version.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #if QT_VERSION < 300
 #include <qgfx_qws.h>
 #endif
 #include <qwindowsystem_qws.h>
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
 #include <opie2/odevice.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "passworddialogimpl.h"
 #include "loginwindowimpl.h"
 #include "loginapplication.h"
 #include "inputmethods.h"
 
 using namespace Opie::Core;
 
 
 LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
 {
 	QPopupMenu *pop = new QPopupMenu ( this );
 	pop-> insertItem ( tr( "Restart" ), this, SLOT( restart()));
 	pop-> insertItem ( tr( "Quit" ), this, SLOT( quit()));
 	m_menu-> setPopup ( pop );
 
 	QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this );
 	connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&)));
 
 	QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 );
 	m_input = new InputMethods ( m_taskbar );
  	connect ( m_input, SIGNAL( inputToggled(bool)), this, SLOT( calcMaxWindowRect()));
 	lay-> addWidget ( m_input );
 	lay-> addStretch ( 10 );
 
 	setActiveWindow ( );
 	m_password-> setFocus ( );
 
 	m_user-> insertStringList ( lApp-> allUsers ( ));
 
 	//there is no point in displaying the IM for a zaurus
 	if (ODevice::inst ( )-> series ( ) != Model_Zaurus){
 		QTimer::singleShot ( 0, this, SLOT( showIM()));
 	}
 
 	QString opiedir = ::getenv ( "OPIEDIR" );
 	QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" );
 
 	if ( !bgpix. isNull ( )) {
 		setBackgroundPixmap ( bgpix );
 		m_caption-> setBackgroundPixmap ( bgpix);
 		TextLabel1-> setBackgroundPixmap ( bgpix);
 		TextLabel2-> setBackgroundPixmap ( bgpix);
 	}
 
-	m_caption-> setText ( tr("<center>Welcome to OPIE %1</center><center>& %2 %3</center>"). arg(QPE_VERSION). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( )));
+//	m_caption-> setText ( tr("<center>Welcome to OPIE %1</center><center>& %2 %3</center>"). arg(QPE_VERSION). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( )));
 
 	Config cfg ( "opie-login" );
 	cfg. setGroup ( "General" );
 	QString last = cfg. readEntry ( "LastLogin" );
 
 	if ( !last. isEmpty ( ))
 		m_user-> setEditText ( last );
 
 	calcMaxWindowRect ( );
+
+        if ( PasswordDialogImpl::needDialog() )
+            QTimer::singleShot(10, this,  SLOT(showPasswordDialog()) );
+
+
 }
 
 LoginWindowImpl::~LoginWindowImpl ( )
 {
 }
 
 
 void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data )
 {
 	QDataStream stream ( data, IO_ReadOnly );
 
 	if ( msg == "hideInputMethod()" )
 		m_input-> hideInputMethod ( );
 	else if ( msg == "showInputMethod()" )
 		m_input-> showInputMethod ( );
 	else if ( msg == "reloadInputMethods()" )
 		m_input-> loadInputMethods ( );
 }
 
 void LoginWindowImpl::calcMaxWindowRect ( )
 {
 #ifdef Q_WS_QWS
 	QRect wr;
 	int displayWidth = qApp-> desktop ( )-> width ( );
@@ -227,24 +233,30 @@ void LoginWindowImpl::login ( )
 
 	if ( !user || !user [0] )
 		return;
 	if ( !pass )
 		pass = "";
 
 	if ( lApp-> checkPassword ( user, pass )) {
 		Config cfg ( "opie-login" );
 		cfg. setGroup ( "General" );
 		cfg. writeEntry ( "LastLogin", user );
 		cfg. write ( );
 
 		lApp-> setLoginAs ( user );
 
 		// Draw a big wait icon, the image can be altered in later revisions
 		m_input-> hideInputMethod ( );
 		new WaitLogo ( );
 		// WaitLogo::showEvent() calls qApp-> quit()
 	}
 	else {
 		QMessageBox::warning ( this, tr( "Wrong password" ), tr( "The given password is incorrect." ));
 		m_password-> clear ( );
 	}
 }
+
+void LoginWindowImpl::showPasswordDialog() {
+    PasswordDialogImpl dia( this );
+    dia.showMaximized();
+    dia.exec();
+}