summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp65
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.h8
2 files changed, 39 insertions, 34 deletions
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 0fd8e57..6444ebf 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -26,5 +26,4 @@
26 26
27*/ 27*/
28#include <stdio.h>
29 28
30#include <qfile.h> 29#include <qfile.h>
@@ -35,4 +34,6 @@
35#include <qtextstream.h> 34#include <qtextstream.h>
36 35
36#include <opie/oprocess.h>
37
37#include <qpe/config.h> 38#include <qpe/config.h>
38#include <qpe/resource.h> 39#include <qpe/resource.h>
@@ -43,19 +44,4 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
43 : QWidget( parent, name ) 44 : QWidget( parent, name )
44{ 45{
45 Config config( "todayweatherplugin");
46 config.setGroup( "Config" );
47
48 location = config.readEntry( "Location", "" );
49 useMetric = config.readBoolEntry( "Metric", TRUE );
50 frequency = config.readNumEntry( "Frequency", 5 );
51
52 localFile = "/tmp/";
53 localFile.append( location );
54 localFile.append( ".TXT" );
55
56 remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
57 remoteFile.append( location );
58 remoteFile.append( ".TXT" );
59
60 QHBoxLayout *layout = new QHBoxLayout( this ); 46 QHBoxLayout *layout = new QHBoxLayout( this );
61 layout->setAutoAdd( TRUE ); 47 layout->setAutoAdd( TRUE );
@@ -73,5 +59,4 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
73 59
74 startTimer(1000); 60 startTimer(1000);
75 //retreiveData();
76} 61}
77 62
@@ -97,4 +82,19 @@ void WeatherPluginWidget::retreiveData()
97 startTimer( frequency * 60000 ); 82 startTimer( frequency * 60000 );
98 83
84 Config config( "todayweatherplugin");
85 config.setGroup( "Config" );
86
87 location = config.readEntry( "Location", "" );
88 useMetric = config.readBoolEntry( "Metric", TRUE );
89 frequency = config.readNumEntry( "Frequency", 5 );
90
91 localFile = "/tmp/";
92 localFile.append( location );
93 localFile.append( ".TXT" );
94
95 remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
96 remoteFile.append( location );
97 remoteFile.append( ".TXT" );
98
99 QFile file( localFile ); 99 QFile file( localFile );
100 if ( file.exists() ) 100 if ( file.exists() )
@@ -103,18 +103,9 @@ void WeatherPluginWidget::retreiveData()
103 } 103 }
104 104
105 QString command = "wget -q "; 105 OProcess *proc = new OProcess;
106 command.append( remoteFile ); 106
107 command.append( " -O " ); 107 *proc << "wget" << "-q" << remoteFile << "-O" << localFile;
108 command.append( localFile ); 108 connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) );
109 FILE *get = popen( command.latin1(), "r" ); 109 proc->start();
110 if ( get )
111 {
112 pclose( get );
113 displayWeather();
114 }
115 else
116 {
117 weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
118 }
119} 110}
120 111
@@ -320,2 +311,14 @@ void WeatherPluginWidget::getIcon(const QString &data )
320 } 311 }
321} 312}
313
314void WeatherPluginWidget::dataRetrieved( OProcess *process )
315{
316 if ( process->normalExit() )
317 {
318 displayWeather();
319 }
320 else
321 {
322 weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
323 }
324}
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.h b/noncore/todayplugins/weather/weatherpluginwidget.h
index 2c0238d..d2bbd8b 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.h
+++ b/noncore/todayplugins/weather/weatherpluginwidget.h
@@ -33,6 +33,5 @@
33#include <qwidget.h> 33#include <qwidget.h>
34 34
35#include <unistd.h> 35class OProcess;
36
37class QLabel; 36class QLabel;
38class QTimer; 37class QTimer;
@@ -57,5 +56,5 @@ class WeatherPluginWidget : public QWidget {
57 QLabel *weatherLabel; 56 QLabel *weatherLabel;
58 QLabel *weatherIcon; 57 QLabel *weatherIcon;
59 58
60 void timerEvent( QTimerEvent * ); 59 void timerEvent( QTimerEvent * );
61 void retreiveData(); 60 void retreiveData();
@@ -65,4 +64,7 @@ class WeatherPluginWidget : public QWidget {
65 void getPressure( const QString & ); 64 void getPressure( const QString & );
66 void getIcon( const QString & ); 65 void getIcon( const QString & );
66
67 private slots:
68 void dataRetrieved( OProcess * );
67}; 69};
68 70