author | zecke <zecke> | 2003-02-11 17:26:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-11 17:26:51 (UTC) |
commit | 99ccdda218112cfb0f7371fa05d7a696b8da1c40 (patch) (unidiff) | |
tree | 64d46b22de7acbccbc2ee73c406be7645ff693c3 | |
parent | df37010a49dfa9624c9600e4ed838ec7aade1b31 (diff) | |
download | opie-99ccdda218112cfb0f7371fa05d7a696b8da1c40.zip opie-99ccdda218112cfb0f7371fa05d7a696b8da1c40.tar.gz opie-99ccdda218112cfb0f7371fa05d7a696b8da1c40.tar.bz2 |
fix bug 0000591
AppLnk does not need to reload all labels but it needs to reload
the names for the ids in mCat
-rw-r--r-- | library/applnk.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp index 5763c62..35822dd 100644 --- a/library/applnk.cpp +++ b/library/applnk.cpp | |||
@@ -80,25 +80,29 @@ public: | |||
80 | mPixmaps.insert(0, pix ); | 80 | mPixmaps.insert(0, pix ); |
81 | mPixmaps.insert(1, pix); | 81 | mPixmaps.insert(1, pix); |
82 | } | 82 | } |
83 | 83 | ||
84 | QStringList mCatList; // always correct | 84 | QStringList mCatList; // always correct |
85 | QArray<int> mCat; // cached value; correct if not empty | 85 | QArray<int> mCat; // cached value; correct if not empty |
86 | QMap<int, QPixmap> mPixmaps; | 86 | QMap<int, QPixmap> mPixmaps; |
87 | 87 | ||
88 | void updateCatListFromArray() | 88 | void updateCatListFromArray() |
89 | { | 89 | { |
90 | Categories cat( 0 ); | 90 | Categories cat( 0 ); |
91 | cat.load( categoryFileName() ); | 91 | cat.load( categoryFileName() ); |
92 | mCatList = cat.labels("Document View",mCat); | 92 | // we need to update the names for the mCat... to mCatList |
93 | mCatList.clear(); | ||
94 | for (uint i = 0; i < mCat.count(); i++ ) | ||
95 | mCatList << cat.label("Document View", mCat[i] ); | ||
96 | |||
93 | } | 97 | } |
94 | 98 | ||
95 | void setCatArrayDirty() | 99 | void setCatArrayDirty() |
96 | { | 100 | { |
97 | mCat.resize(0); | 101 | mCat.resize(0); |
98 | } | 102 | } |
99 | 103 | ||
100 | void ensureCatArray() | 104 | void ensureCatArray() |
101 | { | 105 | { |
102 | if ( mCat.count() > 0 || mCatList.count()==0 ) | 106 | if ( mCat.count() > 0 || mCatList.count()==0 ) |
103 | return; | 107 | return; |
104 | 108 | ||
@@ -397,24 +401,25 @@ AppLnk::AppLnk( const QString &file ) | |||
397 | } | 401 | } |
398 | d->mCat[i] = id; | 402 | d->mCat[i] = id; |
399 | } | 403 | } |
400 | d->updateCatListFromArray(); | 404 | d->updateCatListFromArray(); |
401 | } | 405 | } |
402 | } | 406 | } |
403 | } | 407 | } |
404 | mId = 0; | 408 | mId = 0; |
405 | } | 409 | } |
406 | 410 | ||
407 | AppLnk& AppLnk::operator=(const AppLnk ©) | 411 | AppLnk& AppLnk::operator=(const AppLnk ©) |
408 | { | 412 | { |
413 | if ( this == © ) return *this; | ||
409 | if ( mId ) | 414 | if ( mId ) |
410 | qWarning("Deleting AppLnk that is in an AppLnkSet"); | 415 | qWarning("Deleting AppLnk that is in an AppLnkSet"); |
411 | if ( d ) | 416 | if ( d ) |
412 | delete d; | 417 | delete d; |
413 | 418 | ||
414 | 419 | ||
415 | mName = copy.mName; | 420 | mName = copy.mName; |
416 | 421 | ||
417 | /* remove for Qtopia 3.0 -zecke */ | 422 | /* remove for Qtopia 3.0 -zecke */ |
418 | mPixmap = copy.mPixmap; | 423 | mPixmap = copy.mPixmap; |
419 | mBigPixmap = copy.mBigPixmap; | 424 | mBigPixmap = copy.mBigPixmap; |
420 | 425 | ||