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

diff --git a/qt/formatter.cc b/qt/formatter.cc
index 141e16c94ca451f74bad9478374ef8bf47d9e0f4..3aeb4920f0c781bf475068a8ad4b97a68c4c741b 100644 (file)
--- a/qt/formatter.cc
+++ b/qt/formatter.cc
@@ -189,3 +189,20 @@ Formatter :: timeToString( int seconds )
 
     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);
+}
+

diff --git a/qt/formatter.h b/qt/formatter.h
index de8b76f21e555e53eafcb9cb3bb031a208506403..944ccac5aede15b3b0384430d5eb64b5415a1ce3 100644 (file)
--- a/qt/formatter.h
+++ b/qt/formatter.h
@@ -38,6 +38,8 @@ class Formatter: public QObject
         static QString percentToString( double x );
         static QString ratioToString( double ratio );
         static QString timeToString( int seconds );
+        static QString uploadSpeedToString (const Speed& up);
+        static QString downloadSpeedToString (const Speed& down);
 
     public:
 

diff --git a/qt/mainwin.cc b/qt/mainwin.cc
index 07523e08f65b361ba295efa4b82ec56010485c4c..207e1c86bd23a928c65b4823f438e4d461e0eaa8 100644 (file)
--- a/qt/mainwin.cc
+++ b/qt/mainwin.cc
@@ -402,13 +402,10 @@ TrMainWindow :: createStatusBar ()
   h->addStretch (1);
 
     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,9 +413,6 @@ TrMainWindow :: createStatusBar ()
     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);
 
   h->addSpacing (HIG::PAD);
 
@@ -764,10 +758,9 @@ TrMainWindow :: refreshTrayIcon ()
 void
 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 ());
 

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 677c74886560a5394bf4d20d37a9d34b5c1df3ac..12d9bdbd443d5ac0e9351cdd6191f53bd9be9ce4 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -171,21 +171,16 @@ QString
 TorrentDelegate :: shortTransferString (const Torrent& tor) const
 {
   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)));
   const bool haveUp (haveMeta && tor.peersWeAreUploadingTo()>0);
 
   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;
 }