From 968229be2efcd339f2846c5fa125b3e529de06ce Mon Sep 17 00:00:00 2001 From: Ingo Klcker Date: Wed, 30 Oct 2002 20:45:55 +0000 Subject: [PATCH] Fixes bug 49784 by replacing the question mark icons which indicate unknown signed/encrypted status of messages with better icons svn path=/trunk/kdenetwork/kmail/; revision=186555 --- kmheaders.cpp | 10 ++++++---- kmheaders.h | 6 +++--- pics/Makefile.am | 3 ++- pics/kmmsgundefinedencrypted.png | Bin 0 -> 415 bytes pics/kmmsgundefinedsigned.png | Bin 0 -> 430 bytes 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pics/kmmsgundefinedencrypted.png create mode 100644 pics/kmmsgundefinedsigned.png diff --git a/kmheaders.cpp b/kmheaders.cpp index d4f2926ea..e04fb269f 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -70,10 +70,11 @@ QPixmap* KMHeaders::pixFwd = 0; QPixmap* KMHeaders::pixFlag = 0; QPixmap* KMHeaders::pixFullySigned = 0; QPixmap* KMHeaders::pixPartiallySigned = 0; +QPixmap* KMHeaders::pixUndefinedSigned = 0; QPixmap* KMHeaders::pixFullyEncrypted = 0; QPixmap* KMHeaders::pixPartiallyEncrypted = 0; +QPixmap* KMHeaders::pixUndefinedEncrypted = 0; QPixmap* KMHeaders::pixFiller = 0; -QPixmap* KMHeaders::pixUndefined = 0; QPixmap* KMHeaders::pixEncryptionProblematic = 0; QPixmap* KMHeaders::pixSignatureProblematic = 0; @@ -294,7 +295,7 @@ public: else if( mMsgBase->encryptionState() == KMMsgPartiallyEncrypted ) pixmaps << *KMHeaders::pixPartiallyEncrypted; else if( mMsgBase->encryptionState() == KMMsgEncryptionStateUnknown ) - pixmaps << *KMHeaders::pixUndefined; + pixmaps << *KMHeaders::pixUndefinedEncrypted; else if( mMsgBase->encryptionState() == KMMsgEncryptionProblematic ) pixmaps << *KMHeaders::pixEncryptionProblematic; else @@ -305,7 +306,7 @@ public: else if( mMsgBase->signatureState() == KMMsgPartiallySigned ) pixmaps << *KMHeaders::pixPartiallySigned; else if( mMsgBase->signatureState() == KMMsgSignatureStateUnknown ) - pixmaps << *KMHeaders::pixUndefined; + pixmaps << *KMHeaders::pixUndefinedSigned; else if( mMsgBase->signatureState() == KMMsgSignatureProblematic ) pixmaps << *KMHeaders::pixSignatureProblematic; else @@ -535,10 +536,11 @@ KMHeaders::KMHeaders(KMMainWin *aOwner, QWidget *parent, pixFlag = new QPixmap( UserIcon("kmmsgflag") ); pixFullySigned = new QPixmap( UserIcon( "kmmsgfullysigned" ) ); pixPartiallySigned = new QPixmap( UserIcon( "kmmsgpartiallysigned" ) ); + pixUndefinedSigned = new QPixmap( UserIcon( "kmmsgundefinedsigned" ) ); pixFullyEncrypted = new QPixmap( UserIcon( "kmmsgfullyencrypted" ) ); pixPartiallyEncrypted = new QPixmap( UserIcon( "kmmsgpartiallyencrypted" ) ); + pixUndefinedEncrypted = new QPixmap( UserIcon( "kmmsgundefinedencrypted" ) ); pixFiller = new QPixmap( UserIcon( "kmmsgfiller" ) ); - pixUndefined = new QPixmap( UserIcon( "kmundefined" ) ); pixEncryptionProblematic = new QPixmap( UserIcon( "kmmsgencryptionproblematic" ) ); pixSignatureProblematic = new QPixmap( UserIcon( "kmmsgsignatureproblematic" ) ); } diff --git a/kmheaders.h b/kmheaders.h index 33319cc41..451a68f51 100644 --- a/kmheaders.h +++ b/kmheaders.h @@ -213,9 +213,9 @@ public slots: protected: static QPixmap *pixNew, *pixUns, *pixDel, *pixOld, *pixRep, *pixSent, *pixQueued, *pixFwd, *pixFlag, - *pixFullySigned, *pixPartiallySigned, - *pixFullyEncrypted, *pixPartiallyEncrypted, - *pixFiller, *pixUndefined, *pixEncryptionProblematic, + *pixFullySigned, *pixPartiallySigned, *pixUndefinedSigned, + *pixFullyEncrypted, *pixPartiallyEncrypted, *pixUndefinedEncrypted, + *pixFiller, *pixEncryptionProblematic, *pixSignatureProblematic; /** Look for color changes */ diff --git a/pics/Makefile.am b/pics/Makefile.am index 424076080..119181560 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -5,7 +5,8 @@ data_DATA = kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgold.png \ pub_key_red.png pgp-keys.png \ kmmsgpartiallyencrypted.png \ kmmsgpartiallysigned.png kmmsgfiller.png kmmsgfullyencrypted.png \ - kmmsgfullysigned.png kmundefined.png kmailwindowlayout1.png \ + kmmsgfullysigned.png kmmsgundefinedencrypted.png \ + kmmsgundefinedsigned.png kmailwindowlayout1.png \ kmailwindowlayout2.png kmailwindowlayout3.png kmailwindowlayout4.png \ kmailwindowlayout5.png kmailwindowlayout1_smart_mime.png \ kmailwindowlayout2_smart_mime.png kmailwindowlayout3_smart_mime.png \ diff --git a/pics/kmmsgundefinedencrypted.png b/pics/kmmsgundefinedencrypted.png new file mode 100644 index 0000000000000000000000000000000000000000..e7e555a0ba695ee28b5d12fb4a68d8c33c48530e GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7a+~R@c)Wq$R{ApS>O>_ z%)r1c2*Ql@De)75g6t)pzOL+-xa34cl_sofzRJMBsN?D47*a8(H_+DmaDa&I`=y!5 z(T*Dn3xt;JcyV69T|E51YwR4EqZj1^9A#7j)CHBCG+bXT=4q!v&d;vH6I0e zDJflfy?e#gYl=%*7*sqby==Q%8eQ@%N7>g>Lcejr6ir=ThZw7tTHVw>vwv+`Rrz-;RNA@uI&CXMZ_@0@~Bn&t;uc GLK6TG@1l(W literal 0 HcmV?d00001 diff --git a/pics/kmmsgundefinedsigned.png b/pics/kmmsgundefinedsigned.png new file mode 100644 index 0000000000000000000000000000000000000000..2699cd0fa88ab092c0b1293e5bb5a00da0350e4d GIT binary patch literal 430 zcmV;f0a5;mP) zzAw<8K$S{Gj^hXb+qNYI8zjkf7Xhx<>j}UF@O_`@bh#=E5UtizV6|B6kc|UCt@a^F z8VnY4-Oqq}vsu!7?ra?-DV0jo>2x?bv9PT3m99anbx9`kNHltC09XLar5FxJ%w`va zLdK@K-v`sYCl*Vu$zO-jXih$#z_Nycy}R985{WBgm$Lwx%^8KlG41vp&(B|EvuC*O zJCjKScnFBB-s(&8G#R}Gj%_p=;t$MiYH)CL^SAyFR<&9s5-~ANAAoY%1HKuLOM3@? Y0M@#+tP821f&c&j07*qoM6N<$f`ehICjbBd literal 0 HcmV?d00001