Changeset 9280

Timestamp:

Oct 10, 2009, 8:42:23 PM (13 years ago)

Author:

charles

Message:

(trunk gtk,qt) #2490: gtk, qt clients' Details dialog doesn't show ETA anymore

Location:

trunk

Files:

• gtk/details.c (modified) (3 diffs)
• qt/details.cc (modified) (2 diffs)
• qt/details.h (modified) (1 diff)

trunk/gtk/details.c

@@ -71 +71 @@
     GtkWidget * error_lb;
     GtkWidget * date_started_lb;
+    GtkWidget * eta_lb;
     GtkWidget * last_activity_lb;
 
@@ -731 +732 @@
     }
     gtk_label_set_text( GTK_LABEL( di->date_started_lb ), str );
+
+
+    /* eta */
+    if( n <= 0 )
+        str = none;
+    else {
+        const int baseline = stats[0]->eta;
+        for( i=1; i<n; ++i )
+            if( baseline != stats[i]->eta )
+                break;
+        if( i!=n )
+            str = mixed;
+        else if( baseline < 0 )
+            str = _( "Unknown" );
+        else
+            str = tr_strltime( buf, baseline, sizeof( buf ) );
+    }
+    gtk_label_set_text( GTK_LABEL( di->eta_lb ), str );
+     
 
 
@@ -941 +961 @@
         l = di->date_started_lb = gtk_label_new( NULL );
         hig_workarea_add_row( t, &row, _( "Running time:" ), l, NULL );
+
+        /* eta */
+        l = di->eta_lb = gtk_label_new( NULL );
+        hig_workarea_add_row( t, &row, _( "Remaining time:" ), l, NULL );
 
         /* last activity */

trunk/qt/details.cc

@@ -330 +330 @@
 
 
+    // myETALabel
+    string.clear( );
+    if( torrents.empty( ) )
+        string = none;
+    else {
+        int baseline = torrents[0]->getETA( );
+        foreach( const Torrent * t, torrents ) {
+            if( baseline != t->getETA( ) ) {
+                string = mixed;
+                break;
+            }
+        }
+        if( string.isEmpty( ) ) {
+            if( baseline < 0 )
+                string = tr( "Unknown" );
+            else
+                string = Utils::timeToString( baseline );
+       } 
+    }
+    myETALabel->setText( string );
+
+
     // myLastActivityLabel
     if( torrents.empty( ) )
@@ -792 +814 @@
     hig->addRow( tr( "State:" ), myStateLabel = new SqueezeLabel );
     hig->addRow( tr( "Running time:" ), myRunTimeLabel = new SqueezeLabel );
+    hig->addRow( tr( "Remaining time:" ), myETALabel = new SqueezeLabel );
     hig->addRow( tr( "Last activity:" ), myLastActivityLabel = new SqueezeLabel );
     hig->addRow( tr( "Error:" ), myErrorLabel = new SqueezeLabel );

trunk/qt/details.h

@@ -77 +77 @@
         QLabel * myErrorLabel;
         QLabel * myRunTimeLabel;
+        QLabel * myETALabel;
         QLabel * myLastActivityLabel;