summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp75
1 files changed, 37 insertions, 38 deletions
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 8e00c36..8c41189 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -1,31 +1,37 @@
1/* 1/*
2                This file is part of the OPIE Project 2 This file is part of the OPIE Project
3 =. 3 =.
4             .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4 .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5           .>+-= 5 .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6_;:, .> :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_, > . <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.-- : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i, .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10- . .-<_> .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11 ._= =} : or (at your option) any later version.
12    .%`+i>       _;_. 12 .%`+i> _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13 .i_,=:_. -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15 : .. .:, . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.= = ; Public License for more details.
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>
30
31#include <qpe/applnk.h>
32#include <qpe/config.h>
33#include <qpe/resource.h>
34
29#include <qfile.h> 35#include <qfile.h>
30#include <qimage.h> 36#include <qimage.h>
31#include <qlabel.h> 37#include <qlabel.h>
@@ -33,31 +39,25 @@
33#include <qpixmap.h> 39#include <qpixmap.h>
34#include <qtextstream.h> 40#include <qtextstream.h>
35 41
36#include <opie2/oprocess.h>
37
38#include <qpe/config.h>
39#include <qpe/resource.h>
40
41#include "weatherpluginwidget.h" 42#include "weatherpluginwidget.h"
42 43
43using namespace Opie::Core; 44using namespace Opie::Core;
44WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) 45WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
45 : QWidget( parent, name ) 46 : QWidget( parent, name )
46{ 47{
47 QHBoxLayout *layout = new QHBoxLayout( this ); 48 QHBoxLayout *layout = new QHBoxLayout( this, 1, 2 );
48 layout->setAutoAdd( TRUE ); 49 layout->setAutoAdd( true );
49 layout->setSpacing( 2 );
50 50
51 weatherIcon = new QLabel( this ); 51 weatherIcon = new QLabel( this );
52 weatherIcon->setMaximumWidth( 32 ); 52 QPixmap pic;
53 QImage logo1 = Resource::loadImage( "Clock" ); 53 pic.convertFromImage( Resource::loadImage( "Clock" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
54 QPixmap pic;
55 pic.convertFromImage( logo1 );
56 weatherIcon->setPixmap( pic ); 54 weatherIcon->setPixmap( pic );
57 55
58 weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this ); 56 weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
59 weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); 57 weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
60 58
59 weatherIcon->setFixedSize( weatherLabel->height(), weatherLabel->height() );
60
61 startTimer(1000); 61 startTimer(1000);
62} 62}
63 63
@@ -84,7 +84,7 @@ void WeatherPluginWidget::retreiveData()
84 config.setGroup( "Config" ); 84 config.setGroup( "Config" );
85 85
86 location = config.readEntry( "Location", "" ); 86 location = config.readEntry( "Location", "" );
87 useMetric = config.readBoolEntry( "Metric", TRUE ); 87 useMetric = config.readBoolEntry( "Metric", true );
88 frequency = config.readNumEntry( "Frequency", 5 ); 88 frequency = config.readNumEntry( "Frequency", 5 );
89 89
90 startTimer( frequency * 60000 ); 90 startTimer( frequency * 60000 );
@@ -145,10 +145,9 @@ void WeatherPluginWidget::displayWeather()
145 tmpstr = "todayweatherplugin/"; 145 tmpstr = "todayweatherplugin/";
146 getIcon( weatherData ); 146 getIcon( weatherData );
147 tmpstr.append( dataStr ); 147 tmpstr.append( dataStr );
148 QImage logo1 = Resource::loadImage( tmpstr ); 148 QPixmap pic;
149 QPixmap pic; 149 pic.convertFromImage( Resource::loadImage( tmpstr ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
150 pic.convertFromImage( logo1 ); 150 weatherIcon->setPixmap( pic );
151 weatherIcon->setPixmap( pic );
152 } 151 }
153 else 152 else
154 { 153 {