Changeset 10457

Timestamp:

Apr 6, 2010, 4:54:51 AM (13 years ago)

Author:

charles

Message:

(trunk) poke at details yet again

Location:

trunk

Files:

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

trunk/gtk/details.c

@@ -677 +677 @@
         str = none;
     else {
-        const tr_torrent_activity a = stats[0]->activity;
-        const tr_bool f = stats[0]->finished;
-        str = activityString( a, f );
+        const tr_torrent_activity activity = stats[0]->activity;
+        tr_bool allFinished = stats[0]->finished;
         for( i=1; i<n; ++i ) {
-            if( ( stats[i]->activity != a ) || ( stats[i]->finished != f ) ) {
-                str = mixed;
-                break;
-            }
-        }
+            if( activity != stats[i]->activity )
+                break;
+            if( !stats[i]->finished )
+                allFinished = FALSE;
+        }
+        str = i<n ? mixed : activityString( activity, allFinished );
     }
     stateString = str;
@@ -695 +695 @@
         str = none;
     else {
-        tr_bool allPaused = TRUE;
-        time_t baseline = stats[0]->startDate;
+        const time_t baseline = stats[0]->startDate;
+        tr_bool allFinished = stats[0]->finished;
         for( i=1; i<n; ++i ) {
             if( baseline != stats[i]->startDate )
-                baseline = 0;
-            if( stats[i]->activity != TR_STATUS_STOPPED )
-                allPaused = FALSE;
-        }
-        if( allPaused )
-            str = stateString; // paused || finished
-        else if( !baseline )
+                break;
+            if( !stats[i]->finished )
+                allFinished = FALSE;
+        }
+        if( i != n )
             str = mixed;
+        else if( ( baseline<=0 ) || ( stats[0]->activity == TR_STATUS_STOPPED ) )
+            str = stateString;
         else
             str = tr_strltime( buf, time(NULL)-baseline, sizeof( buf ) );

trunk/qt/details.cc

@@ -246 +246 @@
         string = none;
     else {
+        bool isMixed = false;
+        bool allPaused = true;
+        bool allFinished = true;
         const tr_torrent_activity activity = torrents[0]->getActivity( );
-        string = torrents[0]->activityString( );
         foreach( const Torrent * t, torrents ) {
-            if( activity != t->getActivity( ) ) {
-                string = mixed;
-                break;
-            }
-        }
+            if( activity != t->getActivity( ) )
+                isMixed = true;
+            if( activity != TR_STATUS_STOPPED )
+                allPaused = allFinished = false;
+            if( !t->isFinished( ) )
+                allFinished = false;
+        }
+        if( isMixed )
+            string = mixed;
+        else if( allFinished )
+            string = tr( "Finished" );
+        else if( allPaused )
+            string = tr( "Paused" );
+        else
+            string = torrents[0]->activityString( );
     }
     myStateLabel->setText( string );