Diffstat (limited to 'noncore/todayplugins/weather/weatherpluginwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp index 8c41189..fe54051 100644 --- a/noncore/todayplugins/weather/weatherpluginwidget.cpp +++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp | |||
@@ -19,48 +19,45 @@ _;:, .> :=|. This file is free software; you can | |||
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <opie2/oprocess.h> | 29 | #include <opie2/oprocess.h> |
30 | 30 | ||
31 | #include <qpe/applnk.h> | 31 | #include <opie2/oresource.h> |
32 | |||
32 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
33 | #include <qpe/resource.h> | ||
34 | 34 | ||
35 | #include <qfile.h> | 35 | #include <qfile.h> |
36 | #include <qimage.h> | ||
37 | #include <qlabel.h> | 36 | #include <qlabel.h> |
38 | #include <qlayout.h> | 37 | #include <qlayout.h> |
39 | #include <qpixmap.h> | 38 | #include <qpixmap.h> |
40 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
41 | 40 | ||
42 | #include "weatherpluginwidget.h" | 41 | #include "weatherpluginwidget.h" |
43 | 42 | ||
44 | using namespace Opie::Core; | 43 | using namespace Opie::Core; |
45 | WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) | 44 | WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) |
46 | : QWidget( parent, name ) | 45 | : QWidget( parent, name ) |
47 | { | 46 | { |
48 | QHBoxLayout *layout = new QHBoxLayout( this, 1, 2 ); | 47 | QHBoxLayout *layout = new QHBoxLayout( this, 1, 2 ); |
49 | layout->setAutoAdd( true ); | 48 | layout->setAutoAdd( true ); |
50 | 49 | ||
51 | weatherIcon = new QLabel( this ); | 50 | weatherIcon = new QLabel( this ); |
52 | QPixmap pic; | 51 | weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( "Clock", Opie::Core::OResource::SmallIcon ) ); |
53 | pic.convertFromImage( Resource::loadImage( "Clock" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
54 | weatherIcon->setPixmap( pic ); | ||
55 | 52 | ||
56 | weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this ); | 53 | weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this ); |
57 | weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); | 54 | weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); |
58 | 55 | ||
59 | weatherIcon->setFixedSize( weatherLabel->height(), weatherLabel->height() ); | 56 | weatherIcon->setFixedSize( weatherLabel->height(), weatherLabel->height() ); |
60 | 57 | ||
61 | startTimer(1000); | 58 | startTimer(1000); |
62 | } | 59 | } |
63 | 60 | ||
64 | WeatherPluginWidget::~WeatherPluginWidget() | 61 | WeatherPluginWidget::~WeatherPluginWidget() |
65 | { | 62 | { |
66 | QFile file( localFile ); | 63 | QFile file( localFile ); |
@@ -136,27 +133,25 @@ void WeatherPluginWidget::displayWeather() | |||
136 | getWind( weatherData ); | 133 | getWind( weatherData ); |
137 | tmpstr.append( dataStr ); | 134 | tmpstr.append( dataStr ); |
138 | 135 | ||
139 | tmpstr.append( tr( "\nPres: " ) ); | 136 | tmpstr.append( tr( "\nPres: " ) ); |
140 | getPressure( weatherData ); | 137 | getPressure( weatherData ); |
141 | tmpstr.append( dataStr ); | 138 | tmpstr.append( dataStr ); |
142 | 139 | ||
143 | weatherLabel->setText( tmpstr ); | 140 | weatherLabel->setText( tmpstr ); |
144 | 141 | ||
145 | tmpstr = "todayweatherplugin/"; | 142 | tmpstr = "todayweatherplugin/"; |
146 | getIcon( weatherData ); | 143 | getIcon( weatherData ); |
147 | tmpstr.append( dataStr ); | 144 | tmpstr.append( dataStr ); |
148 | QPixmap pic; | 145 | weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( tmpstr, Opie::Core::OResource::SmallIcon ) ); |
149 | pic.convertFromImage( Resource::loadImage( tmpstr ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
150 | weatherIcon->setPixmap( pic ); | ||
151 | } | 146 | } |
152 | else | 147 | else |
153 | { | 148 | { |
154 | weatherLabel->setText( tr( "Current weather data not available." ) ); | 149 | weatherLabel->setText( tr( "Current weather data not available." ) ); |
155 | } | 150 | } |
156 | } | 151 | } |
157 | 152 | ||
158 | void WeatherPluginWidget::getTemp( const QString &data ) | 153 | void WeatherPluginWidget::getTemp( const QString &data ) |
159 | { | 154 | { |
160 | int value; | 155 | int value; |
161 | bool ok; | 156 | bool ok; |
162 | 157 | ||