2 files changed, 56 insertions, 55 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 555e64e..c6bdf8f 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.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 Robert Griebl <sandman@handhelds.org>
+      .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
@@ -30,12 +30,12 @@
 /* OPIE */
-#include <opie2/ofontselector.h>
-#include <opie2/otabwidget.h>
 #include <opie2/ocolorbutton.h>
-#include <opie2/ofiledialog.h>
 #include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/ofontselector.h>
+#include <opie2/oresource.h>
+#include <opie2/otabwidget.h>
 /* QPE */
-#include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
@@ -100,7 +100,10 @@ public:
-        new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
+        new SampleItem ( this, QObject::tr( "Sample 1" ),
-        new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
+                         Opie::Core::OResource::loadPixmap ( "datebook/DateBook", Opie::Core::OResource::BigIcon ));
-        new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
+        new SampleItem ( this, QObject::tr( "Sample 2" ),
+                         Opie::Core::OResource::loadPixmap ( "Calibrate", Opie::Core::OResource::BigIcon ));
+        new SampleItem ( this, QObject::tr( "Sample 3" ),
+                         Opie::Core::OResource::loadPixmap ( "UnknownDocument", Opie::Core::OResource::BigIcon ));
        setBackgroundType ( TabConfig::Ruled, QString::null );
@@ -160,5 +163,5 @@ public:
            case TabConfig::Image: {
                odebug << "Loading image: " << val << "" << oendl;
-                QPixmap bg = Resource::loadPixmap ( val );
+                QPixmap bg = Opie::Core::OResource::loadPixmap ( val );
                if ( bg. isNull () )
                    bg = QPixmap( val );
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index fca6b20..e7660ef 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.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 Robert Griebl <sandman@handhelds.org>
+      .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
@@ -28,5 +28,6 @@
 #include "tabssettings.h"
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
@@ -114,8 +115,5 @@ void TabsSettings::init ( )
                m_ids << *it;
        }
-        QImage img ( Resource::loadImage ( "DocsIcon" ));
+    m_list-> insertItem ( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ), tr( "Documents" ) );
-        QPixmap pix;
-        pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( ));
-        m_list-> insertItem ( pix, tr( "Documents" ));
        m_ids += "Documents"; // No tr

diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 555e64e..c6bdf8f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	=. This file is part of the OPIE Project	2	=. This file is part of the OPIE Project
3	.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>	3	.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4	.>+-=	4	.>+-=
5	_;:, .> :=\|. This file is free software; you can	5	_;:, .> :=\|. This file is free software; you can
6	.> <`_, > . <= redistribute it and/or modify it under	6	.> <`_, > . <= redistribute it and/or modify it under
7	:`=1 )Y*s>-.-- : the terms of the GNU General Public	7	:`=1 )Y*s>-.-- : the terms of the GNU General Public
8	.="- .-=="i, .._ License as published by the Free Software	8	.="- .-=="i, .._ License as published by the Free Software
9	- . .-<_> .<> Foundation; either version 2 of the License,	9	- . .-<_> .<> Foundation; either version 2 of the License,
10	._= =} : or (at your option) any later version.	10	._= =} : or (at your option) any later version.
11	.%`+i> _;_.	11	.%`+i> _;_.
12	.i_,=:_. -<s. This file is distributed in the hope that	12	.i_,=:_. -<s. This file is distributed in the hope that
13	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	13	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
14	: .. .:, . . . without even the implied warranty of	14	: .. .:, . . . without even the implied warranty of
15	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	15	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
16	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	16	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
17	..}^=.= = ; Public License for more details.	17	..}^=.= = ; Public License for more details.
18	++= -. .` .:	18	++= -. .` .:
19	: = ...= . :.=- You should have received a copy of the GNU	19	: = ...= . :.=- You should have received a copy of the GNU
20	-. .:....=;==+<; General Public License along with this file;	20	-. .:....=;==+<; General Public License along with this file;
21	-_. . . )=. = see the file COPYING. If not, write to the	21	-_. . . )=. = see the file COPYING. If not, write to the
22	-- :-=` Free Software Foundation, Inc.,	22	-- :-=` Free Software Foundation, Inc.,
23	59 Temple Place - Suite 330,	23	59 Temple Place - Suite 330,
24	Boston, MA 02111-1307, USA.	24	Boston, MA 02111-1307, USA.
@@ -30,12 +30,12 @@
30	/* OPIE */	30	/* OPIE */
31		31
32	#include <opie2/ofontselector.h>
33	#include <opie2/otabwidget.h>
34	#include <opie2/ocolorbutton.h>	32	#include <opie2/ocolorbutton.h>
35	#include <opie2/ofiledialog.h>
36	#include <opie2/odebug.h>	33	#include <opie2/odebug.h>
		34	#include <opie2/ofiledialog.h>
		35	#include <opie2/ofontselector.h>
		36	#include <opie2/oresource.h>
		37	#include <opie2/otabwidget.h>
37		38
38	/* QPE */	39	/* QPE */
39	#include <qpe/resource.h>
40	#include <qpe/qpeapplication.h>	40	#include <qpe/qpeapplication.h>
41		41
@@ -100,7 +100,10 @@ public:
100		100
101		101
102	new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));	102	new SampleItem ( this, QObject::tr( "Sample 1" ),
103	new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));	103	Opie::Core::OResource::loadPixmap ( "datebook/DateBook", Opie::Core::OResource::BigIcon ));
104	new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));	104	new SampleItem ( this, QObject::tr( "Sample 2" ),
		105	Opie::Core::OResource::loadPixmap ( "Calibrate", Opie::Core::OResource::BigIcon ));
		106	new SampleItem ( this, QObject::tr( "Sample 3" ),
		107	Opie::Core::OResource::loadPixmap ( "UnknownDocument", Opie::Core::OResource::BigIcon ));
105		108
106	setBackgroundType ( TabConfig::Ruled, QString::null );	109	setBackgroundType ( TabConfig::Ruled, QString::null );
@@ -160,5 +163,5 @@ public:
160	case TabConfig::Image: {	163	case TabConfig::Image: {
161	odebug << "Loading image: " << val << "" << oendl;	164	odebug << "Loading image: " << val << "" << oendl;
162	QPixmap bg = Resource::loadPixmap ( val );	165	QPixmap bg = Opie::Core::OResource::loadPixmap ( val );
163	if ( bg. isNull () )	166	if ( bg. isNull () )
164	bg = QPixmap( val );	167	bg = QPixmap( val );


diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index fca6b20..e7660ef 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	=. This file is part of the OPIE Project	2	=. This file is part of the OPIE Project
3	.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>	3	.=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4	.>+-=	4	.>+-=
5	_;:, .> :=\|. This file is free software; you can	5	_;:, .> :=\|. This file is free software; you can
6	.> <`_, > . <= redistribute it and/or modify it under	6	.> <`_, > . <= redistribute it and/or modify it under
7	:`=1 )Y*s>-.-- : the terms of the GNU General Public	7	:`=1 )Y*s>-.-- : the terms of the GNU General Public
8	.="- .-=="i, .._ License as published by the Free Software	8	.="- .-=="i, .._ License as published by the Free Software
9	- . .-<_> .<> Foundation; either version 2 of the License,	9	- . .-<_> .<> Foundation; either version 2 of the License,
10	._= =} : or (at your option) any later version.	10	._= =} : or (at your option) any later version.
11	.%`+i> _;_.	11	.%`+i> _;_.
12	.i_,=:_. -<s. This file is distributed in the hope that	12	.i_,=:_. -<s. This file is distributed in the hope that
13	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	13	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
14	: .. .:, . . . without even the implied warranty of	14	: .. .:, . . . without even the implied warranty of
15	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	15	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
16	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	16	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
17	..}^=.= = ; Public License for more details.	17	..}^=.= = ; Public License for more details.
18	++= -. .` .:	18	++= -. .` .:
19	: = ...= . :.=- You should have received a copy of the GNU	19	: = ...= . :.=- You should have received a copy of the GNU
20	-. .:....=;==+<; General Public License along with this file;	20	-. .:....=;==+<; General Public License along with this file;
21	-_. . . )=. = see the file COPYING. If not, write to the	21	-_. . . )=. = see the file COPYING. If not, write to the
22	-- :-=` Free Software Foundation, Inc.,	22	-- :-=` Free Software Foundation, Inc.,
23	59 Temple Place - Suite 330,	23	59 Temple Place - Suite 330,
24	Boston, MA 02111-1307, USA.	24	Boston, MA 02111-1307, USA.
@@ -28,5 +28,6 @@
28	#include "tabssettings.h"	28	#include "tabssettings.h"
29		29
30	#include <qpe/resource.h>	30	#include <opie2/oresource.h>
		31
31	#include <qpe/applnk.h>	32	#include <qpe/applnk.h>
32	#include <qpe/mimetype.h>	33	#include <qpe/mimetype.h>
@@ -114,8 +115,5 @@ void TabsSettings::init ( )
114	m_ids << *it;	115	m_ids << *it;
115	}	116	}
116	QImage img ( Resource::loadImage ( "DocsIcon" ));	117	m_list-> insertItem ( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ), tr( "Documents" ) );
117	QPixmap pix;
118	pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( ));
119	m_list-> insertItem ( pix, tr( "Documents" ));
120	m_ids += "Documents"; // No tr	118	m_ids += "Documents"; // No tr
121		119