Changeset 11216

Timestamp:

Sep 17, 2010, 5:43:06 AM (12 years ago)

Author:

charles

Message:

(trunk) #3549 "torrent properties window does not fit netbook screen" -- fixed

Location:

trunk

Files:

• gtk/details.c (modified) (5 diffs)
• gtk/util.c (modified) (1 diff)
• qt/details.cc (modified) (1 diff)

trunk/gtk/details.c

@@ -63 +63 @@
     GtkWidget * state_lb;
     GtkWidget * have_lb;
-    GtkWidget * availability_lb;
     GtkWidget * dl_lb;
     GtkWidget * ul_lb;
@@ -622 +621 @@
     const char * stateString;
     char buf[512];
-    uint64_t available = 0;
     uint64_t sizeWhenDone = 0;
     const tr_stat ** stats = g_new( const tr_stat*, n );
@@ -808 +806 @@
         uint64_t haveValid = 0;
         uint32_t verifiedPieces = 0;
+        uint64_t available = 0;
         for( i=0; i<n; ++i ) {
             const tr_stat * st = stats[i];
@@ -818 +817 @@
             available += st->sizeWhenDone - st->leftUntilDone + st->desiredAvailable;
         }
-        if( !haveValid && !haveUnchecked )
-            str = "";
-        else {
-            char buf2[32], unver[64], total[64];
+        {
+            char buf2[32], unver[64], total[64], avail[32];
+            const double d = ( 100.0 * available ) / sizeWhenDone;
             const double ratio = 100.0 * ( leftUntilDone ? ( haveValid + haveUnchecked ) / (double)sizeWhenDone : 1 );
+            tr_strlpercent( avail, d, sizeof( avail ) );
             tr_strlpercent( buf2, ratio, sizeof( buf2 ) );
             tr_strlsize( total, haveUnchecked + haveValid, sizeof( total ) );
             tr_strlsize( unver, haveUnchecked,             sizeof( unver ) );
-            if( haveUnchecked )
-                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$s%%); %3$s Unverified" ), total, buf2, unver );
+            if( !haveUnchecked && !leftUntilDone )
+                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$s%%)" ), total, buf2 );
+            else if( !haveUnchecked )
+                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$s%% of %3$s%% Available)" ), total, buf2, avail );
             else
-                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$s%%)" ), total, buf2 );
+                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$s%% of %3$s%% Available) + %4$s Unverified" ), total, buf2, avail, unver );
             str = buf;
         }
     }
     gtr_label_set_text( GTK_LABEL( di->have_lb ), str );
-
-    /* availability_lb */
-    if( !sizeWhenDone  )
-        str = "";
-    else {
-        char buf2[32];
-        const double d = ( 100.0 * available ) / sizeWhenDone;
-        tr_strlpercent( buf2, d, sizeof( buf2 ) );
-        g_snprintf( buf, sizeof( buf ), _( "%1$s%%" ), buf2 );
-        str = buf;
-    }
-    gtr_label_set_text( GTK_LABEL( di->availability_lb ), str );
 
     /* dl_lb */
@@ -965 +954 @@
         l = di->have_lb = gtk_label_new( NULL );
         hig_workarea_add_row( t, &row, _( "Have:" ), l, NULL );
-
-        /* availability */
-        l = di->availability_lb = gtk_label_new( NULL );
-        hig_workarea_add_row( t, &row, _( "Availability:" ), l, NULL );
 
         /* downloaded */

trunk/gtk/util.c

@@ -159 +159 @@
 {
     if( !bytes )
-        g_strlcpy( buf, _( "size|None" ), buflen );
+        g_strlcpy( buf, Q_( "size|None" ), buflen );
     else
         tr_formatter_size_B( buf, bytes, buflen );

trunk/qt/details.cc

@@ -363 +363 @@
             }
         }
-        if( !haveVerified && !haveUnverified )
-            string = none;
-        else {
+        {
             const double d = 100.0 * ( sizeWhenDone ? ( sizeWhenDone - leftUntilDone ) / sizeWhenDone : 1 );
             QString pct = Formatter::percentToString( d );
-            if( !haveUnverified )
+            QString astr;
+
+            if( sizeWhenDone )
+                astr = Formatter::percentToString( ( 100.0 * available ) / sizeWhenDone );
+            else
+                astr = "100";
+
+            if( !haveUnverified && !leftUntilDone )
+            {
                 string = tr( "%1 (%2%)" )
                              .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
                              .arg( pct );
-            else
-                string = tr( "%1 (%2%); %3 Unverified" )
+            }
+            else if( !haveUnverified )
+            {
+                string = tr( "%1 (%2% of %3% Available)" )
                              .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
                              .arg( pct )
+                             .arg( astr );
+            }
+            else
+            {
+                string = tr( "%1 (%2% of %3% Available) + %4 Unverified" )
+                             .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
+                             .arg( pct )
+                             .arg( astr )
                              .arg( Formatter::sizeToString( haveUnverified ) );
+            }
         }
     }