From 21d3614f7c8df7fccfa02db08fe1d0d2f83dd28f Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 20 Dec 2007 02:02:51 +0000
Subject: [PATCH] make the short status string a little shorter.

---
 gtk/torrent-cell-renderer.c | 52 +++++++++++++++++++++++--------------
 gtk/tr_window.c             |  4 +--
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 44289623f..6079526ad 100644
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -98,9 +98,32 @@ getProgressString( const tr_info * info, const tr_stat * torStat )
 }
 
 static char*
-getShortStatusString( const tr_stat * torStat )
+getShortTransferString( const tr_stat * torStat, char * buf, size_t buflen )
 {
     char upStr[32], downStr[32];
+    const int haveUp = ( torStat->rateUpload * 1024 ) > 1.0;
+    const int haveDown = ( torStat->rateDownload * 1024 ) > 1.0;
+
+    if( haveDown )
+        tr_strlspeed( downStr, torStat->rateDownload, sizeof(downStr) );
+    if( haveUp )
+        tr_strlspeed( upStr, torStat->rateUpload, sizeof(upStr) );
+
+    if( haveDown && haveUp )
+        g_snprintf( buf, buflen, _( "Down: %s, Up: %s"), downStr, upStr );
+    else if( haveDown )
+        g_snprintf( buf, buflen, _( "Down: %s" ), downStr );
+    else if( haveUp )
+        g_snprintf( buf, buflen, _( "Up: %s" ), upStr );
+    else
+        g_strlcpy( buf, _( "Idle" ), buflen );
+
+    return buf;
+}
+
+static char*
+getShortStatusString( const tr_stat * torStat )
+{
     GString * gstr = g_string_new( NULL );
 
     switch( torStat->status )
@@ -117,18 +140,13 @@ getShortStatusString( const tr_stat * torStat )
             g_string_append_printf( gstr, _("Verifying local data (%.1f%% tested)"),
                                     torStat->recheckProgress * 100.0 );
 
-        case TR_STATUS_DOWNLOAD: {
-            tr_strlspeed( downStr, torStat->rateDownload, sizeof(downStr) );
-            tr_strlspeed( upStr, torStat->rateUpload, sizeof(upStr) );
-            g_string_append_printf( gstr, _("Down: %s, Up: %s"), downStr, upStr );
-            break;
-        }
-
+        case TR_STATUS_DOWNLOAD:
         case TR_STATUS_SEED:
         case TR_STATUS_DONE: {
-            tr_strlspeed( upStr, torStat->rateUpload, sizeof(upStr) );
-            g_string_append_printf( gstr, _("Ratio: %.1f, Up: %s"),
-                                    torStat->ratio*100.0, upStr );
+            char buf[128];
+            if( torStat->status != TR_STATUS_DOWNLOAD )
+                g_string_append_printf( gstr, _("Ratio: %.1f, " ), torStat->ratio*100.0 );
+            g_string_append( gstr, getShortTransferString( torStat, buf, sizeof( buf ) ) );
             break;
         }
 
@@ -185,15 +203,9 @@ getStatusString( const tr_stat * torStat )
 
     if( isActive && !isChecking )
     {
-        char ulbuf[64], dlbuf[64];
-
-        if (torStat->status == TR_STATUS_DOWNLOAD)
-            g_string_append_printf( gstr, _(" - Down: %s, Up: %s" ),
-                tr_strlspeed( dlbuf, torStat->rateDownload, sizeof(dlbuf) ),
-                tr_strlspeed( ulbuf, torStat->rateUpload, sizeof(ulbuf) ) );
-        else
-            g_string_append_printf( gstr, _(" - Up: %s" ),
-                tr_strlspeed( ulbuf, torStat->rateUpload, sizeof(ulbuf) ) );
+        char buf[256];
+        getShortTransferString( torStat, buf, sizeof(buf) );
+        g_string_append_printf( gstr, " - %s", buf );
     }
 
     return g_string_free( gstr, FALSE );
diff --git a/gtk/tr_window.c b/gtk/tr_window.c
index a3e695559..4fa151704 100644
--- a/gtk/tr_window.c
+++ b/gtk/tr_window.c
@@ -233,11 +233,11 @@ tr_window_update( TrWindow * self, float downspeed, float upspeed )
     char buf[64];
 
     tr_strlspeed( speedStr, downspeed, sizeof(speedStr) );
-    g_snprintf( buf, sizeof(buf), _("Total DL: %s"), speedStr );
+    g_snprintf( buf, sizeof(buf), _("Down: %s"), speedStr );
     gtk_label_set_text( GTK_LABEL(p->dl_lb), buf );
 
     tr_strlspeed( speedStr, upspeed, sizeof(speedStr) );
-    g_snprintf( buf, sizeof(buf), _("Total UL: %s"), speedStr );
+    g_snprintf( buf, sizeof(buf), _("Up: %s"), speedStr );
     gtk_label_set_text( GTK_LABEL(p->ul_lb), buf );
 }