author | zecke <zecke> | 2003-08-28 14:51:14 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:51:14 (UTC) |
commit | 0fac4909554179fa212c7c9e350735e0a058879e (patch) (unidiff) | |
tree | c77bcbb1e1f0fef765b21eda678b8ad7c0f74dd8 /core | |
parent | 225fa91f6d57f211d53ec686518ca15fc5278d21 (diff) | |
download | opie-0fac4909554179fa212c7c9e350735e0a058879e.zip opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.gz opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.bz2 |
Use owait
Harlekin you're not destroying owait...
-rw-r--r-- | core/launcher/wait.cpp | 29 | ||||
-rw-r--r-- | core/launcher/wait.h | 12 |
2 files changed, 20 insertions, 21 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,10 +1,10 @@ | |||
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 |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
@@ -17,14 +17,16 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
29 | 31 | ||
30 | 32 | ||
@@ -33,14 +35,14 @@ Wait *lastWaitObject = NULL; | |||
33 | 35 | ||
34 | Wait::Wait( QWidget *parent ) : QWidget( parent ), | 36 | 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 | ||
45 | Wait *Wait::getWaitObject() | 47 | Wait *Wait::getWaitObject() |
46 | { | 48 | { |
@@ -48,25 +50,24 @@ Wait *Wait::getWaitObject() | |||
48 | } | 50 | } |
49 | 51 | ||
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 | ||
71 | void Wait::paintEvent( QPaintEvent * ) | 72 | void Wait::paintEvent( QPaintEvent * ) |
72 | { | 73 | { |
diff --git a/core/launcher/wait.h b/core/launcher/wait.h index d7c29bd..e7294d2 100644 --- a/core/launcher/wait.h +++ b/core/launcher/wait.h | |||
@@ -1,10 +1,10 @@ | |||
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 |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
@@ -18,31 +18,29 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef __WAIT_H__ | 21 | #ifndef __WAIT_H__ |
22 | #define __WAIT_H__ | 22 | #define __WAIT_H__ |
23 | 23 | ||
24 | #include <opie/owait.h> | 24 | #include <qtopia/resource.h> |
25 | |||
26 | #include <qpe/resource.h> | ||
27 | 25 | ||
28 | #include <qwidget.h> | 26 | #include <qwidget.h> |
29 | #include <qlabel.h> | ||
30 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
31 | #include <qpainter.h> | 28 | #include <qpainter.h> |
32 | 29 | ||
30 | class OWait; | ||
33 | class Wait : public QWidget | 31 | class Wait : public QWidget |
34 | { | 32 | { |
35 | public: | 33 | public: |
36 | Wait( QWidget *parent ); | 34 | Wait( QWidget *parent ); |
37 | void setWaiting( bool w ); | 35 | void setWaiting( bool w ); |
38 | void paintEvent( QPaintEvent * ); | 36 | void paintEvent( QPaintEvent * ); |
39 | static Wait *getWaitObject(); | 37 | static Wait *getWaitObject(); |
40 | private: | 38 | private: |
41 | OWait* centralWait; | ||
42 | QPixmap pm; | 39 | QPixmap pm; |
43 | bool waiting; | 40 | bool waiting; |
41 | OWait* m_centralWait; | ||
44 | }; | 42 | }; |
45 | 43 | ||
46 | 44 | ||
47 | #endif // __WAIT_H__ | 45 | #endif // __WAIT_H__ |
48 | 46 | ||