1 files changed, 12 insertions, 8 deletions

diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
index cc1bbbb..a7f98be 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
@@ -9,108 +9,108 @@
  *                                                                         *
  *   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"
 
 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->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);
 
-    Config cfg( "stockticker");
-    cfg.setGroup("Timer");
-    timerDelay= cfg.readNumEntry("Delay",0);
-    if(timerDelay > 0)
-        startTimer(timerDelay*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);
     donameCheck=cfg.readBoolEntry("nameCheck",1);
     docurrentPriceCheck=cfg.readBoolEntry("currentPriceCheck",1);
     dolastPriceCheck=cfg.readBoolEntry("lastPriceCheck",1);
     doopenPriceCheck=cfg.readBoolEntry("openPriceCheck",1);
     dominPriceCheck=cfg.readBoolEntry("minPriceCheck",1);
     domaxPriceCheck=cfg.readBoolEntry("maxPriceCheck",1);
     dovariationCheck=cfg.readBoolEntry("variationCheck",1);
     dovolumeCheck=cfg.readBoolEntry("volumeCheck",1);
 
     DefProxy();
     char *stock_liste = (char *)blah;
       /* Get the stocks and process errors */
     error = get_stocks( stock_liste, &stocks_quotes);
 
     if (error) {
         printf("Error in getting stocks (%d)\n", error);
@@ -203,54 +203,58 @@ void StockTickerPluginWidget::getStocks( const char *blah) {
         if(domaxPriceCheck)
             output +=tempString;
 
 //         printf("| Var       | %-6.2f (%5.2f %%)         |\n", stocks_tmp->Variation, stocks_tmp->Pourcentage);
         tempString.sprintf("|  Var %-6.2f (%5.2f %%)  ", stocks_tmp->Variation, stocks_tmp->Pourcentage);
         if(dovariationCheck)
                 output +=tempString;
 
 //         printf("| Volume    | %-9d                |\n", stocks_tmp->Volume);
         tempString.sprintf("|  Volume %-9d  ", stocks_tmp->Volume);
         if(dovolumeCheck)
             output +=tempString;
 
 //         printf("----------------------------------------\n\n");
         tempString.sprintf("||==++==|");
         output +=tempString;
 
           /* Simple function which help to browse in the stocks list */ 
         stocks_tmp = next_stock(stocks_tmp);
     }
 
       /* frees stocks */
     free_stocks(stocks_quotes);
 
 }
 
 void StockTickerPluginWidget::DefProxy(void) {
     char *proxy;
     libstocks_return_code error;
 
       /* Proxy support */
       /* Checks for "http_proxy" environment variable */
     proxy = getenv("http_proxy");
     if(proxy) {
           /* printf("proxy set\n"); */
         error = set_proxy(proxy);
         if (error) {
 //             printf("Proxy error (%d)\n", error);
           QString tempString;
             tempString.sprintf("Proxy error (%d)\n", error);
             output = tempString;
             return;
 //             exit(1);
         }
     }
 }
 
 void  StockTickerPluginWidget::timerEvent( QTimerEvent *e ) {
-    qDebug("timer");
     killTimer(e->timerId());    
     doStocks();
+    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);
+    
 }