Changeset 13978

Timestamp:

Feb 5, 2013, 11:05:26 PM (8 years ago)

Author:

jordan

Message:

(qt) in the statusbar, use the same upload/download symbols as in the torrent list

Location:

trunk/qt

Files:

• formatter.cc (modified) (1 diff)
• formatter.h (modified) (1 diff)
• mainwin.cc (modified) (3 diffs)
• torrent-delegate.cc (modified) (2 diffs)

trunk/qt/formatter.cc

@@ -190 +190 @@
     return str;
 }
+
+QString
+Formatter :: uploadSpeedToString (const Speed& uploadSpeed)
+{
+  static const QChar uploadSymbol (0x25B4);
+
+  return tr( "%1 %2").arg(speedToString(uploadSpeed)).arg(uploadSymbol);
+}
+
+QString
+Formatter :: downloadSpeedToString (const Speed& downloadSpeed)
+{
+  static const QChar downloadSymbol (0x25BE);
+
+  return tr( "%1 %2").arg(speedToString(downloadSpeed)).arg(downloadSymbol);
+}
+

trunk/qt/formatter.h

@@ -39 +39 @@
         static QString ratioToString( double ratio );
         static QString timeToString( int seconds );
+        static QString uploadSpeedToString (const Speed& up);
+        static QString downloadSpeedToString (const Speed& down);
 
     public:

trunk/qt/mainwin.cc

@@ -403 +403 @@
 
     l = myDownloadSpeedLabel = new QLabel (this);
-    const int minimumSpeedWidth = l->fontMetrics ().width (Formatter::speedToString (Speed::fromKBps (999.99)));
+    const int minimumSpeedWidth = l->fontMetrics ().width (Formatter::uploadSpeedToString (Speed::fromKBps (999.99)));
     l->setMinimumWidth (minimumSpeedWidth);
     l->setAlignment (Qt::AlignRight|Qt::AlignVCenter);
     h->addWidget (l);
-    l = new QLabel (this);
-    l->setPixmap (getStockIcon ("go-down", QStyle::SP_ArrowDown).pixmap (smallIconSize));
-    h->addWidget (l);
 
   h->addSpacing (HIG::PAD);
@@ -416 +413 @@
     l->setMinimumWidth (minimumSpeedWidth);
     l->setAlignment (Qt::AlignRight|Qt::AlignVCenter);
-    h->addWidget (l);
-    l = new QLabel;
-    l->setPixmap (getStockIcon ("go-up", QStyle::SP_ArrowUp).pixmap (smallIconSize));
     h->addWidget (l);
 
@@ -765 +759 @@
 TrMainWindow :: refreshStatusBar ()
 {
-  const Speed up (myModel.getUploadSpeed ());
-  const Speed down (myModel.getDownloadSpeed ());
-  myUploadSpeedLabel->setText (Formatter:: speedToString (up));
-  myDownloadSpeedLabel->setText (Formatter:: speedToString (down));
+  myUploadSpeedLabel->setText (Formatter::uploadSpeedToString(myModel.getUploadSpeed()));
+
+  myDownloadSpeedLabel->setText (Formatter::downloadSpeedToString(myModel.getDownloadSpeed()));
 
   myNetworkLabel->setVisible (!mySession.isServer ());

trunk/qt/torrent-delegate.cc

@@ -172 +172 @@
 {
   QString str;
-  static const QChar uploadSymbol (0x25B4);
-  static const QChar downloadSymbol (0x25BE);
   const bool haveMeta (tor.hasMetadata());
   const bool haveDown (haveMeta && ((tor.webseedsWeAreDownloadingFrom()>0) || (tor.peersWeAreDownloadingFrom()>0)));
@@ -179 +177 @@
 
   if (haveDown)
-    str = tr( "%1 %2   %3 %4" ).arg(Formatter::speedToString(tor.downloadSpeed()))
-                               .arg(downloadSymbol)
-                               .arg(Formatter::speedToString(tor.uploadSpeed()))
-                               .arg(uploadSymbol);
+    str = tr( "%1   %2" ).arg(Formatter::downloadSpeedToString(tor.downloadSpeed()))
+                         .arg(Formatter::uploadSpeedToString(tor.uploadSpeed()));
 
   else if (haveUp)
-    str = tr( "%1 %2" ).arg(Formatter::speedToString(tor.uploadSpeed()))
-                       .arg(uploadSymbol);
+    str = Formatter::uploadSpeedToString(tor.uploadSpeed());
 
   return str;