-rw-r--r-- | core/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/launcher/wait.cpp | 21 | ||||
-rw-r--r-- | core/launcher/wait.h | 4 | ||||
-rw-r--r-- | core/launcher/waitpopup.cpp | 23 | ||||
-rw-r--r-- | core/launcher/waitpopup.h | 14 |
5 files changed, 59 insertions, 5 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index d0a573b..a876d1d 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro | |||
@@ -1,124 +1,126 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = ../../bin |
4 | HEADERS = background.h \ | 4 | HEADERS = background.h \ |
5 | desktop.h \ | 5 | desktop.h \ |
6 | screensaver.h \ | 6 | screensaver.h \ |
7 | mediummountgui.h \ | 7 | mediummountgui.h \ |
8 | info.h \ | 8 | info.h \ |
9 | appicons.h \ | 9 | appicons.h \ |
10 | taskbar.h \ | 10 | taskbar.h \ |
11 | sidething.h \ | 11 | sidething.h \ |
12 | runningappbar.h \ | 12 | runningappbar.h \ |
13 | stabmon.h \ | 13 | stabmon.h \ |
14 | inputmethods.h \ | 14 | inputmethods.h \ |
15 | systray.h \ | 15 | systray.h \ |
16 | wait.h \ | 16 | wait.h \ |
17 | waitpopup.h \ | ||
17 | shutdownimpl.h \ | 18 | shutdownimpl.h \ |
18 | launcher.h \ | 19 | launcher.h \ |
19 | launcherview.h \ | 20 | launcherview.h \ |
20 | ../../core/apps/calibrate/calibrate.h \ | 21 | ../../core/apps/calibrate/calibrate.h \ |
21 | startmenu.h \ | 22 | startmenu.h \ |
22 | transferserver.h \ | 23 | transferserver.h \ |
23 | qcopbridge.h \ | 24 | qcopbridge.h \ |
24 | packageslave.h \ | 25 | packageslave.h \ |
25 | irserver.h \ | 26 | irserver.h \ |
26 | ../../rsync/buf.h \ | 27 | ../../rsync/buf.h \ |
27 | ../../rsync/checksum.h \ | 28 | ../../rsync/checksum.h \ |
28 | ../../rsync/command.h \ | 29 | ../../rsync/command.h \ |
29 | ../../rsync/emit.h \ | 30 | ../../rsync/emit.h \ |
30 | ../../rsync/job.h \ | 31 | ../../rsync/job.h \ |
31 | ../../rsync/netint.h \ | 32 | ../../rsync/netint.h \ |
32 | ../../rsync/protocol.h \ | 33 | ../../rsync/protocol.h \ |
33 | ../../rsync/prototab.h \ | 34 | ../../rsync/prototab.h \ |
34 | ../../rsync/rsync.h \ | 35 | ../../rsync/rsync.h \ |
35 | ../../rsync/search.h \ | 36 | ../../rsync/search.h \ |
36 | ../../rsync/stream.h \ | 37 | ../../rsync/stream.h \ |
37 | ../../rsync/sumset.h \ | 38 | ../../rsync/sumset.h \ |
38 | ../../rsync/trace.h \ | 39 | ../../rsync/trace.h \ |
39 | ../../rsync/types.h \ | 40 | ../../rsync/types.h \ |
40 | ../../rsync/util.h \ | 41 | ../../rsync/util.h \ |
41 | ../../rsync/whole.h \ | 42 | ../../rsync/whole.h \ |
42 | ../../rsync/config_rsync.h \ | 43 | ../../rsync/config_rsync.h \ |
43 | ../../rsync/qrsync.h \ | 44 | ../../rsync/qrsync.h \ |
44 | quicklauncher.h | 45 | quicklauncher.h |
45 | SOURCES = background.cpp \ | 46 | SOURCES = background.cpp \ |
46 | desktop.cpp \ | 47 | desktop.cpp \ |
47 | screensaver.cpp \ | 48 | screensaver.cpp \ |
48 | mediummountgui.cpp \ | 49 | mediummountgui.cpp \ |
49 | info.cpp \ | 50 | info.cpp \ |
50 | appicons.cpp \ | 51 | appicons.cpp \ |
51 | taskbar.cpp \ | 52 | taskbar.cpp \ |
52 | sidething.cpp \ | 53 | sidething.cpp \ |
53 | runningappbar.cpp \ | 54 | runningappbar.cpp \ |
54 | stabmon.cpp \ | 55 | stabmon.cpp \ |
55 | inputmethods.cpp \ | 56 | inputmethods.cpp \ |
56 | systray.cpp \ | 57 | systray.cpp \ |
57 | wait.cpp \ | 58 | wait.cpp \ |
59 | waitpopup.cpp \ | ||
58 | shutdownimpl.cpp \ | 60 | shutdownimpl.cpp \ |
59 | launcher.cpp \ | 61 | launcher.cpp \ |
60 | launcherview.cpp \ | 62 | launcherview.cpp \ |
61 | ../../core/apps/calibrate/calibrate.cpp \ | 63 | ../../core/apps/calibrate/calibrate.cpp \ |
62 | transferserver.cpp \ | 64 | transferserver.cpp \ |
63 | packageslave.cpp \ | 65 | packageslave.cpp \ |
64 | irserver.cpp \ | 66 | irserver.cpp \ |
65 | qcopbridge.cpp \ | 67 | qcopbridge.cpp \ |
66 | startmenu.cpp \ | 68 | startmenu.cpp \ |
67 | main.cpp \ | 69 | main.cpp \ |
68 | ../../rsync/base64.c \ | 70 | ../../rsync/base64.c \ |
69 | ../../rsync/buf.c \ | 71 | ../../rsync/buf.c \ |
70 | ../../rsync/checksum.c \ | 72 | ../../rsync/checksum.c \ |
71 | ../../rsync/command.c \ | 73 | ../../rsync/command.c \ |
72 | ../../rsync/delta.c \ | 74 | ../../rsync/delta.c \ |
73 | ../../rsync/emit.c \ | 75 | ../../rsync/emit.c \ |
74 | ../../rsync/hex.c \ | 76 | ../../rsync/hex.c \ |
75 | ../../rsync/job.c \ | 77 | ../../rsync/job.c \ |
76 | ../../rsync/mdfour.c \ | 78 | ../../rsync/mdfour.c \ |
77 | ../../rsync/mksum.c \ | 79 | ../../rsync/mksum.c \ |
78 | ../../rsync/msg.c \ | 80 | ../../rsync/msg.c \ |
79 | ../../rsync/netint.c \ | 81 | ../../rsync/netint.c \ |
80 | ../../rsync/patch.c \ | 82 | ../../rsync/patch.c \ |
81 | ../../rsync/prototab.c \ | 83 | ../../rsync/prototab.c \ |
82 | ../../rsync/readsums.c \ | 84 | ../../rsync/readsums.c \ |
83 | ../../rsync/scoop.c \ | 85 | ../../rsync/scoop.c \ |
84 | ../../rsync/search.c \ | 86 | ../../rsync/search.c \ |
85 | ../../rsync/stats.c \ | 87 | ../../rsync/stats.c \ |
86 | ../../rsync/stream.c \ | 88 | ../../rsync/stream.c \ |
87 | ../../rsync/sumset.c \ | 89 | ../../rsync/sumset.c \ |
88 | ../../rsync/trace.c \ | 90 | ../../rsync/trace.c \ |
89 | ../../rsync/tube.c \ | 91 | ../../rsync/tube.c \ |
90 | ../../rsync/util.c \ | 92 | ../../rsync/util.c \ |
91 | ../../rsync/version.c \ | 93 | ../../rsync/version.c \ |
92 | ../../rsync/whole.c \ | 94 | ../../rsync/whole.c \ |
93 | ../../rsync/qrsync.cpp | 95 | ../../rsync/qrsync.cpp |
94 | INTERFACES= syncdialog.ui | 96 | INTERFACES= syncdialog.ui |
95 | INCLUDEPATH += ../../include | 97 | INCLUDEPATH += ../../include |
96 | DEPENDPATH+= ../../include . | 98 | DEPENDPATH+= ../../include . |
97 | INCLUDEPATH += ../../core/apps/calibrate | 99 | INCLUDEPATH += ../../core/apps/calibrate |
98 | DEPENDPATH+= ../../core/apps/calibrate | 100 | DEPENDPATH+= ../../core/apps/calibrate |
99 | INCLUDEPATH += ../../rsync | 101 | INCLUDEPATH += ../../rsync |
100 | DEPENDPATH+= ../../rsync | 102 | DEPENDPATH+= ../../rsync |
101 | TARGET = qpe | 103 | TARGET = qpe |
102 | LIBS += -lqpe -lcrypt -lopie | 104 | LIBS += -lqpe -lcrypt -lopie |
103 | 105 | ||
104 | TRANSLATIONS = ../../i18n/de/qpe.ts \ | 106 | TRANSLATIONS = ../../i18n/de/qpe.ts \ |
105 | ../../i18n/xx/qpe.ts \ | 107 | ../../i18n/xx/qpe.ts \ |
106 | ../../i18n/en/qpe.ts \ | 108 | ../../i18n/en/qpe.ts \ |
107 | ../../i18n/es/qpe.ts \ | 109 | ../../i18n/es/qpe.ts \ |
108 | ../../i18n/fr/qpe.ts \ | 110 | ../../i18n/fr/qpe.ts \ |
109 | ../../i18n/hu/qpe.ts \ | 111 | ../../i18n/hu/qpe.ts \ |
110 | ../../i18n/ja/qpe.ts \ | 112 | ../../i18n/ja/qpe.ts \ |
111 | ../../i18n/ko/qpe.ts \ | 113 | ../../i18n/ko/qpe.ts \ |
112 | ../../i18n/no/qpe.ts \ | 114 | ../../i18n/no/qpe.ts \ |
113 | ../../i18n/pl/qpe.ts \ | 115 | ../../i18n/pl/qpe.ts \ |
114 | ../../i18n/pt/qpe.ts \ | 116 | ../../i18n/pt/qpe.ts \ |
115 | ../../i18n/pt_BR/qpe.ts \ | 117 | ../../i18n/pt_BR/qpe.ts \ |
116 | ../../i18n/sl/qpe.ts \ | 118 | ../../i18n/sl/qpe.ts \ |
117 | ../../i18n/zh_CN/qpe.ts \ | 119 | ../../i18n/zh_CN/qpe.ts \ |
118 | ../../i18n/it/qpe.ts \ | 120 | ../../i18n/it/qpe.ts \ |
119 | ../../i18n/zh_TW/qpe.ts \ | 121 | ../../i18n/zh_TW/qpe.ts \ |
120 | ../../i18n/da/qpe.ts | 122 | ../../i18n/da/qpe.ts |
121 | 123 | ||
122 | 124 | ||
123 | 125 | ||
124 | include ( $(OPIEDIR)/include.pro ) | 126 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -1,64 +1,77 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
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 <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 | ||
30 | Wait *lastWaitObject = NULL; | 31 | Wait *lastWaitObject = NULL; |
31 | 32 | ||
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 ); |
61 | p.drawPixmap( 0, 0, pm ); | 74 | p.drawPixmap( 0, 0, pm ); |
62 | } | 75 | } |
63 | 76 | ||
64 | 77 | ||
diff --git a/core/launcher/wait.h b/core/launcher/wait.h index 519b654..6e5e41a 100644 --- a/core/launcher/wait.h +++ b/core/launcher/wait.h | |||
@@ -1,45 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
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 <qpe/resource.h> | 24 | #include <qpe/resource.h> |
25 | 25 | ||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | #include <qlabel.h> | ||
27 | #include <qpixmap.h> | 28 | #include <qpixmap.h> |
28 | #include <qpainter.h> | 29 | #include <qpainter.h> |
29 | 30 | #include "waitpopup.h" | |
30 | 31 | ||
31 | class Wait : public QWidget | 32 | class Wait : public QWidget |
32 | { | 33 | { |
33 | public: | 34 | public: |
34 | Wait( QWidget *parent ); | 35 | Wait( QWidget *parent ); |
35 | void setWaiting( bool w ); | 36 | void setWaiting( bool w ); |
36 | void paintEvent( QPaintEvent * ); | 37 | void paintEvent( QPaintEvent * ); |
37 | static Wait *getWaitObject(); | 38 | static Wait *getWaitObject(); |
38 | private: | 39 | private: |
40 | WaitPopup* centralWait; | ||
39 | QPixmap pm; | 41 | QPixmap pm; |
40 | bool waiting; | 42 | bool waiting; |
41 | }; | 43 | }; |
42 | 44 | ||
43 | 45 | ||
44 | #endif // __WAIT_H__ | 46 | #endif // __WAIT_H__ |
45 | 47 | ||
diff --git a/core/launcher/waitpopup.cpp b/core/launcher/waitpopup.cpp new file mode 100644 index 0000000..e488ab5 --- a/dev/null +++ b/core/launcher/waitpopup.cpp | |||
@@ -0,0 +1,23 @@ | |||
1 | #include <qlabel.h> | ||
2 | #include <qlayout.h> | ||
3 | #include <qtimer.h> | ||
4 | #include <qmovie.h> | ||
5 | |||
6 | #include "waitpopup.h" | ||
7 | #include <qpe/resource.h> | ||
8 | |||
9 | |||
10 | WaitPopup::WaitPopup(QWidget *parent, const char* msg, bool dispIcon ) | ||
11 | :QDialog(parent, QObject::tr("Wait"), TRUE,WStyle_Customize) { | ||
12 | QHBoxLayout *hbox = new QHBoxLayout( this ); | ||
13 | QLabel *lb; | ||
14 | lb = new QLabel( this ); | ||
15 | //lb->setMovie( QMovie( "./wait.gif" , 200) ); | ||
16 | lb->setPixmap( Resource::loadPixmap( "Clock" ) ); | ||
17 | lb->setBackgroundMode ( NoBackground ); | ||
18 | hbox->addWidget( lb ); | ||
19 | hbox->activate(); | ||
20 | } | ||
21 | |||
22 | WaitPopup::~WaitPopup() { | ||
23 | } | ||
diff --git a/core/launcher/waitpopup.h b/core/launcher/waitpopup.h new file mode 100644 index 0000000..76f0c27 --- a/dev/null +++ b/core/launcher/waitpopup.h | |||
@@ -0,0 +1,14 @@ | |||
1 | #ifndef WAITPOPUP_H | ||
2 | #define WAITPOPUP_H | ||
3 | |||
4 | #include <qdialog.h> | ||
5 | |||
6 | class WaitPopup : public QDialog { | ||
7 | Q_OBJECT | ||
8 | |||
9 | public: | ||
10 | WaitPopup(QWidget *parent=0,const char* msg=0,bool dispIcon=TRUE); | ||
11 | ~WaitPopup(); | ||
12 | }; | ||
13 | |||
14 | #endif | ||