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
@@ -17,111 +17,116 @@
   _.=:.       :    :=>`:     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 <stdlib.h>
 
 #include <qcheckbox.h>
 #include <qclipboard.h>
 #include <qfontmetrics.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qwhatsthis.h>
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <opie/todayconfigwidget.h>
 
 #include "weatherconfig.h"
 
 WeatherPluginConfig::WeatherPluginConfig( QWidget *parent,  const char* name)
 	: TodayConfigWidget(parent,  name )
 {
 	Config config( "todayweatherplugin");
 	config.setGroup( "Config" );
 
 	QFontMetrics fm = fontMetrics();
 	int fh = fm.height();
 
 	QGridLayout *layout = new QGridLayout( this );
 	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 );
 
 	//QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ),
 	//	tr( "Copy link" ), this );
 	//connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) );
 	//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");
 	config.setGroup( "Config" );
 
 	config.writeEntry( "Location", locationEdit->text().upper().stripWhiteSpace() );
 	config.writeEntry( "Metric", metricCB->isChecked() );
 	config.writeEntry( "Frequency", timerDelaySB->value() );
 
 	config.write();
 }
 
 WeatherPluginConfig::~WeatherPluginConfig()
 {
 }
 
 void WeatherPluginConfig::doLookup()
 {
 	system( "weather" );
 }
 
 /*
 
 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
@@ -69,133 +69,134 @@ WeatherPluginWidget::~WeatherPluginWidget()
 	}
 }
 
 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.open( IO_ReadOnly ) )
+	
+	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.\nTry looking out the window." ) );
+		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 ) )
@@ -274,51 +275,51 @@ void WeatherPluginWidget::getPressure( const QString &data )
 		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 ||
 			  data.find( "IC ", 20 ) > -1 )
 	{
 		dataStr = "sleet";
 	}
 }
 
 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." ) );
 	}
 }