-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 | |||
@@ -41,78 +41,83 @@ | |||
41 | 41 | ||
42 | #include <qpe/config.h> | 42 | #include <qpe/config.h> |
43 | #include <qpe/qpeapplication.h> | 43 | #include <qpe/qpeapplication.h> |
44 | #include <qpe/resource.h> | 44 | #include <qpe/resource.h> |
45 | #include <opie/todayconfigwidget.h> | 45 | #include <opie/todayconfigwidget.h> |
46 | 46 | ||
47 | #include "weatherconfig.h" | 47 | #include "weatherconfig.h" |
48 | 48 | ||
49 | WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) | 49 | WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) |
50 | : TodayConfigWidget(parent, name ) | 50 | : TodayConfigWidget(parent, name ) |
51 | { | 51 | { |
52 | Config config( "todayweatherplugin"); | 52 | Config config( "todayweatherplugin"); |
53 | config.setGroup( "Config" ); | 53 | config.setGroup( "Config" ); |
54 | 54 | ||
55 | QFontMetrics fm = fontMetrics(); | 55 | QFontMetrics fm = fontMetrics(); |
56 | int fh = fm.height(); | 56 | int fh = fm.height(); |
57 | 57 | ||
58 | QGridLayout *layout = new QGridLayout( this ); | 58 | QGridLayout *layout = new QGridLayout( this ); |
59 | layout->setSpacing( 4 ); | 59 | layout->setSpacing( 4 ); |
60 | layout->setMargin( 4 ); | 60 | layout->setMargin( 4 ); |
61 | 61 | ||
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 ); |
73 | label->setMaximumHeight( label->height() ); | 75 | label->setMaximumHeight( label->height() ); |
74 | layout->addMultiCellWidget( label, 2, 2, 0, 1 ); | 76 | layout->addMultiCellWidget( label, 2, 2, 0, 1 ); |
75 | //layout->addWidget( label, 2, 0 ); | 77 | //layout->addWidget( label, 2, 0 ); |
76 | 78 | ||
77 | //QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ), | 79 | //QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ), |
78 | //tr( "Copy link" ), this ); | 80 | //tr( "Copy link" ), this ); |
79 | //connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) ); | 81 | //connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) ); |
80 | //layout->addWidget( pb, 2, 1 ); | 82 | //layout->addWidget( pb, 2, 1 ); |
81 | 83 | ||
82 | metricCB = new QCheckBox( tr( "Use metric units" ), this ); | 84 | metricCB = new QCheckBox( tr( "Use metric units" ), this ); |
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 | ||
98 | void WeatherPluginConfig::writeConfig() | 103 | void WeatherPluginConfig::writeConfig() |
99 | { | 104 | { |
100 | Config config( "todayweatherplugin"); | 105 | Config config( "todayweatherplugin"); |
101 | config.setGroup( "Config" ); | 106 | config.setGroup( "Config" ); |
102 | 107 | ||
103 | config.writeEntry( "Location", locationEdit->text().upper().stripWhiteSpace() ); | 108 | config.writeEntry( "Location", locationEdit->text().upper().stripWhiteSpace() ); |
104 | config.writeEntry( "Metric", metricCB->isChecked() ); | 109 | config.writeEntry( "Metric", metricCB->isChecked() ); |
105 | config.writeEntry( "Frequency", timerDelaySB->value() ); | 110 | config.writeEntry( "Frequency", timerDelaySB->value() ); |
106 | 111 | ||
107 | config.write(); | 112 | config.write(); |
108 | } | 113 | } |
109 | 114 | ||
110 | WeatherPluginConfig::~WeatherPluginConfig() | 115 | WeatherPluginConfig::~WeatherPluginConfig() |
111 | { | 116 | { |
112 | } | 117 | } |
113 | 118 | ||
114 | void WeatherPluginConfig::doLookup() | 119 | void WeatherPluginConfig::doLookup() |
115 | { | 120 | { |
116 | system( "weather" ); | 121 | system( "weather" ); |
117 | } | 122 | } |
118 | 123 | ||
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 | |||
@@ -93,85 +93,86 @@ void WeatherPluginWidget::retreiveData() | |||
93 | localFile.append( ".TXT" ); | 93 | localFile.append( ".TXT" ); |
94 | 94 | ||
95 | remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/"; | 95 | remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/"; |
96 | remoteFile.append( location ); | 96 | remoteFile.append( location ); |
97 | remoteFile.append( ".TXT" ); | 97 | remoteFile.append( ".TXT" ); |
98 | 98 | ||
99 | QFile file( localFile ); | 99 | QFile file( localFile ); |
100 | if ( file.exists() ) | 100 | if ( file.exists() ) |
101 | { | 101 | { |
102 | file.remove(); | 102 | file.remove(); |
103 | } | 103 | } |
104 | 104 | ||
105 | OProcess *proc = new OProcess; | 105 | OProcess *proc = new OProcess; |
106 | 106 | ||
107 | *proc << "wget" << "-q" << remoteFile << "-O" << localFile; | 107 | *proc << "wget" << "-q" << remoteFile << "-O" << localFile; |
108 | connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) ); | 108 | connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) ); |
109 | proc->start(); | 109 | proc->start(); |
110 | } | 110 | } |
111 | 111 | ||
112 | void WeatherPluginWidget::displayWeather() | 112 | void WeatherPluginWidget::displayWeather() |
113 | { | 113 | { |
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() ) |
121 | { | 122 | { |
122 | weatherData.append( data.readLine() ); | 123 | weatherData.append( data.readLine() ); |
123 | } | 124 | } |
124 | file.close(); | 125 | file.close(); |
125 | weatherData = weatherData.simplifyWhiteSpace(); | 126 | weatherData = weatherData.simplifyWhiteSpace(); |
126 | 127 | ||
127 | QString tmpstr; | 128 | QString tmpstr; |
128 | 129 | ||
129 | tmpstr.append( tr( "Temp: " ) ); | 130 | tmpstr.append( tr( "Temp: " ) ); |
130 | getTemp( weatherData ); | 131 | getTemp( weatherData ); |
131 | tmpstr.append( dataStr ); | 132 | tmpstr.append( dataStr ); |
132 | 133 | ||
133 | tmpstr.append( tr( " Wind: " ) ); | 134 | tmpstr.append( tr( " Wind: " ) ); |
134 | getWind( weatherData ); | 135 | getWind( weatherData ); |
135 | tmpstr.append( dataStr ); | 136 | tmpstr.append( dataStr ); |
136 | 137 | ||
137 | tmpstr.append( tr( "\nPres: " ) ); | 138 | tmpstr.append( tr( "\nPres: " ) ); |
138 | getPressure( weatherData ); | 139 | getPressure( weatherData ); |
139 | tmpstr.append( dataStr ); | 140 | tmpstr.append( dataStr ); |
140 | 141 | ||
141 | weatherLabel->setText( tmpstr ); | 142 | weatherLabel->setText( tmpstr ); |
142 | 143 | ||
143 | tmpstr = "todayweatherplugin/"; | 144 | tmpstr = "todayweatherplugin/"; |
144 | getIcon( weatherData ); | 145 | getIcon( weatherData ); |
145 | tmpstr.append( dataStr ); | 146 | tmpstr.append( dataStr ); |
146 | QImage logo1 = Resource::loadImage( tmpstr ); | 147 | QImage logo1 = Resource::loadImage( tmpstr ); |
147 | QPixmap pic; | 148 | QPixmap pic; |
148 | pic.convertFromImage( logo1 ); | 149 | pic.convertFromImage( logo1 ); |
149 | weatherIcon->setPixmap( pic ); | 150 | weatherIcon->setPixmap( pic ); |
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 | ||
157 | void WeatherPluginWidget::getTemp( const QString &data ) | 158 | void WeatherPluginWidget::getTemp( const QString &data ) |
158 | { | 159 | { |
159 | int value; | 160 | int value; |
160 | bool ok; | 161 | bool ok; |
161 | 162 | ||
162 | int pos = data.find( QRegExp( "M?[0-9]+/M?[0-9]+" ), 20 ); | 163 | int pos = data.find( QRegExp( "M?[0-9]+/M?[0-9]+" ), 20 ); |
163 | if ( pos > -1 ) | 164 | if ( pos > -1 ) |
164 | { | 165 | { |
165 | if ( data.at( pos ) == 'M' ) | 166 | if ( data.at( pos ) == 'M' ) |
166 | { | 167 | { |
167 | value = -1 * data.mid( pos + 1, 2 ).toInt( &ok ); | 168 | value = -1 * data.mid( pos + 1, 2 ).toInt( &ok ); |
168 | } | 169 | } |
169 | else | 170 | else |
170 | { | 171 | { |
171 | value = data.mid( pos, 2 ).toInt( &ok ); | 172 | value = data.mid( pos, 2 ).toInt( &ok ); |
172 | } | 173 | } |
173 | if ( useMetric ) | 174 | if ( useMetric ) |
174 | { | 175 | { |
175 | dataStr = QString::number( value ); | 176 | dataStr = QString::number( value ); |
176 | dataStr.append( 'C' ); | 177 | dataStr.append( 'C' ); |
177 | } | 178 | } |
@@ -298,27 +299,27 @@ void WeatherPluginWidget::getIcon(const QString &data ) | |||
298 | } | 299 | } |
299 | else if ( data.find( "SN ", 20 ) > -1 || | 300 | else if ( data.find( "SN ", 20 ) > -1 || |
300 | data.find( "SG ", 20 ) > -1 ) | 301 | data.find( "SG ", 20 ) > -1 ) |
301 | { | 302 | { |
302 | dataStr = "snow"; | 303 | dataStr = "snow"; |
303 | } | 304 | } |
304 | else if ( data.find( "FZ ", 20 ) > -1 || | 305 | else if ( data.find( "FZ ", 20 ) > -1 || |
305 | data.find( "GR ", 20 ) > -1 || | 306 | data.find( "GR ", 20 ) > -1 || |
306 | data.find( "GS ", 20 ) > -1 || | 307 | data.find( "GS ", 20 ) > -1 || |
307 | data.find( "PE ", 20 ) > -1 || | 308 | data.find( "PE ", 20 ) > -1 || |
308 | data.find( "IC ", 20 ) > -1 ) | 309 | data.find( "IC ", 20 ) > -1 ) |
309 | { | 310 | { |
310 | dataStr = "sleet"; | 311 | dataStr = "sleet"; |
311 | } | 312 | } |
312 | } | 313 | } |
313 | 314 | ||
314 | void WeatherPluginWidget::dataRetrieved( OProcess *process ) | 315 | void WeatherPluginWidget::dataRetrieved( OProcess *process ) |
315 | { | 316 | { |
316 | if ( process->normalExit() ) | 317 | if ( process->normalExit() ) |
317 | { | 318 | { |
318 | displayWeather(); | 319 | displayWeather(); |
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 | } |