summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp183
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h16
3 files changed, 136 insertions, 65 deletions
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index 4b7b177..13c846b 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -22,3 +22,3 @@ DEPENDPATH += $(OPIEDIR)/include \
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopie -lpthread
TMAKE_CFLAGS += -D__UNIX__
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
index 8830472..572a720 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
@@ -16,2 +16,3 @@
+#include <qsocket.h>
#include <qvaluelist.h>
@@ -25,2 +26,3 @@
#include <qtimer.h>
+#include <qmessagebox.h>
@@ -29,5 +31,5 @@
#include <qpe/qcopenvelope_qws.h>
+#include <qpe/network.h>
#include <opie/oticker.h>
-//#include "ticker.h"
@@ -37,43 +39,15 @@ extern "C" {
-#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 OTicker(this);
- stocktickerTicker->setMinimumHeight(15);
- connect( stocktickerTicker, SIGNAL( mousePressed()), this, SLOT( doStocks() ));
+#include <pthread.h>
- layout->addWidget( stocktickerTicker);
-
-}
-
-void StockTickerPluginWidget::doStocks() {
- Config cfg( "stockticker");
- cfg.setGroup( "Symbols" );
- QString symbollist;
- symbollist = cfg.readEntry("Symbols", "");
- symbollist.replace(QRegExp(" "),"+");//seperated by +
-// qDebug(symbollist);
+#include "stocktickerpluginwidget.h"
- getStocks( symbollist.latin1());
+QString output;
+OTicker *stocktickerTicker;
- stocktickerTicker->setText( output );
-}
-
-void StockTickerPluginWidget::getStocks( const char *blah) {
+void getStocks( const QString *blah) {
+// stocktickerTicker->setText( "Downloading stock data.");
stock *stocks_quotes=NULL;
stock *stocks_tmp;
-
+ qDebug("%s", blah->latin1());
QString tempString;
@@ -103,4 +77,25 @@ void StockTickerPluginWidget::getStocks( const char *blah) {
- DefProxy();
- char *stock_liste = (char *)blah;
+// DefProxy();
+ {
+ 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);
+ }
+ }
+ }
+ char *stock_liste = (char *)blah->latin1();
+// char *stock_liste = (char *)blah;
/* Get the stocks and process errors */
@@ -219,2 +214,3 @@ void StockTickerPluginWidget::getStocks( const char *blah) {
free_stocks(stocks_quotes);
+ stocktickerTicker->setText( output );
@@ -222,21 +218,57 @@ void StockTickerPluginWidget::getStocks( const char *blah) {
-void StockTickerPluginWidget::DefProxy(void) {
- char *proxy;
- libstocks_return_code error;
+StockTickerPluginWidget::StockTickerPluginWidget( QWidget *parent, const char* name)
+ : QWidget(parent, name ) {
+ init();
+ startTimer(1000);
+// checkConnection();
+}
- /* 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);
+StockTickerPluginWidget::~StockTickerPluginWidget() {
}
+
+void StockTickerPluginWidget::init() {
+
+ QHBoxLayout* layout = new QHBoxLayout( this );
+ stocktickerTicker = new OTicker(this);
+ stocktickerTicker->setMinimumHeight(15);
+ connect( stocktickerTicker, SIGNAL( mousePressed()), this, SLOT( checkConnection() ));
+ layout->addWidget( stocktickerTicker);
+ wasError = true;
+}
+
+void StockTickerPluginWidget::doStocks() {
+ Config cfg( "stockticker");
+ cfg.setGroup( "Symbols" );
+ QString symbollist;
+ symbollist = cfg.readEntry("Symbols", "");
+ symbollist.replace(QRegExp(" "),"+");//seperated by +
+
+// qDebug(symbollist);
+ if (!symbollist.isEmpty()) {
+ pthread_t thread1;
+ pthread_create(&thread1,NULL, (void * (*)(void *))getStocks, &symbollist);
}
+// pthread_join(thread1,NULL);
+// getStocks( symbollist.latin1() );
+}
+
+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);
+// }
+// }
}
@@ -245,3 +277,26 @@ void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) {
killTimer(e->timerId());
+ checkConnection();
+}
+
+void StockTickerPluginWidget::checkConnection() {
+// qDebug("checking connection");
+// Sock = new QSocket( this );
+
+// if( wasError)
+// stocktickerTicker->setText("Checking connection");
+
+// if(Sock->state() == QSocket::Idle) {
+// Sock->connectToHost("finance.yahoo.com", 80);
+// connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) );
+// connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) );
+// } else {
+// qDebug("State is not Idle");
+ isConnected();
+// }
+}
+
+void StockTickerPluginWidget::isConnected() {
+// qDebug("We connect, so ok to grab stocks");
doStocks();
+
Config cfg( "stockticker");
@@ -252,2 +307,22 @@ void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) {
qDebug("timer set for %d",(timerDelay*60000)/60000);
+ wasError = false;
+
+// Sock->close();
+}
+
+void StockTickerPluginWidget::socketError(int errcode) {
+ switch(errcode) {
+ case QSocket::ErrConnectionRefused:
+ output = tr("Connection refused.");
+ break;
+ case QSocket::ErrHostNotFound:
+ output = tr("Could not find server.");
+ break;
+ case QSocket::ErrSocketRead :
+ output = tr("Socket read error.");
+ break;
+ };
+ stocktickerTicker->setText( output );
+ wasError = true;
+// Sock->close();
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
index 26472fa..c8de806 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h
@@ -20,2 +20,3 @@
+#include <qsocket.h>
#include <qstring.h>
@@ -35,8 +36,2 @@
-//#include "ticker.h"
-
-/* extern "C" { */
-/* #include "stocks.h" */
-/* } */
-
class QTimer;
@@ -50,3 +45,2 @@ public:
~StockTickerPluginWidget();
- QString output;
@@ -54,8 +48,10 @@ protected slots:
void doStocks();
-
+ void isConnected();
+ void socketError(int);
+ void checkConnection();
private:
- OTicker *stocktickerTicker;
+ bool wasError;
+ QSocket *Sock;
void timerEvent( QTimerEvent * );
void init();
- void getStocks( const char *stock_liste);
void DefProxy(void);