Changeset 11440

Timestamp:

Nov 27, 2010, 10:42:47 PM (12 years ago)

Author:

charles

Message:

(trunk qt) #3706 "improve torrent details" -- committed patch from Longinus00

File:

• trunk/qt/details.cc (modified) (4 diffs)

trunk/qt/details.cc

@@ -374 +374 @@
             const double d = 100.0 * ( sizeWhenDone ? ( sizeWhenDone - leftUntilDone ) / sizeWhenDone : 1 );
             QString pct = Formatter::percentToString( d );
-            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 );
+                string = tr( "%1 (100%)" )
+                             .arg( Formatter::sizeToString( haveVerified ) );
             }
             else if( !haveUnverified )
             {
-                string = tr( "%1 (%2% of %3% Available)" )
-                             .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
-                             .arg( pct )
-                             .arg( astr );
+                string = tr( "%1 of %2 (%3%)" )
+                             .arg( Formatter::sizeToString( haveVerified ) )
+                             .arg( Formatter::sizeToString( sizeWhenDone ) )
+                             .arg( pct );
             }
             else
             {
-                string = tr( "%1 (%2% of %3% Available) + %4 Unverified" )
+                string = tr( "%1 of %2% (%3%), %4 Unverified" )
                              .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
+                             .arg( Formatter::sizeToString( sizeWhenDone ) )
                              .arg( pct )
-                             .arg( astr )
                              .arg( Formatter::sizeToString( haveUnverified ) );
             }
@@ -429 +422 @@
         const QString fstr = Formatter::sizeToString( f );
         if( f )
-            string = tr( "%1 (+%2 corrupt)" ).arg( dstr ).arg( fstr );
+            string = tr( "%1 (%2 corrupt)" ).arg( dstr ).arg( fstr );
         else
             string = dstr;
@@ -847 +840 @@
 
     hig->addSectionTitle( tr( "Activity" ) );
-    hig->addRow( tr( "Torrent size:" ), mySizeLabel = new SqueezeLabel );
     hig->addRow( tr( "Have:" ), myHaveLabel = new SqueezeLabel );
     hig->addRow( tr( "Availability:" ), myAvailabilityLabel = new SqueezeLabel );
@@ -861 +853 @@
     hig->addSectionDivider( );
     hig->addSectionTitle( tr( "Details" ) );
+    hig->addRow( tr( "Size:" ), mySizeLabel = new SqueezeLabel );
     hig->addRow( tr( "Location:" ), myLocationLabel = new SqueezeLabel );
     hig->addRow( tr( "Hash:" ), myHashLabel = new SqueezeLabel );