5 files changed, 8 insertions, 142 deletions

diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index 5281373..4b7b177 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -1,27 +1,27 @@
 TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt debug
 
-HEADERS = stocktickerplugin.h stocktickeruginimpl.h stocktickerpluginwidget.h ticker.h stocktickerconfig.h \
+HEADERS = stocktickerplugin.h stocktickeruginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \
       ../libstocks/csv.h \
       ../libstocks/http.h \
       ../libstocks/lists.h \
       ../libstocks/stocks.h
-SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidget.cpp ticker.cpp stocktickerconfig.cpp \
+SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidget.cpp stocktickerconfig.cpp \
       ../libstocks/csv.c \
       ../libstocks/currency.c \
       ../libstocks/history.c \
       ../libstocks/http.c \
       ../libstocks/lists.c \
       ../libstocks/stocks.c
 
 INCLUDEPATH     += $(OPIEDIR)/include \
     ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
     ../ ../library
 
 LIBS+= -lqpe -lopie
 TMAKE_CFLAGS += -D__UNIX__
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
index a7f98be..8830472 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
@@ -1,100 +1,94 @@
 /*
  * stocktickerpluginwidget.cpp
  *
  * copyright   : (c) 2002 by L.J. Potter
  * email       : llornkcor@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include <qvaluelist.h>
 #include <qtl.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qobject.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <qpe/config.h>
 #include <qpe/timestring.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include "ticker.h"
+#include <opie/oticker.h>
+//#include "ticker.h"
 
 extern "C" {
 #include "libstocks/stocks.h"
 }
 
 #include "stocktickerpluginwidget.h"
 
 StockTickerPluginWidget::StockTickerPluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  name ) {
     init();
     startTimer(1000);
 }
 
 StockTickerPluginWidget::~StockTickerPluginWidget() {
 }
 
 void StockTickerPluginWidget::init() {
 
     QHBoxLayout* layout = new QHBoxLayout( this );
 
-    stocktickerTicker = new Ticker(this);
+    stocktickerTicker = new OTicker(this);
     stocktickerTicker->setMinimumHeight(15);
     connect( stocktickerTicker, SIGNAL( mousePressed()), this, SLOT( doStocks() ));
  
     layout->addWidget( stocktickerTicker);
-//    Config cfg( "stockticker");
-//     cfg.setGroup("Timer");
-//     timerDelay= cfg.readNumEntry("Delay",0);
-//     if(timerDelay > 0 )
-//         startTimer(timerDelay*60000);
-//     qDebug("timer ^ set for %d",(timerDelay*60000)/60000);
 
 }
 
 void StockTickerPluginWidget::doStocks() {
     Config cfg( "stockticker");
-
     cfg.setGroup( "Symbols" );
     QString symbollist;
     symbollist = cfg.readEntry("Symbols", "");
     symbollist.replace(QRegExp(" "),"+");//seperated by +
 //    qDebug(symbollist);
 
     getStocks( symbollist.latin1());
     
     stocktickerTicker->setText( output );
 }
 
 void StockTickerPluginWidget::getStocks( const char *blah) {
 
     stock *stocks_quotes=NULL;
     stock *stocks_tmp;
 
     QString tempString;
     output = "";
 
     libstocks_return_code error;
 
     Config cfg( "stockticker");
     cfg.setGroup( "Fields" );
     bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck;
     bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck;
     bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck;
 
     dotimeCheck=dodateCheck=dosymbolCheck=donameCheck= docurrentPriceCheck=dolastPriceCheck=doopenPriceCheck=dominPriceCheck=domaxPriceCheck=dovariationCheck=dovolumeCheck=false;
 
     dotimeCheck=cfg.readBoolEntry("timeCheck",1);
     dodateCheck=cfg.readBoolEntry("dateCheck",1);
     dosymbolCheck=cfg.readBoolEntry("symbolCheck",1);
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
index 8f3441d..26472fa 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
@@ -1,64 +1,65 @@
 /*
  * stocktickerpluginwidget.h
  *
  * copyright   : (c) 2002 by L.J. Potter
  * email       : lornkcor@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef STOCKTICKERL_PLUGIN_WIDGET_H
 #define STOCKTICKERL_PLUGIN_WIDGET_H
 
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlineedit.h>
 
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
+#include <opie/oticker.h>
 
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "ticker.h"
+//#include "ticker.h"
 
 /* extern "C" { */
 /* #include "stocks.h" */
 /* } */
 
 class QTimer;
 
 class StockTickerPluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     StockTickerPluginWidget( QWidget *parent,  const char *name );
     ~StockTickerPluginWidget();
     QString output;
 
 protected slots:
     void doStocks();
 
 private:
-    Ticker *stocktickerTicker;
+    OTicker *stocktickerTicker;
     void timerEvent( QTimerEvent * );
     void init();
     void getStocks( const char *stock_liste);
     void DefProxy(void);
     int timerDelay;
 };
 
 #endif
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/ticker.cpp b/noncore/todayplugins/stockticker/stocktickerlib/ticker.cpp
deleted file mode 100644
index 3bdc820..0000000
--- a/noncore/todayplugins/stockticker/stocktickerlib/ticker.cpp
+++ b/dev/null
@@ -1,97 +0,0 @@
-/*
-                            This file is part of the Opie Project
-
-                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
-                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
-                             Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
-              =.
-            .=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.
-
-*/
-
-#include <qpe/qpeapplication.h>
-#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 "ticker.h"
-
-Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) {
-        setFrameStyle( NoFrame/*WinPanel | Sunken */);
-}
-
-Ticker::~Ticker() {
-}
-
-void Ticker::setText( const QString& text ) {
-    Config cfg("qpe");
-    cfg.setGroup("Appearance");
-    
-    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( QColor( cfg.readEntry( "Background", "#E5E1D5" ) ));
-    QPainter pmp( &pm );
-    pmp.setPen( Qt::black );
-    pmp.drawText( 0, 0, pixelLen, contentsRect().height(), AlignVCenter, scrollText );
-    pmp.end();
-    scrollTextPixmap = pm;
-
-    killTimers();
-    if ( pixelLen > contentsRect().width() )
-        startTimer( 50 );
-    update();
-}
-
-
-void Ticker::timerEvent( QTimerEvent * ) {
-    pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - 1;
-    repaint( FALSE );
-}
-
-void Ticker::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 Ticker::mouseReleaseEvent( QMouseEvent * e) {
-    qDebug("<<<<<<<>>>>>>>>>");
-    emit mousePressed();
-}
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/ticker.h b/noncore/todayplugins/stockticker/stocktickerlib/ticker.h
deleted file mode 100644
index 3b68928..0000000
--- a/noncore/todayplugins/stockticker/stocktickerlib/ticker.h
+++ b/dev/null
@@ -1,32 +0,0 @@
-#ifndef TICKER_H
-#define TICKER_H
-
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qslider.h>
-#include <qframe.h>
-#include <qlineedit.h>
-
-class Ticker : public QFrame {
-    Q_OBJECT
-
-public:
-    Ticker( QWidget* parent=0 );
-    ~Ticker();
-    void setText( const QString& text ) ;
-signals:
-    void mousePressed();
-protected:
-    void timerEvent( QTimerEvent * );
-    void drawContents( QPainter *p );
-    void mouseReleaseEvent ( QMouseEvent *);
-private:
-    QString scrollText;
-    QPixmap scrollTextPixmap;
-    int pos;//, pixelLen;
-};
-
-#endif