5 files changed, 61 insertions, 33 deletions
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index 71dd7eb..73f8bb3 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -11,2 +11,3 @@ | |||
11 | #include <qlabel.h> | 11 | #include <qlabel.h> |
12 | #include <qlayout.h> | ||
12 | #include <qpe/config.h> | 13 | #include <qpe/config.h> |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp index d740b6f..915233a 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp | |||
@@ -123,3 +123,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
123 | cfg.setGroup("Timer"); | 123 | cfg.setGroup("Timer"); |
124 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",0)); | 124 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",15)); |
125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); | 125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h index 2b67a8b..10f9678 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h | |||
@@ -30,3 +30,3 @@ class QSpinBox; | |||
30 | class StocktickerPluginConfig : public TodayConfigWidget { | 30 | class StocktickerPluginConfig : public TodayConfigWidget { |
31 | //Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index c3ca52d..fedc79c 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -32,2 +32,6 @@ QString output; | |||
32 | OTicker *stocktickerTicker; | 32 | OTicker *stocktickerTicker; |
33 | QCString stock_liste; | ||
34 | bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck; | ||
35 | bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck; | ||
36 | bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck; | ||
33 | 37 | ||
@@ -38,16 +42,15 @@ void getStocks(char *blah) { | |||
38 | stock *stocks_tmp; | 42 | stock *stocks_tmp; |
39 | QCString stock_liste = blah; | 43 | stock_liste = blah; |
40 | ::free ( blah ); | 44 | ::free ( blah ); |
41 | // char *stock_liste = (char *)blah->latin1(); | 45 | // char *stock_liste = (char *)blah->latin1(); |
42 | qDebug("%s", stock_liste.data() ); | 46 | // qDebug("%s", stock_liste.data() ); |
43 | QString tempString; | ||
44 | output = ""; | 47 | output = ""; |
45 | 48 | QString tempString; | |
46 | libstocks_return_code error; | 49 | libstocks_return_code error; |
47 | 50 | ||
48 | Config cfg( "stockticker"); | 51 | // Config cfg( "stockticker"); |
49 | cfg.setGroup( "Fields" ); | 52 | // cfg.setGroup( "Fields" ); |
50 | bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck; | 53 | // bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck; |
51 | bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck; | 54 | // bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck; |
52 | bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck; | 55 | // bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck; |
53 | 56 | ||
@@ -55,18 +58,30 @@ void getStocks(char *blah) { | |||
55 | 58 | ||
56 | dotimeCheck=cfg.readBoolEntry("timeCheck",1); | 59 | dotimeCheck=1; |
57 | dodateCheck=cfg.readBoolEntry("dateCheck",1); | 60 | dodateCheck=1; |
58 | dosymbolCheck=cfg.readBoolEntry("symbolCheck",1); | 61 | dosymbolCheck=1; |
59 | donameCheck=cfg.readBoolEntry("nameCheck",1); | 62 | donameCheck=1; |
60 | docurrentPriceCheck=cfg.readBoolEntry("currentPriceCheck",1); | 63 | docurrentPriceCheck=1; |
61 | dolastPriceCheck=cfg.readBoolEntry("lastPriceCheck",1); | 64 | dolastPriceCheck=1; |
62 | doopenPriceCheck=cfg.readBoolEntry("openPriceCheck",1); | 65 | doopenPriceCheck=1; |
63 | dominPriceCheck=cfg.readBoolEntry("minPriceCheck",1); | 66 | dominPriceCheck=1; |
64 | domaxPriceCheck=cfg.readBoolEntry("maxPriceCheck",1); | 67 | domaxPriceCheck=1; |
65 | dovariationCheck=cfg.readBoolEntry("variationCheck",1); | 68 | dovariationCheck=1; |
66 | dovolumeCheck=cfg.readBoolEntry("volumeCheck",1); | 69 | dovolumeCheck=1; |
70 | |||
71 | // dotimeCheck=cfg.readBoolEntry("timeCheck",1); | ||
72 | // dodateCheck=cfg.readBoolEntry("dateCheck",1); | ||
73 | // dosymbolCheck=cfg.readBoolEntry("symbolCheck",1); | ||
74 | // donameCheck=cfg.readBoolEntry("nameCheck",1); | ||
75 | // docurrentPriceCheck=cfg.readBoolEntry("currentPriceCheck",1); | ||
76 | // dolastPriceCheck=cfg.readBoolEntry("lastPriceCheck",1); | ||
77 | // doopenPriceCheck=cfg.readBoolEntry("openPriceCheck",1); | ||
78 | // dominPriceCheck=cfg.readBoolEntry("minPriceCheck",1); | ||
79 | // domaxPriceCheck=cfg.readBoolEntry("maxPriceCheck",1); | ||
80 | // dovariationCheck=cfg.readBoolEntry("variationCheck",1); | ||
81 | // dovolumeCheck=cfg.readBoolEntry("volumeCheck",1); | ||
67 | 82 | ||
68 | // DefProxy(); | 83 | // DefProxy(); |
69 | { | 84 | // { |
70 | char *proxy; | 85 | char *proxy; |
71 | libstocks_return_code error; | 86 | // libstocks_return_code error; |
72 | 87 | ||
@@ -79,6 +94,7 @@ void getStocks(char *blah) { | |||
79 | if (error) { | 94 | if (error) { |
80 | printf("Proxy error (%d)\n", error); | 95 | // printf("Proxy error (%d)\n", error); |
81 | QString tempString; | 96 | // QString tempString2; |
82 | tempString.sprintf("Proxy error (%d)\n", error); | 97 | // tempString2.sprintf("Proxy error (%d)\n", error); |
83 | output = tempString; | 98 | // output = tempString2; |
99 | // delete tempString2; | ||
84 | return; | 100 | return; |
@@ -87,4 +103,4 @@ void getStocks(char *blah) { | |||
87 | } | 103 | } |
88 | } | 104 | ::free(proxy); |
89 | // char *stock_liste = (char *)blah; | 105 | // } |
90 | /* Get the stocks and process errors */ | 106 | /* Get the stocks and process errors */ |
@@ -97,3 +113,2 @@ void getStocks(char *blah) { | |||
97 | return; | 113 | return; |
98 | // exit(1); | ||
99 | } | 114 | } |
@@ -201,6 +216,12 @@ void getStocks(char *blah) { | |||
201 | 216 | ||
217 | stocktickerTicker->setText( output.latin1() ); | ||
218 | |||
202 | /* frees stocks */ | 219 | /* frees stocks */ |
203 | free_stocks(stocks_quotes); | 220 | free_stocks(stocks_quotes); |
204 | stocktickerTicker->setText( output.latin1() ); | 221 | free_stocks(stocks_tmp); |
205 | 222 | ||
223 | stock_liste=""; | ||
224 | //delete stock_liste; | ||
225 | tempString=""; | ||
226 | output=""; | ||
206 | } | 227 | } |
@@ -244,2 +265,6 @@ void StockTickerPluginWidget::doStocks() { | |||
244 | pthread_create(&thread1,NULL, (void * (*)(void *))getStocks, (void *) blah); | 265 | pthread_create(&thread1,NULL, (void * (*)(void *))getStocks, (void *) blah); |
266 | pthread_detach( thread1); | ||
267 | |||
268 | //::free((void*)thread1); | ||
269 | //getStocks(blah); | ||
245 | } | 270 | } |
@@ -271,2 +296,3 @@ void StockTickerPluginWidget::isConnected() { | |||
271 | // qDebug("We connect, so ok to grab stocks"); | 296 | // qDebug("We connect, so ok to grab stocks"); |
297 | if(this->isVisible()) | ||
272 | doStocks(); | 298 | doStocks(); |
@@ -278,3 +304,3 @@ void StockTickerPluginWidget::isConnected() { | |||
278 | startTimer(timerDelay*60000); | 304 | startTimer(timerDelay*60000); |
279 | qDebug("timer set for %d",(timerDelay*60000)/60000); | 305 | // qDebug("timer set for %d",(timerDelay*60000)/60000); |
280 | wasError = false; | 306 | wasError = false; |
diff --git a/noncore/todayplugins/weather/weatherconfig.h b/noncore/todayplugins/weather/weatherconfig.h index 3877818..d9ffec2 100644 --- a/noncore/todayplugins/weather/weatherconfig.h +++ b/noncore/todayplugins/weather/weatherconfig.h | |||
@@ -43,2 +43,3 @@ class WeatherPluginConfig : public TodayConfigWidget | |||
43 | { | 43 | { |
44 | Q_OBJECT | ||
44 | public: | 45 | public: |