1 files changed, 17 insertions, 6 deletions

diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index b4afbf9..6cd0dc8 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -32,40 +32,41 @@
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qwidget.h>
 #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;
     update();
 }
 
 void OTicker::setFrame(int frameStyle) {
@@ -76,38 +77,48 @@ void OTicker::setFrame(int frameStyle) {
 void OTicker::setText( const QString& text ) {
     pos = 0; // reset it everytime the text is changed
     scrollText = 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;
+}
+