diff --git a/kmheaders.cpp b/kmheaders.cpp index 574f677c7..196745383 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -152,7 +152,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, QWidget *parent, pixFwd = new QPixmap( UserIcon( "kmmsgforwarded" ) ); pixFlag = new QPixmap( UserIcon( "mail_flag" ) ); pixWatched = new QPixmap( UserIcon( "kmmsgwatched" ) ); - pixIgnored = new QPixmap( UserIcon( "kmmsgignored" ) ); + pixIgnored = new QPixmap( UserIcon( "mail_ignore" ) ); pixSpam = new QPixmap( UserIcon( "mail_spam" ) ); pixHam = new QPixmap( UserIcon( "mail_ham" ) ); pixFullySigned = new QPixmap( UserIcon( "kmmsgfullysigned" ) ); diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index ce208b8a3..0c6c6aada 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -2620,7 +2620,7 @@ void KMMainWidget::setupActions() 0, this, SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); - mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "kmmsgignored", + mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "mail_ignore", 0, this, SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); diff --git a/kmsearchpattern.h b/kmsearchpattern.h index 6849003ee..ee501e4ab 100644 --- a/kmsearchpattern.h +++ b/kmsearchpattern.h @@ -230,7 +230,7 @@ namespace KMail { { I18N_NOOP( "Queued" ), "kmmsgqueued" }, { I18N_NOOP( "Sent" ), "kmmsgsent" }, { I18N_NOOP( "Watched" ), "kmmsgwatched" }, - { I18N_NOOP( "Ignored" ), "kmmsgignored" }, + { I18N_NOOP( "Ignored" ), "mail_ignore" }, { I18N_NOOP( "Spam" ), "mail_spam" }, { I18N_NOOP( "Ham" ), "mail_ham" }, { I18N_NOOP( "To Do" ), "kontact_todo" }, diff --git a/pics/Makefile.am b/pics/Makefile.am index 39b4e476a..aca88ff5e 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = icons pics_DATA = kmmsgnew.png kmmsgunseen.png kmmsgread.png \ kmmsgreplied.png kmmsgforwarded.png kmmsgqueued.png \ - kmmsgsent.png kmmsgwatched.png kmmsgignored.png kmmsgtodo.png \ + kmmsgsent.png kmmsgwatched.png \ kmmsgread_fwd.png kmmsgread_replied.png kmmsgread_fwd_replied.png \ pgp-keys.png \ kmmsgpartiallyencrypted.png \ diff --git a/pics/icons/cr16-action-mail_ignore.png b/pics/icons/cr16-action-mail_ignore.png new file mode 100644 index 000000000..6f75c09ae Binary files /dev/null and b/pics/icons/cr16-action-mail_ignore.png differ diff --git a/pics/icons/cr22-action-mail_ignore.png b/pics/icons/cr22-action-mail_ignore.png new file mode 100644 index 000000000..4376a6219 Binary files /dev/null and b/pics/icons/cr22-action-mail_ignore.png differ diff --git a/pics/icons/cr32-action-mail_ignore.png b/pics/icons/cr32-action-mail_ignore.png new file mode 100644 index 000000000..6ef61fb52 Binary files /dev/null and b/pics/icons/cr32-action-mail_ignore.png differ diff --git a/pics/icons/crsc-action-mail_ignore.svgz b/pics/icons/crsc-action-mail_ignore.svgz new file mode 100644 index 000000000..9dde04291 Binary files /dev/null and b/pics/icons/crsc-action-mail_ignore.svgz differ diff --git a/pics/kmmsgignored.png b/pics/kmmsgignored.png deleted file mode 100644 index 8b9658541..000000000 Binary files a/pics/kmmsgignored.png and /dev/null differ