| -rw-r--r-- | noncore/todayplugins/weather/weatherconfig.cpp | 7 | ||||
| -rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 7 |
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 @@ -49,79 +49,84 @@ 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 @@ -101,33 +101,34 @@ void WeatherPluginWidget::retreiveData() { 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: " ) ); @@ -137,33 +138,33 @@ void WeatherPluginWidget::displayWeather() 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 @@ -306,19 +307,19 @@ void WeatherPluginWidget::getIcon(const QString &data ) 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." ) ); } } |