2 files changed, 57 insertions, 12 deletions

diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index b4afbf9..6cd0dc8 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -36,32 +36,33 @@
 #include <qpixmap.h>
 #include <qbutton.h>
 #include <qpainter.h>
 #include <qframe.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "oticker.h"
 
 OTicker::OTicker( QWidget* parent )
-        : QFrame( parent ) {
-
-//    setFrameStyle( NoFrame/*WinPanel | Sunken */);
-
+        : QLabel( parent ) {
+  //        : QFrame( parent ) {
+    setTextFormat(Qt::RichText);
     Config cfg("qpe");
     cfg.setGroup("Appearance");
     backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
     foregroundcolor= Qt::black;
+    updateTimerTime = 50;
+    scrollLength = 1;
 }
 
 OTicker::~OTicker() {
 }
 
 void OTicker::setBackgroundColor(QColor backcolor) {
     backgroundcolor = backcolor;
     update();
 }
 
 void OTicker::setForegroundColor(QColor backcolor) {
     foregroundcolor = backcolor;
@@ -80,34 +81,44 @@ void OTicker::setText( const QString& text ) {
     int pixelLen = fontMetrics().width( text );
     QPixmap pm( pixelLen, contentsRect().height() );
 //    pm.fill( QColor( 167, 212, 167 ));
  
     pm.fill(backgroundcolor);
     QPainter pmp( &pm );
     pmp.setPen(foregroundcolor );
     pmp.drawText( 0, 0, pixelLen, contentsRect().height(), AlignVCenter, scrollText );
     pmp.end();
     scrollTextPixmap = pm;
 
     killTimers();
+    //    qDebug("Scrollupdate %d", updateTimerTime);
     if ( pixelLen > contentsRect().width() )
-        startTimer( 50 );
+        startTimer( updateTimerTime);
     update();
 }
 
 
 void OTicker::timerEvent( QTimerEvent * ) {
-    pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - 1;
+  pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1;
     repaint( FALSE );
 }
 
 void OTicker::drawContents( QPainter *p ) {
     int pixelLen = scrollTextPixmap.width(); 
     p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap );
     if ( pixelLen > contentsRect().width() ) // Scrolling
         p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap );
 }
 
 void OTicker::mouseReleaseEvent( QMouseEvent * ) {
 //    qDebug("<<<<<<<>>>>>>>>>");
     emit mousePressed();
 }
+
+void OTicker::setUpdateTime(int time) {
+ updateTimerTime=time;
+}
+
+void OTicker::setScrollLength(int len) {
+scrollLength=len;
+}
+
diff --git a/libopie/oticker.h b/libopie/oticker.h
index 92a4be4..b7499e3 100644
--- a/libopie/oticker.h
+++ b/libopie/oticker.h
@@ -1,37 +1,71 @@
+/*
+                            This file is part of the Opie Project
+                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
 #ifndef OTICKER_H
 #define OTICKER_H
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qslider.h>
+#include <qlabel.h>
 #include <qframe.h>
 #include <qlineedit.h>
 #include <qcolor.h>
 
-class OTicker : public QFrame {
+class OTicker : public QLabel {
+//class OTicker : public QFrame {
     Q_OBJECT
 
 public:
     OTicker( QWidget* parent=0 );
     ~OTicker();
     void setText( const QString& text ) ;
-    void setBackgroundColor(QColor color);
-    void setForegroundColor(QColor color);
-    void setFrame(int);
+    void setBackgroundColor(QColor color); //sets background 
+    void setForegroundColor(QColor color); //sets text color
+    void setFrame(int); //sets frame style
+    void setUpdateTime(int); //sets timeout for redraws default is 50 ms
+    void setScrollLength(int); //sets amount of scrolling default is 1
 signals:
-    void mousePressed();
+    void mousePressed(); // for mouse press events
 protected:
     void timerEvent( QTimerEvent * );
     void drawContents( QPainter *p );
     void mouseReleaseEvent ( QMouseEvent *);
 private:
     QColor backgroundcolor, foregroundcolor;
     QString scrollText;
     QPixmap scrollTextPixmap;
-    int pos;//, pixelLen;
+    int pos, updateTimerTime, scrollLength;
 };
 
 #endif