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,98 +1,97 @@
 /****************************************************************************
-** $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 ) ) );
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,148 +1,148 @@
 /*
                              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;