mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk qt) #3739 "filterbar should use locale info to group thousands' place (ex: 1,000 instead of 1000)" -- done.

This commit is contained in:
Charles Kerr 2010-11-14 05:03:38 +00:00
parent 889e2c0ca0
commit bd61a9bc40
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qt/filterbar.cc
View File

@ -183,9 +183,9 @@ FilterBarComboBox :: paintEvent( QPaintEvent * e )
} }
// draw the count // draw the count
const int count = modelIndex.data( TorrentCountRole ).toInt(); QString text = modelIndex.data(TorrentCountRole).toString();
if( count >= 0 ) { if( !text.isEmpty( ) )
const QString text = QString::number( count); {
const QPen pen = painter.pen( ); const QPen pen = painter.pen( );
painter.setPen( opt.palette.color( QPalette::Disabled, QPalette::Text ) ); painter.setPen( opt.palette.color( QPalette::Disabled, QPalette::Text ) );
QRect r = s->itemTextRect( painter.fontMetrics(), rect, Qt::AlignRight|Qt::AlignVCenter, false, text ); QRect r = s->itemTextRect( painter.fontMetrics(), rect, Qt::AlignRight|Qt::AlignVCenter, false, text );
@ -195,7 +195,7 @@ FilterBarComboBox :: paintEvent( QPaintEvent * e )
} }
// draw the text // draw the text
QString text = modelIndex.data( Qt::DisplayRole ).toString(); text = modelIndex.data( Qt::DisplayRole ).toString();
text = painter.fontMetrics().elidedText ( text, Qt::ElideRight, rect.width() ); text = painter.fontMetrics().elidedText ( text, Qt::ElideRight, rect.width() );
s->drawItemText( &painter, rect, Qt::AlignLeft|Qt::AlignVCenter, opt.palette, true, text ); s->drawItemText( &painter, rect, Qt::AlignLeft|Qt::AlignVCenter, opt.palette, true, text );
} }
@ -319,14 +319,14 @@ FilterBar :: refreshTrackers( )
} }
// update the "All" row // update the "All" row
myTrackerModel->setData( myTrackerModel->index(0,0), myTorrents.rowCount(), TorrentCountRole ); myTrackerModel->setData( myTrackerModel->index(0,0), getCountString(myTorrents.rowCount()), TorrentCountRole );
// rows to update // rows to update
foreach( QString host, oldHosts & newHosts ) foreach( QString host, oldHosts & newHosts )
{ {
const QString name = readableHostName( host ); const QString name = readableHostName( host );
QStandardItem * row = myTrackerModel->findItems(name).front(); QStandardItem * row = myTrackerModel->findItems(name).front();
row->setData( torrentsPerHost[host], TorrentCountRole ); row->setData( getCountString(torrentsPerHost[host]), TorrentCountRole );
row->setData( favicons.findFromHost(host), Qt::DecorationRole ); row->setData( favicons.findFromHost(host), Qt::DecorationRole );
} }
@ -352,7 +352,7 @@ FilterBar :: refreshTrackers( )
// add the row // add the row
QStandardItem * row = new QStandardItem( favicons.findFromHost( host ), readableHostName( host ) ); QStandardItem * row = new QStandardItem( favicons.findFromHost( host ), readableHostName( host ) );
row->setData( torrentsPerHost[host], TorrentCountRole ); row->setData( getCountString(torrentsPerHost[host]), TorrentCountRole );
row->setData( favicons.findFromHost(host), Qt::DecorationRole ); row->setData( favicons.findFromHost(host), Qt::DecorationRole );
row->setData( host, TrackerRole ); row->setData( host, TrackerRole );
myTrackerModel->insertRow( i, row ); myTrackerModel->insertRow( i, row );
@ -373,7 +373,7 @@ FilterBar :: createTrackerCombo( QStandardItemModel * model )
QStandardItem * row = new QStandardItem( tr( "All" ) ); QStandardItem * row = new QStandardItem( tr( "All" ) );
row->setData( "", TrackerRole ); row->setData( "", TrackerRole );
row->setData( myTorrents.rowCount(), TorrentCountRole ); row->setData( getCountString(myTorrents.rowCount()), TorrentCountRole );
model->appendRow( row ); model->appendRow( row );
model->appendRow( new QStandardItem ); // separator model->appendRow( new QStandardItem ); // separator
@ -549,11 +549,15 @@ FilterBar :: recount ( )
const FilterMode m( i ); const FilterMode m( i );
QAbstractItemModel * model = myActivityCombo->model( ); QAbstractItemModel * model = myActivityCombo->model( );
QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode(), -1 ); QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode(), -1 );
if( !indices.isEmpty( ) ) { if( !indices.isEmpty( ) )
const int count = myFilter.count( m ); model->setData( indices.first(), getCountString(myFilter.count(m)), TorrentCountRole );
model->setData( indices.first(), count, TorrentCountRole );
}
} }
refreshTrackers( ); refreshTrackers( );
} }
QString
FilterBar :: getCountString( int n ) const
{
return n>0 ? QString("%L1").arg(n) : QString();
}

1
qt/filterbar.h
View File

@ -71,6 +71,7 @@ class FilterBar: public QWidget
QComboBox * createActivityCombo( ); QComboBox * createActivityCombo( );
void recountSoon( ); void recountSoon( );
void refreshTrackers( ); void refreshTrackers( );
QString getCountString( int n ) const;
private: private:
Prefs& myPrefs; Prefs& myPrefs;