now as owait in libopie

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
@@ -11,13 +11,12 @@ HEADERS		= background.h \
                   sidething.h \
                   runningappbar.h \
                   stabmon.h \
                   inputmethods.h \
                   systray.h \
                   wait.h \
-                  waitpopup.h \
                   shutdownimpl.h \
                   launcher.h \
                   launcherview.h \
                   ../../core/apps/calibrate/calibrate.h \
                   startmenu.h \
                   transferserver.h \
@@ -53,13 +52,12 @@ SOURCES		= background.cpp \
                   sidething.cpp \
                    runningappbar.cpp \
                   stabmon.cpp \
                   inputmethods.cpp \
                   systray.cpp \
                   wait.cpp \
-                  waitpopup.cpp \
                   shutdownimpl.cpp \
                   launcher.cpp \
                   launcherview.cpp \
                   ../../core/apps/calibrate/calibrate.cpp \
                   transferserver.cpp \
                   packageslave.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
@@ -33,13 +33,13 @@ Wait *lastWaitObject = NULL;
 
 Wait::Wait( QWidget *parent ) : QWidget( parent ),
         pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
 {
     setFixedSize( pm.size() );
     lastWaitObject = this;
-    centralWait = new WaitPopup( 0L );
+    centralWait = new OWait( 0L );
     centralWait->hide();
     hide();
 }
 
 
 Wait *Wait::getWaitObject()
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
@@ -18,12 +18,14 @@
 **
 **********************************************************************/
 
 #ifndef __WAIT_H__
 #define __WAIT_H__
 
+#include <opie/owait.h>
+
 #include <qpe/resource.h>
 
 #include <qwidget.h>
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qpainter.h>
@@ -34,13 +36,13 @@ class Wait : public QWidget
 public:
     Wait( QWidget *parent );
     void setWaiting( bool w );
     void paintEvent( QPaintEvent * );
     static Wait *getWaitObject();
 private:
-    WaitPopup* centralWait;
+    OWait* centralWait;
     QPixmap pm;
     bool waiting;
 };
 
 
 #endif // __WAIT_H__
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 @@
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qmovie.h>
-
-#include "waitpopup.h"
-#include <qpe/resource.h>
-
-
-WaitPopup::WaitPopup(QWidget *parent, const char* msg, bool dispIcon )
-  :QDialog(parent, QObject::tr("Wait"), TRUE,WStyle_Customize) {
-  QHBoxLayout *hbox  = new QHBoxLayout( this );
-  QLabel *lb;
-  lb = new QLabel( this );
-  //lb->setMovie( QMovie( "./wait.gif"  , 200) );
-  lb->setPixmap( Resource::loadPixmap( "Clock" ) );
-  lb->setBackgroundMode ( NoBackground );
-  hbox->addWidget( lb );
-  hbox->activate();
-}
-
-WaitPopup::~WaitPopup() {
-}
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 @@
-#ifndef WAITPOPUP_H
-#define WAITPOPUP_H
-
-#include <qdialog.h>
-
-class WaitPopup : public QDialog {
-    Q_OBJECT
-
-public:
-    WaitPopup(QWidget *parent=0,const char* msg=0,bool dispIcon=TRUE);
-    ~WaitPopup();
-};
-
-#endif