author | mickeyl <mickeyl> | 2005-07-03 22:13:00 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-03 22:13:00 (UTC) |
commit | 2cabd9ad4b49eefccdf99ad59550c76546b473c9 (patch) (unidiff) | |
tree | 00bab275ac356aecc5a39b86ca22ce172d01f622 /core/launcher/launcherview.cpp | |
parent | 47011752d4457a1055894479e5bf855e100fddac (diff) | |
download | opie-2cabd9ad4b49eefccdf99ad59550c76546b473c9.zip opie-2cabd9ad4b49eefccdf99ad59550c76546b473c9.tar.gz opie-2cabd9ad4b49eefccdf99ad59550c76546b473c9.tar.bz2 |
Resource -> OResource
This is a large diff and I'd appreciate some additional pairs of eyes checking it
Diffstat (limited to 'core/launcher/launcherview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/launcher/launcherview.cpp | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index d960908..6275fcb 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -1,36 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /* |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | This file is part of the Opie Project |
3 | ** | 3 | =. (C) 2000-2002 Trolltech AS |
4 | ** This file is part of the Qtopia Environment. | 4 | .=l. (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> |
5 | ** | 5 | .>+-= |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | _;:, .> :=|. This program is free software; you can |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
9 | ** packaging of this file. | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | ** | 10 | - . .-<_> .<> Foundation; version 2 of the License. |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ._= =} : |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | .%`+i> _;_. |
13 | ** | 13 | .i_,=:_. -<s. This program is distributed in the hope that |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | ** | 15 | : .. .:, . . . without even the implied warranty of |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | ** not clear to you. | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
18 | ** | 18 | ..}^=.= = ; Library General Public License for more |
19 | **********************************************************************/ | 19 | ++= -. .` .: details. |
20 | 20 | : = ...= . :.=- | |
21 | -. .:....=;==+<; You should have received a copy of the GNU | ||
22 | -_. . . )=. = Library General Public License along with | ||
23 | -- :-=` this library; see the file COPYING.LIB. | ||
24 | If not, write to the Free Software Foundation, | ||
25 | Inc., 59 Temple Place - Suite 330, | ||
26 | Boston, MA 02111-1307, USA. | ||
27 | */ | ||
21 | #include "launcherview.h" | 28 | #include "launcherview.h" |
22 | 29 | ||
23 | /* OPIE */ | 30 | /* OPIE */ |
24 | #include <opie2/odebug.h> | 31 | #include <opie2/odebug.h> |
32 | #include <opie2/oresource.h> | ||
25 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
26 | #include <qtopia/qpeapplication.h> | 34 | #include <qtopia/qpeapplication.h> |
27 | #include <qtopia/private/categories.h> | 35 | #include <qtopia/private/categories.h> |
28 | #include <qtopia/categoryselect.h> | 36 | #include <qtopia/categoryselect.h> |
29 | #include <qtopia/mimetype.h> | 37 | #include <qtopia/mimetype.h> |
30 | #include <qtopia/resource.h> | ||
31 | using namespace Opie::Core; | 38 | using namespace Opie::Core; |
32 | 39 | ||
33 | #include <qpe/qcopenvelope_qws.h> | 40 | #include <qpe/qcopenvelope_qws.h> |
34 | 41 | ||
35 | /* QT */ | 42 | /* QT */ |
36 | #include <qtimer.h> | 43 | #include <qtimer.h> |
@@ -423,13 +430,13 @@ void LauncherIconView::addCatsAndMimes(AppLnk* app) | |||
423 | 430 | ||
424 | void LauncherIconView::setBusy(bool on) | 431 | void LauncherIconView::setBusy(bool on) |
425 | { | 432 | { |
426 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY | 433 | #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY |
427 | if ( busyPix.isNull() ) { | 434 | if ( busyPix.isNull() ) { |
428 | int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); | 435 | int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); |
429 | busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) ); | 436 | busyPix.convertFromImage( OResource::loadImage( "busy", OResource::NoScale ).smoothScale( size * 16, size ) ); |
430 | } | 437 | } |
431 | #endif | 438 | #endif |
432 | 439 | ||
433 | if ( on ) { | 440 | if ( on ) { |
434 | busyTimer = startTimer( 100 ); | 441 | busyTimer = startTimer( 100 ); |
435 | } else { | 442 | } else { |
@@ -998,13 +1005,13 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val ) | |||
998 | (*bgCache)[bgName]->ref++; | 1005 | (*bgCache)[bgName]->ref++; |
999 | bg = (*bgCache)[bgName]->pm; | 1006 | bg = (*bgCache)[bgName]->pm; |
1000 | } else { | 1007 | } else { |
1001 | QString imgFile = bgName; | 1008 | QString imgFile = bgName; |
1002 | bool tile = FALSE; | 1009 | bool tile = FALSE; |
1003 | if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) { | 1010 | if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) { |
1004 | imgFile = Resource::findPixmap( imgFile ); | 1011 | imgFile = OResource::findPixmap( imgFile ); |
1005 | tile = TRUE; | 1012 | tile = TRUE; |
1006 | } | 1013 | } |
1007 | QImage img = loadBackgroundImage(imgFile); | 1014 | QImage img = loadBackgroundImage(imgFile); |
1008 | 1015 | ||
1009 | 1016 | ||
1010 | if ( img.depth() == 1 ) | 1017 | if ( img.depth() == 1 ) |