From 5db2256e7e342f290e17096cf70b8b318bfcd987 Mon Sep 17 00:00:00 2001 From: drw Date: Wed, 04 May 2005 22:20:27 +0000 Subject: Resource -> OResource --- (limited to 'core') 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,25 +1,25 @@ /* -               =. This file is part of the OPIE Project -             .=l. Copyright (c) 2002 Robert Griebl -           .>+-= - _;:,     .>    :=|. 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_,=:_.      -`: 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., + =. This file is part of the OPIE Project + .=l. Copyright (c) 2002 Robert Griebl + .>+-= +_;:, .> :=|. 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_,=:_. -`: 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. @@ -29,14 +29,14 @@ /* OPIE */ -#include -#include #include -#include #include +#include +#include +#include +#include /* QPE */ -#include #include /* QT */ @@ -99,9 +99,12 @@ public: calculateGrid ( Bottom ); - new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); - new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); - new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); + new SampleItem ( this, QObject::tr( "Sample 1" ), + Opie::Core::OResource::loadPixmap ( "datebook/DateBook", Opie::Core::OResource::BigIcon )); + 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 ); @@ -159,7 +162,7 @@ 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 ); setBackgroundPixmap ( bg ); 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,25 +1,25 @@ /* -               =. This file is part of the OPIE Project -             .=l. Copyright (c) 2002 Robert Griebl -           .>+-= - _;:,     .>    :=|. 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_,=:_.      -`: 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., + =. This file is part of the OPIE Project + .=l. Copyright (c) 2002 Robert Griebl + .>+-= +_;:, .> :=|. 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_,=:_. -`: 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. @@ -27,7 +27,8 @@ #include "tabssettings.h" -#include +#include + #include #include #include @@ -113,10 +114,7 @@ void TabsSettings::init ( ) m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); m_ids << *it; } - QImage img ( Resource::loadImage ( "DocsIcon" )); - QPixmap pix; - pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); - m_list-> insertItem ( pix, tr( "Documents" )); + m_list-> insertItem ( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ), tr( "Documents" ) ); m_ids += "Documents"; // No tr Config cfg ( "Launcher" ); -- cgit v0.9.0.2