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
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>460</width>
+            <width>456</width>
             <height>341</height>
@@ -74,3 +74,3 @@
                             <family>helvetica</family>
-                            <pointsize>18</pointsize>
+                            <pointsize>36</pointsize>
                             <bold>1</bold>
@@ -80,3 +80,3 @@
                         <name>autoMask</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
@@ -140,3 +140,3 @@
                                 <name>autoMask</name>
-                                <bool>true</bool>
+                                <bool>false</bool>
                             </property>
@@ -232,3 +232,3 @@
                                 <name>autoMask</name>
-                                <bool>true</bool>
+                                <bool>false</bool>
                             </property>
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
@@ -26,3 +26,3 @@
 */
-
+#include <qpe/version.h>
 #include <qapplication.h>
@@ -80,4 +80,7 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
         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 ( )));
+                }
 
@@ -86,6 +89,10 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
 
-        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 ( )));