author | drw <drw> | 2002-12-29 23:36:15 (UTC) |
---|---|---|
committer | drw <drw> | 2002-12-29 23:36:15 (UTC) |
commit | 46df3c62a8d630fe7e0b578566c05b6b10218296 (patch) (unidiff) | |
tree | 45f715da6dbf846aee33aa05f04afbdb58bbcd0c /noncore/todayplugins/weather | |
parent | d1fcfdb7fee76146f89a6ad763349ca5aa79d247 (diff) | |
download | opie-46df3c62a8d630fe7e0b578566c05b6b10218296.zip opie-46df3c62a8d630fe7e0b578566c05b6b10218296.tar.gz opie-46df3c62a8d630fe7e0b578566c05b6b10218296.tar.bz2 |
Correctly display message when unable to get weather info & add qwhatsthis to configuration widget.
-rw-r--r-- | noncore/todayplugins/weather/weatherconfig.cpp | 5 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 7 |
2 files changed, 9 insertions, 3 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 | |||
@@ -63,4 +63,5 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | |||
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 ); |
@@ -68,4 +69,5 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | |||
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 ); |
@@ -84,8 +86,10 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | |||
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 ); |
@@ -93,4 +97,5 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | |||
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 | ||
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 | |||
@@ -115,5 +115,6 @@ void WeatherPluginWidget::displayWeather() | |||
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 ); |
@@ -151,5 +152,5 @@ void WeatherPluginWidget::displayWeather() | |||
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 | } |
@@ -320,5 +321,5 @@ void WeatherPluginWidget::dataRetrieved( OProcess *process ) | |||
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 | } |