summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/wait.cpp21
-rw-r--r--core/launcher/wait.h4
-rw-r--r--core/launcher/waitpopup.cpp23
-rw-r--r--core/launcher/waitpopup.h14
5 files changed, 59 insertions, 5 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index d0a573b..a876d1d 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -16,2 +16,3 @@ HEADERS = background.h \
16 wait.h \ 16 wait.h \
17 waitpopup.h \
17 shutdownimpl.h \ 18 shutdownimpl.h \
@@ -57,2 +58,3 @@ SOURCES = background.cpp \
57 wait.cpp \ 58 wait.cpp \
59 waitpopup.cpp \
58 shutdownimpl.cpp \ 60 shutdownimpl.cpp \
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index 059e6f1..e1832dd 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -23,2 +23,3 @@
23#include <qpe/resource.h> 23#include <qpe/resource.h>
24#include <qpe/config.h>
24 25
@@ -37,2 +38,4 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ),
37 lastWaitObject = this; 38 lastWaitObject = this;
39 centralWait = new WaitPopup( 0L );
40 centralWait->hide();
38 hide(); 41 hide();
@@ -49,7 +52,17 @@ void Wait::setWaiting( bool w )
49{ 52{
53 Config cfg ( "Launcher" );
54 cfg. setGroup ( "GUI" );
55
56
50 waiting = w; 57 waiting = w;
51 if ( w ) 58 if ( w ) {
52 show(); 59 if ( cfg. readBoolEntry ( "BigBusy" ) ) {
53 else 60 centralWait->show();
54 hide(); 61 } else {
62 show();
63 }
64 } else {
65 centralWait->hide();
66 hide();
67 }
55} 68}
diff --git a/core/launcher/wait.h b/core/launcher/wait.h
index 519b654..6e5e41a 100644
--- a/core/launcher/wait.h
+++ b/core/launcher/wait.h
@@ -26,5 +26,6 @@
26#include <qwidget.h> 26#include <qwidget.h>
27#include <qlabel.h>
27#include <qpixmap.h> 28#include <qpixmap.h>
28#include <qpainter.h> 29#include <qpainter.h>
29 30#include "waitpopup.h"
30 31
@@ -38,2 +39,3 @@ public:
38private: 39private:
40 WaitPopup* centralWait;
39 QPixmap pm; 41 QPixmap pm;
diff --git a/core/launcher/waitpopup.cpp b/core/launcher/waitpopup.cpp
new file mode 100644
index 0000000..e488ab5
--- a/dev/null
+++ b/core/launcher/waitpopup.cpp
@@ -0,0 +1,23 @@
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
new file mode 100644
index 0000000..76f0c27
--- a/dev/null
+++ b/core/launcher/waitpopup.h
@@ -0,0 +1,14 @@
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