summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp65
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp1
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
@@ -19,148 +19,147 @@
#include <qpe/config.h>
#include <qapplication.h>
#include <qspinbox.h>
#include <qcheckbox.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qlayout.h>
#include <qvariant.h>
#include <qpushbutton.h>
#include <qwhatsthis.h>
#include <qlabel.h>
#include <qpe/config.h>
#include <qstringlist.h>
#include <qmainwindow.h>
#include <stdlib.h>
StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* name)
: TodayConfigWidget(parent, name ) {
QGridLayout *layout = new QGridLayout( this );
- layout->setSpacing(6);
+ layout->setSpacing(2);
layout->setMargin( 2);
LineEdit1 = new QLineEdit( this, "LineEdit1" );
LineEdit1->setFocus();
// QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here."));
- layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3);
+ layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4);
Config cfg( "stockticker");
cfg.setGroup( "Symbols" );
QString symbollist;
symbollist = cfg.readEntry("Symbols", "");
LineEdit1->setText(symbollist);
QLabel *label;
label = new QLabel(this);
label->setText( tr("Enter stock symbols seperated\nby a space."));
label->setMaximumHeight(60);
- layout->addMultiCellWidget( label, 1, 1, 0, 3);
+ layout->addMultiCellWidget( label, 1, 1, 0, 4);
cfg.setGroup( "Fields" );
timeCheck= new QCheckBox ( "Time",this );
timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1));
layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 );
-// QWhatsThis::add( timeCheck, tr("Toggles Time Field"));
+ QWhatsThis::add( timeCheck, tr("Toggles Time of current price field"));
dateCheck= new QCheckBox ( "Date", this );
dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1));
layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 );
-// QWhatsThis::add(dateCheck, tr("Toggles date field"));
+ QWhatsThis::add(dateCheck, tr("Toggles date field"));
symbolCheck= new QCheckBox ( "Symbol", this );
symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1));
- layout->addMultiCellWidget( symbolCheck, 3, 3, 0, 0 );
-// QWhatsThis::add(symbolCheck, tr("Toggles Symbol field"));
+ layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 );
+ QWhatsThis::add(symbolCheck, tr("Toggles Symbol field"));
nameCheck= new QCheckBox ( "Name", this );
nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1));
- layout->addMultiCellWidget( nameCheck, 3, 3, 1, 1 );
-// QWhatsThis::add(nameCheck, tr("Toggles Name field"));
+ layout->addMultiCellWidget( nameCheck, 3, 3, 0, 0 );
+ QWhatsThis::add(nameCheck, tr("Toggles Name of symbols owner field"));
- currentPriceCheck= new QCheckBox ( "Current Price", this );
+ currentPriceCheck= new QCheckBox ( "Price", this );
currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1));
- layout->addMultiCellWidget( currentPriceCheck, 4, 4, 0, 0 );
-// QWhatsThis::add(currentPriceCheck, tr("Toggles current Price field"));
-
+ layout->addMultiCellWidget( currentPriceCheck, 3, 3, 1, 1 );
+ QWhatsThis::add(currentPriceCheck, tr("Toggles current Price field"));
lastPriceCheck= new QCheckBox ( "Last Price", this );
lastPriceCheck->setChecked( cfg.readBoolEntry("lastPriceCheck",1));
- layout->addMultiCellWidget(lastPriceCheck, 4, 4, 1, 1);
-// QWhatsThis::add(lastPriceCheck, tr("Toggles last price field"));
+ layout->addMultiCellWidget(lastPriceCheck, 3, 3, 2, 2);
+ QWhatsThis::add(lastPriceCheck, tr("Toggles last price field"));
openPriceCheck= new QCheckBox ( "Open Price", this);
openPriceCheck->setChecked( cfg.readBoolEntry("openPriceCheck",1));
- layout->addMultiCellWidget( openPriceCheck, 5, 5, 0, 0 );
-// QWhatsThis::add(openPriceCheck, tr("Toggles opening price field"));
+ layout->addMultiCellWidget( openPriceCheck, 4, 4, 0, 0 );
+ QWhatsThis::add(openPriceCheck, tr("Toggles opening price field"));
minPriceCheck= new QCheckBox ( "Min Price", this );
minPriceCheck->setChecked( cfg.readBoolEntry("minPriceCheck",1));
- layout->addMultiCellWidget( minPriceCheck, 5, 5, 1, 1);
-// QWhatsThis::add(minPriceCheck, tr("Toggles minamum price field"));
+ layout->addMultiCellWidget( minPriceCheck, 4, 4, 1, 1);
+ QWhatsThis::add(minPriceCheck, tr("Toggles minimum daily price field"));
maxPriceCheck= new QCheckBox ( "Max Price", this);
maxPriceCheck->setChecked( cfg.readBoolEntry("maxPriceCheck",1));
- layout->addMultiCellWidget( maxPriceCheck, 6, 6, 0, 0 );
-// QWhatsThis::add(maxPriceCheck, tr("Toggles maximum price field"));
+ layout->addMultiCellWidget( maxPriceCheck, 4, 4, 2, 2 );
+ QWhatsThis::add(maxPriceCheck, tr("Toggles maximum daily price field"));
variationCheck= new QCheckBox ( "Variation", this );
variationCheck->setChecked( cfg.readBoolEntry("variationCheck",1));
- layout->addMultiCellWidget( variationCheck, 6, 6, 1, 1 );
-// QWhatsThis::add(variationCheck, tr("Toggles daily variation field"));
+ layout->addMultiCellWidget( variationCheck, 5, 5, 0, 0 );
+ QWhatsThis::add(variationCheck, tr("Toggles daily variation of price field"));
volumeCheck= new QCheckBox ( "Volume", this );
volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1));
- layout->addMultiCellWidget( volumeCheck , 7, 7, 0, 0);
-// QWhatsThis::add(volumeCheck, tr("Toggles volume field"));
+ layout->addMultiCellWidget( volumeCheck , 5, 5, 1, 1);
+ QWhatsThis::add(volumeCheck, tr("Toggles volume of trading field"));
timerDelaySpin = new QSpinBox( this, "timer spin" );
QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) );
timerDelaySpin->setMaxValue( 60);
cfg.setGroup("Timer");
timerDelaySpin->setValue( cfg.readNumEntry("Delay",0));
- layout->addMultiCellWidget( timerDelaySpin , 8, 8, 0, 0);
+ layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0);
QLabel *label2;
label2 = new QLabel(this);
- label2->setText( tr("Minutes between stock\nprice lookups."));
+ label2->setText( tr("Minutes between lookups."));
label2->setMaximumHeight(60);
- layout->addMultiCellWidget( label2, 8, 8, 1, 1);
+ layout->addMultiCellWidget( label2, 6, 6, 1, 2);
-// lookupButton = new QPushButton(this, "LookupButton");
-// lookupButton->setText(tr("Symbol Lookup"));
-// connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup()));
-// layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0);
+// lookupButton = new QPushButton(this, "LookupButton");
+// lookupButton->setText(tr("Symbol Lookup"));
+// connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup()));
+// layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
- layout->addItem( spacer, 10, 0 );
+ layout->addItem( spacer, 8, 0 );
}
void StocktickerPluginConfig::writeConfig() {
Config cfg( "stockticker");
cfg.setGroup( "Symbols" );
QString outText = text().upper();
outText.stripWhiteSpace();
cfg.writeEntry("Symbols", outText );
cfg.setGroup( "Fields" );
cfg.writeEntry("timeCheck",timeCheck->isChecked());
cfg.writeEntry("dateCheck",dateCheck->isChecked());
cfg.writeEntry("symbolCheck",symbolCheck->isChecked());
cfg.writeEntry("nameCheck",nameCheck->isChecked());
cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked());
cfg.writeEntry("lastPriceCheck",lastPriceCheck->isChecked());
cfg.writeEntry("openPriceCheck",openPriceCheck->isChecked());
cfg.writeEntry("minPriceCheck",minPriceCheck->isChecked());
cfg.writeEntry("maxPriceCheck",maxPriceCheck->isChecked());
cfg.writeEntry("variationCheck",variationCheck->isChecked());
cfg.writeEntry("volumeCheck",volumeCheck->isChecked());
cfg.setGroup("Timer");
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
@@ -7,40 +7,40 @@
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef STOCKTICKER_PLUGIN_CONFIG_H
#define STOCKTICKER_PLUGIN_CONFIG_H
#include <qwidget.h>
#include <opie/todayconfigwidget.h>
#include <qstring.h>
class QLineEdit;
class QCheckBox;
class QPushButton;
class QCheckBox;
class QSpinBox;
class StocktickerPluginConfig : public TodayConfigWidget {
-
+//Q_OBJECT
public:
StocktickerPluginConfig( QWidget *parent, const char *name );
~StocktickerPluginConfig();
QString text() const;
void writeConfig();
private:
QLineEdit* LineEdit1;
QCheckBox *timeCheck, *dateCheck, *symbolCheck, *nameCheck, *currentPriceCheck, *lastPriceCheck, *openPriceCheck, *minPriceCheck, *maxPriceCheck, *variationCheck, *volumeCheck;
QPushButton *lookupButton;
QSpinBox *timerDelaySpin;
private slots:
void doLookup();
};
#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
@@ -220,48 +220,49 @@ StockTickerPluginWidget::StockTickerPluginWidget( QWidget *parent, const char*
: QWidget(parent, name ) {
init();
startTimer(1000);
// checkConnection();
}
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 = 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;