summaryrefslogtreecommitdiff
authordrw <drw>2002-12-29 23:36:15 (UTC)
committer drw <drw>2002-12-29 23:36:15 (UTC)
commit46df3c62a8d630fe7e0b578566c05b6b10218296 (patch) (unidiff)
tree45f715da6dbf846aee33aa05f04afbdb58bbcd0c
parentd1fcfdb7fee76146f89a6ad763349ca5aa79d247 (diff)
downloadopie-46df3c62a8d630fe7e0b578566c05b6b10218296.zip
opie-46df3c62a8d630fe7e0b578566c05b6b10218296.tar.gz
opie-46df3c62a8d630fe7e0b578566c05b6b10218296.tar.bz2
Correctly display message when unable to get weather info & add qwhatsthis to configuration widget.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherconfig.cpp7
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp7
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
@@ -62,11 +62,13 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name)
62 QLabel *label = new QLabel( tr( "Enter ICAO location identifier:" ), this ); 62 QLabel *label = new QLabel( tr( "Enter ICAO location identifier:" ), this );
63 label->setMaximumHeight( fh + 3 ); 63 label->setMaximumHeight( fh + 3 );
64 layout->addMultiCellWidget( label, 0, 0, 0, 1 ); 64 layout->addMultiCellWidget( label, 0, 0, 0, 1 );
65 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." ) );
65 66
66 locationEdit = new QLineEdit( config.readEntry( "Location", "" ), this ); 67 locationEdit = new QLineEdit( config.readEntry( "Location", "" ), this );
67 locationEdit->setMaximumHeight( fh + 5 ); 68 locationEdit->setMaximumHeight( fh + 5 );
68 locationEdit->setFocus(); 69 locationEdit->setFocus();
69 layout->addMultiCellWidget( locationEdit, 1, 1, 0, 1 ); 70 layout->addMultiCellWidget( locationEdit, 1, 1, 0, 1 );
71 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." ) );
70 72
71 label = new QLabel( tr( "Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location." ), this ); 73 label = new QLabel( tr( "Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location." ), this );
72 label->setAlignment( AlignHCenter | WordBreak ); 74 label->setAlignment( AlignHCenter | WordBreak );
@@ -83,15 +85,18 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name)
83 metricCB->setMaximumHeight( fh + 5 ); 85 metricCB->setMaximumHeight( fh + 5 );
84 metricCB->setChecked( config.readBoolEntry( "Metric", TRUE ) ); 86 metricCB->setChecked( config.readBoolEntry( "Metric", TRUE ) );
85 layout->addMultiCellWidget( metricCB, 3, 3, 0, 1 ); 87 layout->addMultiCellWidget( metricCB, 3, 3, 0, 1 );
88 QWhatsThis::add( metricCB, tr( "Click here to select type of units displayed." ) );
86 89
87 label = new QLabel( tr( "Update frequency (in minutes):" ), this ); 90 label = new QLabel( tr( "Update frequency (in minutes):" ), this );
88 label->setMaximumHeight( fh + 3 ); 91 label->setMaximumHeight( fh + 3 );
89 layout->addWidget( label, 4, 0 ); 92 layout->addWidget( label, 4, 0 );
93 QWhatsThis::add( label, tr( "Select how often (in minutes) you want the weather to be updated." ) );
90 94
91 timerDelaySB = new QSpinBox( 1, 60, 1, this ); 95 timerDelaySB = new QSpinBox( 1, 60, 1, this );
92 timerDelaySB->setMaximumHeight( fh + 5 ); 96 timerDelaySB->setMaximumHeight( fh + 5 );
93 timerDelaySB->setValue( config.readNumEntry( "Frequency", 5 ) ); 97 timerDelaySB->setValue( config.readNumEntry( "Frequency", 5 ) );
94 layout->addWidget( timerDelaySB, 4, 1 ); 98 layout->addWidget( timerDelaySB, 4, 1 );
99 QWhatsThis::add( timerDelaySB, tr( "Select how often (in minutes) you want the weather to be updated." ) );
95} 100}
96 101
97 102
@@ -124,4 +129,4 @@ void WeatherPluginConfig::slotCopyLink()
124{ 129{
125 QPEApplication::clipboard()->setText( "http://www.nws.noaa.gov/tg/siteloc.shtml" ); 130 QPEApplication::clipboard()->setText( "http://www.nws.noaa.gov/tg/siteloc.shtml" );
126} 131}
127*/ \ No newline at end of file 132*/
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
@@ -114,7 +114,8 @@ void WeatherPluginWidget::displayWeather()
114 weatherData = QString::null; 114 weatherData = QString::null;
115 115
116 QFile file( localFile ); 116 QFile file( localFile );
117 if ( file.open( IO_ReadOnly ) ) 117
118 if ( file.size() > 0 && file.open( IO_ReadOnly ) )
118 { 119 {
119 QTextStream data( &file ); 120 QTextStream data( &file );
120 while ( !data.eof() ) 121 while ( !data.eof() )
@@ -150,7 +151,7 @@ void WeatherPluginWidget::displayWeather()
150 } 151 }
151 else 152 else
152 { 153 {
153 weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) ); 154 weatherLabel->setText( tr( "Current weather data not available." ) );
154 } 155 }
155} 156}
156 157
@@ -319,6 +320,6 @@ void WeatherPluginWidget::dataRetrieved( OProcess *process )
319 } 320 }
320 else 321 else
321 { 322 {
322 weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) ); 323 weatherLabel->setText( tr( "Current weather data not available." ) );
323 } 324 }
324} 325}