From d3bad500077b597b28864abdbe003dbb99ffcc90 Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Wed, 27 Jun 2012 21:46:04 -0400 Subject: KfW GUI -- abbreviate durations Map days -> d; hours -> h; minutes -> m Signed-off-by: Kevin Wasserman ticket: 7285 (new) queue: kfw target_version: 1.10.4 tags: pullup --- src/windows/leash/LeashView.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/windows/leash') diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp index 298bee76cf..ceac1c4117 100644 --- a/src/windows/leash/LeashView.cpp +++ b/src/windows/leash/LeashView.cpp @@ -309,25 +309,15 @@ void DurationToString(long delta, LPTSTR *outStr) delta -= hours * SECONDS_PER_HOUR; minutes = delta / SECONDS_PER_MINUTE; - if (minutes != 1) - _snprintf(minutesStr, MAX_DURATION_STR, "%d minutes", minutes); - else - _snprintf(minutesStr, MAX_DURATION_STR, "1 minute"); + _snprintf(minutesStr, MAX_DURATION_STR, "%d m", minutes); minutesStr[MAX_DURATION_STR] = 0; - if (hours != 1) - _snprintf(hoursStr, MAX_DURATION_STR, "%d hours", hours); - else - _snprintf(hoursStr, MAX_DURATION_STR, "1 hour"); + _snprintf(hoursStr, MAX_DURATION_STR, "%d h", hours); hoursStr[MAX_DURATION_STR] = 0; if (days > 0) { - if (days > 1) - _snprintf(*outStr, MAX_DURATION_STR, "(%d days, %s remaining)", - days, hoursStr); - else - _snprintf(*outStr, MAX_DURATION_STR, "(1 day, %s remaining)", - hoursStr); + _snprintf(*outStr, MAX_DURATION_STR, "(%d d, %s remaining)", days, + hoursStr); } else if (hours > 0) { _snprintf(*outStr, MAX_DURATION_STR, "(%s, %s remaining)", hoursStr, minutesStr); -- cgit