[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kmail
From:       Till Adam <till () adam-lilienthal ! de>
Date:       2003-06-01 9:06:58
[Download RAW message or body]

CVS commit by tilladam: 

Do default icon handling for search folder in KmFolderTreeItem::normalIcon
where it is done for the others as well now, and don't abuse custom icon
handling to do it. As a side effect this change makes it possible to have
custom icons for search folders.


  M +0 -5      kmfoldersearch.h   1.14
  M +4 -1      kmfoldertree.cpp   1.243


--- kdepim/kmail/kmfoldersearch.h  #1.13:1.14
@@ -153,9 +153,4 @@ public:
   Q_UINT32 serNum(int idx) { return mSerNums[idx]; }
 
-  virtual bool useCustomIcons() { return true; }
-  virtual void setUseCustomIcons(bool) { }
-  virtual QString normalIconPath() { return "mail_find"; }
-  virtual QString unreadIconPath() { return "mail_find"; }
-
 protected:
   virtual FolderJob* doCreateJob(KMMessage *msg, FolderJob::JobType jt,

--- kdepim/kmail/kmfoldertree.cpp  #1.242:1.243
@@ -105,5 +105,8 @@ QPixmap KMFolderTreeItem::normalIcon(int
       case Drafts: icon = "folder";break;
     }
-  } else if ( mFolder->useCustomIcons() ) {
+  } else if ( protocol() == KMFolderTreeItem::Search) {
+    icon = "mail_find";
+  }
+  if (mFolder && mFolder->useCustomIcons() ) {
     icon = mFolder->normalIconPath();
   }


[prev in list] [next in list] [prev in thread] [next in thread]