From 291068d2b9e92890d834cc795d9711940676ef26 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Mon, 24 Dec 2007 23:33:08 +0000 Subject: [PATCH] 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 | 10 +++--- kmmainwidget.cpp | 2 +- kmsearchpattern.h | 32 +++++++++--------- pics/CMakeLists.txt | 2 +- pics/mail-mark-important.png | Bin 566 -> 0 bytes pics/mail-mark-read.png | Bin 513 -> 0 bytes pics/mail-mark-unread.png | Bin 394 -> 0 bytes pics/mail-read.png | Bin 513 -> 0 bytes ...ead-ignore.png => mail-thread-ignored.png} | Bin pics/mail-unread.png | Bin 394 -> 0 bytes 10 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 pics/mail-mark-important.png delete mode 100644 pics/mail-mark-read.png delete mode 100644 pics/mail-mark-unread.png delete mode 100644 pics/mail-read.png rename pics/{mail-thread-ignore.png => mail-thread-ignored.png} (100%) delete mode 100644 pics/mail-unread.png diff --git a/kmheaders.cpp b/kmheaders.cpp index 1136e35c3..502f2288c 100644 --- a/kmheaders.cpp +++ b/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" ) ); diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 17b3143c1..d156829c8 100644 --- a/kmmainwidget.cpp +++ b/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())); diff --git a/kmsearchpattern.h b/kmsearchpattern.h index 4a0ecadd9..487bc37bc 100644 --- a/kmsearchpattern.h +++ b/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 { diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index 0628c9c99..9c2582f88 100644 --- a/pics/CMakeLists.txt +++ b/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) diff --git a/pics/mail-mark-important.png b/pics/mail-mark-important.png deleted file mode 100644 index c1d236bea8cbfea47ff283f8617cc44d1aff39b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}P)F@n8O4(z`a7qao6mYQ;DdL8Tdd0qN! zE%SNyZvJC_AR7`gz?mk{Yyzzoj_mBt>#rEW{*k{W68=}Z(A z_Lh-Kfth9u-)92P-vaOsz%s{so05>rPjeF|vRRoM8q8$Gy&zx=zZ#9N7Nsjz7+L_N zq7Gst1e&I8QewQhzvnbP3053-!DjD0SbMFtwe{`Nej*-T25?*ffaM5; zlx*jV`L*2Z=iGxo9P}|a9YabmERWl6{chW85BM}5!VhqM^@D@cic-*hI*ZTJga!fx zgtPqa{U`bH!yE06plcd4Q%}gG;!2@$WAn3VprbLC7~$=!mjHJpKS+v~HBK(R;duhn z7I;E1Ka)cF0y>6$yt0}*+T6&^`=x|zW|Z;dV;U`!wka?=Hm>)VD7iSVu(Xh!+xYyo zXGsFKE7;mS!?0Yu?i`Co$UGgvxV6~ZDex#7#WbCNp^>mOo2GeVA^SEY8jW8~CWePd zCX)n%AprE=|6THh5{IW{=tDy?7>TIMtyUY+Kcq6)F1%QrRByE%f#rH?4u(P`M&s0K zb*zrrBNV=rxUN)HK+&!H{i=M;S*eKQIMlya`7itd+!4|Gd~F<~00000NkvXXu0mjf DIdAox zAVkd3;XcJej$+9HETSkj13%j9_C}1qCR9(G04x9_k$|~9Z$kI&ldbI%$z+<&(~z61 z8o7L)FceDwz_x8lZjst;oBMj3D2#b*z2X!$ab0)brvOL*NFfRQfL621nv-RH!@>6j zq7Gst1e&I8QewQhzvnbP3053-!DjD0SbMFtwe{`Nej*-T25?*ffaM5; zlx*jV`L*2Z=iGxo9P}|a9YabmERWl6{chW85BM}5!VhqM^@D@cic-*hI*ZTJga!fx zgtPqa{U`bH!yE06plcd4Q%}gG;!2@$WAn3VprbLC7~$=!mjHJpKS+v~HBK(R;duhn z7I;E1Ka)cF0y>6$yt0}*+T6&^`=x|zW|Z;dV;U`!wka?=Hm>)VD7iSVu(Xh!+xYyo zXGsFKE7;mS!?0Yu?i`Co$UGgvxV6~ZDex#7#WbCNp^>mOo2GeVA^SEY8jW8~CWePd zCX)n%AprE=|6THh5{IW{=tDy?7>TIMtyUY+Kcq6)F1%QrRByE%f#rH?4u(P`M&s0K zb*zrrBNV=rxUN)HK+&!H{i=M;S*eKQIMlya`7itd+!4|Gd~F<~00000NkvXXu0mjf DIdAox zAVkd3;XcJej$+9HETSkj13%j9_C}1qCR9(G04x9_k$|~9Z$kI&ldbI%$z+<&(~z61 z8o7L)FceDwz_x8lZjst;oBMj3D2#b*z2X!$ab0)brvOL*NFfRQfL621nv-RH!@>6j z