Changeset 6796

Timestamp:

Sep 23, 2008, 8:06:26 PM (13 years ago)

Author:

charles

Message:

(gtk) #1289: duplicate of progress info in torrent activity tab

File:

• trunk/gtk/tr-torrent.c (modified) (3 diffs)

trunk/gtk/tr-torrent.c

@@ -250 +250 @@
     const int       upeers = MAX ( st->peersGettingFromUs, 0 );
     const int       eta = st->eta;
-    double          prog = st->percentDone * 100.0; /* [0...100] */
 
     switch( st->status )
     {
         case TR_STATUS_CHECK_WAIT:
-            prog = st->recheckProgress * 100.0; /* [0...100] */
             top =
                 g_strdup_printf( _(
                                      "Waiting to verify local data (%.1f%% tested)" ),
-                                 prog );
+                                 st->recheckProgress * 100.0 );
             break;
 
         case TR_STATUS_CHECK:
-            prog = st->recheckProgress * 100.0; /* [0...100] */
             top =
                 g_strdup_printf( _(
                                      "Verifying local data (%.1f%% tested)" ),
-                                 prog );
+                                 st->recheckProgress * 100.0 );
             break;
 
@@ -273 +270 @@
 
             if( eta < 0 )
-                top = g_strdup_printf( _(
-                                           "Remaining time unknown (%.1f%%)" ),
-                                       prog );
+                top = g_strdup_printf( _( "Remaining time unknown" ) );
             else
             {
                 char timestr[128];
                 tr_strltime( timestr, eta, sizeof( timestr ) );
-                /* %1$s is # of minutes
-                   %2$.1f is a percentage of how much of the torrent is done */
-                top = g_strdup_printf( _(
-                                           "%1$s remaining (%2$.1f%%)" ),
-                                       timestr, prog );
+                /* %s is # of minutes */
+                top = g_strdup_printf( _( "%1$s remaining" ), timestr );
             }
             break;
@@ -297 +289 @@
 
         case TR_STATUS_STOPPED:
-            top = g_strdup_printf( _( "Stopped (%.1f%%)" ), prog );
+            top = g_strdup( _( "Stopped" ) );
             break;
 
         default:
-            top = g_strdup_printf( "???" );
+            top = g_strdup( "???" );
             break;
     }