summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 2de0180..711bedc 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -1,26 +1,26 @@
1/* 1/*
2� � � � � � � �=. This file is part of the OPIE Project 2� � � � � � � �=. This file is part of the OPIE Project
3� � � � � � �.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3� � � � � � �.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4� � � � � �.>+-= 4� � � � � �.>+-=
5�_;:, � � .> � �:=|. This file is free software; you can 5�_;:, � � .> � �:=|. This file is free software; you can
6.> <`_, � > �. � <= redistribute it and/or modify it under 6.> <`_, � > �. � <= redistribute it and/or modify it under
7:`=1 )Y*s>-.-- � : the terms of the GNU General Public 7:`=1 )Y*s>-.-- � : the terms of the GNU General Public
8.="- .-=="i, � � .._ License as published by the Free Software 8.="- .-=="i, � � .._ License as published by the Free Software
9�- . � .-<_> � � .<> Foundation; either version 2 of the License, 9�- . � .-<_> � � .<> Foundation; version 2 of the License.
10� � �._= =} � � � : or (at your option) any later version. 10� � �._= =} � � � :
11� � .%`+i> � � � _;_. 11� � .%`+i> � � � _;_.
12� � .i_,=:_. � � �-<s. This file is distributed in the hope that 12� � .i_,=:_. � � �-<s. This file is distributed in the hope that
13� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY; 13� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
14� � : .. � �.:, � � . . . without even the implied warranty of 14� � : .. � �.:, � � . . . without even the implied warranty of
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*/
@@ -308,42 +308,37 @@ public:
308 m_backlight_bright = bright; 308 m_backlight_bright = bright;
309 309
310 bright = backlight ( ); 310 bright = backlight ( );
311 ODevice::inst ( ) -> setDisplayBrightness ( bright ); 311 ODevice::inst ( ) -> setDisplayBrightness ( bright );
312 312
313 m_backlight_bright = bright; 313 m_backlight_bright = bright;
314 } 314 }
315 315
316private: 316private:
317 bool m_lcd_status; 317 bool m_lcd_status;
318 318
319 int m_backlight_bright; 319 int m_backlight_bright;
320 bool m_backlight_forcedoff; 320 bool m_backlight_forcedoff;
321}; 321};
322 322
323 323
324namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting
325
326
327int login_main ( int argc, char **argv, pid_t ppid ) 324int login_main ( int argc, char **argv, pid_t ppid )
328{ 325{
329 QWSServer::setDesktopBackground( QImage() ); 326 QWSServer::setDesktopBackground( QImage() );
330 LoginApplication *app = new LoginApplication ( argc, argv, ppid ); 327 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
331 328
332 Opie::force_appearance = 0;
333
334 app-> setFont ( QFont ( "Helvetica", 10 )); 329 app-> setFont ( QFont ( "Helvetica", 10 ));
335 app-> setStyle ( new QPEStyle ( )); 330 app-> setStyle ( new QPEStyle ( ));
336 331
337 if ( QWSServer::mouseHandler() && 332 if ( QWSServer::mouseHandler() &&
338 QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { 333 QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
339 if ( !QFile::exists ( "/etc/pointercal" )) { 334 if ( !QFile::exists ( "/etc/pointercal" )) {
340 // Make sure calibration widget starts on top. 335 // Make sure calibration widget starts on top.
341 Calibrate *cal = new Calibrate; 336 Calibrate *cal = new Calibrate;
342 cal-> exec ( ); 337 cal-> exec ( );
343 delete cal; 338 delete cal;
344 } 339 }
345 } 340 }
346 341
347 LoginScreenSaver *saver = new LoginScreenSaver; 342 LoginScreenSaver *saver = new LoginScreenSaver;
348 343
349 saver-> setIntervals ( ); 344 saver-> setIntervals ( );