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 @@ 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 @@ -3,7 +3,7 @@ Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stocktic Priority: optional Section: opie/plugins Maintainer: L.J. Potter <lpotter@trolltech.com> 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 @@ -1,5 +1,5 @@ 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,8 +1,7 @@ #include "inputDialog.h" #include <qapplication.h> - #include <qlayout.h> #include <qcheckbox.h> #include <qlineedit.h> #include <qvariant.h> @@ -14,10 +13,8 @@ #include <qstringlist.h> #include <qmainwindow.h> #include "helpwindow.h" -#include <opie/oprocess.h> - #include <stdlib.h> // #include <sys/stat.h> // #include <unistd.h> @@ -30,11 +27,11 @@ InputDialog::InputDialog( ) layout->setMargin( 2); 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.")); label->setMaximumHeight(60); @@ -61,9 +58,9 @@ 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); */ system(cmd.latin1()); @@ -71,19 +68,19 @@ void InputDialog::doLookup() { StockLookup->setCaption("Symbol"); 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 @@ -1,12 +1,13 @@ #ifndef INPUTDIALOG_H #define INPUTDIALOG_H +#include <opie2/oprocess.h> + #include <qvariant.h> #include <qdialog.h> #include <qmainwindow.h> -#include <opie/oprocess.h> class QLineEdit; class QCheckBox; @@ -15,15 +16,15 @@ 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 @@ -1,12 +1,12 @@ 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 @@ -14,14 +14,14 @@ * * ***************************************************************************/ #include "stocktickerconfig.h" -#include <opie/todayconfigwidget.h> + +#include <opie2/todayconfigwidget.h> #include <qpe/config.h> #include <qapplication.h> - #include <qlayout.h> #include <qspinbox.h> #include <qcheckbox.h> #include <qlineedit.h> @@ -43,17 +43,17 @@ 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.")); label->setMaximumHeight(60); @@ -64,14 +64,14 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* timeCheck= new QCheckBox ( "Time",this ); 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 ); QWhatsThis::add(symbolCheck, tr("Toggles Symbol field")); @@ -122,9 +122,9 @@ 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.")); label2->setMaximumHeight(60); @@ -136,9 +136,9 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* scrollSpeed->setSteps(50,50); 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")); label3->setMaximumHeight(60); @@ -150,20 +150,20 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* // scrollLength->setSteps(5,5); 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 ); } @@ -191,9 +191,9 @@ void StocktickerPluginConfig::writeConfig() { cfg.setGroup("Timer"); cfg.writeEntry("Delay",timerDelaySpin->value()); cfg.writeEntry("ScrollLength",scrollLength->value()); cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); - + cfg.write(); } StocktickerPluginConfig::~StocktickerPluginConfig() { 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 @@ -16,10 +16,11 @@ #ifndef STOCKTICKER_PLUGIN_CONFIG_H #define STOCKTICKER_PLUGIN_CONFIG_H +#include <opie2/todayconfigwidget.h> + #include <qwidget.h> -#include <opie/todayconfigwidget.h> #include <qstring.h> class QLineEdit; class QCheckBox; 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 @@ -19,9 +19,9 @@ INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie -lpthread +LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread TMAKE_CFLAGS += -D__UNIX__ DESTDIR = $(OPIEDIR)/plugins/today TARGET = todaystocktickerplugin 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 @@ -17,16 +17,15 @@ #ifndef STOCKTICKER_PLUGIN_H #define STOCKTICKER_PLUGIN_H +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> +#include <opie2/todayconfigwidget.h> + #include <qstring.h> #include <qwidget.h> -#include <opie/oclickablelabel.h> - -#include <opie/todayplugininterface.h> -#include <opie/todayconfigwidget.h> - class StockTickerPlugin : public TodayPluginObject { public: StockTickerPlugin(); 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 @@ -13,15 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ - #include <qlayout.h> + #include <opie2/oticker.h> #include <qpe/config.h> - #include <opie/oticker.h> + #include <qlayout.h> - extern "C" { +extern "C" { #include "libstocks/stocks.h" } #include <pthread.h> @@ -209,9 +209,9 @@ void getStocks(char *blah) { // printf("----------------------------------------\n\n"); 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); } stocktickerTicker->setText( output.latin1() ); @@ -281,9 +281,9 @@ 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()) ); // } else { |