mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00
Code Issues Releases Wiki Activity

(trunk) poke at details yet again

Browse source
This commit is contained in:
Charles Kerr 2010-04-06 04:54:51 +00:00
parent a709b719bf
commit af09bb2853
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gtk/details.c
View file

@ -676,15 +676,15 @@ refreshInfo( struct DetailsImpl * di, tr_torrent ** torrents, int n )
if( n < 1 )
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;
if( activity != stats[i]->activity )
break;
}
if( !stats[i]->finished )
allFinished = FALSE;
}
str = i<n ? mixed : activityString( activity, allFinished );
}
stateString = str;
gtr_label_set_text( GTK_LABEL( di->state_lb ), str );
@ -694,18 +694,18 @@ refreshInfo( struct DetailsImpl * di, tr_torrent ** torrents, int n )
if( n < 1 )
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;
break;
if( !stats[i]->finished )
allFinished = FALSE;
}
if( allPaused )
str = stateString; // paused || finished
else if( !baseline )
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 ) );
}

22
qt/details.cc
View file

@ -245,14 +245,26 @@ Details :: refresh( )
if( torrents.empty( ) )
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 );
const QString stateString = string;