| -rw-r--r-- | noncore/todayplugins/weather/weatherconfig.cpp | 49 | ||||
| -rw-r--r-- | noncore/todayplugins/weather/weatherpluginwidget.cpp | 13 |
2 files changed, 25 insertions, 37 deletions
diff --git a/noncore/todayplugins/weather/weatherconfig.cpp b/noncore/todayplugins/weather/weatherconfig.cpp index 4663549..d3ff3c9 100644 --- a/noncore/todayplugins/weather/weatherconfig.cpp +++ b/noncore/todayplugins/weather/weatherconfig.cpp @@ -1,24 +1,24 @@ /* - This file is part of the OPIE Project + This file is part of the OPIE Project =. - .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org> - .>+-= - _;:, .> :=|. This file is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This file is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General -..}^=.= = ; Public License for more details. -++= -. .` .: - : = ...= . :.=- You should have received a copy of the GNU - -. .:....=;==+<; General Public License along with this file; - -_. . . )=. = see the file COPYING. If not, write to the - -- :-=` Free Software Foundation, Inc., + .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org> + .>+-= +_;:, .> :=|. This file is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU General Public +.="- .-=="i, .._ License as published by the Free Software +- . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This file is distributed in the hope that + + . -:. = it will be useful, but WITHOUT ANY WARRANTY; + : .. .:, . . . without even the implied warranty of + =_ + =;=|` MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General +..}^=.= = ; Public License for more details. +++= -. .` .: +: = ...= . :.=- You should have received a copy of the GNU +-. .:....=;==+<; General Public License along with this file; + -_. . . )=. = see the file COPYING. If not, write to the + -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -32,3 +32,2 @@ #include <qpe/qpeapplication.h> -#include <qpe/resource.h> @@ -75,8 +74,2 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name) layout->addMultiCellWidget( label, 2, 2, 0, 1 ); - //layout->addWidget( label, 2, 0 ); - - //QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ), - // tr( "Copy link" ), this ); - //connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) ); - //layout->addWidget( pb, 2, 1 ); 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 @@ -30,8 +30,7 @@ _;:, .> :=|. This file is free software; you can -#include <qpe/applnk.h> +#include <opie2/oresource.h> + #include <qpe/config.h> -#include <qpe/resource.h> #include <qfile.h> -#include <qimage.h> #include <qlabel.h> @@ -51,5 +50,3 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) weatherIcon = new QLabel( this ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "Clock" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - weatherIcon->setPixmap( pic ); + weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( "Clock", Opie::Core::OResource::SmallIcon ) ); @@ -147,5 +144,3 @@ void WeatherPluginWidget::displayWeather() tmpstr.append( dataStr ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( tmpstr ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - weatherIcon->setPixmap( pic ); + weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( tmpstr, Opie::Core::OResource::SmallIcon ) ); } |