-rw-r--r-- | core/launcher/wait.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp index 059e6f1..e1832dd 100644 --- a/core/launcher/wait.cpp +++ b/core/launcher/wait.cpp | |||
@@ -18,12 +18,13 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "wait.h" | 21 | #include "wait.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/config.h> | ||
24 | 25 | ||
25 | #include <qwidget.h> | 26 | #include <qwidget.h> |
26 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
27 | #include <qpainter.h> | 28 | #include <qpainter.h> |
28 | 29 | ||
29 | 30 | ||
@@ -32,29 +33,41 @@ Wait *lastWaitObject = NULL; | |||
32 | 33 | ||
33 | Wait::Wait( QWidget *parent ) : QWidget( parent ), | 34 | Wait::Wait( QWidget *parent ) : QWidget( parent ), |
34 | pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) | 35 | pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) |
35 | { | 36 | { |
36 | setFixedSize( pm.size() ); | 37 | setFixedSize( pm.size() ); |
37 | lastWaitObject = this; | 38 | lastWaitObject = this; |
39 | centralWait = new WaitPopup( 0L ); | ||
40 | centralWait->hide(); | ||
38 | hide(); | 41 | hide(); |
39 | } | 42 | } |
40 | 43 | ||
41 | 44 | ||
42 | Wait *Wait::getWaitObject() | 45 | Wait *Wait::getWaitObject() |
43 | { | 46 | { |
44 | return lastWaitObject; | 47 | return lastWaitObject; |
45 | } | 48 | } |
46 | 49 | ||
47 | 50 | ||
48 | void Wait::setWaiting( bool w ) | 51 | void Wait::setWaiting( bool w ) |
49 | { | 52 | { |
53 | Config cfg ( "Launcher" ); | ||
54 | cfg. setGroup ( "GUI" ); | ||
55 | |||
56 | |||
50 | waiting = w; | 57 | waiting = w; |
51 | if ( w ) | 58 | if ( w ) { |
52 | show(); | 59 | if ( cfg. readBoolEntry ( "BigBusy" ) ) { |
53 | else | 60 | centralWait->show(); |
54 | hide(); | 61 | } else { |
62 | show(); | ||
63 | } | ||
64 | } else { | ||
65 | centralWait->hide(); | ||
66 | hide(); | ||
67 | } | ||
55 | } | 68 | } |
56 | 69 | ||
57 | 70 | ||
58 | void Wait::paintEvent( QPaintEvent * ) | 71 | void Wait::paintEvent( QPaintEvent * ) |
59 | { | 72 | { |
60 | QPainter p( this ); | 73 | QPainter p( this ); |