From 0e4dbbb1cc22da19c3d3061aadc3af661b76ec66 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 2 Jul 2015 15:53:25 +0200
Subject: [PATCH] Some work on the Launcher

---
 apps/Launcher/infowidget.cpp | 6 ++++++
 apps/Launcher/infowidget.h   | 1 +
 apps/Launcher/syncwidget.cpp | 6 +++---
 data                         | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/Launcher/infowidget.cpp b/apps/Launcher/infowidget.cpp
index 45395903bc..11ea196638 100644
--- a/apps/Launcher/infowidget.cpp
+++ b/apps/Launcher/infowidget.cpp
@@ -36,6 +36,7 @@ InfoWidget::InfoWidget(QString name, int totalBytes)
     , _bytes(nullptr)
     , _progress(nullptr)
     , _messagesLeft(nullptr)
+    , _messagesCenter(nullptr)
     , _messagesRight(nullptr)
     , _totalBytes(totalBytes)
 {
@@ -56,9 +57,11 @@ InfoWidget::InfoWidget(QString name, int totalBytes)
     layout->addWidget(_progress, 1, 1);
 
     _messagesLeft = new QLabel("");
+    _messagesCenter = new QLabel("");
     _messagesRight = new QLabel("");
     
     layout->addWidget(_messagesLeft, 2, 0, 1, 2);
+    layout->addWidget(_messagesCenter, 2, 0, 1, 2, Qt::AlignCenter);
     layout->addWidget(_messagesRight, 2, 0, 1, 2, Qt::AlignRight);
 
     setLayout(layout);
@@ -99,6 +102,9 @@ void InfoWidget::update(libtorrent::torrent_status s) {
             QString left = "Time remaining %1 s";
             _messagesLeft->setText(left.arg(static_cast<int>(seconds)));
 
+            QString center = "Peers: %1 (%2) | Seeds: %3 (%4)";
+            _messagesCenter->setText(center.arg(s.num_peers).arg(s.list_peers).arg(s.num_seeds).arg(s.list_seeds));
+
             QString right = "Download Rate: %1 KiB/s";
             _messagesRight->setText(right.arg(bytesPerSecond / 1024));
         }
diff --git a/apps/Launcher/infowidget.h b/apps/Launcher/infowidget.h
index e2d42f9e4a..2cf9d1f5da 100644
--- a/apps/Launcher/infowidget.h
+++ b/apps/Launcher/infowidget.h
@@ -52,6 +52,7 @@ private:
     QLabel* _bytes;
     QProgressBar* _progress;
     QLabel* _messagesLeft;
+    QLabel* _messagesCenter;
     QLabel* _messagesRight;
 
     int _totalBytes;
diff --git a/apps/Launcher/syncwidget.cpp b/apps/Launcher/syncwidget.cpp
index 7f6540f696..6ad5409e4f 100644
--- a/apps/Launcher/syncwidget.cpp
+++ b/apps/Launcher/syncwidget.cpp
@@ -117,7 +117,7 @@ SyncWidget::SyncWidget(QWidget* parent, Qt::WindowFlags f)
     openspace::DownloadManager::initialize("http://openspace.itn.liu.se/data/request", DownloadApplicationVersion);
 
     libtorrent::error_code ec;
-    _session->listen_on(std::make_pair(20285, 20285), ec);
+    _session->listen_on(std::make_pair(20280, 20290), ec);
     if (ec) {
         LFATAL("Failed to open socket: " << ec.message());
         return;
@@ -125,9 +125,9 @@ SyncWidget::SyncWidget(QWidget* parent, Qt::WindowFlags f)
     _session->start_upnp();
     _session->start_dht();
 
-    _session->add_dht_router({ "dht.transmissionbt.com", 6881});
-    _session->add_dht_router({ "router.bittorrent.com", 6881});
     _session->add_dht_router({ "router.utorrent.com", 6881 });
+    _session->add_dht_router({ "dht.transmissionbt.com", 6881 });
+    _session->add_dht_router({ "router.bittorrent.com", 6881 });
     _session->add_dht_router({ "router.bitcomet.com", 6881 });
 
     QTimer* timer = new QTimer(this);
diff --git a/data b/data
index fa00aaa0c2..e234fc3176 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit fa00aaa0c244e8e5709877a344c3007d2244e9ec
+Subproject commit e234fc317660bf8b593a23ca505892a44a17d70e