| -rw-r--r-- | core/opie-login/loginwindow.ui | 10 | ||||
| -rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 19 |
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 @@ -8,13 +8,13 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>460</width> + <width>456</width> <height>341</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Login</string> @@ -69,19 +69,19 @@ </sizepolicy> </property> <property stdset="1"> <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> <enum>ParentOrigin</enum> </property> <property stdset="1"> @@ -135,13 +135,13 @@ <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> </property> <property stdset="1"> <name>autoMask</name> - <bool>true</bool> + <bool>false</bool> </property> <property stdset="1"> <name>backgroundOrigin</name> <enum>ParentOrigin</enum> </property> <property stdset="1"> @@ -227,13 +227,13 @@ <property stdset="1"> <name>name</name> <cstring>TextLabel2</cstring> </property> <property stdset="1"> <name>autoMask</name> - <bool>true</bool> + <bool>false</bool> </property> <property stdset="1"> <name>backgroundOrigin</name> <enum>ParentOrigin</enum> </property> <property stdset="1"> 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 @@ -21,13 +21,13 @@ -_. . . )=. = see the file COPYING. If not, write to the -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - +#include <qpe/version.h> #include <qapplication.h> #include <qpushbutton.h> #include <qlayout.h> #include <qframe.h> #include <qlineedit.h> #include <qtimer.h> @@ -75,22 +75,29 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C lay-> addStretch ( 10 ); setActiveWindow ( ); 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" ); QString last = cfg. readEntry ( "LastLogin" ); if ( !last. isEmpty ( )) |