From 2c00fdd8f3b0c9680ee642a78dfd6587f32e8460 Mon Sep 17 00:00:00 2001 From: drw Date: Tue, 02 Mar 2004 16:38:47 +0000 Subject: Today stock ticker plugin: libopie -> libopie2 --- (limited to 'noncore/todayplugins') 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 @@ config TODAY_STOCKTICKER boolean "opie-today-stocktickerplugin (stock ticker)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY source noncore/todayplugins/stockticker/stockticker/config.in 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 @@ -4,6 +4,6 @@ Priority: optional Section: opie/plugins Maintainer: L.J. Potter Architecture: arm -Depends: libqte2, opie-today +Depends: libqte2, libopiecore2, libopiepim2, libopieui2, opie-today Description: Stock ticker plugin for Today 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 @@ -2,4 +2,4 @@ config TODAY_STOCKTICKERSUB boolean depends TODAY_STOCKTICKERLIB default "y" if TODAY_STOCKTICKER - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY + 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,7 +1,6 @@ #include "inputDialog.h" #include - #include #include #include @@ -15,8 +14,6 @@ #include #include "helpwindow.h" -#include - #include // #include // #include @@ -31,9 +28,9 @@ InputDialog::InputDialog( ) LineEdit1 = new QLineEdit( this, "LineEdit1" ); LineEdit1->setFocus(); - + layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); - + QLabel *label; label = new QLabel(this); label->setText( tr("Enter something to lookup / search.")); @@ -62,7 +59,7 @@ void InputDialog::doLookup() { OProcess proc; proc << "/usr/bin/wget"; proc<<"-O"<< tempHtml<< url; - + connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); proc.start( OProcess::NotifyOnExit); */ @@ -72,18 +69,18 @@ void InputDialog::doLookup() { StockLookup->showMaximized(); StockLookup->show(); LineEdit1->text(); - - + + } void InputDialog::showBrowser(OProcess*) { qDebug("BLAH"); QString tempHtml = "/tmp/stockticker.html"; - + HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); StockLookup->setCaption("Symbol"); StockLookup->showMaximized(); StockLookup->show(); LineEdit1->text(); - + } 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 @@ -2,10 +2,11 @@ #ifndef INPUTDIALOG_H #define INPUTDIALOG_H +#include + #include #include #include -#include class QLineEdit; class QCheckBox; @@ -16,14 +17,14 @@ class InputDialog : public QMainWindow { public: InputDialog( ); ~InputDialog(); - + private: QLineEdit* LineEdit1; private slots: void doLookup(); - void showBrowser(OProcess*); + void showBrowser(OProcess*); protected slots: - + }; #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 @@ -2,11 +2,11 @@ TEMPLATE = app CONFIG = qt warn_on release HEADERS = inputDialog.h helpwindow.h SOURCES = inputDialog.cpp helpwindow.cpp main.cpp -INTERFACES = +INTERFACES = TARGET = stockticker -INCLUDEPATH += $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 DESTDIR = $(OPIEDIR)/bin 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 @@ -15,12 +15,12 @@ ***************************************************************************/ #include "stocktickerconfig.h" -#include + +#include #include #include - #include #include #include @@ -44,15 +44,15 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* 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, 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.")); @@ -65,12 +65,12 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1)); layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 ); 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")); - + symbolCheck= new QCheckBox ( "Symbol", this ); symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1)); layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 ); @@ -123,7 +123,7 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* cfg.setGroup("Timer"); timerDelaySpin->setValue( cfg.readNumEntry("Delay",15)); layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); - + QLabel *label2; label2 = new QLabel(this); label2->setText( tr("Minutes between lookups.")); @@ -137,7 +137,7 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* cfg.setGroup("Timer"); scrollSpeed->setValue( cfg.readNumEntry("ScrollSpeed",50)); layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); - + QLabel *label3; label3 = new QLabel(this); label3->setText( tr("Scroll Speed, in milliseconds")); @@ -151,18 +151,18 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* cfg.setGroup("Timer"); scrollLength->setValue( cfg.readNumEntry("ScrollLength",1)); layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); - + QLabel *label4; label4 = new QLabel(this); label4->setText( tr("Scroll Length")); label4->setMaximumHeight(60); layout->addMultiCellWidget( label4, 8, 8, 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); - + QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); layout->addItem( spacer, 9, 0 ); @@ -192,7 +192,7 @@ void StocktickerPluginConfig::writeConfig() { cfg.writeEntry("Delay",timerDelaySpin->value()); cfg.writeEntry("ScrollLength",scrollLength->value()); cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); - + cfg.write(); } 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 @@ -17,8 +17,9 @@ #ifndef STOCKTICKER_PLUGIN_CONFIG_H #define STOCKTICKER_PLUGIN_CONFIG_H +#include + #include -#include #include class QLineEdit; 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 @@ -20,7 +20,7 @@ INCLUDEPATH += $(OPIEDIR)/include \ DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie -lpthread +LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread TMAKE_CFLAGS += -D__UNIX__ DESTDIR = $(OPIEDIR)/plugins/today 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 @@ -18,14 +18,13 @@ #ifndef STOCKTICKER_PLUGIN_H #define STOCKTICKER_PLUGIN_H +#include +#include +#include + #include #include -#include - -#include -#include - class StockTickerPlugin : public TodayPluginObject { public: 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 @@ -14,13 +14,13 @@ * * ***************************************************************************/ - #include + #include #include - #include + #include - extern "C" { +extern "C" { #include "libstocks/stocks.h" } @@ -210,7 +210,7 @@ void getStocks(char *blah) { tempString.sprintf("||==++==|"); output +=tempString; - /* Simple function which help to browse in the stocks list */ + /* Simple function which help to browse in the stocks list */ stocks_tmp = next_stock(stocks_tmp); } @@ -282,7 +282,7 @@ void getStocks(char *blah) { // if( wasError) // stocktickerTicker->setText("Checking connection"); - // if(Sock->state() == QSocket::Idle) { + // if(Sock->state() == QSocket::Idle) { // Sock->connectToHost("finance.yahoo.com", 80); // connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) ); // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); -- cgit v0.9.0.2