-rw-r--r-- | core/opie-login/config.in | 2 | ||||
-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 26 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/core/opie-login/config.in b/core/opie-login/config.in index 339b589..a71319c 100644 --- a/core/opie-login/config.in +++ b/core/opie-login/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIE-LOGIN | 1 | config OPIE-LOGIN |
2 | boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)" | 2 | boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index e1b9360..32f98f3 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <qpe/qcopenvelope_qws.h> | 42 | #include <qpe/qcopenvelope_qws.h> |
43 | #include <qpe/config.h> | 43 | #include <qpe/config.h> |
44 | 44 | ||
45 | #include <opie/odevice.h> | 45 | #include <opie2/odevice.h> |
46 | 46 | ||
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | #include <stdlib.h> | 48 | #include <stdlib.h> |
@@ -51,7 +51,7 @@ | |||
51 | #include "loginapplication.h" | 51 | #include "loginapplication.h" |
52 | #include "inputmethods.h" | 52 | #include "inputmethods.h" |
53 | 53 | ||
54 | using namespace Opie; | 54 | using namespace Opie::Core; |
55 | 55 | ||
56 | 56 | ||
57 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) | 57 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) |
@@ -62,7 +62,7 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
62 | m_menu-> setPopup ( pop ); | 62 | m_menu-> setPopup ( pop ); |
63 | 63 | ||
64 | QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this ); | 64 | QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this ); |
65 | connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&))); | 65 | connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&))); |
66 | 66 | ||
67 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); | 67 | QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); |
68 | m_input = new InputMethods ( m_taskbar ); | 68 | m_input = new InputMethods ( m_taskbar ); |
@@ -74,11 +74,11 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
74 | m_password-> setFocus ( ); | 74 | m_password-> setFocus ( ); |
75 | 75 | ||
76 | m_user-> insertStringList ( lApp-> allUsers ( )); | 76 | m_user-> insertStringList ( lApp-> allUsers ( )); |
77 | 77 | ||
78 | //there is no point in displaying the IM for a zaurus | 78 | //there is no point in displaying the IM for a zaurus |
79 | if (ODevice::inst ( )-> series ( ) != Model_Zaurus){ | 79 | if (ODevice::inst ( )-> series ( ) != Model_Zaurus){ |
80 | QTimer::singleShot ( 0, this, SLOT( showIM())); | 80 | QTimer::singleShot ( 0, this, SLOT( showIM())); |
81 | } | 81 | } |
82 | 82 | ||
83 | QString opiedir = ::getenv ( "OPIEDIR" ); | 83 | QString opiedir = ::getenv ( "OPIEDIR" ); |
84 | QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" ); | 84 | QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" ); |
@@ -88,8 +88,8 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
88 | m_caption-> setBackgroundPixmap ( bgpix); | 88 | m_caption-> setBackgroundPixmap ( bgpix); |
89 | TextLabel1-> setBackgroundPixmap ( bgpix); | 89 | TextLabel1-> setBackgroundPixmap ( bgpix); |
90 | TextLabel2-> setBackgroundPixmap ( bgpix); | 90 | TextLabel2-> setBackgroundPixmap ( bgpix); |
91 | } | 91 | } |
92 | 92 | ||
93 | 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 ( ))); | 93 | 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 ( ))); |
94 | 94 | ||
95 | Config cfg ( "opie-login" ); | 95 | Config cfg ( "opie-login" ); |
@@ -98,7 +98,7 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
98 | 98 | ||
99 | if ( !last. isEmpty ( )) | 99 | if ( !last. isEmpty ( )) |
100 | m_user-> setEditText ( last ); | 100 | m_user-> setEditText ( last ); |
101 | 101 | ||
102 | calcMaxWindowRect ( ); | 102 | calcMaxWindowRect ( ); |
103 | } | 103 | } |
104 | 104 | ||
@@ -110,8 +110,8 @@ LoginWindowImpl::~LoginWindowImpl ( ) | |||
110 | void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data ) | 110 | void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data ) |
111 | { | 111 | { |
112 | QDataStream stream ( data, IO_ReadOnly ); | 112 | QDataStream stream ( data, IO_ReadOnly ); |
113 | 113 | ||
114 | if ( msg == "hideInputMethod()" ) | 114 | if ( msg == "hideInputMethod()" ) |
115 | m_input-> hideInputMethod ( ); | 115 | m_input-> hideInputMethod ( ); |
116 | else if ( msg == "showInputMethod()" ) | 116 | else if ( msg == "showInputMethod()" ) |
117 | m_input-> showInputMethod ( ); | 117 | m_input-> showInputMethod ( ); |
@@ -129,7 +129,7 @@ void LoginWindowImpl::calcMaxWindowRect ( ) | |||
129 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); | 129 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); |
130 | else | 130 | else |
131 | wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 ); | 131 | wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 ); |
132 | 132 | ||
133 | #if QT_VERSION < 300 | 133 | #if QT_VERSION < 300 |
134 | wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); | 134 | wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); |
135 | #endif | 135 | #endif |
@@ -137,7 +137,7 @@ void LoginWindowImpl::calcMaxWindowRect ( ) | |||
137 | QWSServer::setMaxWindowRect( wr ); | 137 | QWSServer::setMaxWindowRect( wr ); |
138 | #endif | 138 | #endif |
139 | } | 139 | } |
140 | 140 | ||
141 | 141 | ||
142 | void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) | 142 | void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) |
143 | { | 143 | { |
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 6aa7287..f0a8ba2 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -32,7 +32,7 @@ | |||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | #include <qpe/qpestyle.h> | 34 | #include <qpe/qpestyle.h> |
35 | #include <qpe/power.h> | 35 | #include <qpe/power.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | 37 | ||
38 | /* QT */ | 38 | /* QT */ |
@@ -40,7 +40,7 @@ | |||
40 | #include <qmessagebox.h> | 40 | #include <qmessagebox.h> |
41 | #include <qlabel.h> | 41 | #include <qlabel.h> |
42 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | #include <qfile.h> | 43 | #include <qfile.h> |
44 | 44 | ||
45 | /* STD */ | 45 | /* STD */ |
46 | #include <sys/types.h> | 46 | #include <sys/types.h> |
@@ -56,7 +56,7 @@ | |||
56 | #include <getopt.h> | 56 | #include <getopt.h> |
57 | #include <string.h> | 57 | #include <string.h> |
58 | 58 | ||
59 | using namespace Opie; | 59 | using namespace Opie::Core; |
60 | 60 | ||
61 | int login_main ( int argc, char **argv, pid_t ppid ); | 61 | int login_main ( int argc, char **argv, pid_t ppid ); |
62 | void sigterm ( int sig ); | 62 | void sigterm ( int sig ); |
@@ -188,7 +188,7 @@ int main ( int argc, char **argv ) | |||
188 | if ( !user. isEmpty ( )) | 188 | if ( !user. isEmpty ( )) |
189 | autolog = ::strdup ( user. latin1 ( )); | 189 | autolog = ::strdup ( user. latin1 ( )); |
190 | } | 190 | } |
191 | 191 | ||
192 | if ( autolog && !userExited ) { | 192 | if ( autolog && !userExited ) { |
193 | 193 | ||
194 | QWSServer::setDesktopBackground( QImage() ); | 194 | QWSServer::setDesktopBackground( QImage() ); |
@@ -196,7 +196,7 @@ int main ( int argc, char **argv ) | |||
196 | ODevice::inst ( )-> setSoftSuspend ( false ); | 196 | ODevice::inst ( )-> setSoftSuspend ( false ); |
197 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 197 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
198 | LoginApplication::setLoginAs ( autolog ); | 198 | LoginApplication::setLoginAs ( autolog ); |
199 | 199 | ||
200 | 200 | ||
201 | if ( LoginApplication::changeIdentity ( )) | 201 | if ( LoginApplication::changeIdentity ( )) |
202 | ::exit ( LoginApplication::login ( )); | 202 | ::exit ( LoginApplication::login ( )); |