merge noncore/todayplugins/*

2 files changed, 1 insertions, 2 deletions

diff --git a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
index 23e78f2..2274402 100644
--- a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
+++ b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
@@ -1,258 +1,257 @@
 /****************************************************************************
-** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include "helpwindow.h"
 #include <qstatusbar.h>
 
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 
 #include <ctype.h>
 
 HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
     : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
     readHistory();
     readBookmarks();
 
     browser = new QTextBrowser( this );
     QStringList Strlist;
     Strlist.append( home_);
     
     browser->mimeSourceFactory()->setFilePath( Strlist );
 
     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 
     connect( browser, SIGNAL( textChanged() ),
 
              this, SLOT( textChanged() ) );
 
     setCentralWidget( browser );
 
     if ( !home_.isEmpty() )
 
 ////////////////////////////////
         browser->setSource( home_ );
 
 ////////////////////////////////
     connect( browser, SIGNAL( highlighted( const QString&) ),
        statusBar(), SLOT( message( const QString&)) );
 
     setGeometry( 0,0,236,280);
 
     QPopupMenu* file = new QPopupMenu( this );
 //    file->insertItem( tr("&New Window"), this, SLOT( newWindow() ), ALT | Key_N );
     file->insertItem( tr("&Open File"), this, SLOT( openFile() ), ALT | Key_O );
 //    file->insertItem( tr("&Print"), this, SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
     file->insertItem( tr("&Close"), this, SLOT( close() ), ALT | Key_Q );
 //    file->insertItem( tr("E&xit"), qApp, SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
 ////F FIXME
     QString pixs=(QDir::homeDirPath ()) +"/Applications/gutenbrowser/pix/";
     QIconSet icon_back( QPixmap(pixs+"back.png") );
     QIconSet icon_forward( QPixmap(pixs+"forward.png") );
     QIconSet icon_home( QPixmap(pixs+"home.png") );
 
     QPopupMenu* go = new QPopupMenu( this );
     backwardId = go->insertItem( icon_back, tr("&Backward"), browser, SLOT( backward() ), ALT | Key_Left );
     forwardId = go->insertItem( icon_forward, tr("&Forward"), browser, SLOT( forward() ), ALT | Key_Right );
     go->insertItem( icon_home, tr("&Home"), browser, SLOT( home() ) );
 
 
     hist = new QPopupMenu( this );
     QStringList::Iterator it = history.begin();
     for ( ; it != history.end(); ++it )
     mHistory[ hist->insertItem( *it ) ] = *it;
     connect( hist, SIGNAL( activated( int ) ), this, SLOT( histChosen( int ) ) );
 
     bookm = new QPopupMenu( this );
     bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) );
     bookm->insertSeparator();
 
     QStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
    mBookmarks[ bookm->insertItem( *it2 ) ] = *it2;
     connect( bookm, SIGNAL( activated( int ) ),
        this, SLOT( bookmChosen( int ) ) );
 
     menuBar()->insertItem( tr("&File"), file );
     menuBar()->insertItem( tr("&Go"), go );
     menuBar()->insertItem( tr( "History" ), hist );
     menuBar()->insertItem( tr( "Bookmarks" ), bookm );
 //      menuBar()->insertSeparator();
 //      menuBar()->insertItem( tr("&Help"), help );
 
     menuBar()->setItemEnabled( forwardId, FALSE);
     menuBar()->setItemEnabled( backwardId, FALSE);
     connect( browser, SIGNAL( backwardAvailable( bool ) ), this, SLOT( setBackwardAvailable( bool ) ) );
     connect( browser, SIGNAL( forwardAvailable( bool ) ), this, SLOT( setForwardAvailable( bool ) ) );
 
 
     QToolBar* toolbar = new QToolBar( this );
     addToolBar( toolbar, "Toolbar");
     QToolButton* button;
 
     button = new QToolButton( icon_back, tr("Backward"), "", browser, SLOT(backward()), toolbar );
     connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) );
     button->setEnabled( FALSE );
     button = new QToolButton( icon_forward, tr("Forward"), "", browser, SLOT(forward()), toolbar );
     connect( browser, SIGNAL( forwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) );
     button->setEnabled( FALSE );
     button = new QToolButton( icon_home, tr("Home"), "", browser, SLOT(home()), toolbar );
 
     toolbar->addSeparator();
 
     pathCombo = new QComboBox( TRUE, toolbar );
     connect( pathCombo, SIGNAL( activated( const QString & ) ), this, SLOT( pathSelected( const QString & ) ) );
     toolbar->setStretchableWidget( pathCombo );
 
 //    pathCombo->setMaximumWidth(190);
 //     setRightJustification( TRUE );
 //      setDockEnabled( Left, FALSE );
 //      setDockEnabled( Right, FALSE );
 
     pathCombo->insertItem( home_ );
 
     browser->setFocus();
 
 
 }
 
 
 void HelpWindow::setBackwardAvailable( bool b)
 {
     menuBar()->setItemEnabled( backwardId, b);
 }
 
 void HelpWindow::setForwardAvailable( bool b)
 {
     menuBar()->setItemEnabled( forwardId, b);
 }
 
 
 void HelpWindow::textChanged()
 {
     if ( browser->documentTitle().isNull() ) {
   setCaption( "Stockticker Lookup - " + browser->context() );
   selectedURL = browser->context();
     }
     else {
   setCaption( "Stockticker Lookup - " + browser->documentTitle() ) ;
   selectedURL = browser->documentTitle();
     }
 
     if ( !selectedURL.isEmpty() && pathCombo ) {
   bool exists = FALSE;
   int i;
   for ( i = 0; i < pathCombo->count(); ++i ) {
       if ( pathCombo->text( i ) == selectedURL ) {
     exists = TRUE;
     break;
       }
   }
   if ( !exists ) {
       pathCombo->insertItem( selectedURL, 0 );
       pathCombo->setCurrentItem( 0 );
       mHistory[ hist->insertItem( selectedURL ) ] = selectedURL;
   } else
       pathCombo->setCurrentItem( i );
   selectedURL = QString::null;
     }
 }
 
 HelpWindow::~HelpWindow()
 {
     history.clear();
     QMap<int, QString>::Iterator it = mHistory.begin();
     for ( ; it != mHistory.end(); ++it )
   history.append( *it );
 
     QFile f( QDir::currentDirPath() + "/.history" );
     f.open( IO_WriteOnly );
     QDataStream s( &f );
     s << history;
     f.close();
 
     bookmarks.clear();
     QMap<int, QString>::Iterator it2 = mBookmarks.begin();
     for ( ; it2 != mBookmarks.end(); ++it2 )
   bookmarks.append( *it2 );
 
     QFile f2( QDir::currentDirPath() + "/.bookmarks" );
     f2.open( IO_WriteOnly );
     QDataStream s2( &f2 );
     s2 << bookmarks;
     f2.close();
 }
 
 void HelpWindow::openFile()
 {
 #ifndef QT_NO_FILEDIALOG
     QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, this );
     if ( !fn.isEmpty() )
   browser->setSource( fn );
 #endif
 }
 
 void HelpWindow::newWindow()
 {
     ( new HelpWindow(browser->source(), "qbrowser") )->show();
 }
 
 void HelpWindow::pathSelected( const QString &_path )
 {
     browser->setSource( _path );
     QMap<int, QString>::Iterator it = mHistory.begin();
     bool exists = FALSE;
     for ( ; it != mHistory.end(); ++it ) {
   if ( *it == _path ) {
       exists = TRUE;
       break;
   }
     }
     if ( !exists )
   mHistory[ hist->insertItem( _path ) ] = _path;
 }
 
 void HelpWindow::readHistory()
 {
     if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
   QFile f( QDir::currentDirPath() + "/.history" );
   f.open( IO_ReadOnly );
   QDataStream s( &f );
   s >> history;
   f.close();
   while ( history.count() > 20 )
       history.remove( history.begin() );
     }
 }
 
 void HelpWindow::readBookmarks()
 {
     if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
   QFile f( QDir::currentDirPath() + "/.bookmarks" );
   f.open( IO_ReadOnly );
   QDataStream s( &f );
   s >> bookmarks;
   f.close();
     }
 }
 
 void HelpWindow::histChosen( int i )
 {
     if ( mHistory.contains( i ) )
   browser->setSource( mHistory[ i ] );
 }
 
 void HelpWindow::bookmChosen( int i )
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 800fdcb..8440f20 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -1,308 +1,308 @@
 /*
                              This file is part of the OPIE Project
                =.
              .=l.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qtextstream.h>
 
 #include <opie/oprocess.h>
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include "weatherpluginwidget.h"
 
 WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent,  name )
 {
 	QHBoxLayout *layout = new QHBoxLayout( this );
 	layout->setAutoAdd( TRUE );
 	layout->setSpacing( 2 );
 
 	weatherIcon = new QLabel( this );
 	weatherIcon->setMaximumWidth( 32 );
-	QImage logo1 = Resource::loadImage( "todayweatherplugin/wait" );
+	QImage logo1 = Resource::loadImage( "Clock" );
 	QPixmap pic;
 	pic.convertFromImage( logo1 );
 	weatherIcon->setPixmap( pic );
 
 	weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
 	weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
 
 	startTimer(1000);
 }
 
 WeatherPluginWidget::~WeatherPluginWidget()
 {
 	QFile file( localFile );
 	if ( file.exists() )
 	{
 		file.remove();
 	}
 }
 
 void WeatherPluginWidget::timerEvent( QTimerEvent *e )
 {
 	killTimer( e->timerId() );
 	retreiveData();
 }
 
 
 
 void WeatherPluginWidget::retreiveData()
 {
 	Config config( "todayweatherplugin");
 	config.setGroup( "Config" );
 
 	location = config.readEntry( "Location", "" );
 	useMetric = config.readBoolEntry( "Metric", TRUE );
 	frequency = config.readNumEntry( "Frequency", 5 );
 	
 	startTimer( frequency * 60000 );
 
 	localFile = "/tmp/";
 	localFile.append( location );
 	localFile.append( ".TXT" );
 
 	remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
 	remoteFile.append( location );
 	remoteFile.append( ".TXT" );
 
 	QFile file( localFile );
 	if ( file.exists() )
 	{
 		file.remove();
 	}
 
 	OProcess *proc = new OProcess;
 
 	*proc << "wget" << "-q" << remoteFile << "-O" << localFile;
 	connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) );
 	proc->start();
 }
 
 void WeatherPluginWidget::displayWeather()
 {
 	weatherData = QString::null;
 
 	QFile file( localFile );
 	
 	if ( file.size() > 0 && file.open( IO_ReadOnly ) )
 	{
 		QTextStream data( &file );
 		while ( !data.eof() )
 		{
 			weatherData.append( data.readLine() );
 		}
 		file.close();
 		weatherData = weatherData.simplifyWhiteSpace();
 
 		QString tmpstr;
 
 		tmpstr.append( tr( "Temp: " ) );
 		getTemp( weatherData );
 		tmpstr.append( dataStr );
 
 		tmpstr.append( tr( "  Wind: " ) );
 		getWind( weatherData );
 		tmpstr.append( dataStr );
 
 		tmpstr.append( tr( "\nPres: " ) );
 		getPressure( weatherData );
 		tmpstr.append( dataStr );
 
 		weatherLabel->setText( tmpstr );
 
 		tmpstr = "todayweatherplugin/";
 		getIcon( weatherData );
 		tmpstr.append( dataStr );
 		QImage logo1 = Resource::loadImage( tmpstr );
 		QPixmap pic;
 		pic.convertFromImage( logo1 );
 		weatherIcon->setPixmap( pic );
 	}
 	else
 	{
 		weatherLabel->setText( tr( "Current weather data not available." ) );
 	}
 }
 
 void WeatherPluginWidget::getTemp( const QString &data )
 {
 	int value;
 	bool ok;
 
 	int pos = data.find( QRegExp( "M?[0-9]+/M?[0-9]+" ), 20 );
 	if ( pos > -1 )
 	{
 		if ( data.at( pos ) == 'M' )
 		{
 			value = -1 * data.mid( pos + 1, 2 ).toInt( &ok );
 		}
 		else
 		{
 			value = data.mid( pos, 2 ).toInt( &ok );
 		}
 		if ( useMetric )
 		{
 			dataStr = QString::number( value );
 			dataStr.append( 'C' );
 		}
 		else
 		{
 			dataStr = QString::number( ( value * 9 / 5 ) + 32 );
 			dataStr.append( 'F' );
 		}
 	}
 	else
 	{
 		dataStr = tr( "n/a" );
 	}
 }
 
 void WeatherPluginWidget::getWind( const QString &data )
 {
 	int value;
 	bool ok;
 
 	int pos = data.find( QRegExp( "[0-9]*G*[0-9]*KT" ), 20 );
 	if ( pos > -1 )
 	{
 		if ( data.mid( pos, 3 ) != "VRB" )
 		{
 			value = data.mid( pos, 3 ).toInt( &ok );
 			if ( ( value >= 0 && value < 23 ) || ( value >= 239 && value <= 360 ) )
 				dataStr = tr("E " );
 			else if ( value >= 23 && value < 69 )
 				dataStr = tr( "NE " );
 			else if ( value >= 69 && value < 113 )
 				dataStr = tr( "N " );
 			else if ( value >= 113 && value < 157 )
 				dataStr = tr( "NW " );
 			else if ( value >= 157 && value < 203 )
 				dataStr = tr( "W " );
 			else if ( value >= 203 && value < 248 )
 				dataStr = tr( "SW " );
 			else if ( value >= 248 && value < 294 )
 				dataStr = tr( "S " );
 			else if ( value >= 294 && value < 238 )
 				dataStr = tr( "SE " );
 		}
 		if ( data.mid( pos + 5, 1) == "G" ||
 			 data.mid( pos + 5, 1) == "K" )
 		{
 			value = data.mid( pos + 3, 2 ).toInt( &ok );
 		}
 		else
 		{
 			value = data.mid( pos + 3, 3 ).toInt( &ok );
 		}
 		if ( useMetric )
 		{
 			value = value * 3.6 / 1.94;
 			dataStr.append( QString::number( value ) );
 			dataStr.append( tr( " KPH" ) );
 		}
 		else
 		{
 			value = value * 2.24 / 1.94;
 			dataStr.append( QString::number( value ) );
 			dataStr.append( tr( " MPH" ) );
 		}
 	}
 	else
 	{
 		dataStr = tr( "n/a" );
 	}
 }
 
 void WeatherPluginWidget::getPressure( const QString &data )
 {
 	float value;
 	bool ok;
 
 	int pos = data.find( QRegExp( "[AQ][0-9]+" ), 20 );
 	if ( pos > -1 )
 	{
 		value = data.mid( pos + 1, 4 ).toFloat( &ok );
 		if ( useMetric )
 		{
 			if ( data.mid( pos, 1 ) == "A" )
 				value *= 33.8639 / 100;
 			dataStr = QString::number( value, 'f', 2 );
 			dataStr.append( tr( " hPa" ) );
 		}
 		else
 		{
 			if ( data.mid( pos, 1 ) == "Q" )
 				value /= 33.8639;
 			else
 				value /= 100;
 			dataStr = QString::number( value, 'f', 2 );
 			dataStr.append( tr( " Hg" ) );
 		}
 	}
 	else
 	{
 		dataStr = tr( "n/a" );
 	}
 }
 
 void WeatherPluginWidget::getIcon(const QString &data )
 {
 	dataStr = "psunny";
 	if ( data.find( "CLR ", 20  ) > -1 ||
 		 data.find( "SKC ", 20  ) > -1 ||
 		 data.find( "CAVOK ", 20  ) > -1 )
 	{
 		dataStr = "sunny";
 	}
 	else if ( data.find( "SH ", 20 ) > -1 ||
 			  data.find( "DZ ", 20 ) > -1 ||
 			  data.find( "RA ", 20 ) > -1 ||
 			  data.find( "UP ", 20 ) > -1 ||
 			  data.find( "BR ", 20 ) > -1 )
 	{
 		dataStr = "shower";
 	}
 	else if ( data.find( "TS ", 20 ) > -1 )
 	{
 		dataStr = "tstorm";
 	}
 	else if ( data.find( "SN ", 20 ) > -1 ||
 			  data.find( "SG ", 20 ) > -1 )
 	{
 		dataStr = "snow";
 	}
 	else if ( data.find( "FZ ", 20 ) > -1 ||
 			  data.find( "GR ", 20 ) > -1 ||
 			  data.find( "GS ", 20 ) > -1 ||
 			  data.find( "PE ", 20 ) > -1 ||