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
@@ -64,2 +64,3 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         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." ) );
 
@@ -69,2 +70,3 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
     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." ) );
 
@@ -85,2 +87,3 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         layout->addMultiCellWidget( metricCB, 3, 3, 0, 1 );
+    QWhatsThis::add( metricCB, tr( "Click here to select type of units displayed." ) );
 
@@ -89,2 +92,3 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         layout->addWidget( label, 4, 0 );
+    QWhatsThis::add( label, tr( "Select how often (in minutes) you want the weather to be updated." ) );
 
@@ -94,2 +98,3 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
         layout->addWidget( timerDelaySB, 4, 1 );
+    QWhatsThis::add( timerDelaySB, tr( "Select how often (in minutes) you want the weather to be updated." ) );
 }
@@ -126,2 +131,2 @@ void WeatherPluginConfig::slotCopyLink()
 }
-*/
\ 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
@@ -116,3 +116,4 @@ void WeatherPluginWidget::displayWeather()
         QFile file( localFile );
-        if ( file.open( IO_ReadOnly ) )
+        
+        if ( file.size() > 0 && file.open( IO_ReadOnly ) )
         {
@@ -152,3 +153,3 @@ void WeatherPluginWidget::displayWeather()
         {
-                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+                weatherLabel->setText( tr( "Current weather data not available." ) );
         }
@@ -321,3 +322,3 @@ void WeatherPluginWidget::dataRetrieved( OProcess *process )
         {
-                weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+                weatherLabel->setText( tr( "Current weather data not available." ) );
         }