summaryrefslogtreecommitdiff
path: root/core/launcher
Unidiff
Diffstat (limited to 'core/launcher') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/wait.cpp2
-rw-r--r--core/launcher/wait.h4
-rw-r--r--core/launcher/waitpopup.cpp23
-rw-r--r--core/launcher/waitpopup.h14
5 files changed, 4 insertions, 41 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index a876d1d..d0a573b 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -5,25 +5,24 @@ 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 \
18 shutdownimpl.h \ 17 shutdownimpl.h \
19 launcher.h \ 18 launcher.h \
20 launcherview.h \ 19 launcherview.h \
21 ../../core/apps/calibrate/calibrate.h \ 20 ../../core/apps/calibrate/calibrate.h \
22 startmenu.h \ 21 startmenu.h \
23 transferserver.h \ 22 transferserver.h \
24 qcopbridge.h \ 23 qcopbridge.h \
25 packageslave.h \ 24 packageslave.h \
26 irserver.h \ 25 irserver.h \
27 ../../rsync/buf.h \ 26 ../../rsync/buf.h \
28 ../../rsync/checksum.h \ 27 ../../rsync/checksum.h \
29 ../../rsync/command.h \ 28 ../../rsync/command.h \
@@ -47,25 +46,24 @@ SOURCES = background.cpp \
47 desktop.cpp \ 46 desktop.cpp \
48 screensaver.cpp \ 47 screensaver.cpp \
49 mediummountgui.cpp \ 48 mediummountgui.cpp \
50 info.cpp \ 49 info.cpp \
51 appicons.cpp \ 50 appicons.cpp \
52 taskbar.cpp \ 51 taskbar.cpp \
53 sidething.cpp \ 52 sidething.cpp \
54 runningappbar.cpp \ 53 runningappbar.cpp \
55 stabmon.cpp \ 54 stabmon.cpp \
56 inputmethods.cpp \ 55 inputmethods.cpp \
57 systray.cpp \ 56 systray.cpp \
58 wait.cpp \ 57 wait.cpp \
59 waitpopup.cpp \
60 shutdownimpl.cpp \ 58 shutdownimpl.cpp \
61 launcher.cpp \ 59 launcher.cpp \
62 launcherview.cpp \ 60 launcherview.cpp \
63 ../../core/apps/calibrate/calibrate.cpp \ 61 ../../core/apps/calibrate/calibrate.cpp \
64 transferserver.cpp \ 62 transferserver.cpp \
65 packageslave.cpp \ 63 packageslave.cpp \
66 irserver.cpp \ 64 irserver.cpp \
67 qcopbridge.cpp \ 65 qcopbridge.cpp \
68 startmenu.cpp \ 66 startmenu.cpp \
69 main.cpp \ 67 main.cpp \
70 ../../rsync/base64.c \ 68 ../../rsync/base64.c \
71 ../../rsync/buf.c \ 69 ../../rsync/buf.c \
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index e1832dd..d202d26 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -27,25 +27,25 @@
27#include <qpixmap.h> 27#include <qpixmap.h>
28#include <qpainter.h> 28#include <qpainter.h>
29 29
30 30
31Wait *lastWaitObject = NULL; 31Wait *lastWaitObject = NULL;
32 32
33 33
34Wait::Wait( QWidget *parent ) : QWidget( parent ), 34Wait::Wait( QWidget *parent ) : QWidget( parent ),
35 pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) 35 pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
36{ 36{
37 setFixedSize( pm.size() ); 37 setFixedSize( pm.size() );
38 lastWaitObject = this; 38 lastWaitObject = this;
39 centralWait = new WaitPopup( 0L ); 39 centralWait = new OWait( 0L );
40 centralWait->hide(); 40 centralWait->hide();
41 hide(); 41 hide();
42} 42}
43 43
44 44
45Wait *Wait::getWaitObject() 45Wait *Wait::getWaitObject()
46{ 46{
47 return lastWaitObject; 47 return lastWaitObject;
48} 48}
49 49
50 50
51void Wait::setWaiting( bool w ) 51void Wait::setWaiting( bool w )
diff --git a/core/launcher/wait.h b/core/launcher/wait.h
index 6e5e41a..6a087ec 100644
--- a/core/launcher/wait.h
+++ b/core/launcher/wait.h
@@ -12,36 +12,38 @@
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 <opie/owait.h>
25
24#include <qpe/resource.h> 26#include <qpe/resource.h>
25 27
26#include <qwidget.h> 28#include <qwidget.h>
27#include <qlabel.h> 29#include <qlabel.h>
28#include <qpixmap.h> 30#include <qpixmap.h>
29#include <qpainter.h> 31#include <qpainter.h>
30#include "waitpopup.h" 32#include "waitpopup.h"
31 33
32class Wait : public QWidget 34class Wait : public QWidget
33{ 35{
34public: 36public:
35 Wait( QWidget *parent ); 37 Wait( QWidget *parent );
36 void setWaiting( bool w ); 38 void setWaiting( bool w );
37 void paintEvent( QPaintEvent * ); 39 void paintEvent( QPaintEvent * );
38 static Wait *getWaitObject(); 40 static Wait *getWaitObject();
39private: 41private:
40 WaitPopup* centralWait; 42 OWait* centralWait;
41 QPixmap pm; 43 QPixmap pm;
42 bool waiting; 44 bool waiting;
43}; 45};
44 46
45 47
46#endif // __WAIT_H__ 48#endif // __WAIT_H__
47 49
diff --git a/core/launcher/waitpopup.cpp b/core/launcher/waitpopup.cpp
deleted file mode 100644
index e488ab5..0000000
--- a/core/launcher/waitpopup.cpp
+++ b/dev/null
@@ -1,23 +0,0 @@
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
10WaitPopup::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
22WaitPopup::~WaitPopup() {
23}
diff --git a/core/launcher/waitpopup.h b/core/launcher/waitpopup.h
deleted file mode 100644
index 76f0c27..0000000
--- a/core/launcher/waitpopup.h
+++ b/dev/null
@@ -1,14 +0,0 @@
1#ifndef WAITPOPUP_H
2#define WAITPOPUP_H
3
4#include <qdialog.h>
5
6class WaitPopup : public QDialog {
7 Q_OBJECT
8
9public:
10 WaitPopup(QWidget *parent=0,const char* msg=0,bool dispIcon=TRUE);
11 ~WaitPopup();
12};
13
14#endif