2 files changed, 54 insertions, 59 deletions

diff --git a/noncore/tools/clock/analogclock.cpp b/noncore/tools/clock/analogclock.cpp
index c5f0155..7f8ca67 100644
--- a/noncore/tools/clock/analogclock.cpp
+++ b/noncore/tools/clock/analogclock.cpp
@@ -1,203 +1,197 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 
 #include "analogclock.h"
 
 #include <qlayout.h>
 #include <qpainter.h>
 #include <qtopia/global.h>
 
 #include <math.h>
 
         const double deg2rad = 0.017453292519943295769;// pi/180
 
 AnalogClock::AnalogClock( QWidget *parent, const char *name )
     : QFrame( parent, name ), clear(false)
 {
     setMinimumSize(50,50);
 }
 
 QSizePolicy AnalogClock::sizePolicy() const
 {
     return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 }
 
 void AnalogClock::drawContents( QPainter *p )
 {
-#if !defined(NO_DEBUG)
-    static bool first = true;
-    if ( first ) {
-        //QTOPIA_PROFILE("first paint event");
-        first = false;
-    }
-#endif
 
     QRect r = contentsRect();
 
     if ( r.width() < r.height() ) {
         r.setY( (r.height() - r.width())/2 );
         r.setHeight( r.width() );
     }
 
+    QPoint l1( r.x() + r.width() / 2, r.y() + 2 );
+    QPoint l2( r.x() + r.width() / 2, r.y() + 8 );
     QPoint center( r.x() + r.width() / 2, r.y() + r.height() / 2 );
 
-    const int w_tick = r.width()/300+1;
-    const int w_sec = r.width()/400+1;
-    const int w_hour = r.width()/80+1;
+    QBrush bgBrush = colorGroup().brush( QColorGroup::Background );
 
-    QPoint l1( r.x() + r.width() / 2, r.y() + 2 );
-    QPoint l2( r.x() + r.width() / 2, r.y() + 8 );
+//    if ( clear ){
+        p->fillRect ( r, bgBrush );
 
-    QPoint h1( r.x() + r.width() / 2, r.y() + r.height() / 4 );
-    QPoint h2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
 
-    QPoint m1( r.x() + r.width() / 2, r.y() + r.height() / 9 );
-    QPoint m2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
+        // draw ticks
+        p->setPen( QPen( colorGroup ( ). color ( QColorGroup::Text ), 1 ) );
+        for ( int i = 0; i < 12; i++ )
+            p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
+//    }else {
+//        p->setBrush( bgBrush );
+//        drawPointers ( p, r, colorGroup ( ). color ( QColorGroup::Background ), prevTime, &currTime );
+//    }
 
-    QPoint s1( r.x() + r.width() / 2, r.y() + 8 );
-    QPoint s2( r.x() + r.width() / 2, r.y() + r.height() / 2 );
+    QColor col = colorGroup().color( QColorGroup::Text );
+    p->setBrush( col );
+    drawPointers ( p, r, col, currTime );
 
-    QColor color( clear ? backgroundColor() : black );
-    QTime time = clear ? prevTime : currTime;
 
-    if ( clear && prevTime.secsTo(currTime) > 1 ) {
-        p->eraseRect( rect() );
-        return;
-    }
+    prevTime = currTime;
+}
 
-    if ( !clear ) {
-        // draw ticks
-        p->setPen( QPen( color, w_tick ) );
-        for ( int i = 0; i < 12; i++ )
-            p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
-    }
+void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 )
+{
+    QPoint center = r. center ( );
 
-    if ( !clear || prevTime.minute() != currTime.minute() ||
-            prevTime.hour() != currTime.hour() ) {
-        // draw hour pointer
-        h1 = rotate( center, h1, 30 * ( time.hour() % 12 ) + time.minute() / 2 );
-        h2 = rotate( center, h2, 30 * ( time.hour() % 12 ) + time.minute() / 2 );
-        p->setPen( color );
-        p->setBrush( color );
-        drawHand( p, h1, h2 );
-    }
 
-    if ( !clear || prevTime.minute() != currTime.minute() ) {
-        // draw minute pointer
-        m1 = rotate( center, m1, time.minute() * 6 );
-        m2 = rotate( center, m2, time.minute() * 6 );
-        p->setPen( color );
-        p->setBrush( color );
-        drawHand( p, m1, m2 );
-    }
+    QPoint h1( center. x ( ), r. y ( ) + r. height ( ) / 4 );
+    QPoint h2( center. x ( ), center. y ( ) );
 
-    // draw second pointer
-    s1 = rotate( center, s1, time.second() * 6 );
-    s2 = rotate( center, s2, time.second() * 6 );
-    p->setPen( QPen( color, w_sec ) );
-    p->drawLine( s1, s2 );
+    QPoint m1( center. x ( ), r.y() + r.height() / 8 );
+    QPoint m2( center. x ( ), center. y ( ) );
 
-    // cap
-    p->setBrush(color);
-    p->drawEllipse( center.x()-w_hour/2, center.y()-w_hour/2, w_hour, w_hour );
+    QPoint s1( center. x ( ), r. y ( ) + 8 );
+    QPoint s2( center. x ( ), center. y ( ) );
 
-    if ( !clear )
-        prevTime = currTime;
+
+    if ( !t2 || ( t. minute ( ) != t2-> minute ( ) || t. hour ( ) != t2-> hour ( ))) {
+        // draw hour pointer
+        h1 = rotate( center, h1, 30 * ( t.hour() % 12 ) + t.minute() / 2 );
+        h2 = rotate( center, h2, 30 * ( t.hour() % 12 ) + t.minute() / 2 );
+        p-> setPen ( QPen ( c, 3 ));
+        drawHand( p, h1, h2 );
+    }
+
+    if ( !t2 || ( t. minute ( ) != t2-> minute ( ))) {
+        // draw minute pointer
+        m1 = rotate( center, m1, t.minute() * 6 );
+        m2 = rotate( center, m2, t.minute() * 6 );
+        p-> setPen ( QPen ( c, 2 ));
+        drawHand( p, m1, m2 );
+    }
+
+    if ( !t2 || ( t. second ( ) != t2-> second ( ))) {
+        // draw second pointer
+        s1 = rotate( center, s1, t.second() * 6 );
+        s2 = rotate( center, s2, t.second() * 6 );
+        p-> setPen ( QPen ( c, 1 ));
+        p-> drawLine ( s1, s2 );
+    }
 }
 
+
 // Dijkstra's bisection algorithm to find the square root as an integer.
 
 static uint int_sqrt(uint n)
 {
     if ( n >= UINT_MAX>>2 ) // n must be in the range 0...UINT_MAX/2-1
         return 2*int_sqrt( n/4 );
     uint h, p= 0, q= 1, r= n;
     while ( q <= n )
         q <<= 2;
     while ( q != 1 ) {
         q >>= 2;
         h= p + q;
         p >>= 1;
         if ( r >= h ) {
             p += q;
             r -= h;
         }
     }
     return p;
 }
 
 void AnalogClock::drawHand( QPainter *p, QPoint p1, QPoint p2 )
 {
     int hw = 7;
     if ( contentsRect().height() < 100 )
         hw = 5;
 
     int dx = p2.x() - p1.x();
     int dy = p2.y() - p1.y();
     int w = dx*dx+dy*dy;
     int ix,iy;
     w = int_sqrt(w*256);
     iy = w ? (hw * dy * 16)/ w : dy ? 0 : hw;
     ix = w ? (hw * dx * 16)/ w : dx ? 0 : hw;
 
     // rounding dependent on sign
     int nix, niy;
     if ( ix < 0 ) {
         nix = ix/2;
         ix = (ix-1)/2;
     } else {
         nix = (ix+1)/2;
         ix = ix/2;
     }
     if ( iy < 0 ) {
         niy = iy/2;
         iy = (iy-1)/2;
     } else {
         niy = (iy+1)/2;
         iy = iy/2;
     }
 
     QPointArray pa(4);
     pa[0] = p1;
     pa[1] = QPoint( p2.x()+iy, p2.y()-nix );
     pa[2] = QPoint( p2.x()-niy, p2.y()+ix );
     pa[3] = p1;
 
     p->drawPolygon( pa );
 }
 
 void AnalogClock::display( const QTime& t )
 {
     currTime = t;
-    clear = true;
-    repaint( false );
     clear = false;
     repaint( false );
+    clear = true;
 }
 
 QPoint AnalogClock::rotate( QPoint c, QPoint p, int a )
 {
     double angle = deg2rad * ( - a + 180 );
     double nx = c.x() - ( p.x() - c.x() ) * cos( angle ) -
                 ( p.y() - c.y() ) * sin( angle );
     double ny = c.y() - ( p.y() - c.y() ) * cos( angle ) +
                 ( p.x() - c.x() ) * sin( angle );
     return QPoint( int(nx), int(ny) );
 }
diff --git a/noncore/tools/clock/analogclock.h b/noncore/tools/clock/analogclock.h
index 3aa035e..5f30d68 100644
--- a/noncore/tools/clock/analogclock.h
+++ b/noncore/tools/clock/analogclock.h
@@ -1,49 +1,50 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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 ANALOGCLOCK_H
 #define ANALOGCLOCK_H
 
 #include <qdatetime.h>
 #include <qframe.h>
 
 class AnalogClock : public QFrame
 {
     Q_OBJECT
 public:
     AnalogClock( QWidget *parent=0, const char *name=0 );
 
     QSizePolicy sizePolicy() const;
 
     void display( const QTime& time );
 
 protected:
     void drawContents( QPainter *p );
     void drawHand( QPainter *p, QPoint, QPoint );
+    void drawPointers ( QPainter *p, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0);
 
 private:
     QPoint rotate( QPoint center, QPoint p, int angle );
 
     QTime currTime;
     QTime prevTime;
     bool clear;
 };
 
 #endif