Fix download layout bug, port most of remaining themes

17 files changed, 191 insertions, 134 deletions

diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp
index 6d79b0f5..fa2cc077 100644
--- a/src/downloadlist.cpp
+++ b/src/downloadlist.cpp
@@ -28,7 +28,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 DownloadList::DownloadList(DownloadManager *manager, QObject *parent)

   : QAbstractTableModel(parent), m_Manager(manager)

-  , m_FontMetrics(QFont())

 {

   connect(m_Manager, SIGNAL(update(int)), this, SLOT(update(int)));

   connect(m_Manager, SIGNAL(aboutToUpdate()), this, SLOT(aboutToUpdate()));

@@ -81,50 +80,35 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
     if (pendingDownload) {

       std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(index.row() - m_Manager->numTotalDownloads());

       switch (index.column()) {

-        case COL_NAME:

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

-        case COL_SIZE:

-          return tr("Unknown");

-        case COL_STATUS:

-          return tr("Pending");

+        case COL_NAME: return tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids));

+        case COL_SIZE: return tr("Unknown");

+        case COL_STATUS: return tr("Pending");

       }

     } else {

       switch (index.column()) {

-        case COL_NAME:

-          return m_Manager->getFileName(index.row());

-        case COL_SIZE:

-          return sizeFormat(m_Manager->getFileSize(index.row()));

+        case COL_NAME: return m_Manager->getFileName(index.row());

+        case COL_SIZE: return sizeFormat(m_Manager->getFileSize(index.row()));

         case COL_STATUS:

           switch (m_Manager->getState(index.row())) {

-            case DownloadManager::STATE_STARTED:

-              return tr("Started");

-            case DownloadManager::STATE_CANCELING:

-              return tr("Canceling");

-            case DownloadManager::STATE_PAUSING:

-              return tr("Pausing");

-            case DownloadManager::STATE_CANCELED:

-              return tr("Canceled");

-            case DownloadManager::STATE_PAUSED:

-              return tr("Paused");

-            case DownloadManager::STATE_ERROR:

-              return tr("Error");

-            case DownloadManager::STATE_FETCHINGMODINFO:

-              return tr("Fetching Info 1");

-            case DownloadManager::STATE_FETCHINGFILEINFO:

-              return tr("Fetching Info 2");

-            case DownloadManager::STATE_READY:

-              return tr("Downloaded");

-            case DownloadManager::STATE_INSTALLED:

-              return tr("Installed");

-            case DownloadManager::STATE_UNINSTALLED:

-              return tr("Uninstalled");

+            // STATE_DOWNLOADING handled by DownloadProgressDelegate

+            case DownloadManager::STATE_STARTED: return tr("Started");

+            case DownloadManager::STATE_CANCELING: return tr("Canceling");

+            case DownloadManager::STATE_PAUSING: return tr("Pausing");

+            case DownloadManager::STATE_CANCELED: return tr("Canceled");

+            case DownloadManager::STATE_PAUSED: return tr("Paused");

+            case DownloadManager::STATE_ERROR: return tr("Error");

+            case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info 1");

+            case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info 2");

+            case DownloadManager::STATE_READY: return tr("Downloaded");

+            case DownloadManager::STATE_INSTALLED: return tr("Installed");

+            case DownloadManager::STATE_UNINSTALLED: return tr("Uninstalled");

           }

       }

     }

-  } else if (role == Qt::ForegroundRole) {

+  } else if (role == Qt::ForegroundRole && index.column() == COL_STATUS) {

     if (pendingDownload) {

       return QColor(Qt::darkBlue);

-    } else if (index.column() == COL_STATUS) {

+    } else {

       DownloadManager::DownloadState state = m_Manager->getState(index.row());

       if (state == DownloadManager::STATE_READY)

         return QColor(Qt::darkGreen);

@@ -135,7 +119,7 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
     }

   } else if (role == Qt::ToolTipRole) {

     if (pendingDownload) {

-      return tr("pending download");

+      return tr("Pending download");

     } else {

       QString text = m_Manager->getFileName(index.row()) + "\n";

       if (m_Manager->isInfoIncomplete(index.row())) {

@@ -168,13 +152,12 @@ void DownloadList::aboutToUpdate()
 

 void DownloadList::update(int row)

 {

-  if (row < 0) {

+  if (row < 0)

     emit endResetModel();

-  } else if (row < this->rowCount()) {

+  else if (row < this->rowCount())

     emit dataChanged(this->index(row, 0, QModelIndex()), this->index(row, this->columnCount(QModelIndex())-1, QModelIndex()));

-  } else {

+  else

     qCritical("invalid row %d in download list, update failed", row);

-  }

 }

 

 QString DownloadList::sizeFormat(quint64 size) const

@@ -187,8 +170,7 @@ QString DownloadList::sizeFormat(quint64 size) const
   QString unit("KB");

 

   calc /= 1024.0;

-  while (calc >= 1024.0 && i.hasNext())

-  {

+  while (calc >= 1024.0 && i.hasNext()) {

     unit = i.next();

     calc /= 1024.0;

   }

diff --git a/src/downloadlist.h b/src/downloadlist.h
index 3b33fc40..4e0b5ef4 100644
--- a/src/downloadlist.h
+++ b/src/downloadlist.h
@@ -90,7 +90,6 @@ public slots:
 private:

 

   DownloadManager *m_Manager;

-  QFontMetrics m_FontMetrics;

 

   QString sizeFormat(quint64 size) const;

 };

diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp
index ac327f7b..f69f9e9f 100644
--- a/src/downloadlistwidget.cpp
+++ b/src/downloadlistwidget.cpp
@@ -34,13 +34,17 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt
     bool pendingDownload = sourceIndex.row() >= m_Manager->numTotalDownloads();

     QProgressBar progressBar;

     progressBar.setProperty("downloadView", option.widget->property("downloadView"));

+    progressBar.setProperty("downloadProgress", true);

     progressBar.resize(option.rect.width(), option.rect.height());

-    progressBar.setTextVisible(false);

+    progressBar.setTextVisible(true);

+    progressBar.setAlignment(Qt::AlignCenter);

     progressBar.setMinimum(0);

     progressBar.setMaximum(100);

     progressBar.setValue(m_Manager->getProgress(sourceIndex.row()).first);

+    progressBar.setFormat(m_Manager->getProgress(sourceIndex.row()).second);

     progressBar.setStyle(QApplication::style());

 

+    /*

     QLabel progressText;

     progressText.setProperty("downloadView", option.widget->property("downloadView"));

     progressText.setProperty("downloadProgress", true);

@@ -49,6 +53,7 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt
     progressText.setAlignment(Qt::AlignCenter);

     progressText.setText(m_Manager->getProgress(sourceIndex.row()).second);

     progressText.setStyle(QApplication::style());

+    */

 

     // paint the background with default delegate first to preserve table cell styling

     QStyledItemDelegate::paint(painter, option, index);

@@ -56,7 +61,7 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt
     painter->save();

     painter->translate(option.rect.topLeft());

     progressBar.render(painter);

-    progressText.render(painter);

+    //progressText.render(painter);

     painter->restore();

   } else {

     QStyledItemDelegate::paint(painter, option, index);

@@ -82,11 +87,11 @@ void DownloadListWidget::setManager(DownloadManager *manager)
 void DownloadListWidget::onDoubleClick(const QModelIndex &index)

 {

   QModelIndex sourceIndex = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(index);

-  if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) {

+  if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY)

     emit installDownload(sourceIndex.row());

-  } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) {

+  else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED)

+          || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING))

     emit resumeDownload(sourceIndex.row());

-  }

 }

 

 void DownloadListWidget::onCustomContextMenu(const QPoint &point)

@@ -94,38 +99,34 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)
   QMenu menu(this);

   QModelIndex index = indexAt(point);

   bool hidden = false;

+

   if (index.row() >= 0) {

     m_ContextRow = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(index).row();

     DownloadManager::DownloadState state = m_Manager->getState(m_ContextRow);

     hidden = m_Manager->isHidden(m_ContextRow);

+

     if (state >= DownloadManager::STATE_READY) {

       menu.addAction(tr("Install"), this, SLOT(issueInstall()));

-      if (m_Manager->isInfoIncomplete(m_ContextRow)) {

+      if (m_Manager->isInfoIncomplete(m_ContextRow))

         menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));

-      }

-      else {

+      else

         menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));

-      }

-

       menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));

       menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));

 

       menu.addSeparator();

 

       menu.addAction(tr("Delete"), this, SLOT(issueDelete()));

-      if (hidden) {

+      if (hidden)

         menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));

-      }

-      else {

+      else

         menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView()));

-      }

-    }

-    else if (state == DownloadManager::STATE_DOWNLOADING) {

+    } else if (state == DownloadManager::STATE_DOWNLOADING) {

       menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));

       menu.addAction(tr("Pause"), this, SLOT(issuePause()));

       menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));

-    }

-    else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {

+    } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)

+              || (state == DownloadManager::STATE_PAUSING)) {

       menu.addAction(tr("Delete"), this, SLOT(issueDelete()));

       menu.addAction(tr("Resume"), this, SLOT(issueResume()));

       menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));

@@ -137,14 +138,12 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)
   menu.addAction(tr("Delete Uninstalled..."), this, SLOT(issueDeleteUninstalled()));

   menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll()));

 

+  menu.addSeparator();

   if (!hidden) {

-    menu.addSeparator();

     menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));

     menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled()));

     menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));

-  }

-  if (hidden) {

-    menu.addSeparator();

+  } else {

     menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll()));

   }

 

@@ -163,11 +162,11 @@ void DownloadListWidget::issueQueryInfo()
 

 void DownloadListWidget::issueDelete()

 {

-	if (QMessageBox::question(nullptr, tr("Delete Files?"),

-		tr("This will permanently delete the selected download."),

-		QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

-		emit removeDownload(m_ContextRow, true);

-	}

+  if (QMessageBox::question(nullptr, tr("Delete Files?"),

+                            tr("This will permanently delete the selected download."),

+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

+    emit removeDownload(m_ContextRow, true);

+  }

 }

 

 void DownloadListWidget::issueRemoveFromView()

@@ -178,7 +177,7 @@ void DownloadListWidget::issueRemoveFromView()
 

 void DownloadListWidget::issueRestoreToView()

 {

-		emit restoreDownload(m_ContextRow);

+	emit restoreDownload(m_ContextRow);

 }

 

 void DownloadListWidget::issueRestoreToViewAll()

@@ -237,8 +236,8 @@ void DownloadListWidget::issueDeleteCompleted()
 void DownloadListWidget::issueDeleteUninstalled()

 {

   if (QMessageBox::question(nullptr, tr("Delete Files?"),

-    tr("This will remove all uninstalled downloads from this list and from disk."),

-    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

+                            tr("This will remove all uninstalled downloads from this list and from disk."),

+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

     emit removeDownload(-3, true);

   }

 }

@@ -264,8 +263,8 @@ void DownloadListWidget::issueRemoveFromViewCompleted()
 void DownloadListWidget::issueRemoveFromViewUninstalled()

 {

   if (QMessageBox::question(nullptr, tr("Are you sure?"),

-    tr("This will remove all uninstalled downloads from this list (but NOT from disk)."),

-    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

+                            tr("This will remove all uninstalled downloads from this list (but NOT from disk)."),

+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

     emit removeDownload(-3, false);

   }

 }

diff --git a/src/downloadlistwidget.h b/src/downloadlistwidget.h
index c19e4473..93ece07a 100644
--- a/src/downloadlistwidget.h
+++ b/src/downloadlistwidget.h
@@ -34,8 +34,6 @@ namespace Ui {
   class DownloadListWidget;

 }

 

-class DownloadManager;

-

 class DownloadProgressDelegate : public QStyledItemDelegate

 {

   Q_OBJECT

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b4d77085..f20665eb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -5184,6 +5184,7 @@ void MainWindow::updateDownloadView()
     ui->downloadView->setProperty("downloadView", "standard");

   ui->downloadView->style()->unpolish(ui->downloadView);

   ui->downloadView->style()->polish(ui->downloadView);

+  m_OrganizerCore.downloadManager()->refreshList();

 }

 

 void MainWindow::modDetailsUpdated(bool)

diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss
index 748e589e..572d3313 100644
--- a/src/stylesheets/Paper Automata.qss
+++ b/src/stylesheets/Paper Automata.qss
@@ -893,29 +893,28 @@ DownloadListWidget {
 	background: transparent;
 }
 
-DownloadListWidget QFrame, 
-DownloadListWidgetCompact, 
-DownloadListWidgetCompact QLabel {
-	/* an entry on the Downloads tab */
+DownloadListWidget::item:!selected {
 	background: #DAD4BB;
 }
 
-DownloadListWidget QFrame#frame {
-	/* outer box of an entry on the Downloads tab */
-	border: 2px solid #DAD4BB;
+DownloadListWidget[downloadView=standard]::item {
+	padding: 15px;
+	margin-bottom: 2px;
 }
 
-DownloadListWidget QLabel#installLabel {
-	/* installed/done label */
-	color: none;
+QProgressBar[downloadView=standard] {
+	margin: 4px 0px 6px 0px;
 }
 
 /* Compact Downloads View */
 
-DownloadListWidgetCompact, 
-DownloadListWidgetCompact QLabel {
-	/* an entry on the Downloads tab */
-	background: #DAD4BB;
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px 4px 6px 4px;
+	margin-bottom: 2px;
+}
+
+QProgressBar[downloadView=compact] {
+	margin: 1px 0px 3px 0px;
 }
 
 /* Categories Filter */
diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss
index 9f4db66f..ae6ea77b 100644
--- a/src/stylesheets/Paper Dark by 6788.qss
+++ b/src/stylesheets/Paper Dark by 6788.qss
@@ -919,29 +919,30 @@ QSlider::handle:hover {
 	background: #242424;
 }
 
-DownloadListWidget QFrame, 
-DownloadListWidgetCompact, 
-DownloadListWidgetCompact QLabel {
-	/* an entry on the Downloads tab */
-	background: #141414;
+DownloadListWidget[downloadView=standard]::item {
+	padding: 15px;
+	border-bottom: 2px solid #666666;
 }
 
-DownloadListWidget#frame {
-	/* outer box of an entry on the Downloads tab */
-	border: none;
-}
-
-#installLabel {
-	/* installed/done label */
-	color: none;
+QProgressBar[downloadView=standard] {
+	background: transparent;
+	border: 2px solid #666666;
+	border-radius: 8px;
+	margin: 4px 0px 6px 0px;
 }
 
 /* Compact Downloads View */
 
-DownloadListWidgetCompact, 
-DownloadListWidgetCompact QLabel {
-	/* an entry on the Downloads tab */
-	background: #141414;
+DownloadListWidget[downloadView=compact]::item {
+	padding: 3px;
+	border-bottom: 2px solid #666666;
+}
+
+QProgressBar[downloadView=compact] {
+	background: transparent;
+	border: 2px solid gray;
+	border-radius: 8px;
+	margin: 1px 0px 3px 0px;
 }
 
 /* Categories Filter */
diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss
index 3193b817..5e69b79d 100644
--- a/src/stylesheets/Paper Light by 6788.qss
+++ b/src/stylesheets/Paper Light by 6788.qss
@@ -940,11 +940,6 @@ QProgressBar[downloadView=standard] {
 	margin: 4px 0px 6px 0px;
 }
 
-QLabel[downloadProgress] {
-	qproperty-alignment: AlignCenter;
-	padding-bottom: 3px;
-}
-
 /* Compact Downloads View */
 
 DownloadListWidget[downloadView=compact]::item {
diff --git a/src/stylesheets/dark.qss b/src/stylesheets/dark.qss
index d5a7aedf..5bbb0f0c 100644
--- a/src/stylesheets/dark.qss
+++ b/src/stylesheets/dark.qss
@@ -257,7 +257,6 @@ QProgressBar
 QProgressBar::chunk

 {

   background-color: #427683;

-  width: 20px;

 }

 

 QTabBar::tab

@@ -366,4 +365,12 @@ QTreeView::branch:open:has-children:has-siblings
 

 DownloadListWidget QLabel#installLabel {

   color: none;

+}

+

+DownloadListWidget[downloadView=standard]::item {

+	padding: 16px;

+}

+

+DownloadListWidget[downloadView=compact]::item {

+	padding: 4px;

 }
\ No newline at end of file
diff --git a/src/stylesheets/dracula.qss b/src/stylesheets/dracula.qss
index 99cf918d..33ce5f66 100644
--- a/src/stylesheets/dracula.qss
+++ b/src/stylesheets/dracula.qss
@@ -394,4 +394,24 @@ SaveGameInfoWidget {
 
  DownloadListWidget QLabel#installLabel {
     color: none;
-}
\ No newline at end of file
+}
+
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
+QProgressBar
+{
+  border: 2px solid grey;
+  border-radius: 5px;
+  text-align: center;
+}
+
+QProgressBar::chunk
+{
+  background-color: #427683;
+}
diff --git a/src/stylesheets/skyrim.qss b/src/stylesheets/skyrim.qss
index e4d87499..d36eac57 100644
--- a/src/stylesheets/skyrim.qss
+++ b/src/stylesheets/skyrim.qss
@@ -534,7 +534,7 @@ QProgressBar {
   background-color: transparent;
   color: transparent;
   height: 14px;
-  margin: 0 10px;
+  margin: 0 0px;
   border-width: 4px 21px;
   border-style: solid;
   border-color: transparent;
@@ -542,6 +542,14 @@ QProgressBar {
   QProgressBar::chunk {
     background: url(./skyrim/progress-bar-chunk.png) center center repeat-x qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 #95BED9, stop:0.78781 #6EB9CE); }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 15px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border: none;
diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss
index 5427b38a..10f923cb 100644
--- a/src/stylesheets/vs15 Dark-Green.qss
+++ b/src/stylesheets/vs15 Dark-Green.qss
@@ -532,8 +532,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -599,11 +599,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;
diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss
index fe65ece0..bbde1f82 100644
--- a/src/stylesheets/vs15 Dark-Orange.qss
+++ b/src/stylesheets/vs15 Dark-Orange.qss
@@ -533,8 +533,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -600,11 +600,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;
diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss
index eb2e8b82..faad7297 100644
--- a/src/stylesheets/vs15 Dark-Purple.qss
+++ b/src/stylesheets/vs15 Dark-Purple.qss
@@ -533,8 +533,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -600,11 +600,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0px 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;
diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss
index ee363e0b..2ffcff68 100644
--- a/src/stylesheets/vs15 Dark-Red.qss
+++ b/src/stylesheets/vs15 Dark-Red.qss
@@ -533,8 +533,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -600,11 +600,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;
diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss
index 08dbe758..24afe005 100644
--- a/src/stylesheets/vs15 Dark-Yellow.qss
+++ b/src/stylesheets/vs15 Dark-Yellow.qss
@@ -533,8 +533,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -600,11 +600,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;
diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss
index 8c4d354e..6a551775 100644
--- a/src/stylesheets/vs15 Dark.qss
+++ b/src/stylesheets/vs15 Dark.qss
@@ -532,8 +532,8 @@ QHeaderView::up-arrow {
   image: url(./vs15/sort-asc.png);
   margin-bottom: -37px; }
 
-QTreeView#downloadView QHeaderView::up-arrow {
-  margin-bottom: -32px; }
+DownloadListWidget QHeaderView::up-arrow {
+  margin-bottom: -47px; }
 
 QHeaderView::down-arrow {
   image: url(./vs15/sort-desc.png);
@@ -599,11 +599,19 @@ QProgressBar {
   text-align: center;
   border-style: solid;
   border-width: 1px;
-  margin: 0 10px; }
+  margin: 0 0px; }
 
 QProgressBar::chunk {
   background: #06B025; }
 
+DownloadListWidget[downloadView=standard]::item {
+	padding: 16px;
+}
+
+DownloadListWidget[downloadView=compact]::item {
+	padding: 4px;
+}
+
 /* Right Pane and Tab Bars #QTabWidget, #QTabBar */
 QTabWidget::pane {
   border-color: #3F3F46;