Changeset 11043

Timestamp:

Jul 24, 2010, 2:43:06 AM (12 years ago)

Author:

charles

Message:

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

Location:

trunk/qt

Files:

• formatter.cc (modified) (1 diff)
• formatter.h (modified) (1 diff)
• torrent-delegate-min.cc (modified) (4 diffs)

trunk/qt/formatter.cc

@@ -30 +30 @@
 }
 
-QString Formatter::unitStrings[3][4];
+QString Formatter::unitStrings[3][5];
 
 void

trunk/qt/formatter.h

@@ -47 +47 @@
     private:
 
-        static QString unitStrings[3][4];
+        static QString unitStrings[3][5];
 };
 

trunk/qt/torrent-delegate-min.cc

@@ -31 +31 @@
 {
    GUI_PAD = 6,
+   BAR_WIDTH = 50,
    BAR_HEIGHT = 12,
    LINE_SPACING = 4
@@ -38 +39 @@
 ****
 ****   +---------+-----------------------------------------------+
-****   |  Icon   |   Title                   shortStatusString   |
-****   |  Icon   |   [ Progressbar.......................... ]   |
+****   |  Icon   |   Title      shortStatusString [Progressbar]  |
 ****   +-------- +-----------------------------------------------+
 ****
@@ -64 +64 @@
     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 ) );
 }
 
@@ -127 +129 @@
                           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