Correctly display message when unable to get weather info & add qwhatsthis to configuration widget.

2 files changed, 10 insertions, 4 deletions

diff --git a/noncore/todayplugins/weather/weatherconfig.cpp b/noncore/todayplugins/weather/weatherconfig.cpp
index fe10883..99ee2a0 100644
--- a/noncore/todayplugins/weather/weatherconfig.cpp
+++ b/noncore/todayplugins/weather/weatherconfig.cpp
@@ -59,17 +59,19 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         layout->setSpacing( 4 );
         layout->setMargin( 4 );
 
         QLabel *label = new QLabel( tr( "Enter ICAO location identifier:" ), this );
         label->setMaximumHeight( fh + 3 );
         layout->addMultiCellWidget( label, 0, 0, 0, 1 );
+    QWhatsThis::add( label, tr( "Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you." ) );
 
         locationEdit = new QLineEdit( config.readEntry( "Location", "" ), this );
         locationEdit->setMaximumHeight( fh + 5 );
         locationEdit->setFocus();
     layout->addMultiCellWidget( locationEdit, 1, 1, 0, 1 );
+    QWhatsThis::add( locationEdit, tr( "Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you." ) );
 
         label = new QLabel( tr( "Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location." ), this );
         label->setAlignment( AlignHCenter | WordBreak );
         label->setMaximumHeight( label->height() );
         layout->addMultiCellWidget( label, 2, 2, 0, 1 );
         //layout->addWidget( label, 2, 0 );
@@ -80,21 +82,24 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         //layout->addWidget( pb, 2, 1 );
 
         metricCB = new QCheckBox( tr( "Use metric units" ), this );
         metricCB->setMaximumHeight( fh + 5 );
         metricCB->setChecked( config.readBoolEntry( "Metric", TRUE ) );
         layout->addMultiCellWidget( metricCB, 3, 3, 0, 1 );
+    QWhatsThis::add( metricCB, tr( "Click here to select type of units displayed." ) );
 
         label = new QLabel( tr( "Update frequency (in minutes):" ), this );
         label->setMaximumHeight( fh + 3 );
         layout->addWidget( label, 4, 0 );
+    QWhatsThis::add( label, tr( "Select how often (in minutes) you want the weather to be updated." ) );
 
         timerDelaySB = new QSpinBox( 1, 60, 1, this );
         timerDelaySB->setMaximumHeight( fh + 5 );
         timerDelaySB->setValue( config.readNumEntry( "Frequency", 5 ) );
         layout->addWidget( timerDelaySB, 4, 1 );
+    QWhatsThis::add( timerDelaySB, tr( "Select how often (in minutes) you want the weather to be updated." ) );
 }
 
 
 void WeatherPluginConfig::writeConfig()
 {
         Config config( "todayweatherplugin");
@@ -121,7 +126,7 @@ void WeatherPluginConfig::doLookup()
 Doesn't seem to like QPEApplication::clipboard()...
 
 void WeatherPluginConfig::slotCopyLink()
 {
         QPEApplication::clipboard()->setText( "http://www.nws.noaa.gov/tg/siteloc.shtml" );
 }
-*/
\ No newline at end of file
+*/
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index f4ea0f2..800fdcb 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -111,13 +111,14 @@ void WeatherPluginWidget::retreiveData()
 
 void WeatherPluginWidget::displayWeather()
 {
         weatherData = QString::null;
 
         QFile file( localFile );
-        if ( file.open( IO_ReadOnly ) )
+        
+        if ( file.size() > 0 && file.open( IO_ReadOnly ) )
         {
                 QTextStream data( &file );
                 while ( !data.eof() )
                 {
                         weatherData.append( data.readLine() );
                 }
@@ -147,13 +148,13 @@ void WeatherPluginWidget::displayWeather()
                 QPixmap pic;
                 pic.convertFromImage( logo1 );
                 weatherIcon->setPixmap( pic );
         }
         else
         {
-                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+                weatherLabel->setText( tr( "Current weather data not available." ) );
         }
 }
 
 void WeatherPluginWidget::getTemp( const QString &data )
 {
         int value;
@@ -316,9 +317,9 @@ void WeatherPluginWidget::dataRetrieved( OProcess *process )
         if ( process->normalExit() )
         {
                 displayWeather();
         }
         else
         {
-                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+                weatherLabel->setText( tr( "Current weather data not available." ) );
         }
 }