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 | |||
@@ -1,7 +1,7 @@ | |||
1 | config TODAY_STOCKTICKER | 1 | config TODAY_STOCKTICKER |
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 |
7 | source noncore/todayplugins/stockticker/stocktickerlib/config.in | 7 | source noncore/todayplugins/stockticker/stocktickerlib/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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-today-stocktickerplugin | 1 | Package: opie-today-stocktickerplugin |
2 | Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png | 2 | Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/plugins | 4 | 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | config TODAY_STOCKTICKERSUB | 1 | config TODAY_STOCKTICKERSUB |
2 | boolean | 2 | boolean |
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 | |||
@@ -1,48 +1,45 @@ | |||
1 | #include "inputDialog.h" | 1 | #include "inputDialog.h" |
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> |
7 | #include <qlineedit.h> | 6 | #include <qlineedit.h> |
8 | #include <qvariant.h> | 7 | #include <qvariant.h> |
9 | #include <qpushbutton.h> | 8 | #include <qpushbutton.h> |
10 | #include <qwhatsthis.h> | 9 | #include <qwhatsthis.h> |
11 | #include <qlabel.h> | 10 | #include <qlabel.h> |
12 | #include <qlayout.h> | 11 | #include <qlayout.h> |
13 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
14 | #include <qstringlist.h> | 13 | #include <qstringlist.h> |
15 | #include <qmainwindow.h> | 14 | #include <qmainwindow.h> |
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> |
22 | // #include <unistd.h> | 19 | // #include <unistd.h> |
23 | 20 | ||
24 | InputDialog::InputDialog( ) | 21 | InputDialog::InputDialog( ) |
25 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { | 22 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { |
26 | setCaption( tr("Symbol Lookup")); | 23 | setCaption( tr("Symbol Lookup")); |
27 | 24 | ||
28 | QGridLayout *layout = new QGridLayout( this ); | 25 | QGridLayout *layout = new QGridLayout( this ); |
29 | layout->setSpacing(6); | 26 | layout->setSpacing(6); |
30 | layout->setMargin( 2); | 27 | layout->setMargin( 2); |
31 | 28 | ||
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); |
39 | label->setText( tr("Enter something to lookup / search.")); | 36 | label->setText( tr("Enter something to lookup / search.")); |
40 | label->setMaximumHeight(60); | 37 | label->setMaximumHeight(60); |
41 | layout->addMultiCellWidget( label, 1, 1, 0, 3); | 38 | layout->addMultiCellWidget( label, 1, 1, 0, 3); |
42 | 39 | ||
43 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(doLookup())); | 40 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(doLookup())); |
44 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 41 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
45 | layout->addItem( spacer, 8, 0 ); | 42 | layout->addItem( spacer, 8, 0 ); |
46 | 43 | ||
47 | } | 44 | } |
48 | 45 | ||
@@ -53,37 +50,37 @@ void InputDialog::doLookup() { | |||
53 | // http://finance.yahoo.com/l?m=&s=siemens&t= | 50 | // http://finance.yahoo.com/l?m=&s=siemens&t= |
54 | 51 | ||
55 | QString url = "\"http://finance.yahoo.com/l?m=&s="+LineEdit1->text()+"\""; | 52 | QString url = "\"http://finance.yahoo.com/l?m=&s="+LineEdit1->text()+"\""; |
56 | QString tempHtml = "/tmp/stockticker.html"; | 53 | QString tempHtml = "/tmp/stockticker.html"; |
57 | QString cmd = "wget -O "+tempHtml+" "+url; | 54 | QString cmd = "wget -O "+tempHtml+" "+url; |
58 | qDebug(cmd); | 55 | qDebug(cmd); |
59 | 56 | ||
60 | 57 | ||
61 | /* | 58 | /* |
62 | OProcess proc; | 59 | OProcess proc; |
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); |
68 | */ | 65 | */ |
69 | system(cmd.latin1()); | 66 | system(cmd.latin1()); |
70 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); | 67 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); |
71 | StockLookup->setCaption("Symbol"); | 68 | StockLookup->setCaption("Symbol"); |
72 | StockLookup->showMaximized(); | 69 | StockLookup->showMaximized(); |
73 | StockLookup->show(); | 70 | StockLookup->show(); |
74 | LineEdit1->text(); | 71 | LineEdit1->text(); |
75 | 72 | ||
76 | 73 | ||
77 | } | 74 | } |
78 | 75 | ||
79 | void InputDialog::showBrowser(OProcess*) { | 76 | 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"); |
85 | StockLookup->showMaximized(); | 82 | StockLookup->showMaximized(); |
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 | |||
@@ -1,29 +1,30 @@ | |||
1 | 1 | ||
2 | #ifndef INPUTDIALOG_H | 2 | #ifndef INPUTDIALOG_H |
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; |
11 | class QCheckBox; | 12 | class QCheckBox; |
12 | 13 | ||
13 | class InputDialog : public QMainWindow { | 14 | class InputDialog : public QMainWindow { |
14 | Q_OBJECT | 15 | Q_OBJECT |
15 | 16 | ||
16 | public: | 17 | 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 | ||
29 | #endif // INPUTDIALOG_H | 30 | #endif // INPUTDIALOG_H |
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 | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on release | 2 | 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 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -6,80 +6,80 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
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> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qlineedit.h> | 27 | #include <qlineedit.h> |
28 | #include <qvariant.h> | 28 | #include <qvariant.h> |
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | #include <qwhatsthis.h> | 30 | #include <qwhatsthis.h> |
31 | #include <qlabel.h> | 31 | #include <qlabel.h> |
32 | #include <qstringlist.h> | 32 | #include <qstringlist.h> |
33 | #include <qmainwindow.h> | 33 | #include <qmainwindow.h> |
34 | 34 | ||
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | 36 | ||
37 | StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* name) | 37 | StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* name) |
38 | : TodayConfigWidget(parent, name ) { | 38 | : TodayConfigWidget(parent, name ) { |
39 | 39 | ||
40 | QGridLayout *layout = new QGridLayout( this ); | 40 | QGridLayout *layout = new QGridLayout( this ); |
41 | layout->setSpacing(2); | 41 | layout->setSpacing(2); |
42 | layout->setMargin( 2); | 42 | layout->setMargin( 2); |
43 | 43 | ||
44 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 44 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
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" ); |
52 | QString symbollist; | 52 | QString symbollist; |
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); |
58 | label->setText( tr("Enter stock symbols seperated\nby a space.")); | 58 | label->setText( tr("Enter stock symbols seperated\nby a space.")); |
59 | label->setMaximumHeight(60); | 59 | label->setMaximumHeight(60); |
60 | layout->addMultiCellWidget( label, 1, 1, 0, 4); | 60 | layout->addMultiCellWidget( label, 1, 1, 0, 4); |
61 | 61 | ||
62 | cfg.setGroup( "Fields" ); | 62 | cfg.setGroup( "Fields" ); |
63 | 63 | ||
64 | timeCheck= new QCheckBox ( "Time",this ); | 64 | timeCheck= new QCheckBox ( "Time",this ); |
65 | timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1)); | 65 | timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1)); |
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)); |
76 | layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 ); | 76 | layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 ); |
77 | QWhatsThis::add(symbolCheck, tr("Toggles Symbol field")); | 77 | QWhatsThis::add(symbolCheck, tr("Toggles Symbol field")); |
78 | 78 | ||
79 | nameCheck= new QCheckBox ( "Name", this ); | 79 | nameCheck= new QCheckBox ( "Name", this ); |
80 | nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1)); | 80 | nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1)); |
81 | layout->addMultiCellWidget( nameCheck, 3, 3, 0, 0 ); | 81 | layout->addMultiCellWidget( nameCheck, 3, 3, 0, 0 ); |
82 | QWhatsThis::add(nameCheck, tr("Toggles Name of symbols owner field")); | 82 | QWhatsThis::add(nameCheck, tr("Toggles Name of symbols owner field")); |
83 | 83 | ||
84 | currentPriceCheck= new QCheckBox ( "Price", this ); | 84 | currentPriceCheck= new QCheckBox ( "Price", this ); |
85 | currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1)); | 85 | currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1)); |
@@ -114,64 +114,64 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
114 | volumeCheck= new QCheckBox ( "Volume", this ); | 114 | volumeCheck= new QCheckBox ( "Volume", this ); |
115 | volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1)); | 115 | volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1)); |
116 | layout->addMultiCellWidget( volumeCheck , 5, 5, 1, 1); | 116 | layout->addMultiCellWidget( volumeCheck , 5, 5, 1, 1); |
117 | QWhatsThis::add(volumeCheck, tr("Toggles volume of trading field")); | 117 | QWhatsThis::add(volumeCheck, tr("Toggles volume of trading field")); |
118 | 118 | ||
119 | timerDelaySpin = new QSpinBox( this, "timer spin" ); | 119 | timerDelaySpin = new QSpinBox( this, "timer spin" ); |
120 | QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) ); | 120 | QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) ); |
121 | timerDelaySpin->setMaxValue( 60); | 121 | timerDelaySpin->setMaxValue( 60); |
122 | 122 | ||
123 | cfg.setGroup("Timer"); | 123 | cfg.setGroup("Timer"); |
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); |
129 | label2->setText( tr("Minutes between lookups.")); | 129 | label2->setText( tr("Minutes between lookups.")); |
130 | label2->setMaximumHeight(60); | 130 | label2->setMaximumHeight(60); |
131 | layout->addMultiCellWidget( label2, 6, 6, 1, 2); | 131 | layout->addMultiCellWidget( label2, 6, 6, 1, 2); |
132 | 132 | ||
133 | scrollSpeed = new QSpinBox( this, "Scrollspin" ); | 133 | scrollSpeed = new QSpinBox( this, "Scrollspin" ); |
134 | QWhatsThis::add( timerDelaySpin , tr( "Speed of scrolling action, in milliseconds" ) ); | 134 | QWhatsThis::add( timerDelaySpin , tr( "Speed of scrolling action, in milliseconds" ) ); |
135 | scrollSpeed->setMaxValue( 1000); | 135 | scrollSpeed->setMaxValue( 1000); |
136 | scrollSpeed->setSteps(50,50); | 136 | scrollSpeed->setSteps(50,50); |
137 | cfg.setGroup("Timer"); | 137 | cfg.setGroup("Timer"); |
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); |
143 | label3->setText( tr("Scroll Speed, in milliseconds")); | 143 | label3->setText( tr("Scroll Speed, in milliseconds")); |
144 | label3->setMaximumHeight(60); | 144 | label3->setMaximumHeight(60); |
145 | layout->addMultiCellWidget( label3, 7, 7, 1, 2); | 145 | layout->addMultiCellWidget( label3, 7, 7, 1, 2); |
146 | 146 | ||
147 | scrollLength = new QSpinBox( this, "ScrollLength" ); | 147 | scrollLength = new QSpinBox( this, "ScrollLength" ); |
148 | QWhatsThis::add( timerDelaySpin , tr( "Length of scrolling" ) ); | 148 | QWhatsThis::add( timerDelaySpin , tr( "Length of scrolling" ) ); |
149 | scrollLength->setMaxValue( 10); | 149 | scrollLength->setMaxValue( 10); |
150 | // scrollLength->setSteps(5,5); | 150 | // scrollLength->setSteps(5,5); |
151 | cfg.setGroup("Timer"); | 151 | cfg.setGroup("Timer"); |
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); |
157 | label4->setText( tr("Scroll Length")); | 157 | label4->setText( tr("Scroll Length")); |
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 ); |
168 | 168 | ||
169 | } | 169 | } |
170 | 170 | ||
171 | 171 | ||
172 | void StocktickerPluginConfig::writeConfig() { | 172 | void StocktickerPluginConfig::writeConfig() { |
173 | Config cfg( "stockticker"); | 173 | Config cfg( "stockticker"); |
174 | cfg.setGroup( "Symbols" ); | 174 | cfg.setGroup( "Symbols" ); |
175 | QString outText = text().upper(); | 175 | QString outText = text().upper(); |
176 | outText.stripWhiteSpace(); | 176 | outText.stripWhiteSpace(); |
177 | cfg.writeEntry("Symbols", outText ); | 177 | cfg.writeEntry("Symbols", outText ); |
@@ -183,25 +183,25 @@ void StocktickerPluginConfig::writeConfig() { | |||
183 | cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked()); | 183 | cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked()); |
184 | cfg.writeEntry("lastPriceCheck",lastPriceCheck->isChecked()); | 184 | cfg.writeEntry("lastPriceCheck",lastPriceCheck->isChecked()); |
185 | cfg.writeEntry("openPriceCheck",openPriceCheck->isChecked()); | 185 | cfg.writeEntry("openPriceCheck",openPriceCheck->isChecked()); |
186 | cfg.writeEntry("minPriceCheck",minPriceCheck->isChecked()); | 186 | cfg.writeEntry("minPriceCheck",minPriceCheck->isChecked()); |
187 | cfg.writeEntry("maxPriceCheck",maxPriceCheck->isChecked()); | 187 | cfg.writeEntry("maxPriceCheck",maxPriceCheck->isChecked()); |
188 | cfg.writeEntry("variationCheck",variationCheck->isChecked()); | 188 | cfg.writeEntry("variationCheck",variationCheck->isChecked()); |
189 | cfg.writeEntry("volumeCheck",volumeCheck->isChecked()); | 189 | cfg.writeEntry("volumeCheck",volumeCheck->isChecked()); |
190 | 190 | ||
191 | cfg.setGroup("Timer"); | 191 | cfg.setGroup("Timer"); |
192 | cfg.writeEntry("Delay",timerDelaySpin->value()); | 192 | cfg.writeEntry("Delay",timerDelaySpin->value()); |
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 | } |
198 | 198 | ||
199 | StocktickerPluginConfig::~StocktickerPluginConfig() { | 199 | StocktickerPluginConfig::~StocktickerPluginConfig() { |
200 | } | 200 | } |
201 | 201 | ||
202 | QString StocktickerPluginConfig::text() const { | 202 | QString StocktickerPluginConfig::text() const { |
203 | return LineEdit1->text(); | 203 | return LineEdit1->text(); |
204 | } | 204 | } |
205 | 205 | ||
206 | void StocktickerPluginConfig::doLookup() { | 206 | void StocktickerPluginConfig::doLookup() { |
207 | 207 | ||
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 | |||
@@ -8,26 +8,27 @@ | |||
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef STOCKTICKER_PLUGIN_CONFIG_H | 17 | #ifndef STOCKTICKER_PLUGIN_CONFIG_H |
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 | ||
24 | class QLineEdit; | 25 | class QLineEdit; |
25 | class QCheckBox; | 26 | class QCheckBox; |
26 | class QPushButton; | 27 | class QPushButton; |
27 | class QCheckBox; | 28 | class QCheckBox; |
28 | class QSpinBox; | 29 | class QSpinBox; |
29 | 30 | ||
30 | class StocktickerPluginConfig : public TodayConfigWidget { | 31 | class StocktickerPluginConfig : public TodayConfigWidget { |
31 | Q_OBJECT | 32 | Q_OBJECT |
32 | public: | 33 | public: |
33 | StocktickerPluginConfig( QWidget *parent, const char *name ); | 34 | StocktickerPluginConfig( QWidget *parent, const char *name ); |
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 | |||
@@ -11,19 +11,19 @@ SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidge | |||
11 | ../libstocks/csv.c \ | 11 | ../libstocks/csv.c \ |
12 | ../libstocks/currency.c \ | 12 | ../libstocks/currency.c \ |
13 | ../libstocks/history.c \ | 13 | ../libstocks/history.c \ |
14 | ../libstocks/http.c \ | 14 | ../libstocks/http.c \ |
15 | ../libstocks/lists.c \ | 15 | ../libstocks/lists.c \ |
16 | ../libstocks/stocks.c | 16 | ../libstocks/stocks.c |
17 | 17 | ||
18 | INCLUDEPATH += $(OPIEDIR)/include \ | 18 | INCLUDEPATH += $(OPIEDIR)/include \ |
19 | ../ ../library | 19 | ../ ../library |
20 | DEPENDPATH += $(OPIEDIR)/include \ | 20 | 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 | ||
26 | DESTDIR = $(OPIEDIR)/plugins/today | 26 | DESTDIR = $(OPIEDIR)/plugins/today |
27 | TARGET = todaystocktickerplugin | 27 | TARGET = todaystocktickerplugin |
28 | 28 | ||
29 | include ( $(OPIEDIR)/include.pro ) | 29 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -9,32 +9,31 @@ | |||
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | #ifndef STOCKTICKER_PLUGIN_H | 18 | #ifndef STOCKTICKER_PLUGIN_H |
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 | ||
31 | public: | 30 | public: |
32 | StockTickerPlugin(); | 31 | StockTickerPlugin(); |
33 | ~StockTickerPlugin(); | 32 | ~StockTickerPlugin(); |
34 | 33 | ||
35 | QString pluginName() const; | 34 | QString pluginName() const; |
36 | double versionNumber() const; | 35 | double versionNumber() const; |
37 | QString pixmapNameWidget() const; | 36 | QString pixmapNameWidget() const; |
38 | QWidget* widget(QWidget *); | 37 | QWidget* widget(QWidget *); |
39 | QString pixmapNameConfig() const; | 38 | QString pixmapNameConfig() const; |
40 | TodayConfigWidget* configWidget(QWidget *); | 39 | TodayConfigWidget* configWidget(QWidget *); |
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 | |||
@@ -5,31 +5,31 @@ | |||
5 | * email : llornkcor@handhelds.org | 5 | * email : llornkcor@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
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 | } |
26 | 26 | ||
27 | #include <pthread.h> | 27 | #include <pthread.h> |
28 | 28 | ||
29 | #include "stocktickerpluginwidget.h" | 29 | #include "stocktickerpluginwidget.h" |
30 | 30 | ||
31 | QString output; | 31 | QString output; |
32 | OTicker *stocktickerTicker; | 32 | OTicker *stocktickerTicker; |
33 | QCString stock_liste; | 33 | QCString stock_liste; |
34 | bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck; | 34 | bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck; |
35 | bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck; | 35 | bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck; |
@@ -201,25 +201,25 @@ void getStocks(char *blah) { | |||
201 | if(dovariationCheck) | 201 | if(dovariationCheck) |
202 | output +=tempString; | 202 | output +=tempString; |
203 | 203 | ||
204 | // printf("| Volume | %-9d |\n", stocks_tmp->Volume); | 204 | // printf("| Volume | %-9d |\n", stocks_tmp->Volume); |
205 | tempString.sprintf("| Volume %-9d ", stocks_tmp->Volume); | 205 | tempString.sprintf("| Volume %-9d ", stocks_tmp->Volume); |
206 | if(dovolumeCheck) | 206 | if(dovolumeCheck) |
207 | output +=tempString; | 207 | output +=tempString; |
208 | 208 | ||
209 | // printf("----------------------------------------\n\n"); | 209 | // printf("----------------------------------------\n\n"); |
210 | tempString.sprintf("||==++==|"); | 210 | tempString.sprintf("||==++==|"); |
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 | } |
216 | 216 | ||
217 | stocktickerTicker->setText( output.latin1() ); | 217 | stocktickerTicker->setText( output.latin1() ); |
218 | 218 | ||
219 | /* frees stocks */ | 219 | /* frees stocks */ |
220 | free_stocks(stocks_quotes); | 220 | free_stocks(stocks_quotes); |
221 | free_stocks(stocks_tmp); | 221 | free_stocks(stocks_tmp); |
222 | 222 | ||
223 | stock_liste=""; | 223 | stock_liste=""; |
224 | //delete stock_liste; | 224 | //delete stock_liste; |
225 | tempString=""; | 225 | tempString=""; |
@@ -273,25 +273,25 @@ void getStocks(char *blah) { | |||
273 | void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) { | 273 | void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) { |
274 | killTimer(e->timerId()); | 274 | killTimer(e->timerId()); |
275 | checkConnection(); | 275 | checkConnection(); |
276 | } | 276 | } |
277 | 277 | ||
278 | void StockTickerPluginWidget::checkConnection() { | 278 | void StockTickerPluginWidget::checkConnection() { |
279 | // qDebug("checking connection"); | 279 | // qDebug("checking connection"); |
280 | // Sock = new QSocket( this ); | 280 | // Sock = new QSocket( this ); |
281 | 281 | ||
282 | // if( wasError) | 282 | // if( wasError) |
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)) ); |
288 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); | 288 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); |
289 | // } else { | 289 | // } else { |
290 | // qDebug("State is not Idle"); | 290 | // qDebug("State is not Idle"); |
291 | isConnected(); | 291 | isConnected(); |
292 | // } | 292 | // } |
293 | } | 293 | } |
294 | 294 | ||
295 | void StockTickerPluginWidget::isConnected() { | 295 | void StockTickerPluginWidget::isConnected() { |
296 | // qDebug("We connect, so ok to grab stocks"); | 296 | // qDebug("We connect, so ok to grab stocks"); |
297 | if(this->isVisible()) | 297 | if(this->isVisible()) |