author | drw <drw> | 2005-04-06 22:25:21 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-06 22:25:21 (UTC) |
commit | cd1b15147d372d8786c855764d397553651c358d (patch) (unidiff) | |
tree | 643479f1a84698f79227d7c8243921eacc3fe818 /core/pim/today/today.cpp | |
parent | 678c792dd69e42a15d8ac5eaaa9228dfd413ed4c (diff) | |
download | opie-cd1b15147d372d8786c855764d397553651c358d.zip opie-cd1b15147d372d8786c855764d397553651c358d.tar.gz opie-cd1b15147d372d8786c855764d397553651c358d.tar.bz2 |
Use OResource for loading images and fix headers
-rw-r--r-- | core/pim/today/today.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 3e895a4..67b23e1 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -1,27 +1,41 @@ | |||
1 | /* | 1 | /* |
2 | * today.cpp | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | * | 3 | |
4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß | 4 | Copyright (C) Maximilian Reiss <harlekin@handhelds.org> |
5 | * email : harlekin@handhelds.org | 5 | =. |
6 | * | 6 | .=l. |
7 | Â Â Â Â Â Â .>+-= | ||
8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can | ||
9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under | ||
10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public | ||
11 | .="- .-=="i, Â Â .._ License as published by the Free Software | ||
12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, | ||
13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. | ||
14 | Â Â .%`+i> Â Â Â _;_. | ||
15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that | ||
16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; | ||
17 | Â Â : .. Â Â .:, Â Â . . . without even the implied warranty of | ||
18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A | ||
19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU | ||
20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more | ||
21 | ++= Â -. Â Â .` Â Â .: details. | ||
22 | Â : Â Â = Â ...= . :.=- | ||
23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU | ||
24 | Â -_. . . Â )=. Â = Library General Public License along with | ||
25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. | ||
26 | If not, write to the Free Software Foundation, | ||
27 | Inc., 59 Temple Place - Suite 330, | ||
28 | Boston, MA 02111-1307, USA. | ||
7 | */ | 29 | */ |
8 | /*************************************************************************** | ||
9 | * * | ||
10 | * This program is free software; you can redistribute it and/or modify * | ||
11 | * it under the terms of the GNU General Public License as published by * | ||
12 | * the Free Software Foundation; either version 2 of the License, or * | ||
13 | * (at your option) any later version. * | ||
14 | * * | ||
15 | ***************************************************************************/ | ||
16 | 30 | ||
17 | #include "today.h" | 31 | #include "today.h" |
18 | 32 | ||
19 | #include <opie2/odebug.h> | 33 | #include <opie2/odebug.h> |
20 | #include <opie2/opluginloader.h> | 34 | #include <opie2/opluginloader.h> |
21 | #include <opie2/oconfig.h> | 35 | #include <opie2/oconfig.h> |
36 | #include <opie2/oresource.h> | ||
22 | 37 | ||
23 | #include <qpe/qcopenvelope_qws.h> | 38 | #include <qpe/qcopenvelope_qws.h> |
24 | #include <qpe/resource.h> | ||
25 | #include <qpe/qpeapplication.h> | 39 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/contact.h> | 40 | #include <qpe/contact.h> |
27 | 41 | ||
@@ -218,7 +232,7 @@ void Today::loadPluginWidgets() { | |||
218 | plugin.guiBox = new QWidget( m_big_box ); | 232 | plugin.guiBox = new QWidget( m_big_box ); |
219 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); | 233 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); |
220 | QPixmap plugPix; | 234 | QPixmap plugPix; |
221 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); | 235 | plugPix.convertFromImage( Opie::Core::OResource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); |
222 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); | 236 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); |
223 | plugIcon->setPixmap( plugPix ); | 237 | plugIcon->setPixmap( plugPix ); |
224 | QWhatsThis::add | 238 | QWhatsThis::add |