From c57a10113d7abc28a8e05d2cbf9ea9956bb5b58b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 13 Jun 2012 21:56:45 -0500
Subject: [PATCH] Make tray icon easier to see and understand

---
 src/cr22-action-kerberos_ticketexpiring.png | Bin 1398 -> 0 bytes
 src/cr22-action-kerberos_timeroverlay.png   | Bin 0 -> 428 bytes
 src/cr22-action-kerberos_warningoverlay.png | Bin 0 -> 436 bytes
 src/toplevel.cpp                            |  31 ++++++++++----------
 src/toplevel.h                              |   3 +-
 5 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 src/cr22-action-kerberos_ticketexpiring.png
 create mode 100644 src/cr22-action-kerberos_timeroverlay.png
 create mode 100644 src/cr22-action-kerberos_warningoverlay.png

diff --git a/src/cr22-action-kerberos_ticketexpiring.png b/src/cr22-action-kerberos_ticketexpiring.png
deleted file mode 100644
index 2354930c028c0cb4655ca8513107e78cba380ce0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1398
zcmV-+1&R8JP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyh=
z2Qw{2k}H(}00j0)L_t(I%e|CqOp{j_$N%r8Z|^Ow*p`k-DMFPoLC`2(7!#bh2yrfs
z1aH}hb2GtAvtj(OW&5yX2{XoQ4i}BgKo%D9GM(8-)#y-}0*af8IHX_;r9kg3#rExc
z_5o$W663OD=gWD{KRLhiJWrng0sf~&C2y$TzNh|9@3GdQVB^)H;Er#u-bu(T+3=sJ
z#+B6{H{FboKCeJ}Mq;FABt~pLLJqfhi7IQ&d;f;TOh%l^Qu;wn-OH(3v27#*XMo3`
zpNGQ}g<L6zhc)H?d7<$KfDb+on0^w7({h$_nk3adR|JD00j@CtLty~}!8q;>hM`C@
z8znDhEq&gM{|0j+sYuKq5C<Mn6k;?Do}n=g3IU!#DiMJdOO($GW}gIsfv($hEGXz_
zXlWTIK*}*7gdjXFKq_P49(MD~G!Dh*M|N6$UQaS1Bu)q!t!@0d=0wNn*=J_IVDlHJ
z8t?Puyh|W0Zh`#j7D)48oP2jDMi#9sZ@K*SyRKDPnoj_j0VEe>s5V_Wu+3h+NMHW!
z{MDAiiUYU#^Y$3&2@2$1Kp<8-AshC$j~%QkKDTLU(x=m}tj$e)>-#-r=bx?~(+=V}
zZ+x_Sd5(z*x+7?J0Td|6#T1t0TBI0Cn%nETRy!T+lbCwj$IVgzVgUR<z{<ReZKdnW
zOEd}^;{>2Y6MB#*(5e{x#^o7H3;OrGT>?Yl>a_)KUswq0^HcSDeR@|{*NF7sx0*;K
z5}tJ0<6Tw!*@f$cujX4MR1_>bArk;Z0C--&us4XZk*}f|Sved<GYI&7;4CGu+wCwI
z47haZlC`q3at(m!<hUu)i;J`K=35ww2g@-KOBl#yEaWm4VhIC=V-R=UMfNLYoW`;o
z6wQDI59i<jj7B4RdU{Y)RJ1~;)8$TSMcU$3t96NT$OSKSrz@e0UWZq<5JE)*VvG#o
zh=5T#3Ytv-tJFa`D;u1`4o`qUBoaZR(ZFW2jfKPEu_*>InlduY1`%f7twY8v3MmUB
zNRga{?8YHz6fD$o25EUqaM5}OQO`q=SOm04f|S%WghC-`wOTkF4tF>l9-i`73_rAm
z^-AfA9RDfltjr#?9d*L892o0<fSGw^P-+t)#5kP1c;A<=af&#Zn)cdmj_yDD<E>bn
zaAvbvp-?CiL?RK>*4EZMWo#PP%g#Bh^T<#$$nkX`Lroy|dXOWVQ(doB>^x+ix9t7J
zY09m`ZB4}8d4}xWl2;1=YPCAAp`l@*qoaegwzdjIMMYaCTXB3H-Z3w<6dC3W0m9>#
z1R%)-yks2EZ5!X$+WY(E+H`}WFF0Zs1U`ye51fAhfZy-$sH&=3-`(A9SE*D~b#?WZ
zCX*?fKJg|@GF|fSoQ(`<G7Jg;!%oa04Pbsj6f(79_mS6;wz0JEL%BAIeiZWJrp?>+
zq*|}nd(CRKUg_)Wi>IfjCzh0yRMH|@LRIEk{cINP01qf<0J>B_sR0lNSO%Dz6`C!V
zVwZ>$CvfrvM1o#Vzx&aHr#cz0tE=1E+1Yu+=kuYzzu&`3H1sZAhI7J<JP>jLZaWYj
z1tc>kG=l-OR)y^;bFw2K0<1rsYzd4D&S~xr?b}<kqp7hWzwe>rB6WJB<QMe|SVdFg
zfB*<FAnXAY2>?Yfsrh|qKITZW0?^c7an=CvKkGmH3jod+X4my!WB>pF07*qoM6N<$
Ef+o*+HUIzs

diff --git a/src/cr22-action-kerberos_timeroverlay.png b/src/cr22-action-kerberos_timeroverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b94ceed9ee522b25dfb4f5330a2df1acda4f2b3
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<Ha;djITLFUH=rpxo-U3d7N_4%
zwDvxnAmKLuy>R|yJ~4Lo>0MnMd}8YZS8i^a?8g;*#r37mj^FGp0wP`q`PPZ$cbl+$
zY?^qBO}iuPsF>4AwzZ~e_h0*a)H$60H|L?HL$4GAbHl{Y-sfJ^WTZGe>O<LIEnHY8
zJk9vJ;KR%bi=^c5?I^h{-*@7f?xjs?FYQ%!r3vS0U)!;KLGs5C&zXG{|HP)O=kR(O
zr)eU%?1nYxmK?3PYPmO=lTW3!)*7}gP7x};{CLLAuE!5n9cX$OcQW{bLX5<+-u6wr
zvHM-`KhQYy#nNhaL)yE?N57riAyoZK^mloFNzs3&U+NbNFRDJhDCQ9I@#4aH{Ab_q
z6nFKWlghP3N_E#pk1zeX;f)@1*Y_|y?rkis%uMtu%3<HVX&KWst__c?IR7!`?&}tP
U`Gx5QFen*3UHx3vIVCg!0COR%wg3PC

literal 0
HcmV?d00001

diff --git a/src/cr22-action-kerberos_warningoverlay.png b/src/cr22-action-kerberos_warningoverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d2380eef4083dfb93eebb83c4b6c5723553ef4
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyh@
z0xmJ1>M0)p00A^fL_t(I%k9v+O2cpz$MJ9eNlPylt=8H?p=m7jI#kisK?Da|kYo~^
zx@G9nrO(mPClH5Zaq1h0h^vB&;Gh;SgS~*Ji9<v?RO>9B?RO4*IOo8B{ehAOgKZF%
zggA_=iSqMx>)7qHXV`Rp0>ohOJj~qIPC2{QBfCl&Fh_0h30OK>Vs6QtRxdd}dLgO7
zWCqhV(0&Cdp=e`vQ`Tgz{47I$9Zgnfj07y5O1fAmrRMLz{g}9rRw0!OmMophw}5S+
zMv|F&abHGwEhIoz{O<~2W#g5|_*mW2QHKJ7$V7E<cP6iJ1`fogAen<$9O(O}EG)P4
zfgshPKqxM1$-=F`0UT)G!{ZHf9{h|0sT3j{rZx;vdQaWv=|Oi}NdDdK8^{5;I04D~
e>h-!bhXL<B2~6?B>ooHK0000<MNUMnLSTX+xwv)!

literal 0
HcmV?d00001

diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 3b80d2d..d998691 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -271,7 +271,8 @@ void TopLevel::resizeEvent (TQResizeEvent *)
 	noTicketsPixmap = loadSizedIcon("kerberos_notickets", width());
 	expiredTicketsPixmap = loadSizedIcon("kerberos_expiredtickets", width());
 	partiallyExpiredTicketsPixmap = loadSizedIcon("kerberos_someexpiredtickets", width());
-	expiringTicketsPixmap = loadSizedIcon("kerberos_ticketexpiring", width());
+	timerOverlayPixmap = loadSizedIcon("kerberos_timeroverlay", width());
+	warningOverlayPixmap = loadSizedIcon("kerberos_warningoverlay", width());
 	repaint();
 }
 
@@ -293,8 +294,6 @@ void TopLevel::mousePressEvent(TQMouseEvent *event) {
 void TopLevel::paintEvent(TQPaintEvent *) {
 	TQString baseToolTip = i18n("%1 Kerberos ticket(s) listed for principal %2").arg(m_ticketList.count()).arg(m_ticketList[0].cachePrincipal);
 
-	TQPixmap *pm = &noTicketsPixmap;
-
 	bool has_tickets = false;
 	bool tickets_expiring_soon = false;
 	bool some_tickets_expired = false;
@@ -318,31 +317,33 @@ void TopLevel::paintEvent(TQPaintEvent *) {
 
 	if (!notifyExpiry) tickets_expiring_soon = false;
 
+	TQPainter p(this);
 	if (has_tickets) {
 		if (all_tickets_expired) {
-			pm = &expiredTicketsPixmap;
+			p.drawPixmap(0, 0, expiredTicketsPixmap);
+			p.drawPixmap(0, 0, warningOverlayPixmap);
 			baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) have expired");
 		}
-		else if (tickets_expiring_soon) {
-			pm = &expiringTicketsPixmap;
-			baseToolTip = baseToolTip + "\n" + i18n("Ticket(s) will expire soon");
-		}
 		else if (some_tickets_expired) {
-			pm = &partiallyExpiredTicketsPixmap;
+			p.drawPixmap(0, 0, partiallyExpiredTicketsPixmap);
+			p.drawPixmap(0, 0, warningOverlayPixmap);
 			baseToolTip = baseToolTip + "\n" + i18n("Some ticket(s) have expired");
 		}
 		else {
-			pm = &activeTicketsPixmap;
-			baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) are active");
+			p.drawPixmap(0, 0, activeTicketsPixmap);
+			if (tickets_expiring_soon) {
+				p.drawPixmap(0, 0, timerOverlayPixmap);
+				baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) are active\nSome ticket(s) will expire shortly");
+			}
+			else {
+				baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) are active");
+			}
 		}
 	}
 	else {
+		p.drawPixmap(0, 0, noTicketsPixmap);
 		baseToolTip = i18n("No Kerberos tickets are available");
 	}
-
-	TQPixmap base(*pm);                                      // make copy of base pixmap
-	TQPainter p(this);
-	p.drawPixmap(0, 0, base);
 	p.end();
 
 	setToolTip(baseToolTip);
diff --git a/src/toplevel.h b/src/toplevel.h
index 4082eef..41ed816 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -79,7 +79,8 @@ private:
 	TQPixmap noTicketsPixmap;
 	TQPixmap expiredTicketsPixmap;
 	TQPixmap partiallyExpiredTicketsPixmap;
-	TQPixmap expiringTicketsPixmap;
+	TQPixmap timerOverlayPixmap;
+	TQPixmap warningOverlayPixmap;
 	KAction *confAct;
 	KAction *getNewTGTAct;
 	KAction *getNewSTAct;