7 files changed, 209 insertions, 112 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,19 +1,30 @@
 /*
- * main.cpp
+                             This file is part of the Opie Project
- *
- * ---------------------
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- *
+              =.
- * begin       : Sun 10 17:20:00 CEST 2002
+            .=l.
- * copyright   : (c) 2002, 2003, 2004 by Maximilian Rei�
+           .>+-=
- * email       : max.reiss@gmx.de
+ _;:,     .>    :=|.         This program is free software; you can
- *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- */
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-/***************************************************************************
+.="- .-=="i,     .._         License as published by the Free Software
- *                                                                         *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   This program is free software; you can redistribute it and/or modify  *
+     ._= =}       :          or (at your option) any later version.
- *   it under the terms of the GNU General Public License as published by  *
+    .%`+i>       _;_.
- *   the Free Software Foundation; either version 2 of the License, or     *
+    .i_,=:_.      -<s.       This program is distributed in the hope that
- *   (at your option) any later version.                                   *
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
- *                                                                         *
+    : ..    .:,     . . .    without even the implied warranty of
- ***************************************************************************/
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
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,16 +1,30 @@
 /*
- * today.cpp
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002,2003,2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
@@ -21,5 +35,5 @@
 #include <opie2/oconfig.h>
+#include <opie2/oresource.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
@@ -220,3 +234,3 @@ void Today::loadPluginWidgets() {
        QPixmap plugPix;
-        plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
+        plugPix.convertFromImage( Opie::Core::OResource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
        OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
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,16 +1,31 @@
 /*
- * today.h
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002,2003,2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef 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,16 +1,30 @@
 /*
- * todaybase.cpp
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002, 2003, 2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
@@ -18,4 +32,5 @@
+#include <opie2/oresource.h>
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
@@ -28,4 +43,4 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags )
-  QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
+  QPixmap logo = Opie::Core::OResource::loadPixmap( "today/today_logo" ); // logo
-  QImage  opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) );
+  QImage  opiezillaimage = QImage( Opie::Core::OResource::loadImage( "logo/opielogo" ) );
  opiezillaimage = opiezillaimage.smoothScale( 45, 45 );
@@ -33,4 +48,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags )
  opiezilla.convertFromImage( opiezillaimage );
-  QPixmap config;
+  QPixmap config = Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon );
-  config.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
@@ -83,3 +97,3 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags )
  Opiezilla->setPixmap( opiezilla );
-  QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Rei�" ) );
+  QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Rei�" ) );
  Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
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,16 +1,30 @@
 /*
- * todaybase.h
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002, 2003, 2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
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,16 +1,30 @@
 /*
- * todayconfig.cpp
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002, 2003, 2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
@@ -20,5 +34,5 @@
 #include <opie2/opluginloader.h>
+#include <opie2/oresource.h>
 #include <opie2/todayplugininterface.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -46,3 +60,4 @@ public:
 : QToolButton( parent, name ) {
-        setPixmap( Resource::loadPixmap( icon ) );
+        setUsesBigPixmap( true );
+        setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) );
        setAutoRaise( TRUE );
@@ -244,3 +259,3 @@ void TodayConfig::pluginManagement( OPluginItem plugItem ) {
    TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface );
-    QPixmap icon = Resource::loadPixmap( iface->guiPart()->pixmapNameWidget() );
+    QPixmap icon = Opie::Core::OResource::loadPixmap( iface->guiPart()->pixmapNameWidget(), Opie::Core::OResource::SmallIcon );
    if ( !icon.isNull() ) {
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,16 +1,30 @@
 /*
- * todayconfig.h
+                             This file is part of the Opie Project
- *
- * copyright   : (c) 2002,2003, 2004 by Maximilian Rei�
+                             Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
- * email       : harlekin@handhelds.org
+              =.
- *
+            .=l.
- */
+           .>+-=
-/***************************************************************************
+ _;:,     .>    :=|.         This program is free software; you can
- *                                                                         *
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
- *   This program is free software; you can redistribute it and/or modify  *
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- *   it under the terms of the GNU General Public License as published by  *
+.="- .-=="i,     .._         License as published by the Free Software
- *   the Free Software Foundation; either version 2 of the License, or     *
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
- *   (at your option) any later version.                                   *
+     ._= =}       :          or (at your option) any later version.
- *                                                                         *
+    .%`+i>       _;_.
- ***************************************************************************/
+    .i_,=:_.      -<s.       This program 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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/

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,19 +1,30 @@
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	*/	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	/***************************************************************************	11	.="- .-=="i, .._ License as published by the Free Software
12	* *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* This program is free software; you can redistribute it and/or modify *	13	._= =} : or (at your option) any later version.
14	* it under the terms of the GNU General Public License as published by *	14	.%`+i> _;_.
15	* the Free Software Foundation; either version 2 of the License, or *	15	.i_,=:_. -<s. This program is distributed in the hope that
16	* (at your option) any later version. *	16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17	* *	17	: .. .:, . . . without even the implied warranty of
18	***************************************************************************/	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.
		29	*/
19		30


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,16 +1,30 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
16		30
@@ -21,5 +35,5 @@
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>
@@ -220,3 +234,3 @@ void Today::loadPluginWidgets() {
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 );


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,16 +1,31 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
		30
16	#ifndef TODAY_H	31	#ifndef 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,16 +1,30 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
16		30
@@ -18,4 +32,5 @@
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
@@ -28,4 +43,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
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 );
@@ -33,4 +48,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
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
@@ -83,3 +97,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
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 );


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,16 +1,30 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
16		30


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,16 +1,30 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
16		30
@@ -20,5 +34,5 @@
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>
@@ -46,3 +60,4 @@ public:
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 );
@@ -244,3 +259,3 @@ void TodayConfig::pluginManagement( OPluginItem plugItem ) {
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() ) {


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,16 +1,30 @@
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	*/	7	.>+-=
8	/***************************************************************************	8	_;:, .> :=\|. This program is free software; you can
9	* *	9	.> <`_, > . <= redistribute it and/or modify it under
10	* This program is free software; you can redistribute it and/or modify *	10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11	* it under the terms of the GNU General Public License as published by *	11	.="- .-=="i, .._ License as published by the Free Software
12	* the Free Software Foundation; either version 2 of the License, or *	12	- . .-<_> .<> Foundation; either version 2 of the License,
13	* (at your option) any later version. *	13	._= =} : or (at your option) any later version.
14	* *	14	.%`+i> _;_.
15	***************************************************************************/	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.
		29	*/
16		30