-rw-r--r-- | core/launcher/wait.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp index d202d26..ab53a07 100644 --- a/core/launcher/wait.cpp +++ b/core/launcher/wait.cpp | |||
@@ -1,8 +1,8 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
@@ -19,10 +19,12 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "wait.h" | 21 | #include "wait.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qtopia/resource.h> |
24 | #include <qpe/config.h> | 24 | #include <qtopia/config.h> |
25 | |||
26 | #include <opie/owait.h> | ||
25 | 27 | ||
26 | #include <qwidget.h> | 28 | #include <qwidget.h> |
27 | #include <qpixmap.h> | 29 | #include <qpixmap.h> |
28 | #include <qpainter.h> | 30 | #include <qpainter.h> |
@@ -35,10 +37,10 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ), | |||
35 | pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) | 37 | pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) |
36 | { | 38 | { |
37 | setFixedSize( pm.size() ); | 39 | setFixedSize( pm.size() ); |
38 | lastWaitObject = this; | 40 | lastWaitObject = this; |
39 | centralWait = new OWait( 0L ); | 41 | m_centralWait = new OWait( 0l ); |
40 | centralWait->hide(); | 42 | m_centralWait->hide(); |
41 | hide(); | 43 | hide(); |
42 | } | 44 | } |
43 | 45 | ||
44 | 46 | ||
@@ -50,21 +52,20 @@ Wait *Wait::getWaitObject() | |||
50 | 52 | ||
51 | void Wait::setWaiting( bool w ) | 53 | void Wait::setWaiting( bool w ) |
52 | { | 54 | { |
53 | Config cfg ( "Launcher" ); | 55 | Config cfg ( "Launcher" ); |
54 | cfg. setGroup ( "GUI" ); | 56 | cfg.setGroup("GUI"); |
55 | 57 | ||
56 | 58 | ||
57 | waiting = w; | 59 | waiting = w; |
58 | if ( w ) { | 60 | if ( w ) { |
59 | if ( cfg. readBoolEntry ( "BigBusy" ) ) { | 61 | if ( cfg. readBoolEntry( "BigBusy" ) ) |
60 | centralWait->show(); | 62 | m_centralWait->show(); |
61 | } else { | 63 | else |
62 | show(); | 64 | show(); |
63 | } | 65 | }else{ |
64 | } else { | 66 | m_centralWait->hide(); |
65 | centralWait->hide(); | 67 | hide(); |
66 | hide(); | ||
67 | } | 68 | } |
68 | } | 69 | } |
69 | 70 | ||
70 | 71 | ||