3 files changed, 34 insertions, 34 deletions
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp index 1334e7d..11b615b 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp | |||
@@ -27,132 +27,131 @@ | |||
27 | #include <qlineedit.h> | 27 | #include <qlineedit.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qvariant.h> | 29 | #include <qvariant.h> |
30 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
31 | #include <qwhatsthis.h> | 31 | #include <qwhatsthis.h> |
32 | #include <qlabel.h> | 32 | #include <qlabel.h> |
33 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
34 | #include <qstringlist.h> | 34 | #include <qstringlist.h> |
35 | #include <qmainwindow.h> | 35 | #include <qmainwindow.h> |
36 | 36 | ||
37 | #include <stdlib.h> | 37 | #include <stdlib.h> |
38 | 38 | ||
39 | StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* name) | 39 | StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* name) |
40 | : TodayConfigWidget(parent, name ) { | 40 | : TodayConfigWidget(parent, name ) { |
41 | 41 | ||
42 | QGridLayout *layout = new QGridLayout( this ); | 42 | QGridLayout *layout = new QGridLayout( this ); |
43 | layout->setSpacing(6); | 43 | layout->setSpacing(2); |
44 | layout->setMargin( 2); | 44 | layout->setMargin( 2); |
45 | 45 | ||
46 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 46 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
47 | LineEdit1->setFocus(); | 47 | LineEdit1->setFocus(); |
48 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); | 48 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); |
49 | 49 | ||
50 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); | 50 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); |
51 | 51 | ||
52 | Config cfg( "stockticker"); | 52 | Config cfg( "stockticker"); |
53 | cfg.setGroup( "Symbols" ); | 53 | cfg.setGroup( "Symbols" ); |
54 | QString symbollist; | 54 | QString symbollist; |
55 | symbollist = cfg.readEntry("Symbols", ""); | 55 | symbollist = cfg.readEntry("Symbols", ""); |
56 | LineEdit1->setText(symbollist); | 56 | LineEdit1->setText(symbollist); |
57 | 57 | ||
58 | QLabel *label; | 58 | QLabel *label; |
59 | label = new QLabel(this); | 59 | label = new QLabel(this); |
60 | label->setText( tr("Enter stock symbols seperated\nby a space.")); | 60 | label->setText( tr("Enter stock symbols seperated\nby a space.")); |
61 | label->setMaximumHeight(60); | 61 | label->setMaximumHeight(60); |
62 | layout->addMultiCellWidget( label, 1, 1, 0, 3); | 62 | layout->addMultiCellWidget( label, 1, 1, 0, 4); |
63 | 63 | ||
64 | cfg.setGroup( "Fields" ); | 64 | cfg.setGroup( "Fields" ); |
65 | 65 | ||
66 | timeCheck= new QCheckBox ( "Time",this ); | 66 | timeCheck= new QCheckBox ( "Time",this ); |
67 | timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1)); | 67 | timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1)); |
68 | layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 ); | 68 | layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 ); |
69 | // QWhatsThis::add( timeCheck, tr("Toggles Time Field")); | 69 | QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); |
70 | 70 | ||
71 | dateCheck= new QCheckBox ( "Date", this ); | 71 | dateCheck= new QCheckBox ( "Date", this ); |
72 | dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1)); | 72 | dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1)); |
73 | layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 ); | 73 | layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 ); |
74 | // QWhatsThis::add(dateCheck, tr("Toggles date field")); | 74 | QWhatsThis::add(dateCheck, tr("Toggles date field")); |
75 | 75 | ||
76 | symbolCheck= new QCheckBox ( "Symbol", this ); | 76 | symbolCheck= new QCheckBox ( "Symbol", this ); |
77 | symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1)); | 77 | symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1)); |
78 | layout->addMultiCellWidget( symbolCheck, 3, 3, 0, 0 ); | 78 | layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 ); |
79 | // QWhatsThis::add(symbolCheck, tr("Toggles Symbol field")); | 79 | QWhatsThis::add(symbolCheck, tr("Toggles Symbol field")); |
80 | 80 | ||
81 | nameCheck= new QCheckBox ( "Name", this ); | 81 | nameCheck= new QCheckBox ( "Name", this ); |
82 | nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1)); | 82 | nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1)); |
83 | layout->addMultiCellWidget( nameCheck, 3, 3, 1, 1 ); | 83 | layout->addMultiCellWidget( nameCheck, 3, 3, 0, 0 ); |
84 | // QWhatsThis::add(nameCheck, tr("Toggles Name field")); | 84 | QWhatsThis::add(nameCheck, tr("Toggles Name of symbols owner field")); |
85 | 85 | ||
86 | currentPriceCheck= new QCheckBox ( "Current Price", this ); | 86 | currentPriceCheck= new QCheckBox ( "Price", this ); |
87 | currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1)); | 87 | currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1)); |
88 | layout->addMultiCellWidget( currentPriceCheck, 4, 4, 0, 0 ); | 88 | layout->addMultiCellWidget( currentPriceCheck, 3, 3, 1, 1 ); |
89 | // QWhatsThis::add(currentPriceCheck, tr("Toggles current Price field")); | 89 | QWhatsThis::add(currentPriceCheck, tr("Toggles current Price field")); |
90 | |||
91 | 90 | ||
92 | lastPriceCheck= new QCheckBox ( "Last Price", this ); | 91 | lastPriceCheck= new QCheckBox ( "Last Price", this ); |
93 | lastPriceCheck->setChecked( cfg.readBoolEntry("lastPriceCheck",1)); | 92 | lastPriceCheck->setChecked( cfg.readBoolEntry("lastPriceCheck",1)); |
94 | layout->addMultiCellWidget(lastPriceCheck, 4, 4, 1, 1); | 93 | layout->addMultiCellWidget(lastPriceCheck, 3, 3, 2, 2); |
95 | // QWhatsThis::add(lastPriceCheck, tr("Toggles last price field")); | 94 | QWhatsThis::add(lastPriceCheck, tr("Toggles last price field")); |
96 | 95 | ||
97 | openPriceCheck= new QCheckBox ( "Open Price", this); | 96 | openPriceCheck= new QCheckBox ( "Open Price", this); |
98 | openPriceCheck->setChecked( cfg.readBoolEntry("openPriceCheck",1)); | 97 | openPriceCheck->setChecked( cfg.readBoolEntry("openPriceCheck",1)); |
99 | layout->addMultiCellWidget( openPriceCheck, 5, 5, 0, 0 ); | 98 | layout->addMultiCellWidget( openPriceCheck, 4, 4, 0, 0 ); |
100 | // QWhatsThis::add(openPriceCheck, tr("Toggles opening price field")); | 99 | QWhatsThis::add(openPriceCheck, tr("Toggles opening price field")); |
101 | 100 | ||
102 | minPriceCheck= new QCheckBox ( "Min Price", this ); | 101 | minPriceCheck= new QCheckBox ( "Min Price", this ); |
103 | minPriceCheck->setChecked( cfg.readBoolEntry("minPriceCheck",1)); | 102 | minPriceCheck->setChecked( cfg.readBoolEntry("minPriceCheck",1)); |
104 | layout->addMultiCellWidget( minPriceCheck, 5, 5, 1, 1); | 103 | layout->addMultiCellWidget( minPriceCheck, 4, 4, 1, 1); |
105 | // QWhatsThis::add(minPriceCheck, tr("Toggles minamum price field")); | 104 | QWhatsThis::add(minPriceCheck, tr("Toggles minimum daily price field")); |
106 | 105 | ||
107 | maxPriceCheck= new QCheckBox ( "Max Price", this); | 106 | maxPriceCheck= new QCheckBox ( "Max Price", this); |
108 | maxPriceCheck->setChecked( cfg.readBoolEntry("maxPriceCheck",1)); | 107 | maxPriceCheck->setChecked( cfg.readBoolEntry("maxPriceCheck",1)); |
109 | layout->addMultiCellWidget( maxPriceCheck, 6, 6, 0, 0 ); | 108 | layout->addMultiCellWidget( maxPriceCheck, 4, 4, 2, 2 ); |
110 | // QWhatsThis::add(maxPriceCheck, tr("Toggles maximum price field")); | 109 | QWhatsThis::add(maxPriceCheck, tr("Toggles maximum daily price field")); |
111 | 110 | ||
112 | variationCheck= new QCheckBox ( "Variation", this ); | 111 | variationCheck= new QCheckBox ( "Variation", this ); |
113 | variationCheck->setChecked( cfg.readBoolEntry("variationCheck",1)); | 112 | variationCheck->setChecked( cfg.readBoolEntry("variationCheck",1)); |
114 | layout->addMultiCellWidget( variationCheck, 6, 6, 1, 1 ); | 113 | layout->addMultiCellWidget( variationCheck, 5, 5, 0, 0 ); |
115 | // QWhatsThis::add(variationCheck, tr("Toggles daily variation field")); | 114 | QWhatsThis::add(variationCheck, tr("Toggles daily variation of price field")); |
116 | 115 | ||
117 | volumeCheck= new QCheckBox ( "Volume", this ); | 116 | volumeCheck= new QCheckBox ( "Volume", this ); |
118 | volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1)); | 117 | volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1)); |
119 | layout->addMultiCellWidget( volumeCheck , 7, 7, 0, 0); | 118 | layout->addMultiCellWidget( volumeCheck , 5, 5, 1, 1); |
120 | // QWhatsThis::add(volumeCheck, tr("Toggles volume field")); | 119 | QWhatsThis::add(volumeCheck, tr("Toggles volume of trading field")); |
121 | 120 | ||
122 | timerDelaySpin = new QSpinBox( this, "timer spin" ); | 121 | timerDelaySpin = new QSpinBox( this, "timer spin" ); |
123 | QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) ); | 122 | QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) ); |
124 | timerDelaySpin->setMaxValue( 60); | 123 | timerDelaySpin->setMaxValue( 60); |
125 | 124 | ||
126 | cfg.setGroup("Timer"); | 125 | cfg.setGroup("Timer"); |
127 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",0)); | 126 | timerDelaySpin->setValue( cfg.readNumEntry("Delay",0)); |
128 | layout->addMultiCellWidget( timerDelaySpin , 8, 8, 0, 0); | 127 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); |
129 | 128 | ||
130 | QLabel *label2; | 129 | QLabel *label2; |
131 | label2 = new QLabel(this); | 130 | label2 = new QLabel(this); |
132 | label2->setText( tr("Minutes between stock\nprice lookups.")); | 131 | label2->setText( tr("Minutes between lookups.")); |
133 | label2->setMaximumHeight(60); | 132 | label2->setMaximumHeight(60); |
134 | layout->addMultiCellWidget( label2, 8, 8, 1, 1); | 133 | layout->addMultiCellWidget( label2, 6, 6, 1, 2); |
135 | 134 | ||
136 | // lookupButton = new QPushButton(this, "LookupButton"); | 135 | // lookupButton = new QPushButton(this, "LookupButton"); |
137 | // lookupButton->setText(tr("Symbol Lookup")); | 136 | // lookupButton->setText(tr("Symbol Lookup")); |
138 | // connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup())); | 137 | // connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup())); |
139 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); | 138 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); |
140 | 139 | ||
141 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 140 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
142 | layout->addItem( spacer, 10, 0 ); | 141 | layout->addItem( spacer, 8, 0 ); |
143 | 142 | ||
144 | } | 143 | } |
145 | 144 | ||
146 | 145 | ||
147 | void StocktickerPluginConfig::writeConfig() { | 146 | void StocktickerPluginConfig::writeConfig() { |
148 | Config cfg( "stockticker"); | 147 | Config cfg( "stockticker"); |
149 | cfg.setGroup( "Symbols" ); | 148 | cfg.setGroup( "Symbols" ); |
150 | QString outText = text().upper(); | 149 | QString outText = text().upper(); |
151 | outText.stripWhiteSpace(); | 150 | outText.stripWhiteSpace(); |
152 | cfg.writeEntry("Symbols", outText ); | 151 | cfg.writeEntry("Symbols", outText ); |
153 | cfg.setGroup( "Fields" ); | 152 | cfg.setGroup( "Fields" ); |
154 | cfg.writeEntry("timeCheck",timeCheck->isChecked()); | 153 | cfg.writeEntry("timeCheck",timeCheck->isChecked()); |
155 | cfg.writeEntry("dateCheck",dateCheck->isChecked()); | 154 | cfg.writeEntry("dateCheck",dateCheck->isChecked()); |
156 | cfg.writeEntry("symbolCheck",symbolCheck->isChecked()); | 155 | cfg.writeEntry("symbolCheck",symbolCheck->isChecked()); |
157 | cfg.writeEntry("nameCheck",nameCheck->isChecked()); | 156 | cfg.writeEntry("nameCheck",nameCheck->isChecked()); |
158 | cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked()); | 157 | cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked()); |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h index 4b950dc..33aed86 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h | |||
@@ -15,32 +15,32 @@ | |||
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 <qwidget.h> | 20 | #include <qwidget.h> |
21 | #include <opie/todayconfigwidget.h> | 21 | #include <opie/todayconfigwidget.h> |
22 | #include <qstring.h> | 22 | #include <qstring.h> |
23 | 23 | ||
24 | class QLineEdit; | 24 | class QLineEdit; |
25 | class QCheckBox; | 25 | class QCheckBox; |
26 | class QPushButton; | 26 | class QPushButton; |
27 | class QCheckBox; | 27 | class QCheckBox; |
28 | class QSpinBox; | 28 | class QSpinBox; |
29 | 29 | ||
30 | class StocktickerPluginConfig : public TodayConfigWidget { | 30 | class StocktickerPluginConfig : public TodayConfigWidget { |
31 | 31 | //Q_OBJECT | |
32 | public: | 32 | public: |
33 | StocktickerPluginConfig( QWidget *parent, const char *name ); | 33 | StocktickerPluginConfig( QWidget *parent, const char *name ); |
34 | ~StocktickerPluginConfig(); | 34 | ~StocktickerPluginConfig(); |
35 | QString text() const; | 35 | QString text() const; |
36 | void writeConfig(); | 36 | void writeConfig(); |
37 | private: | 37 | private: |
38 | QLineEdit* LineEdit1; | 38 | QLineEdit* LineEdit1; |
39 | QCheckBox *timeCheck, *dateCheck, *symbolCheck, *nameCheck, *currentPriceCheck, *lastPriceCheck, *openPriceCheck, *minPriceCheck, *maxPriceCheck, *variationCheck, *volumeCheck; | 39 | QCheckBox *timeCheck, *dateCheck, *symbolCheck, *nameCheck, *currentPriceCheck, *lastPriceCheck, *openPriceCheck, *minPriceCheck, *maxPriceCheck, *variationCheck, *volumeCheck; |
40 | QPushButton *lookupButton; | 40 | QPushButton *lookupButton; |
41 | QSpinBox *timerDelaySpin; | 41 | QSpinBox *timerDelaySpin; |
42 | private slots: | 42 | private slots: |
43 | void doLookup(); | 43 | void doLookup(); |
44 | 44 | ||
45 | }; | 45 | }; |
46 | #endif | 46 | #endif |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index 1d53344..45c5c53 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -228,32 +228,33 @@ StockTickerPluginWidget::~StockTickerPluginWidget() { | |||
228 | 228 | ||
229 | void StockTickerPluginWidget::init() { | 229 | void StockTickerPluginWidget::init() { |
230 | 230 | ||
231 | QHBoxLayout* layout = new QHBoxLayout( this ); | 231 | QHBoxLayout* layout = new QHBoxLayout( this ); |
232 | stocktickerTicker = new OTicker(this); | 232 | stocktickerTicker = new OTicker(this); |
233 | stocktickerTicker->setMinimumHeight(15); | 233 | stocktickerTicker->setMinimumHeight(15); |
234 | connect( stocktickerTicker, SIGNAL( mousePressed()), this, SLOT( checkConnection() )); | 234 | connect( stocktickerTicker, SIGNAL( mousePressed()), this, SLOT( checkConnection() )); |
235 | layout->addWidget( stocktickerTicker); | 235 | layout->addWidget( stocktickerTicker); |
236 | wasError = true; | 236 | wasError = true; |
237 | } | 237 | } |
238 | 238 | ||
239 | void StockTickerPluginWidget::doStocks() { | 239 | void StockTickerPluginWidget::doStocks() { |
240 | Config cfg( "stockticker"); | 240 | Config cfg( "stockticker"); |
241 | cfg.setGroup( "Symbols" ); | 241 | cfg.setGroup( "Symbols" ); |
242 | QString symbollist; | 242 | QString symbollist; |
243 | symbollist = cfg.readEntry("Symbols", ""); | 243 | symbollist = cfg.readEntry("Symbols", ""); |
244 | symbollist = cfg.readEntry("Symbols", ""); | ||
244 | symbollist.replace(QRegExp(" "),"+");//seperated by + | 245 | symbollist.replace(QRegExp(" "),"+");//seperated by + |
245 | 246 | ||
246 | // qDebug(symbollist); | 247 | // qDebug(symbollist); |
247 | if (!symbollist.isEmpty()) { | 248 | if (!symbollist.isEmpty()) { |
248 | pthread_t thread1; | 249 | pthread_t thread1; |
249 | pthread_create(&thread1,NULL, (void * (*)(void *))getStocks, &symbollist); | 250 | pthread_create(&thread1,NULL, (void * (*)(void *))getStocks, &symbollist); |
250 | } | 251 | } |
251 | // pthread_join(thread1,NULL); | 252 | // pthread_join(thread1,NULL); |
252 | // getStocks( symbollist.latin1() ); | 253 | // getStocks( symbollist.latin1() ); |
253 | } | 254 | } |
254 | 255 | ||
255 | //void StockTickerPluginWidget::DefProxy(void) { | 256 | //void StockTickerPluginWidget::DefProxy(void) { |
256 | // char *proxy; | 257 | // char *proxy; |
257 | // libstocks_return_code error; | 258 | // libstocks_return_code error; |
258 | 259 | ||
259 | // /* Proxy support */ | 260 | // /* Proxy support */ |