author | harlekin <harlekin> | 2003-03-28 20:15:42 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-28 20:15:42 (UTC) |
commit | 5bc894df5dcd8ec35e2182ca4ad0494d6408f754 (patch) (side-by-side diff) | |
tree | 9fc09017134e2795d882ff2af1c0f7cf6c40f97b | |
parent | fffa0df4d2cf54b2263172a3dcaa6b7611ba1eef (diff) | |
download | opie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.zip opie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.tar.gz opie-5bc894df5dcd8ec35e2182ca4ad0494d6408f754.tar.bz2 |
now as owait in libopie
-rw-r--r-- | core/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/launcher/wait.cpp | 2 | ||||
-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, 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 @@ -1,91 +1,89 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = ../../bin HEADERS = background.h \ desktop.h \ screensaver.h \ mediummountgui.h \ info.h \ appicons.h \ taskbar.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 \ qcopbridge.h \ packageslave.h \ irserver.h \ ../../rsync/buf.h \ ../../rsync/checksum.h \ ../../rsync/command.h \ ../../rsync/emit.h \ ../../rsync/job.h \ ../../rsync/netint.h \ ../../rsync/protocol.h \ ../../rsync/prototab.h \ ../../rsync/rsync.h \ ../../rsync/search.h \ ../../rsync/stream.h \ ../../rsync/sumset.h \ ../../rsync/trace.h \ ../../rsync/types.h \ ../../rsync/util.h \ ../../rsync/whole.h \ ../../rsync/config_rsync.h \ ../../rsync/qrsync.h \ quicklauncher.h SOURCES = background.cpp \ desktop.cpp \ screensaver.cpp \ mediummountgui.cpp \ info.cpp \ appicons.cpp \ taskbar.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 \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ ../../rsync/base64.c \ ../../rsync/buf.c \ ../../rsync/checksum.c \ ../../rsync/command.c \ ../../rsync/delta.c \ ../../rsync/emit.c \ ../../rsync/hex.c \ ../../rsync/job.c \ ../../rsync/mdfour.c \ ../../rsync/mksum.c \ ../../rsync/msg.c \ ../../rsync/netint.c \ ../../rsync/patch.c \ ../../rsync/prototab.c \ ../../rsync/readsums.c \ ../../rsync/scoop.c \ ../../rsync/search.c \ ../../rsync/stats.c \ ../../rsync/stream.c \ ../../rsync/sumset.c \ ../../rsync/trace.c \ ../../rsync/tube.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 @@ -7,65 +7,65 @@ ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "wait.h" #include <qpe/resource.h> #include <qpe/config.h> #include <qwidget.h> #include <qpixmap.h> #include <qpainter.h> 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() { return lastWaitObject; } void Wait::setWaiting( bool w ) { Config cfg ( "Launcher" ); cfg. setGroup ( "GUI" ); waiting = w; if ( w ) { if ( cfg. readBoolEntry ( "BigBusy" ) ) { centralWait->show(); } else { show(); } } else { centralWait->hide(); hide(); } } void Wait::paintEvent( QPaintEvent * ) 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 @@ -1,47 +1,49 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #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> #include "waitpopup.h" 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 |