Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-26 21:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(trunk qt) use the GTK+ client's compact mode

Browse Source
This commit is contained in:
Charles Kerr
2010-07-24 02:43:06 +00:00
parent d369c36372
commit e5ed55808e
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qt/formatter.cc
View File

@@ -29,7 +29,7 @@ namespace
unsigned int size_K;
}
QString Formatter::unitStrings[3][4];
QString Formatter::unitStrings[3][5];
void
Formatter :: initUnits( )

2
qt/formatter.h
View File

@@ -46,7 +46,7 @@ class Formatter: public QObject
private:
static QString unitStrings[3][4];
static QString unitStrings[3][5];
};
#endif

30
qt/torrent-delegate-min.cc
View File

@@ -30,6 +30,7 @@
enum
{
GUI_PAD = 6,
BAR_WIDTH = 50,
BAR_HEIGHT = 12,
LINE_SPACING = 4
};
@@ -37,8 +38,7 @@ enum
/***
****
**** +---------+-----------------------------------------------+
**** | Icon | Title shortStatusString |
**** | Icon | [ Progressbar.......................... ] |
**** | Icon | Title shortStatusString [Progressbar] |
**** +-------- +-----------------------------------------------+
****
***/
@@ -63,8 +63,10 @@ TorrentDelegateMin :: sizeHint( const QStyleOptionViewItem& option, const Torren
const QSize m( margin( *style ) );
return QSize( m.width() + iconSize + GUI_PAD + nameSize.width() + GUI_PAD + statusSize.width() + m.width(),
m.height() + nameSize.height() + LINE_SPACING + BAR_HEIGHT + m.height() );
return QSize( m.width()*2 + iconSize + GUI_PAD + nameSize.width()
+ GUI_PAD + statusSize.width()
+ GUI_PAD + BAR_WIDTH,
m.height()*2 + std::max( nameSize.height(), (int)BAR_HEIGHT ) );
}
void
@@ -126,18 +128,18 @@ TorrentDelegateMin :: drawTorrent( QPainter * painter, const QStyleOptionViewIte
fillArea.y( ) + ( fillArea.height( ) - iconSize ) / 2,
iconSize,
iconSize );
const QRect statusArea( fillArea.width( ) - statusSize.width( ),
fillArea.top( ) + ((nameSize.height()-statusSize.height())/2),
statusSize.width( ),
statusSize.height( ) );
const QRect barArea( fillArea.x( ) + fillArea.width( ) - BAR_WIDTH,
fillArea.y( ) + ( fillArea.height( ) - BAR_HEIGHT ) / 2,
BAR_WIDTH,
BAR_HEIGHT );
const QRect statusArea( barArea.x( ) - GUI_PAD - statusSize.width( ),
fillArea.y( ),
fillArea.width( ),
fillArea.height( ) );
const QRect nameArea( iconArea.x( ) + iconArea.width( ) + GUI_PAD,
fillArea.y( ),
fillArea.width( ) - statusArea.width( ) - (GUI_PAD*2) - iconArea.width( ),
nameSize.height( ) );
const QRect barArea( nameArea.left( ),
nameArea.bottom( ),
statusArea.right( ) - nameArea.left( ),
BAR_HEIGHT );
statusArea.x( ) - ( iconArea.x( ) + iconArea.width( ) + GUI_PAD * 2 ),
fillArea.height( ) );
// render
if( tor.hasError( ) )