fix bug 0000591

AppLnk does not need to reload all labels but it needs to reload
the names for the ids in mCat

1 files changed, 7 insertions, 2 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5763c62..35822dd 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -1,188 +1,192 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_MIMEEXT
 #define QTOPIA_INTERNAL_PRELOADACCESS
 #define QTOPIA_INTERNAL_APPLNKASSIGN
 
 #include "applnk.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #include <qpe/mimetype.h>
 #include <qpe/config.h>
 #include <qpe/storage.h>
 #include <qpe/resource.h>
 
 #include <qdict.h>
 #include <qdir.h>
 #include <qregexp.h>
 
 #include <qgfx_qws.h>
 
 #include <stdlib.h>
 
 int AppLnk::lastId = 5000;
 
 static int smallSize = 14;
 static int bigSize = 32;
 
 static QString safeFileName(const QString& n)
 {
     QString safename=n;
     safename.replace(QRegExp("[^0-9A-Za-z.]"),"_");
     safename.replace(QRegExp("^[^A-Za-z]*"),"");
     if ( safename.isEmpty() )
 	safename = "_";
     return safename;
 }
 
 static bool prepareDirectories(const QString& lf)
 {
     if ( !QFile::exists(lf) ) {
 	// May need to create directories
 	QFileInfo fi(lf);
 	if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
 	    return FALSE;
     }
     return TRUE;
 }
 
 class AppLnkPrivate
 {
 public:
     /* the size of the Pixmap */
     enum Size {Normal = 0, Big };
     AppLnkPrivate() {
         /* we want one normal and one big item */
 
         QPixmap pix;
         mPixmaps.insert(0, pix );
         mPixmaps.insert(1,  pix);
     }
 
     QStringList mCatList; // always correct
     QArray<int> mCat; // cached value; correct if not empty
     QMap<int,  QPixmap> mPixmaps;
 
     void updateCatListFromArray()
     {
 	Categories cat( 0 );
 	cat.load( categoryFileName() );
-	mCatList = cat.labels("Document View",mCat);
+	// we need to update the names for the mCat... to mCatList
+        mCatList.clear();
+        for (uint i = 0; i < mCat.count(); i++ )
+            mCatList << cat.label("Document View", mCat[i] );
+
     }
 
     void setCatArrayDirty()
     {
 	mCat.resize(0);
     }
 
     void ensureCatArray()
     {
 	if ( mCat.count() > 0 || mCatList.count()==0 )
 	    return;
 
 	Categories cat( 0 );
 	cat.load( categoryFileName() );
 	mCat.resize( mCatList.count() );
 	int i;
 	QStringList::ConstIterator it;
 	for ( i = 0, it = mCatList.begin(); it != mCatList.end();
 	      ++it, i++ ) {
 
 	    bool number;
 	    int id = (*it).toInt( &number );
 	    if ( !number ) {
 		id = cat.id( "Document View", *it );
 		if ( id == 0 )
 		    id = cat.addCategory( "Document View", *it );
 	    }
 	    mCat[i] = id;
 	}
     }
 };
 
 /*!
   \class AppLnk applnk.h
   \brief The AppLnk class represents an application available on the system.
 
     Every Qtopia application \e app has a corresponding \e app.desktop
     file. When one of these files is read its data is stored as an
     AppLnk object.
 
     The AppLnk class introduces some Qtopia-specific concepts, and
     provides a variety of functions, as described in the following
     sections.
     \tableofcontents
 
     \target Types
     \section1 Types
 
     Every AppLnk object has a \e type. For applications, games and
     settings the type is \c Application; for documents the
     type is the document's MIME type.
 
     \target files-and-links
     \section1 Files and Links
 
     When you create an AppLnk (or more likely, a \link doclnk.html
     DocLnk\endlink), you don't deal directly with filenames in the
     filesystem. Instead you do this:
     \code
     DocLnk d;
     d.setType("text/plain");
     d.setName("My Nicely Named Document / Whatever"); // Yes, "/" is legal.
     \endcode
     At this point, the file() and linkFile() are unknown. Normally
     this is uninteresting, and the names become automatically known,
     and more importantly, becomes reserved, when you ask what they are:
 
     \code
     QString fn = d.file();
     \endcode
     This invents a filename, and creates the file on disk (an empty
     reservation file) to prevent the name being used by another
     application.
 
     In some circumstances, you don't want to create the file if it
     doesn't already exist (e.g. in the Document tab, some of the \link
     doclnk.html DocLnk\endlink objects represented by icons are
     DocLnk's created just for that view - they don't have
     corresponding \c .desktop files. To avoid littering empty
     reservation files around, we check in a few places to see whether
     the file really needs to exist).
 
     \section1 Functionality
 
     AppLnk objects are created by calling the constructor with the
     name of a \e .desktop file. The object can be checked for validity
     using isValid().
 
     The following functions are used to set or retrieve information
     about the application:
     \table
     \header \i Get Function \i Set Function \i Short Description
     \row \i \l name()	    \i \l setName()    \i application's name
     \row \i \l pixmap()     \i \e none	    \i application's icon
     \row \i \l bigPixmap()  \i \e none	    \i application's large icon
     \row \i \e none	    \i setIcon()    \i sets the icon's filename
@@ -313,192 +317,193 @@ const QArray<int>& AppLnk::categories() const
     return d->mCat;
 }
 
 /*!
     \fn int AppLnk::id() const
 
   Returns the id of the AppLnk. If the AppLnk is not in an AppLnkSet,
   this value is 0, otherwise it is a value that is unique for the
   duration of the current process.
 
   \sa AppLnkSet::find()
 */
 
 /*!
   \fn bool AppLnk::isValid() const
 
   Returns TRUE if this AppLnk is valid; otherwise returns FALSE.
 */
 
 /*!
   Creates an invalid AppLnk.
 
   \sa isValid()
 */
 AppLnk::AppLnk()
 {
     mId = 0;
     d = new AppLnkPrivate();
 }
 
 /*!
   Loads \a file (e.g. \e app.desktop) as an AppLnk.
 
   \sa writeLink()
 */
 AppLnk::AppLnk( const QString &file )
 {
     QStringList sl;
     d = new AppLnkPrivate();
     if ( !file.isNull() ) {
 	Config config( file, Config::File );
 
 	if ( config.isValid() ) {
 	    config.setGroup( "Desktop Entry" );
 
 	    mName = config.readEntry( "Name", file );
 	    mExec = config.readEntry( "Exec" );
 	    mType = config.readEntry( "Type", QString::null );
 	    mIconFile = config.readEntry( "Icon", QString::null );
 	    mRotation = config.readEntry( "Rotation", "" );
 	    mComment = config.readEntry( "Comment", QString::null );
 	    // MIME types are case-insensitive.
 	    mMimeTypes = config.readListEntry( "MimeType", ';' );
 	    for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
 		*it = (*it).lower();
 	    mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
 	    mLinkFile = file;
 	    mFile = config.readEntry("File", QString::null);
 	    if ( !mExec. isEmpty ( )) {
 		mFile = QString::null;
 	    }
 	    else if ( mFile[0] != '/' ) {
 		int slash = file.findRev('/');
 		if ( slash >= 0 ) {
 		    mFile = file.left(slash) + '/' + mFile;
 		}
 	    }
 	    d->mCatList = config.readListEntry("Categories", ';');
 	    if ( d->mCatList[0].toInt() < -1 ) {
 		// numeric cats in file! convert to text
 		Categories cat( 0 );
 		cat.load( categoryFileName() );
 		d->mCat.resize( d->mCatList.count() );
 		int i;
 		QStringList::ConstIterator it;
 		for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
 		      ++it, i++ ) {
 		    bool number;
 		    int id = (*it).toInt( &number );
 		    if ( !number ) {
 			// convert from text
 			id = cat.id( "Document View", *it );
 			if ( id == 0 )
 			    id = cat.addCategory( "Document View", *it );
 		    }
 		    d->mCat[i] = id;
 		}
 		d->updateCatListFromArray();
 	    }
 	}
     }
     mId = 0;
 }
 
 AppLnk& AppLnk::operator=(const AppLnk &copy)
 {
+    if ( this == &copy ) return *this;
     if ( mId )
 	qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
 	delete d;
 
 
     mName = copy.mName;
 
     /* remove for Qtopia 3.0 -zecke */
     mPixmap = copy.mPixmap;
     mBigPixmap = copy.mBigPixmap;
 
     mExec = copy.mExec;
     mType = copy.mType;
     mRotation = copy.mRotation;
     mComment = copy.mComment;
     mFile = copy.mFile;
     mLinkFile = copy.mLinkFile;
     mIconFile = copy.mIconFile;
     mMimeTypes = copy.mMimeTypes;
     mMimeTypeIcons = copy.mMimeTypeIcons;
     mId = 0;
     d = new AppLnkPrivate();
     d->mCat = copy.d->mCat;
     d->mCatList = copy.d->mCatList;
     d->mPixmaps = copy.d->mPixmaps;
 
     return *this;
 }
 /*!
   protected internally to share code
   should I document that at all?
   I don't know the TT style for that
 */
 const QPixmap& AppLnk::pixmap( int pos, int size ) const {
     if ( d->mPixmaps[pos].isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	if ( mIconFile.isEmpty() ) {
 	    MimeType mt(type());
 	    that->d->mPixmaps[pos] = mt.pixmap();
 	    if ( that->d->mPixmaps[pos].isNull() )
 		that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	    return that->d->mPixmaps[pos];
 	}
 	QImage unscaledIcon = Resource::loadImage( that->mIconFile );
 	if ( unscaledIcon.isNull() ) {
 	    qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
 	    that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	} else {
 	    that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
 	    that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 	}
 	return that->d->mPixmaps[pos];
     }
     return d->mPixmaps[pos];
 }
 
 /*!
   Returns a small pixmap associated with the application.
 
   \sa bigPixmap() setIcon()
 */
 const QPixmap& AppLnk::pixmap() const
 {
     if ( d->mPixmaps[0].isNull() ) {
         return pixmap(AppLnkPrivate::Normal, smallSize );
     }
     return d->mPixmaps[0];
 }
 
 /*!
   Returns a large pixmap associated with the application.
 
   \sa pixmap() setIcon()
 */
 const QPixmap& AppLnk::bigPixmap() const
 {
     if ( d->mPixmaps[1].isNull() ) {
         return pixmap( AppLnkPrivate::Big, bigSize );
     }
     return d->mPixmaps[1];
 }
 
 /*!
   Returns the type of the AppLnk. For applications, games and
   settings the type is \c Application; for documents the type is the
   document's MIME type.
 */
 QString AppLnk::type() const
 {
     if ( mType.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
@@ -757,193 +762,193 @@ void AppLnk::setComment( const QString& comment )
 
   For applications, games and settings the type should be \c
   Application; for documents the type should be the document's MIME
   type.
 
   \sa type()
 */
 void AppLnk::setType( const QString& type )
 {
     mType = type;
 }
 
 /*!
   \fn QString AppLnk::icon() const
 
   Returns the Icon property.
 
   \sa setIcon()
 */
 
 /*!
   Sets the Icon property to \a iconname. This is the filename from
   which the pixmap() and bigPixmap() are obtained.
 
   \sa icon() setSmallIconSize() setBigIconSize()
 */
 void AppLnk::setIcon( const QString& iconname )
 {
     mIconFile = iconname;
     QImage unscaledIcon = Resource::loadImage( mIconFile );
     d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
     d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 }
 
 /*!
   Sets the Categories property to \a c.
 
   See the CategoryWidget for more details.
 
   \sa categories()
 */
 void AppLnk::setCategories( const QArray<int>& c )
 {
     d->mCat = c;
     d->updateCatListFromArray();
 }
 
 /*!
   \fn QStringList AppLnk::mimeTypeIcons() const
 
   Returns the MimeTypeIcons property of the AppLnk.
 */
 
 /*!
   Attempts to ensure that the link file for this AppLnk exists,
   including creating any required directories. Returns TRUE if
   successful; otherwise returns FALSE.
 
   You should not need to use this function.
 */
 bool AppLnk::ensureLinkExists() const
 {
     QString lf = linkFile();
     return prepareDirectories(lf);
 }
 
 /*!
   Commits the AppLnk to disk. Returns TRUE if the operation succeeded;
   otherwise returns FALSE.
 
   In addition, the "linkChanged(QString)" message is sent to the
   "QPE/System" \link qcop.html QCop\endlink channel.
 */
 bool AppLnk::writeLink() const
 {
     // Only re-writes settable parts
     QString lf = linkFile();
     if ( !ensureLinkExists() )
 	return FALSE;
     storeLink();
     return TRUE;
 }
 
 /*!
   \internal
 */
 void AppLnk::storeLink() const
 {
     Config config( mLinkFile, Config::File );
     config.setGroup("Desktop Entry");
     config.writeEntry("Name",mName);
     if ( !mIconFile.isNull() ) config.writeEntry("Icon",mIconFile);
     config.writeEntry("Type",type());
     if(!rotation().isEmpty())
 	config.writeEntry("Rotation",rotation());
     else
-	config.removeEntry("Rotation");    
+	config.removeEntry("Rotation");
     if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
     QString f = file();
     int i = 0;
     while ( i < (int)f.length() && i < (int)mLinkFile.length() && f[i] == mLinkFile[i] )
 	i++;
     while ( i && f[i] != '/' )
 	i--;
     // simple case where in the same directory
     if ( mLinkFile.find( '/', i + 1 ) < 0 )
 	f = f.mid(i+1);
     // ### could do relative ie ../../otherDocs/file.doc
     config.writeEntry("File",f);
     config.writeEntry( "Categories", d->mCatList, ';' );
 
 #ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     e << mLinkFile;
 #endif
 }
 
 /*!
   Sets the property named \a key to \a value.
 
   \sa property()
 */
 void AppLnk::setProperty(const QString& key, const QString& value)
 {
     if ( ensureLinkExists() ) {
 	Config cfg(linkFile(), Config::File);
 	cfg.writeEntry(key,value);
     }
 }
 
 /*!
   Returns the property named \a key.
 
   \sa setProperty()
 */
 QString AppLnk::property(const QString& key) const
 {
     QString lf = linkFile();
     if ( !QFile::exists(lf) )
 	return QString::null;
     Config cfg(lf, Config::File);
     return cfg.readEntry(key);
 }
 
 bool AppLnk::isPreloaded() const {
   // Preload information is stored in the Launcher config in v1.5.
   Config cfg("Launcher");
   cfg.setGroup("Preload");
   QStringList apps = cfg.readListEntry("Apps",',');
   if (apps.contains(exec()))
     return true;
   return false;
 }
 
 void AppLnk::setPreloaded(bool yesNo) {
   // Preload information is stored in the Launcher config in v1.5.
   Config cfg("Launcher");
   cfg.setGroup("Preload");
   QStringList apps = cfg.readListEntry("Apps", ',');
   if (apps.contains(exec()) && !yesNo)
     apps.remove(exec());
   else if (yesNo && !apps.contains(exec()))
     apps.append(exec());
   cfg.writeEntry("Apps", apps, ',');
 }
 
 
 /*!
   Deletes both the linkFile() and the file() associated with this AppLnk.
 
   \sa removeLinkFile()
 */
 void AppLnk::removeFiles()
 {
     bool valid = isValid();
     if ( !valid || !linkFileKnown() || QFile::remove(linkFile()) ) {
 	if ( QFile::remove(file()) ) {
 #ifndef QT_NO_COP
 	    QCopEnvelope e("QPE/System", "linkChanged(QString)");
 	    if ( linkFileKnown() )
 		e << linkFile();
 	    else
 		e << file();
 #endif
 	} else if ( valid ) {
 	    // restore link
 	    writeLink();
 	}
     }
 }
 
 /*!
   Deletes the linkFile(), leaving any file() untouched.