summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-28 20:15:42 (UTC)
committer harlekin <harlekin>2003-03-28 20:15:42 (UTC)
commit5bc894df5dcd8ec35e2182ca4ad0494d6408f754 (patch) (unidiff)
tree9fc09017134e2795d882ff2af1c0f7cf6c40f97b
parentfffa0df4d2cf54b2263172a3dcaa6b7611ba1eef (diff)
downloadopie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.zip
opie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.tar.gz
opie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.tar.bz2
now as owait in libopie
Diffstat (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
@@ -16,3 +16,2 @@ HEADERS = background.h \
16 wait.h \ 16 wait.h \
17 waitpopup.h \
18 shutdownimpl.h \ 17 shutdownimpl.h \
@@ -58,3 +57,2 @@ SOURCES = background.cpp \
58 wait.cpp \ 57 wait.cpp \
59 waitpopup.cpp \
60 shutdownimpl.cpp \ 58 shutdownimpl.cpp \
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
@@ -38,3 +38,3 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ),
38 lastWaitObject = this; 38 lastWaitObject = this;
39 centralWait = new WaitPopup( 0L ); 39 centralWait = new OWait( 0L );
40 centralWait->hide(); 40 centralWait->hide();
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
@@ -23,2 +23,4 @@
23 23
24#include <opie/owait.h>
25
24#include <qpe/resource.h> 26#include <qpe/resource.h>
@@ -39,3 +41,3 @@ public:
39private: 41private:
40 WaitPopup* centralWait; 42 OWait* centralWait;
41 QPixmap pm; 43 QPixmap pm;
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