Use a few more icons from Oxygen and delete the

private ones that were replaced by them.

svn path=/trunk/KDE/kdepim/kmail/pics/; revision=752579

kmheaders.cpp

@@ -180,9 +180,9 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
   {
     pixmapsLoaded = true;
     pixNew                   = new QPixmap( UserIcon( "mail-new"                   ) );
-    pixUns                   = new QPixmap( UserIcon( "mail-unread"                ) );
+    pixUns                   = new QPixmap( KIconLoader().loadIcon( "mail-unread",       KIconLoader::Small ) );
     pixDel                   = new QPixmap( UserIcon( "mail-deleted"               ) );
-    pixRead                  = new QPixmap( UserIcon( "mail-read"                  ) );
+    pixRead                  = new QPixmap( KIconLoader().loadIcon( "mail-read",         KIconLoader::Small ) );
     pixRep                   = new QPixmap( UserIcon( "mail-replied"               ) );
     pixQueued                = new QPixmap( UserIcon( "mail-queued"                ) );
     pixTodo                  = new QPixmap( UserIcon( "mail-task"                  ) );
@@ -190,9 +190,9 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
     pixFwd                   = new QPixmap( UserIcon( "mail-forwarded"             ) );
     pixFlag                  = new QPixmap( UserIcon( "mail-important"             ) );
     pixWatched               = new QPixmap( UserIcon( "mail-thread-watch"          ) );
-    pixIgnored               = new QPixmap( UserIcon( "mail-thread-ignore"         ) );
+    pixIgnored               = new QPixmap( UserIcon( "mail-thread-ignored"        ) );
     pixSpam                  = new QPixmap( UserIcon( "mail-mark-junk"             ) );
-    pixHam                   = new QPixmap( UserIcon( "mail-mark-notjunk"          ) );
+    pixHam                   = new QPixmap( KIconLoader().loadIcon( "mail-mark-notjunk", KIconLoader::Small ) );
     pixFullySigned           = new QPixmap( UserIcon( "mail-signed-verified"       ) );
     pixPartiallySigned       = new QPixmap( UserIcon( "mail-signed-partially"      ) );
     pixUndefinedSigned       = new QPixmap( UserIcon( "mail-signed"                ) );
@@ -201,7 +201,7 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
     pixUndefinedEncrypted    = new QPixmap( UserIcon( "kmmsgundefinedencrypted"    ) );
     pixEncryptionProblematic = new QPixmap( UserIcon( "kmmsgencryptionproblematic" ) );
     pixSignatureProblematic  = new QPixmap( UserIcon( "kmmsgsignatureproblematic"  ) );
-    pixAttachment            = new QPixmap( KIconLoader().loadIcon( "mail-attachment", KIconLoader::Small ) );
+    pixAttachment            = new QPixmap( KIconLoader().loadIcon( "mail-attachment",   KIconLoader::Small ) );
     pixReadFwd               = new QPixmap( UserIcon( "mail-forwarded"             ) );
     pixReadReplied           = new QPixmap( UserIcon( "mail-replied"               ) );
     pixReadFwdReplied        = new QPixmap( UserIcon( "mail-forwarded-replied"     ) );

kmmainwidget.cpp

@@ -3197,7 +3197,7 @@ void KMMainWidget::setupActions()
   actionCollection()->addAction("thread_watched", mWatchThreadAction );
   connect(mWatchThreadAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusWatched()));
 
-  mIgnoreThreadAction = new KToggleAction(KIcon("mail-thread-ignore"), i18n("&Ignore Thread"), this);
+  mIgnoreThreadAction = new KToggleAction(KIcon("process-stop"), i18n("&Ignore Thread"), this);
   actionCollection()->addAction("thread_ignored", mIgnoreThreadAction );
   connect(mIgnoreThreadAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusIgnored()));
 

kmsearchpattern.h

@@ -232,22 +232,22 @@ namespace KMail {
 
   // If you change the ordering here; also do it in the enum below
   static const MessageStatus StatusValues[] = {
-    { I18N_NOOP( "Important" ),        "mail-important"     },
-    { I18N_NOOP( "New" ),              "mail-new"           },
-    { I18N_NOOP( "Unread" ),           "mail-unread"        },
-    { I18N_NOOP( "Read" ),             "mail-read"          },
-    { I18N_NOOP( "Old" ),              0                    },
-    { I18N_NOOP( "Deleted" ),          "mail-deleted"       },
-    { I18N_NOOP( "Replied" ),          "mail-replied"       },
-    { I18N_NOOP( "Forwarded" ),        "mail-forwarded"     },
-    { I18N_NOOP( "Queued" ),           "mail-queued"        },
-    { I18N_NOOP( "Sent" ),             "mail-sent"          },
-    { I18N_NOOP( "Watched" ),          "mail-thread-watch"  },
-    { I18N_NOOP( "Ignored" ),          "mail-thread-ignore" },
-    { I18N_NOOP( "Spam" ),             "mail-mark-junk"     },
-    { I18N_NOOP( "Ham" ),              "mail-mark-notjunk"  },
-    { I18N_NOOP( "To Do" ),            "mail-task"          },
-    { I18N_NOOP( "Has Attachment"),    "mail-attachment"    }
+    { I18N_NOOP( "Important" ),        "mail-important"      },
+    { I18N_NOOP( "New" ),              "mail-new"            },
+    { I18N_NOOP( "Unread" ),           "mail-unread"         },
+    { I18N_NOOP( "Read" ),             "mail-read"           },
+    { I18N_NOOP( "Old" ),              0                     },
+    { I18N_NOOP( "Deleted" ),          "mail-deleted"        },
+    { I18N_NOOP( "Replied" ),          "mail-replied"        },
+    { I18N_NOOP( "Forwarded" ),        "mail-forwarded"      },
+    { I18N_NOOP( "Queued" ),           "mail-queued"         },
+    { I18N_NOOP( "Sent" ),             "mail-sent"           },
+    { I18N_NOOP( "Watched" ),          "mail-thread-watch"   },
+    { I18N_NOOP( "Ignored" ),          "mail-thread-ignored" },
+    { I18N_NOOP( "Spam" ),             "mail-mark-junk"      },
+    { I18N_NOOP( "Ham" ),              "mail-mark-notjunk"   },
+    { I18N_NOOP( "To Do" ),            "mail-task"           },
+    { I18N_NOOP( "Has Attachment"),    "mail-attachment"     }
   };
   // If you change the ordering here; also do it in the array above
   enum StatusValueTypes {

pics/CMakeLists.txt

@@ -5,5 +5,5 @@
 
 ########### install files ###############
 
-install( FILES mail-deleted.png mail-new.png mail-mark-new.png mail-unread.png mail-mark-unread.png mail-read.png mail-mark-read.png mail-replied.png mail-forwarded.png mail-forwarded-replied.png mail-queued.png mail-important.png mail-mark-important.png mail-sent.png mail-thread-watch.png mail-thread-ignore.png mail-task.png mail-mark-task.png pgp-keys.png kmmsgpartiallyencrypted.png mail-signed-partially.png kmmsgfullyencrypted.png mail-signed-verified.png kmmsgundefinedencrypted.png mail-signed.png mail-mark-junk.png kmwizard.png quotecollapse.png quoteexpand.png  DESTINATION ${DATA_INSTALL_DIR}/kmail/pics)
+install( FILES mail-deleted.png mail-new.png mail-mark-new.png mail-replied.png mail-forwarded.png mail-forwarded-replied.png mail-queued.png mail-important.png mail-sent.png mail-thread-watch.png mail-thread-ignored.png mail-task.png mail-mark-task.png pgp-keys.png kmmsgpartiallyencrypted.png mail-signed-partially.png kmmsgfullyencrypted.png mail-signed-verified.png kmmsgundefinedencrypted.png mail-signed.png mail-mark-junk.png kmwizard.png quotecollapse.png quoteexpand.png  DESTINATION ${DATA_INSTALL_DIR}/kmail/pics)