1 files changed, 37 insertions, 35 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index b8bf4e0..fd385d6 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -1,53 +1,61 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
+/*
+                             This file is part of the Opie Project
+              =.             (C) 2000-2002 Trolltech AS
+            .=l.             (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         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; version 2 of the License.
+     ._= =}       :
+    .%`+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.
+*/
 #include "documentlist.h"
 #include "serverinterface.h"
 #include "mediadlg.h"
 
 /* OPIE */
 #include <opie2/oglobal.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qtopia/config.h>
 #include <qtopia/mimetype.h>
-#include <qtopia/resource.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/applnk.h>
 #include <qtopia/storage.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 using namespace Opie::Core;
 
 /* QT */
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qcopchannel_qws.h>
 #include <qlistview.h>
 #include <qlist.h>
 #include <qpixmap.h>
 
 
 AppLnkSet *DocumentList::appLnkSet = 0;
@@ -211,64 +219,61 @@ void DocumentList::timerEvent( QTimerEvent *te )
     }
 }
 
 
 void DocumentList::reloadAppLnks()
 {
     if ( d->sendAppLnks && d->serverGui ) {
     d->serverGui->applicationScanningProgress( 0 );
     d->serverGui->allApplicationsRemoved();
     }
 
     delete appLnkSet;
     appLnkSet = new AppLnkSet( MimeType::appsFolderName() );
 
     if ( d->sendAppLnks && d->serverGui ) {
     static QStringList prevTypeList;
     QStringList types = appLnkSet->types();
     for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
         if ( !(*ittypes).isEmpty() ) {
         if ( !prevTypeList.contains(*ittypes) ) {
             QString name = appLnkSet->typeName(*ittypes);
             QPixmap pm = appLnkSet->typePixmap(*ittypes);
             QPixmap bgPm = appLnkSet->typeBigPixmap(*ittypes);
 
-            if (pm.isNull()) {
-            QImage img( Resource::loadImage( "UnknownDocument" ) );
-            pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
-            bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
+            if (pm.isNull())
+            {
+                pm = OResource::loadImage( "UnknownDocument", OResource::SmallIcon );
+                bgPm = OResource::loadImage( "UnknownDocument", OResource::BigIcon );
             }
 
-            //odebug << "adding type " << (*ittypes) << "" << oendl;
-
-            // ### our current launcher expects docs tab to be last
+            //FIXME our current launcher expects docs tab to be last
             d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
         }
         prevTypeList.remove(*ittypes);
         }
     }
     for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
-        //odebug << "removing type " << (*ittypes) << "" << oendl;
         d->serverGui->typeRemoved(*ittypes);
     }
     prevTypeList = types;
     }
 
     QListIterator<AppLnk> itapp( appLnkSet->children() );
     AppLnk* l;
     while ( (l=itapp.current()) ) {
     ++itapp;
     if ( d->sendAppLnks && d->serverGui )
         d->serverGui->applicationAdded( l->type(), *l );
     }
 
     if ( d->sendAppLnks && d->serverGui )
     d->serverGui->applicationScanningProgress( 100 );
 }
 
 void DocumentList::reloadDocLnks()
 {
     if ( !d->scanDocs )
     return;
 
     if ( d->sendDocLnks && d->serverGui ) {
     d->serverGui->documentScanningProgress( 0 );
@@ -336,64 +341,61 @@ void DocumentList::linkChanged( QString arg )
 }
 
 void DocumentList::restoreDone()
 {
     reloadAppLnks();
     reloadDocLnks();
 }
 
 void DocumentList::DiffAppLnks()
 {
     static AppLnkSet *appLnkSet2;
 
     appLnkSet2 = new AppLnkSet( MimeType::appsFolderName() );
 
     if ( d->sendAppLnks && d->serverGui ) {
     static QStringList prevTypeList = appLnkSet->types();
     QStringList types = appLnkSet2->types();
     for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
         if ( !(*ittypes).isEmpty() ) {
         if ( !prevTypeList.contains(*ittypes) ) {
             QString name = appLnkSet2->typeName(*ittypes);
             QPixmap pm = appLnkSet2->typePixmap(*ittypes);
             QPixmap bgPm = appLnkSet2->typeBigPixmap(*ittypes);
 
-            if (pm.isNull()) {
-            QImage img( Resource::loadImage( "UnknownDocument" ) );
-            pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
-            bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
+            if (pm.isNull())
+            {
+                pm = OResource::loadImage( "UnknownDocument", OResource::SmallIcon );
+                bgPm = OResource::loadImage( "UnknownDocument", OResource::BigIcon );
             }
 
-            odebug << "adding type " << (*ittypes) << "" << oendl;
-
             // ### our current launcher expects docs tab to be last
             d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
         }
         prevTypeList.remove(*ittypes);
         }
     }
     for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
-        odebug << "removing type " << (*ittypes) << "" << oendl;
         d->serverGui->typeRemoved(*ittypes);
     }
     prevTypeList = types;
     }
 
 
     QListIterator<AppLnk> it1( appLnkSet->children() );
     QListIterator<AppLnk> it2( appLnkSet2->children() );
 
     AppLnk *i;
     AppLnk *j;
     bool found;
 
     while ( (j=it2.current()) ) {
     it1 = appLnkSet->children();
     found = false;
     while ( (i=it1.current()) ){
         if (j->name().ascii() && i->name().ascii() && strcmp(i->name().ascii(),j->name().ascii()) == 0)
         found = true;
         ++it1;
     }
     if (!found) {
         odebug << "Item " << j->name().ascii() << " needs to be added" << oendl;
         d->serverGui->applicationAdded( j->type(), *j );