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 | |
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/main.cpp | 43 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 44 | ||||
-rw-r--r-- | core/pim/today/today.h | 41 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 52 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 40 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 47 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 40 |
7 files changed, 202 insertions, 105 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp index d63bc30..44b845c 100644 --- a/core/pim/today/main.cpp +++ b/core/pim/today/main.cpp | |||
@@ -1,20 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * main.cpp | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | * | 3 | |
4 | * --------------------- | 4 | Copyright (C) Maximilian Reiss <harlekin@handhelds.org> |
5 | * | 5 | =. |
6 | * begin : Sun 10 17:20:00 CEST 2002 | 6 | .=l. |
7 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 7 | Â Â Â Â Â Â .>+-= |
8 | * email : max.reiss@gmx.de | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
9 | * | 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. | ||
10 | */ | 29 | */ |
11 | /*************************************************************************** | ||
12 | * * | ||
13 | * This program is free software; you can redistribute it and/or modify * | ||
14 | * it under the terms of the GNU General Public License as published by * | ||
15 | * the Free Software Foundation; either version 2 of the License, or * | ||
16 | * (at your option) any later version. * | ||
17 | * * | ||
18 | ***************************************************************************/ | ||
19 | 30 | ||
20 | #include "today.h" | 31 | #include "today.h" |
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,17 +1,31 @@ | |||
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" |
@@ -20,7 +34,7 @@ | |||
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> |
@@ -219,5 +233,5 @@ void Today::loadPluginWidgets() { | |||
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 ); |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 8dbe9aa..dd828ac 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -1,17 +1,32 @@ | |||
1 | /* | 1 | /* |
2 | * today.h | 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 | /*************************************************************************** | 30 | |
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 | #ifndef TODAY_H | 31 | #ifndef TODAY_H |
17 | #define TODAY_H | 32 | #define TODAY_H |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index a89f454..931f45a 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -1,22 +1,37 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.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 "todaybase.h" | 31 | #include "todaybase.h" |
18 | 32 | ||
33 | #include <opie2/oresource.h> | ||
34 | |||
19 | #include <qpe/applnk.h> | 35 | #include <qpe/applnk.h> |
20 | #include <qpe/resource.h> | ||
21 | 36 | ||
22 | #include <qvbox.h> | 37 | #include <qvbox.h> |
@@ -27,11 +42,10 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | |||
27 | : QWidget( parent, name, WStyle_ContextHelp ) { | 42 | : QWidget( parent, name, WStyle_ContextHelp ) { |
28 | 43 | ||
29 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 44 | QPixmap logo = Opie::Core::OResource::loadPixmap( "today/today_logo" ); // logo |
30 | QImage opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) ); | 45 | QImage opiezillaimage = QImage( Opie::Core::OResource::loadImage( "logo/opielogo" ) ); |
31 | opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); | 46 | opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); |
32 | QPixmap opiezilla; //the opiezilla | 47 | QPixmap opiezilla; //the opiezilla |
33 | opiezilla.convertFromImage( opiezillaimage ); | 48 | opiezilla.convertFromImage( opiezillaimage ); |
34 | QPixmap config; | 49 | QPixmap config = Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ); |
35 | config.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
36 | 50 | ||
37 | layout = 0L; | 51 | layout = 0L; |
@@ -82,5 +96,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | |||
82 | Opiezilla = new QLabel( Frame, "OpieZilla" ); | 96 | Opiezilla = new QLabel( Frame, "OpieZilla" ); |
83 | Opiezilla->setPixmap( opiezilla ); | 97 | Opiezilla->setPixmap( opiezilla ); |
84 | QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); | 98 | QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Rei�" ) ); |
85 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); | 99 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); |
86 | 100 | ||
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 6ee9bb2..5b34234 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -1,17 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.h | 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 | #ifndef TODAYBASE_H | 31 | #ifndef TODAYBASE_H |
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 864c708..04a16e1 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -1,17 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * todayconfig.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 "todayconfig.h" | 31 | #include "todayconfig.h" |
@@ -19,7 +33,7 @@ | |||
19 | #include <opie2/oconfig.h> | 33 | #include <opie2/oconfig.h> |
20 | #include <opie2/opluginloader.h> | 34 | #include <opie2/opluginloader.h> |
35 | #include <opie2/oresource.h> | ||
21 | #include <opie2/todayplugininterface.h> | 36 | #include <opie2/todayplugininterface.h> |
22 | 37 | ||
23 | #include <qpe/resource.h> | ||
24 | #include <qpe/qcopenvelope_qws.h> | 38 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/qpeapplication.h> | 39 | #include <qpe/qpeapplication.h> |
@@ -45,5 +59,6 @@ public: | |||
45 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 59 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
46 | : QToolButton( parent, name ) { | 60 | : QToolButton( parent, name ) { |
47 | setPixmap( Resource::loadPixmap( icon ) ); | 61 | setUsesBigPixmap( true ); |
62 | setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); | ||
48 | setAutoRaise( TRUE ); | 63 | setAutoRaise( TRUE ); |
49 | setFocusPolicy( QWidget::NoFocus ); | 64 | setFocusPolicy( QWidget::NoFocus ); |
@@ -243,5 +258,5 @@ void TodayConfig::pluginManagement( OPluginItem plugItem ) { | |||
243 | 258 | ||
244 | TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface ); | 259 | TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface ); |
245 | QPixmap icon = Resource::loadPixmap( iface->guiPart()->pixmapNameWidget() ); | 260 | QPixmap icon = Opie::Core::OResource::loadPixmap( iface->guiPart()->pixmapNameWidget(), Opie::Core::OResource::SmallIcon ); |
246 | if ( !icon.isNull() ) { | 261 | if ( !icon.isNull() ) { |
247 | item->setPixmap( 0, icon ); | 262 | item->setPixmap( 0, icon ); |
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 81120d3..d467996 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h | |||
@@ -1,17 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * todayconfig.h | 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 | #ifndef TODAYCONFIG_H | 31 | #ifndef TODAYCONFIG_H |