From 5bc894df5dcd8ec35e2182ca4ad0494d6408f754 Mon Sep 17 00:00:00 2001 From: harlekin Date: Fri, 28 Mar 2003 20:15:42 +0000 Subject: now as owait in libopie --- (limited to 'core') 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 @@ -14,7 +14,6 @@ HEADERS = background.h \ inputmethods.h \ systray.h \ wait.h \ - waitpopup.h \ shutdownimpl.h \ launcher.h \ launcherview.h \ @@ -56,7 +55,6 @@ SOURCES = background.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ - waitpopup.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.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 @@ -36,7 +36,7 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ), { setFixedSize( pm.size() ); lastWaitObject = this; - centralWait = new WaitPopup( 0L ); + centralWait = new OWait( 0L ); centralWait->hide(); 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 @@ -21,6 +21,8 @@ #ifndef __WAIT_H__ #define __WAIT_H__ +#include + #include #include @@ -37,7 +39,7 @@ public: void paintEvent( QPaintEvent * ); static Wait *getWaitObject(); private: - WaitPopup* centralWait; + OWait* centralWait; QPixmap pm; bool waiting; }; 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 -#include -#include -#include - -#include "waitpopup.h" -#include - - -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 - -class WaitPopup : public QDialog { - Q_OBJECT - -public: - WaitPopup(QWidget *parent=0,const char* msg=0,bool dispIcon=TRUE); - ~WaitPopup(); -}; - -#endif -- cgit v0.9.0.2