summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/wait.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index a5b329d..523819d 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -1,60 +1,66 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "wait.h" 21#include "wait.h"
22 22
23#include <qtopia/config.h>
24
25#include <opie2/owait.h> 23#include <opie2/owait.h>
26 24
27 25#include <qtopia/config.h>
26#include <qtopia/applnk.h>
28 27
29Wait *lastWaitObject = NULL; 28Wait *lastWaitObject = NULL;
30 29
31 30
32using namespace Opie::Ui; 31using namespace Opie::Ui;
33Wait::Wait( QWidget *parent ) : QWidget( parent ), 32Wait::Wait( QWidget *parent ) : QWidget( parent ),
34 pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) 33 waiting( FALSE )
35{ 34{
36 setFixedSize( pm.size() ); 35
36 QSize size( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
37 setFixedSize( size );
38
39 QImage img = Resource::loadImage( "wait" );
40 img = img.smoothScale( size.width(), size.height() );
41 pm.convertFromImage( img );
42
37 lastWaitObject = this; 43 lastWaitObject = this;
38 m_centralWait = new OWait( 0l ); 44 m_centralWait = new OWait( 0l );
39 m_centralWait->hide(); 45 m_centralWait->hide();
40 hide(); 46 hide();
41} 47}
42 48
43 49
44Wait *Wait::getWaitObject() 50Wait *Wait::getWaitObject()
45{ 51{
46 return lastWaitObject; 52 return lastWaitObject;
47} 53}
48 54
49 55
50void Wait::setWaiting( bool w ) 56void Wait::setWaiting( bool w )
51{ 57{
52 Config cfg ( "Launcher" ); 58 Config cfg ( "Launcher" );
53 cfg.setGroup("GUI"); 59 cfg.setGroup("GUI");
54 60
55 61
56 waiting = w; 62 waiting = w;
57 if ( w ) { 63 if ( w ) {
58 if ( cfg. readBoolEntry( "BigBusy" ) ) 64 if ( cfg. readBoolEntry( "BigBusy" ) )
59 m_centralWait->show(); 65 m_centralWait->show();
60 else 66 else