Diffstat (limited to 'noncore/todayplugins/stockticker') (more/less context) (ignore whitespace changes)
11 files changed, 43 insertions, 45 deletions
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in index 83e7fbd..f0fd4aa 100644 --- a/noncore/todayplugins/stockticker/config.in +++ b/noncore/todayplugins/stockticker/config.in | |||
@@ -2,5 +2,5 @@ | |||
2 | boolean "opie-today-stocktickerplugin (stock ticker)" | 2 | boolean "opie-today-stocktickerplugin (stock ticker)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY |
5 | 5 | ||
6 | source noncore/todayplugins/stockticker/stockticker/config.in | 6 | source noncore/todayplugins/stockticker/stockticker/config.in |
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control index 3e3bad1..f04ad64 100644 --- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control +++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control | |||
@@ -5,5 +5,5 @@ Section: opie/plugins | |||
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: libqte2, opie-today | 7 | Depends: libqte2, libopiecore2, libopiepim2, libopieui2, opie-today |
8 | Description: Stock ticker plugin for Today | 8 | Description: Stock ticker plugin for Today |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/todayplugins/stockticker/stockticker/config.in b/noncore/todayplugins/stockticker/stockticker/config.in index d9e0f1f..1252b63 100644 --- a/noncore/todayplugins/stockticker/stockticker/config.in +++ b/noncore/todayplugins/stockticker/stockticker/config.in | |||
@@ -3,3 +3,3 @@ config TODAY_STOCKTICKERSUB | |||
3 | depends TODAY_STOCKTICKERLIB | 3 | depends TODAY_STOCKTICKERLIB |
4 | default "y" if TODAY_STOCKTICKER | 4 | default "y" if TODAY_STOCKTICKER |
5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && TODAY |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index 64798f4..b3fa708 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -2,5 +2,4 @@ | |||
2 | 2 | ||
3 | #include <qapplication.h> | 3 | #include <qapplication.h> |
4 | |||
5 | #include <qlayout.h> | 4 | #include <qlayout.h> |
6 | #include <qcheckbox.h> | 5 | #include <qcheckbox.h> |
@@ -16,6 +15,4 @@ | |||
16 | #include "helpwindow.h" | 15 | #include "helpwindow.h" |
17 | 16 | ||
18 | #include <opie/oprocess.h> | ||
19 | |||
20 | #include <stdlib.h> | 17 | #include <stdlib.h> |
21 | // #include <sys/stat.h> | 18 | // #include <sys/stat.h> |
@@ -32,7 +29,7 @@ InputDialog::InputDialog( ) | |||
32 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 29 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
33 | LineEdit1->setFocus(); | 30 | LineEdit1->setFocus(); |
34 | 31 | ||
35 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); | 32 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); |
36 | 33 | ||
37 | QLabel *label; | 34 | QLabel *label; |
38 | label = new QLabel(this); | 35 | label = new QLabel(this); |
@@ -63,5 +60,5 @@ void InputDialog::doLookup() { | |||
63 | proc << "/usr/bin/wget"; | 60 | proc << "/usr/bin/wget"; |
64 | proc<<"-O"<< tempHtml<< url; | 61 | proc<<"-O"<< tempHtml<< url; |
65 | 62 | ||
66 | connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); | 63 | connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); |
67 | proc.start( OProcess::NotifyOnExit); | 64 | proc.start( OProcess::NotifyOnExit); |
@@ -73,6 +70,6 @@ void InputDialog::doLookup() { | |||
73 | StockLookup->show(); | 70 | StockLookup->show(); |
74 | LineEdit1->text(); | 71 | LineEdit1->text(); |
75 | 72 | ||
76 | 73 | ||
77 | } | 74 | } |
78 | 75 | ||
@@ -80,5 +77,5 @@ void InputDialog::showBrowser(OProcess*) { | |||
80 | qDebug("BLAH"); | 77 | qDebug("BLAH"); |
81 | QString tempHtml = "/tmp/stockticker.html"; | 78 | QString tempHtml = "/tmp/stockticker.html"; |
82 | 79 | ||
83 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); | 80 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); |
84 | StockLookup->setCaption("Symbol"); | 81 | StockLookup->setCaption("Symbol"); |
@@ -86,4 +83,4 @@ void InputDialog::showBrowser(OProcess*) { | |||
86 | StockLookup->show(); | 83 | StockLookup->show(); |
87 | LineEdit1->text(); | 84 | LineEdit1->text(); |
88 | 85 | ||
89 | } | 86 | } |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.h b/noncore/todayplugins/stockticker/stockticker/inputDialog.h index 15c2f22..a1c00bd 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.h +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.h | |||
@@ -3,8 +3,9 @@ | |||
3 | #define INPUTDIALOG_H | 3 | #define INPUTDIALOG_H |
4 | 4 | ||
5 | #include <opie2/oprocess.h> | ||
6 | |||
5 | #include <qvariant.h> | 7 | #include <qvariant.h> |
6 | #include <qdialog.h> | 8 | #include <qdialog.h> |
7 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
8 | #include <opie/oprocess.h> | ||
9 | 10 | ||
10 | class QLineEdit; | 11 | class QLineEdit; |
@@ -17,12 +18,12 @@ public: | |||
17 | InputDialog( ); | 18 | InputDialog( ); |
18 | ~InputDialog(); | 19 | ~InputDialog(); |
19 | 20 | ||
20 | private: | 21 | private: |
21 | QLineEdit* LineEdit1; | 22 | QLineEdit* LineEdit1; |
22 | private slots: | 23 | private slots: |
23 | void doLookup(); | 24 | void doLookup(); |
24 | void showBrowser(OProcess*); | 25 | void showBrowser(OProcess*); |
25 | protected slots: | 26 | protected slots: |
26 | 27 | ||
27 | }; | 28 | }; |
28 | 29 | ||
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro index 38a9425..a33c877 100644 --- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro +++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro | |||
@@ -3,9 +3,9 @@ CONFIG = qt warn_on release | |||
3 | HEADERS = inputDialog.h helpwindow.h | 3 | HEADERS = inputDialog.h helpwindow.h |
4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp | 4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp |
5 | INTERFACES = | 5 | INTERFACES = |
6 | TARGET = stockticker | 6 | TARGET = stockticker |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS+= -lqpe -lopie | 9 | LIBS+= -lqpe -lopiecore2 |
10 | DESTDIR = $(OPIEDIR)/bin | 10 | DESTDIR = $(OPIEDIR)/bin |
11 | 11 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp index 915233a..009d390 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp | |||
@@ -16,10 +16,10 @@ | |||
16 | 16 | ||
17 | #include "stocktickerconfig.h" | 17 | #include "stocktickerconfig.h" |
18 | #include <opie/todayconfigwidget.h> | 18 | |
19 | #include <opie2/todayconfigwidget.h> | ||
19 | 20 | ||
20 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
21 | 22 | ||
22 | #include <qapplication.h> | 23 | #include <qapplication.h> |
23 | |||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
@@ -45,7 +45,7 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
45 | LineEdit1->setFocus(); | 45 | LineEdit1->setFocus(); |
46 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); | 46 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); |
47 | 47 | ||
48 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); | 48 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); |
49 | 49 | ||
50 | Config cfg( "stockticker"); | 50 | Config cfg( "stockticker"); |
51 | cfg.setGroup( "Symbols" ); | 51 | cfg.setGroup( "Symbols" ); |
@@ -53,5 +53,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
53 | symbollist = cfg.readEntry("Symbols", ""); | 53 | symbollist = cfg.readEntry("Symbols", ""); |
54 | LineEdit1->setText(symbollist); | 54 | LineEdit1->setText(symbollist); |
55 | 55 | ||
56 | QLabel *label; | 56 | QLabel *label; |
57 | label = new QLabel(this); | 57 | label = new QLabel(this); |
@@ -66,10 +66,10 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
66 | layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 ); | 66 | layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 ); |
67 | QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); | 67 | QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); |
68 | 68 | ||
69 | dateCheck= new QCheckBox ( "Date", this ); | 69 | dateCheck= new QCheckBox ( "Date", this ); |
70 | dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1)); | 70 | dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1)); |
71 | layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 ); | 71 | layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 ); |
72 | QWhatsThis::add(dateCheck, tr("Toggles date field")); | 72 | QWhatsThis::add(dateCheck, tr("Toggles date field")); |
73 | 73 | ||
74 | symbolCheck= new QCheckBox ( "Symbol", this ); | 74 | symbolCheck= new QCheckBox ( "Symbol", this ); |
75 | symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1)); | 75 | symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1)); |
@@ -124,5 +124,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
124 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",15)); | 124 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",15)); |
125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); | 125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); |
126 | 126 | ||
127 | QLabel *label2; | 127 | QLabel *label2; |
128 | label2 = new QLabel(this); | 128 | label2 = new QLabel(this); |
@@ -138,5 +138,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
138 | scrollSpeed->setValue( cfg.readNumEntry("ScrollSpeed",50)); | 138 | scrollSpeed->setValue( cfg.readNumEntry("ScrollSpeed",50)); |
139 | layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); | 139 | layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); |
140 | 140 | ||
141 | QLabel *label3; | 141 | QLabel *label3; |
142 | label3 = new QLabel(this); | 142 | label3 = new QLabel(this); |
@@ -152,5 +152,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
152 | scrollLength->setValue( cfg.readNumEntry("ScrollLength",1)); | 152 | scrollLength->setValue( cfg.readNumEntry("ScrollLength",1)); |
153 | layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); | 153 | layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); |
154 | 154 | ||
155 | QLabel *label4; | 155 | QLabel *label4; |
156 | label4 = new QLabel(this); | 156 | label4 = new QLabel(this); |
@@ -158,10 +158,10 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
158 | label4->setMaximumHeight(60); | 158 | label4->setMaximumHeight(60); |
159 | layout->addMultiCellWidget( label4, 8, 8, 1, 2); | 159 | layout->addMultiCellWidget( label4, 8, 8, 1, 2); |
160 | 160 | ||
161 | // lookupButton = new QPushButton(this, "LookupButton"); | 161 | // lookupButton = new QPushButton(this, "LookupButton"); |
162 | // lookupButton->setText(tr("Symbol Lookup")); | 162 | // lookupButton->setText(tr("Symbol Lookup")); |
163 | // connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup())); | 163 | // connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup())); |
164 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); | 164 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); |
165 | 165 | ||
166 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 166 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
167 | layout->addItem( spacer, 9, 0 ); | 167 | layout->addItem( spacer, 9, 0 ); |
@@ -193,5 +193,5 @@ void StocktickerPluginConfig::writeConfig() { | |||
193 | cfg.writeEntry("ScrollLength",scrollLength->value()); | 193 | cfg.writeEntry("ScrollLength",scrollLength->value()); |
194 | cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); | 194 | cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); |
195 | 195 | ||
196 | cfg.write(); | 196 | cfg.write(); |
197 | } | 197 | } |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h index 10f9678..3c852ce 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #define STOCKTICKER_PLUGIN_CONFIG_H | 18 | #define STOCKTICKER_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include <opie2/todayconfigwidget.h> | ||
21 | |||
20 | #include <qwidget.h> | 22 | #include <qwidget.h> |
21 | #include <opie/todayconfigwidget.h> | ||
22 | #include <qstring.h> | 23 | #include <qstring.h> |
23 | 24 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro index bb22b4e..baf6430 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro | |||
@@ -21,5 +21,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
21 | ../ ../library | 21 | ../ ../library |
22 | 22 | ||
23 | LIBS+= -lqpe -lopie -lpthread | 23 | LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread |
24 | TMAKE_CFLAGS += -D__UNIX__ | 24 | TMAKE_CFLAGS += -D__UNIX__ |
25 | 25 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h index e88c687..42af821 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h | |||
@@ -19,12 +19,11 @@ | |||
19 | #define STOCKTICKER_PLUGIN_H | 19 | #define STOCKTICKER_PLUGIN_H |
20 | 20 | ||
21 | #include <opie2/oclickablelabel.h> | ||
22 | #include <opie2/todayplugininterface.h> | ||
23 | #include <opie2/todayconfigwidget.h> | ||
24 | |||
21 | #include <qstring.h> | 25 | #include <qstring.h> |
22 | #include <qwidget.h> | 26 | #include <qwidget.h> |
23 | 27 | ||
24 | #include <opie/oclickablelabel.h> | ||
25 | |||
26 | #include <opie/todayplugininterface.h> | ||
27 | #include <opie/todayconfigwidget.h> | ||
28 | |||
29 | class StockTickerPlugin : public TodayPluginObject { | 28 | class StockTickerPlugin : public TodayPluginObject { |
30 | 29 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index fedc79c..51113ba 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -15,11 +15,11 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include <qlayout.h> | 17 | #include <opie2/oticker.h> |
18 | 18 | ||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | 20 | ||
21 | #include <opie/oticker.h> | 21 | #include <qlayout.h> |
22 | 22 | ||
23 | extern "C" { | 23 | extern "C" { |
24 | #include "libstocks/stocks.h" | 24 | #include "libstocks/stocks.h" |
25 | } | 25 | } |
@@ -211,5 +211,5 @@ void getStocks(char *blah) { | |||
211 | output +=tempString; | 211 | output +=tempString; |
212 | 212 | ||
213 | /* Simple function which help to browse in the stocks list */ | 213 | /* Simple function which help to browse in the stocks list */ |
214 | stocks_tmp = next_stock(stocks_tmp); | 214 | stocks_tmp = next_stock(stocks_tmp); |
215 | } | 215 | } |
@@ -283,5 +283,5 @@ void getStocks(char *blah) { | |||
283 | // stocktickerTicker->setText("Checking connection"); | 283 | // stocktickerTicker->setText("Checking connection"); |
284 | 284 | ||
285 | // if(Sock->state() == QSocket::Idle) { | 285 | // if(Sock->state() == QSocket::Idle) { |
286 | // Sock->connectToHost("finance.yahoo.com", 80); | 286 | // Sock->connectToHost("finance.yahoo.com", 80); |
287 | // connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) ); | 287 | // connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) ); |