Bugfix: Headline is visible again with matchin BG image.

Bugfix: Don't open the InputMethod for a Zaurus, it's got a hardware
        keyboard

2 files changed, 18 insertions, 11 deletions

diff --git a/core/opie-login/loginwindow.ui b/core/opie-login/loginwindow.ui
index 245e942..10c7d80 100644
--- a/core/opie-login/loginwindow.ui
+++ b/core/opie-login/loginwindow.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>460</width>
+            <width>456</width>
             <height>341</height>
         </rect>
     </property>
@@ -72,13 +72,13 @@
                         <name>font</name>
                         <font>
                             <family>helvetica</family>
-                            <pointsize>18</pointsize>
+                            <pointsize>36</pointsize>
                             <bold>1</bold>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>autoMask</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                     <property stdset="1">
                         <name>backgroundOrigin</name>
@@ -138,7 +138,7 @@
                             </property>
                             <property stdset="1">
                                 <name>autoMask</name>
-                                <bool>true</bool>
+                                <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>backgroundOrigin</name>
@@ -230,7 +230,7 @@
                             </property>
                             <property stdset="1">
                                 <name>autoMask</name>
-                                <bool>true</bool>
+                                <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>backgroundOrigin</name>
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 577cb41..330fac5 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -24,7 +24,7 @@
                              Boston, MA 02111-1307, USA.
 
 */
-
+#include <qpe/version.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
@@ -78,16 +78,23 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
 	m_password-> setFocus ( );
 
 	m_user-> insertStringList ( lApp-> allUsers ( ));
-
-	QTimer::singleShot ( 0, this, SLOT( showIM ( )));
+	
+	//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 ( ))
+	if ( !bgpix. isNull ( )) {
 		setBackgroundPixmap ( bgpix );
-
-	m_caption-> setText ( m_caption-> text ( ) + tr( "<center>%1 %2</center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( )));
+		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 ( )));
 
 	Config cfg ( "opie-login" );
 	cfg. setGroup ( "General" );