summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 20:53:08 (UTC)
committer drw <drw>2005-05-24 20:53:08 (UTC)
commit22cda9f7212641869c3abe210c66bf54a03f9579 (patch) (side-by-side diff)
tree446175ae7d2d2790bf52732a66a930648f0a195c
parent2848aca68964a46fb2f786cc01a9b2583d599511 (diff)
downloadopie-22cda9f7212641869c3abe210c66bf54a03f9579.zip
opie-22cda9f7212641869c3abe210c66bf54a03f9579.tar.gz
opie-22cda9f7212641869c3abe210c66bf54a03f9579.tar.bz2
Resource -> OResource and remove unnecessary include
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherconfig.cpp49
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp13
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,105 +1,98 @@
/*
-                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,
Boston, MA 02111-1307, USA.
*/
#include "weatherconfig.h"
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qcheckbox.h>
#include <qclipboard.h>
#include <qfontmetrics.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qwhatsthis.h>
#include <stdlib.h>
WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name)
: TodayConfigWidget(parent, name )
{
Config config( "todayweatherplugin");
config.setGroup( "Config" );
QFontMetrics fm = fontMetrics();
int fh = fm.height();
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 4 );
layout->setMargin( 4 );
QLabel *label = new QLabel( tr( "Enter ICAO location identifier:" ), this );
label->setMaximumHeight( fh + 3 );
layout->addMultiCellWidget( label, 0, 0, 0, 1 );
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." ) );
locationEdit = new QLineEdit( config.readEntry( "Location", "" ), this );
locationEdit->setMaximumHeight( fh + 5 );
locationEdit->setFocus();
layout->addMultiCellWidget( locationEdit, 1, 1, 0, 1 );
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." ) );
label = new QLabel( tr( "Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location." ), this );
label->setAlignment( AlignHCenter | WordBreak );
label->setMaximumHeight( label->height() );
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 );
metricCB = new QCheckBox( tr( "Use metric units" ), this );
metricCB->setMaximumHeight( fh + 5 );
metricCB->setChecked( config.readBoolEntry( "Metric", TRUE ) );
layout->addMultiCellWidget( metricCB, 3, 3, 0, 1 );
QWhatsThis::add( metricCB, tr( "Click here to select type of units displayed." ) );
label = new QLabel( tr( "Update frequency (in minutes):" ), this );
label->setMaximumHeight( fh + 3 );
layout->addWidget( label, 4, 0 );
QWhatsThis::add( label, tr( "Select how often (in minutes) you want the weather to be updated." ) );
timerDelaySB = new QSpinBox( 1, 60, 1, this );
timerDelaySB->setMaximumHeight( fh + 5 );
timerDelaySB->setValue( config.readNumEntry( "Frequency", 5 ) );
layout->addWidget( timerDelaySB, 4, 1 );
QWhatsThis::add( timerDelaySB, tr( "Select how often (in minutes) you want the weather to be updated." ) );
}
void WeatherPluginConfig::writeConfig()
{
Config config( "todayweatherplugin");
config.setGroup( "Config" );
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
@@ -7,72 +7,69 @@ _;:, .> :=|. 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,
Boston, MA 02111-1307, USA.
*/
#include <opie2/oprocess.h>
-#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>
#include <qlayout.h>
#include <qpixmap.h>
#include <qtextstream.h>
#include "weatherpluginwidget.h"
using namespace Opie::Core;
WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
: QWidget( parent, name )
{
QHBoxLayout *layout = new QHBoxLayout( this, 1, 2 );
layout->setAutoAdd( true );
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 ) );
weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
weatherIcon->setFixedSize( weatherLabel->height(), weatherLabel->height() );
startTimer(1000);
}
WeatherPluginWidget::~WeatherPluginWidget()
{
QFile file( localFile );
if ( file.exists() )
{
file.remove();
}
}
void WeatherPluginWidget::timerEvent( QTimerEvent *e )
{
killTimer( e->timerId() );
retreiveData();
}
@@ -124,51 +121,49 @@ void WeatherPluginWidget::displayWeather()
weatherData.append( data.readLine() );
}
file.close();
weatherData = weatherData.simplifyWhiteSpace();
QString tmpstr;
tmpstr.append( tr( "Temp: " ) );
getTemp( weatherData );
tmpstr.append( dataStr );
tmpstr.append( tr( " Wind: " ) );
getWind( weatherData );
tmpstr.append( dataStr );
tmpstr.append( tr( "\nPres: " ) );
getPressure( weatherData );
tmpstr.append( dataStr );
weatherLabel->setText( tmpstr );
tmpstr = "todayweatherplugin/";
getIcon( weatherData );
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 ) );
}
else
{
weatherLabel->setText( tr( "Current weather data not available." ) );
}
}
void WeatherPluginWidget::getTemp( const QString &data )
{
int value;
bool ok;
int pos = data.find( QRegExp( "M?[0-9]+/M?[0-9]+" ), 20 );
if ( pos > -1 )
{
if ( data.at( pos ) == 'M' )
{
value = -1 * data.mid( pos + 1, 2 ).toInt( &ok );
}
else
{
value = data.mid( pos, 2 ).toInt( &ok );
}
if ( useMetric )