From 8b94abe9cff8c3f3af136d22770288740e15bcf9 Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Mon, 30 Nov 2020 16:54:03 -0300
Subject: [PATCH] [ui] fix progress bar location

---
 bauh/view/qt/components.py                    |  6 +++--
 bauh/view/qt/prepare.py                       |  5 ++--
 bauh/view/qt/window.py                        | 26 ++++++++++---------
 bauh/view/resources/style/default/default.qss |  4 +++
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/bauh/view/qt/components.py b/bauh/view/qt/components.py
index 0cadfb7b..58861d7c 100644
--- a/bauh/view/qt/components.py
+++ b/bauh/view/qt/components.py
@@ -1129,10 +1129,12 @@ class QCustomMenuAction(QWidgetAction):
 
 class QCustomToolbar(QWidget):
 
-    def __init__(self, spacing: int = 2, parent: Optional[QWidget] = None, alignment: int = Qt.AlignRight):
+    def __init__(self, spacing: int = 2, parent: Optional[QWidget] = None, alignment: Qt.Alignment = Qt.AlignRight,
+                 policy_width: QSizePolicy.Policy = QSizePolicy.Minimum,
+                 policy_height: QSizePolicy.Policy = QSizePolicy.Preferred):
         super(QCustomToolbar, self).__init__(parent=parent)
         self.setProperty('container', 'true')
-        self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
+        self.setSizePolicy(policy_width, policy_height)
         self.setLayout(QHBoxLayout())
         self.layout().setContentsMargins(0, 0, 0, 0)
         self.layout().setSpacing(spacing)
diff --git a/bauh/view/qt/prepare.py b/bauh/view/qt/prepare.py
index f39ba865..04b1287b 100644
--- a/bauh/view/qt/prepare.py
+++ b/bauh/view/qt/prepare.py
@@ -5,8 +5,8 @@ from typing import Tuple, Optional
 
 from PyQt5.QtCore import QSize, Qt, QThread, pyqtSignal, QCoreApplication
 from PyQt5.QtGui import QIcon, QCursor, QCloseEvent
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy, QTableWidget, QHeaderView, QPushButton, QToolBar, \
-    QProgressBar, QApplication, QPlainTextEdit, QToolButton, QHBoxLayout
+from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy, QTableWidget, QHeaderView, QPushButton, \
+    QProgressBar, QPlainTextEdit, QToolButton, QHBoxLayout
 
 from bauh import __app_name__
 from bauh.api.abstract.context import ApplicationContext
@@ -209,7 +209,6 @@ class PreparePanel(QWidget, TaskManager):
 
         self.progress_bar = QProgressBar()
         self.progress_bar.setObjectName('prepare_progress')
-        self.progress_bar.setMaximumHeight(10 if QApplication.instance().style().objectName().lower() == 'windows' else 4)
         self.progress_bar.setTextVisible(False)
         self.progress_bar.setVisible(False)
         self.progress_bar.setCursor(QCursor(Qt.WaitCursor))
diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py
index ac955c3a..fb4d348b 100755
--- a/bauh/view/qt/window.py
+++ b/bauh/view/qt/window.py
@@ -29,7 +29,7 @@ from bauh.view.qt.about import AboutDialog
 from bauh.view.qt.apps_table import PackagesTable, UpgradeToggleButton
 from bauh.view.qt.commons import sum_updates_displayed
 from bauh.view.qt.components import new_spacer, IconButton, QtComponentsManager, to_widget, QSearchBar, \
-    QCustomMenuAction
+    QCustomMenuAction, QCustomToolbar
 from bauh.view.qt.dialog import ConfirmationDialog
 from bauh.view.qt.history import HistoryDialog
 from bauh.view.qt.info import InfoDialog
@@ -350,21 +350,10 @@ class ManageWindow(QWidget):
         self.container_bottom.setObjectName('container_bottom')
         self.container_bottom.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
         self.container_bottom.setLayout(QHBoxLayout())
-        self.setContentsMargins(0, 0, 0, 0)
         self.container_bottom.layout().setContentsMargins(0, 0, 0, 0)
 
         self.container_bottom.layout().addWidget(new_spacer())
 
-        self.progress_bar = QProgressBar()
-        self.progress_bar.setObjectName('progress_manage')
-        self.progress_bar.setCursor(QCursor(Qt.WaitCursor))
-        self.progress_bar.setMaximumHeight(10 if QApplication.instance().style().objectName().lower() == 'windows' else 4)
-
-        self.progress_bar.setTextVisible(False)
-        self.container_bottom.layout().addWidget(self.progress_bar)
-
-        self.container_bottom.layout().addWidget(new_spacer())
-
         if config['suggestions']['enabled']:
             bt_sugs = IconButton(action=lambda: self._begin_load_suggestions(filter_installed=True),
                                  i18n=i18n,
@@ -406,6 +395,19 @@ class ManageWindow(QWidget):
 
         self.layout.addWidget(self.container_bottom)
 
+        self.container_progress = QCustomToolbar(spacing=0, policy_height=QSizePolicy.Fixed)
+        self.container_progress.setObjectName('container_progress')
+        self.container_progress.add_space()
+
+        self.progress_bar = QProgressBar()
+        self.progress_bar.setObjectName('progress_manage')
+        self.progress_bar.setCursor(QCursor(Qt.WaitCursor))
+
+        self.progress_bar.setTextVisible(False)
+        self.container_progress.add_widget(self.progress_bar)
+        self.container_progress.add_space()
+        self.layout.addWidget(self.container_progress)
+
         qt_utils.centralize(self)
 
         self.filter_only_apps = True
diff --git a/bauh/view/resources/style/default/default.qss b/bauh/view/resources/style/default/default.qss
index 34e71af5..91fc6b54 100644
--- a/bauh/view/resources/style/default/default.qss
+++ b/bauh/view/resources/style/default/default.qss
@@ -28,6 +28,10 @@ QCheckBox::indicator {
     height: 18px;
 }
 
+QProgressBar {
+    max-height: 4px;
+}
+
 QTableWidget QToolButton {
     padding: 5px;
     margin-top: 3px;