From 097429efb842718cff6b3cc38b23284b2fd4270d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Jun 2012 01:56:59 -0500
Subject: [PATCH] Update warning overlay image and increase information in
 tooltip

---
 src/cr22-action-kerberos_warningoverlay.png | Bin 436 -> 362 bytes
 src/toplevel.cpp                            |   9 +++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cr22-action-kerberos_warningoverlay.png b/src/cr22-action-kerberos_warningoverlay.png
index 38d2380eef4083dfb93eebb83c4b6c5723553ef4..29040adcc14cdb83d9347154e2d46303db28f096 100644
GIT binary patch
delta 274
zcmV+t0qy>@1L^{hVSffPEFF@tM*si->PbXFR5;7+kTFXFVE~4o@9q;*kQ=<4gbopL
z5C<W>;T&3$glusWTH=0%yT75yAutpiga(IxK}17K($M{YLYnFluI_UXmzF!4eWsTe
z-e-7W&z?U_Pw}Q5ynl@+C$yH=u6n-8s!4}d(w*D|t5%%{Z+}lptpm(M=75z%paG1J
z88k0*rV76VzlcT`^QO%pkzjU)Q8{;pIqRM%gy;th6Us-K;jD`hE6@(|qk4Y@0TilG
zr~qrIJKqS&C{|#*#hxyG(BShOf)7A}lwjNRVo&t%9xq;QDIq{lZ_9@TARv|IHBPVr
Yc~m%^P>+kz01E&B07*qoM6N<$f)yNgzW@LL

delta 348
zcmV-i0i*uv0<;5=VSfTHF`w!w9{>OWG)Y83R5;7+(7Q^*a1_V!Z~jS3FBYxV+Crge
zEcH56(bYi&2V0P25}dka=+dRn(a|Rmhh%Z;8;FRjf{Wmw7B7RnfToE<L_1XLES~Lm
z4tzN0z<>RLk_Llq5S4^DjH`+A^L6Xk?XzdtbbbQFVDLQ5+<(?iIlI;)yGj`_M{V#4
zSUOr_ZpoZhFF8MYA*sP+2Gcgseg!C@Xk&I$)?}{yEJJ=BO;%`(1T39Ox>zWs=I_A$
zn7EKuA(ac3ES<`?fNh{gl9_sOUq*N>BtTaD?+RdL<CVzxSl!Z5hXR4fM0Ig@Ca-V?
z4#cJ)nS)py=vDitEG)P4fgshPKqxM1$-=F`0UT)G!{ZHf9{h|0sT3j{rZx;vdQaWv
u=|Oi}NdDdK8^{5;I04D~>h-!bhXL<B2~6?B>ooHK0000<MNUMnLSTZKU8Mj3

diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index d998691..0193549 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -299,6 +299,9 @@ void TopLevel::paintEvent(TQPaintEvent *) {
 	bool some_tickets_expired = false;
 	bool all_tickets_expired = true;
 
+	int expired_tickets = 0;
+	int expiring_tickets = 0;
+
 	KerberosTicketInfoList::Iterator it;
 	for (it = m_ticketList.begin(); it != m_ticketList.end(); ++it) {
 		KerberosTicketInfo ticket = *it;
@@ -308,9 +311,11 @@ void TopLevel::paintEvent(TQPaintEvent *) {
 			all_tickets_expired = false;
 		}
 		else {
+			expired_tickets++;
 			some_tickets_expired = true;
 		}
 		if ((ticket.validEndTime > now) && (ticket.validEndTime < now.addSecs(notifyExpiryMinutes*60))) {
+			expiring_tickets++;
 			tickets_expiring_soon = true;
 		}
 	}
@@ -327,13 +332,13 @@ void TopLevel::paintEvent(TQPaintEvent *) {
 		else if (some_tickets_expired) {
 			p.drawPixmap(0, 0, partiallyExpiredTicketsPixmap);
 			p.drawPixmap(0, 0, warningOverlayPixmap);
-			baseToolTip = baseToolTip + "\n" + i18n("Some ticket(s) have expired");
+			baseToolTip = baseToolTip + "\n" + i18n("%1 ticket(s) have expired").arg(expired_tickets);
 		}
 		else {
 			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");
+				baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) are active\n%1 ticket(s) will expire shortly").arg(expiring_tickets);
 			}
 			else {
 				baseToolTip = baseToolTip + "\n" + i18n("All ticket(s) are active");