summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/owait.cpp7
-rw-r--r--libopie/owait.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/libopie/owait.cpp b/libopie/owait.cpp
index 7ed66eb..c90bb72 100644
--- a/libopie/owait.cpp
+++ b/libopie/owait.cpp
@@ -38,13 +38,14 @@ OWait::OWait(QWidget *parent, const char* msg, bool dispIcon )
38 m_lb->setBackgroundMode ( NoBackground ); 38 m_lb->setBackgroundMode ( NoBackground );
39 39
40 hbox->addWidget( m_lb ); 40 hbox->addWidget( m_lb );
41 hbox->activate(); 41 hbox->activate();
42 42
43 m_pix = Resource::loadPixmap( "BigBusy" ); 43 m_pix = Resource::loadPixmap( "BigBusy" );
44 resize( 48, 48 ); 44 m_aniSize = m_pix.height();
45 resize( m_aniSize, m_aniSize );
45 46
46 m_timerLength = 10; 47 m_timerLength = 10;
47 48
48 m_waitTimer = new QTimer( this ); 49 m_waitTimer = new QTimer( this );
49 connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) ); 50 connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) );
50} 51}
@@ -53,18 +54,18 @@ void OWait::timerEvent( QTimerEvent * ) {
53 frame = (++frame) % 4; 54 frame = (++frame) % 4;
54 repaint(); 55 repaint();
55} 56}
56 57
57void OWait::paintEvent( QPaintEvent * ) { 58void OWait::paintEvent( QPaintEvent * ) {
58 QPainter p( m_lb ); 59 QPainter p( m_lb );
59 p.drawPixmap( 0, 0, m_pix, 48 * frame, 0, 48, 48 ); 60 p.drawPixmap( 0, 0, m_pix, m_aniSize * frame, 0, m_aniSize, m_aniSize );
60} 61}
61 62
62void OWait::show() { 63void OWait::show() {
63 64
64 move( ( ( qApp->desktop()->width() ) / 2 ) - 24, ( ( qApp->desktop()->height() ) / 2 ) - 24 ); 65 move( ( ( qApp->desktop()->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop()->height() ) / 2 ) - ( m_aniSize / 2 ) );
65 startTimer( 300 ); 66 startTimer( 300 );
66 m_waitTimer->start( m_timerLength * 1000, true ); 67 m_waitTimer->start( m_timerLength * 1000, true );
67 QDialog::show(); 68 QDialog::show();
68} 69}
69 70
70void OWait::hide() { 71void OWait::hide() {
diff --git a/libopie/owait.h b/libopie/owait.h
index 98409cf..d22e141 100644
--- a/libopie/owait.h
+++ b/libopie/owait.h
@@ -60,9 +60,10 @@ public:
60 void paintEvent( QPaintEvent * ); 60 void paintEvent( QPaintEvent * );
61 61
62 QPixmap m_pix; 62 QPixmap m_pix;
63 QLabel *m_lb; 63 QLabel *m_lb;
64 QTimer *m_waitTimer; 64 QTimer *m_waitTimer;
65 int m_timerLength; 65 int m_timerLength;
66 int m_aniSize;
66}; 67};
67 68
68#endif 69#endif