Diffstat (limited to 'core/opie-login/loginwindowimpl.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
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 | |||
@@ -15,25 +15,25 @@ | |||
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
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> |
31 | #include <qframe.h> | 31 | #include <qframe.h> |
32 | #include <qlineedit.h> | 32 | #include <qlineedit.h> |
33 | #include <qtimer.h> | 33 | #include <qtimer.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | #include <qpixmap.h> | 35 | #include <qpixmap.h> |
36 | #include <qlabel.h> | 36 | #include <qlabel.h> |
37 | #include <qpopupmenu.h> | 37 | #include <qpopupmenu.h> |
38 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
39 | #include <qimage.h> | 39 | #include <qimage.h> |
@@ -70,33 +70,40 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
70 | 70 | ||
71 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); | 71 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); |
72 | m_input = new InputMethods ( m_taskbar ); | 72 | m_input = new InputMethods ( m_taskbar ); |
73 | connect ( m_input, SIGNAL( inputToggled ( bool )), this, SLOT( calcMaxWindowRect ( ))); | 73 | connect ( m_input, SIGNAL( inputToggled ( bool )), this, SLOT( calcMaxWindowRect ( ))); |
74 | lay-> addWidget ( m_input ); | 74 | lay-> addWidget ( m_input ); |
75 | lay-> addStretch ( 10 ); | 75 | lay-> addStretch ( 10 ); |
76 | 76 | ||
77 | setActiveWindow ( ); | 77 | setActiveWindow ( ); |
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 | //there is no point in displaying the IM for a zaurus | ||
83 | if (ODevice::inst ( )-> series ( ) != Model_Zaurus){ | ||
82 | QTimer::singleShot ( 0, this, SLOT( showIM ( ))); | 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 ); |
92 | m_caption-> setBackgroundPixmap ( bgpix); | ||
93 | TextLabel1-> setBackgroundPixmap ( bgpix); | ||
94 | TextLabel2-> setBackgroundPixmap ( bgpix); | ||
95 | } | ||
89 | 96 | ||
90 | m_caption-> setText ( m_caption-> text ( ) + tr( "<center>%1 %2</center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); | 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" ); |
94 | QString last = cfg. readEntry ( "LastLogin" ); | 101 | QString last = cfg. readEntry ( "LastLogin" ); |
95 | 102 | ||
96 | if ( !last. isEmpty ( )) | 103 | if ( !last. isEmpty ( )) |
97 | m_user-> setEditText ( last ); | 104 | m_user-> setEditText ( last ); |
98 | 105 | ||
99 | calcMaxWindowRect ( ); | 106 | calcMaxWindowRect ( ); |
100 | } | 107 | } |
101 | 108 | ||
102 | LoginWindowImpl::~LoginWindowImpl ( ) | 109 | LoginWindowImpl::~LoginWindowImpl ( ) |