From kmail-devel Sun Feb 29 19:38:09 2004 From: Ingo =?iso-8859-15?q?Kl=F6cker?= Date: Sun, 29 Feb 2004 19:38:09 +0000 To: kmail-devel Subject: [PATCH] Reorder status icons Message-Id: <200402292038.10405 () erwin ! ingo-kloecker ! de> X-MARC-Message: https://marc.info/?l=kmail-devel&m=107819587906377 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============1939597440==" --===============1939597440== Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Boundary-03=_i+jQAHjP39w3TTP" Content-Transfer-Encoding: 7bit --Boundary-03=_i+jQAHjP39w3TTP Content-Type: multipart/mixed; boundary="Boundary-01=_i+jQACq3IIMdmcy" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_i+jQACq3IIMdmcy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, now that we have an attachment icon I noticed that the order of the=20 status icons is IMO suboptimal. The attached patch makes the following=20 changes: =2D Show the attachment icon and the crypto icons directly after the=20 primary message status icon (new, unread, read, delete [is delete=20 actually a primary status icon?]) and before the secondary status icons=20 (important, replied, forwarded). =2D I also moved the Queued/Sent icon before the primary status icons. But= =20 I'm not sure about this. This is open for discussion. I'd like to see at least the first change=20 because this icon order makes IMO more sense then the current order. Regards, Ingo --Boundary-01=_i+jQACq3IIMdmcy Content-Type: text/x-diff; charset="us-ascii"; name="reorder-status-icons.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="reorder-status-icons.diff" Index: kmheaders.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/kde/kdepim/kmail/kmheaders.cpp,v retrieving revision 1.616 diff -u -3 -p -r1.616 kmheaders.cpp =2D-- kmheaders.cpp 26 Feb 2004 17:59:43 -0000 1.616 +++ kmheaders.cpp 26 Feb 2004 20:01:45 -0000 @@ -347,15 +347,18 @@ public: if(mMsgBase->isIgnored()) pixmaps << *KMHeaders::pixIgnored; if(mMsgBase->isWatched()) pixmaps << *KMHeaders::pixWatched; =20 + if(mMsgBase->isQueued()) pixmaps << *KMHeaders::pixQueued; + if(mMsgBase->isSent()) pixmaps << *KMHeaders::pixSent; + if(mMsgBase->isNew()) pixmaps << *KMHeaders::pixNew; if(mMsgBase->isRead() || mMsgBase->isOld()) pixmaps << *KMHeaders::p= ixRead; if(mMsgBase->isUnread()) pixmaps << *KMHeaders::pixUns; if(mMsgBase->isDeleted()) pixmaps << *KMHeaders::pixDel; =2D if(mMsgBase->isImportant()) pixmaps << *KMHeaders::pixFlag; =2D if(mMsgBase->isReplied()) pixmaps << *KMHeaders::pixRep; =2D if(mMsgBase->isForwarded()) pixmaps << *KMHeaders::pixFwd; =2D if(mMsgBase->isQueued()) pixmaps << *KMHeaders::pixQueued; =2D if(mMsgBase->isSent()) pixmaps << *KMHeaders::pixSent; + + // Only merge the attachment icon in if that is configured. + if( headers->paintInfo()->showAttachmentIcon && + mMsgBase->attachmentState() =3D=3D KMMsgHasAttachment ) + pixmaps << *KMHeaders::pixAttachment; =20 // Only merge the crypto icons in if that is configured. if( headers->paintInfo()->showCryptoIcons ) { @@ -377,15 +380,15 @@ public: else if( mMsgBase->signatureState() =3D=3D KMMsgSignatureProblem= atic ) pixmaps << *KMHeaders::pixSignatureProblematic; } =2D // Only merge the attachment icon in if that is configured. =2D if( headers->paintInfo()->showAttachmentIcon &&=20 =2D mMsgBase->attachmentState() =3D=3D KMMsgHasAttachment )=20 =2D pixmaps << *KMHeaders::pixAttachment; + + if(mMsgBase->isImportant()) pixmaps << *KMHeaders::pixFlag; + if(mMsgBase->isReplied()) pixmaps << *KMHeaders::pixRep; + if(mMsgBase->isForwarded()) pixmaps << *KMHeaders::pixFwd; =20 static QPixmap mergedpix; mergedpix =3D pixmapMerge( pixmaps ); return &mergedpix; =2D }=20 + } return 0; } =20 --Boundary-01=_i+jQACq3IIMdmcy-- --Boundary-03=_i+jQAHjP39w3TTP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQBAQj+iGnR+RTDgudgRAisNAJsEfIG/V52AMVjRD1Q/YHEng0ZkrACgs5j9 WC5CJITDSSyvszUiVJLvsZw= =D/h3 -----END PGP SIGNATURE----- --Boundary-03=_i+jQAHjP39w3TTP-- --===============1939597440== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ KMail developers mailing list KMail-devel@kde.org https://mail.kde.org/mailman/listinfo/kmail-devel --===============1939597440==--