summaryrefslogtreecommitdiff
authorcoredump <coredump>2003-11-27 12:39:18 (UTC)
committer coredump <coredump>2003-11-27 12:39:18 (UTC)
commitd0bf022b91a6b8ae3ffef5438dc924823aacedb9 (patch) (unidiff)
tree90e6f93fde618a8b16a6970c86a33cdc0c18786f
parent51ca35ecb7e22fc564ffe62184d4a75aa8537b1d (diff)
downloadopie-d0bf022b91a6b8ae3ffef5438dc924823aacedb9.zip
opie-d0bf022b91a6b8ae3ffef5438dc924823aacedb9.tar.gz
opie-d0bf022b91a6b8ae3ffef5438dc924823aacedb9.tar.bz2
Bugfix: Headline is visible again with matchin BG image.
Bugfix: Don't open the InputMethod for a Zaurus, it's got a hardware keyboard
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/loginwindow.ui10
-rw-r--r--core/opie-login/loginwindowimpl.cpp19
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 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>460</width> 14 <width>456</width>
15 <height>341</height> 15 <height>341</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -72,13 +72,13 @@
72 <name>font</name> 72 <name>font</name>
73 <font> 73 <font>
74 <family>helvetica</family> 74 <family>helvetica</family>
75 <pointsize>18</pointsize> 75 <pointsize>36</pointsize>
76 <bold>1</bold> 76 <bold>1</bold>
77 </font> 77 </font>
78 </property> 78 </property>
79 <property stdset="1"> 79 <property stdset="1">
80 <name>autoMask</name> 80 <name>autoMask</name>
81 <bool>true</bool> 81 <bool>false</bool>
82 </property> 82 </property>
83 <property stdset="1"> 83 <property stdset="1">
84 <name>backgroundOrigin</name> 84 <name>backgroundOrigin</name>
@@ -138,7 +138,7 @@
138 </property> 138 </property>
139 <property stdset="1"> 139 <property stdset="1">
140 <name>autoMask</name> 140 <name>autoMask</name>
141 <bool>true</bool> 141 <bool>false</bool>
142 </property> 142 </property>
143 <property stdset="1"> 143 <property stdset="1">
144 <name>backgroundOrigin</name> 144 <name>backgroundOrigin</name>
@@ -230,7 +230,7 @@
230 </property> 230 </property>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>autoMask</name> 232 <name>autoMask</name>
233 <bool>true</bool> 233 <bool>false</bool>
234 </property> 234 </property>
235 <property stdset="1"> 235 <property stdset="1">
236 <name>backgroundOrigin</name> 236 <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 @@
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27#include <qpe/version.h>
28#include <qapplication.h> 28#include <qapplication.h>
29#include <qpushbutton.h> 29#include <qpushbutton.h>
30#include <qlayout.h> 30#include <qlayout.h>
@@ -78,16 +78,23 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
78 m_password-> setFocus ( ); 78 m_password-> setFocus ( );
79 79
80 m_user-> insertStringList ( lApp-> allUsers ( )); 80 m_user-> insertStringList ( lApp-> allUsers ( ));
81 81
82 QTimer::singleShot ( 0, this, SLOT( showIM ( ))); 82 //there is no point in displaying the IM for a zaurus
83 if (ODevice::inst ( )-> series ( ) != Model_Zaurus){
84 QTimer::singleShot ( 0, this, SLOT( showIM ( )));
85 }
83 86
84 QString opiedir = ::getenv ( "OPIEDIR" ); 87 QString opiedir = ::getenv ( "OPIEDIR" );
85 QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" ); 88 QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" );
86 89
87 if ( !bgpix. isNull ( )) 90 if ( !bgpix. isNull ( )) {
88 setBackgroundPixmap ( bgpix ); 91 setBackgroundPixmap ( bgpix );
89 92 m_caption-> setBackgroundPixmap ( bgpix);
90 m_caption-> setText ( m_caption-> text ( ) + tr( "<center>%1 %2</center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); 93 TextLabel1-> setBackgroundPixmap ( bgpix);
94 TextLabel2-> setBackgroundPixmap ( bgpix);
95 }
96
97 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 ( )));
91 98
92 Config cfg ( "opie-login" ); 99 Config cfg ( "opie-login" );
93 cfg. setGroup ( "General" ); 100 cfg. setGroup ( "General" );