Merge pull request #336 from Modorganizer2/Develop

Release 2.1.3

1 files changed, 5 insertions, 3 deletions

diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp
index 9a8ef572..2af74cc2 100644
--- a/src/downloadlistwidget.cpp
+++ b/src/downloadlistwidget.cpp
@@ -53,6 +53,7 @@ DownloadListWidgetDelegate::DownloadListWidgetDelegate(DownloadManager *manager,
   m_InstallLabel = m_ItemWidget->findChild<QLabel*>("installLabel");

 

   m_InstallLabel->setVisible(false);

+  m_Progress->setTextVisible(true);

 

   connect(manager, SIGNAL(stateChanged(int,DownloadManager::DownloadState)), this, SLOT(stateChanged(int,DownloadManager::DownloadState)));

   connect(manager, SIGNAL(downloadRemoved(int)), this, SLOT(resetCache(int)));

@@ -88,8 +89,8 @@ void DownloadListWidgetDelegate::drawCache(QPainter *painter, const QStyleOption
 

 void DownloadListWidgetDelegate::paintPendingDownload(int downloadIndex) const

 {

-  std::pair<int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);

-  m_NameLabel->setText(tr("< mod %1 file %2 >").arg(nexusids.first).arg(nexusids.second));

+  std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);

+  m_NameLabel->setText(tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)));

   m_SizeLabel->setText("???");

   m_InstallLabel->setVisible(true);

   m_InstallLabel->setText(tr("Pending"));

@@ -159,7 +160,8 @@ void DownloadListWidgetDelegate::paintRegularDownload(int downloadIndex) const
   } else {

     m_InstallLabel->setVisible(false);

     m_Progress->setVisible(true);

-    m_Progress->setValue(m_Manager->getProgress(downloadIndex));

+    m_Progress->setValue(m_Manager->getProgress(downloadIndex).first);

+    m_Progress->setFormat(m_Manager->getProgress(downloadIndex).second);

   }

 }