spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-08 22:24:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ui] fix progress bar location

Browse Source
This commit is contained in:
Vinicius Moreira
2020-11-30 16:54:03 -03:00
parent dc8788dd54
commit 8b94abe9cf
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bauh/view/qt/components.py
View File

@@ -1129,10 +1129,12 @@ class QCustomMenuAction(QWidgetAction):
class QCustomToolbar(QWidget): 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) super(QCustomToolbar, self).__init__(parent=parent)
self.setProperty('container', 'true') self.setProperty('container', 'true')
self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) self.setSizePolicy(policy_width, policy_height)
self.setLayout(QHBoxLayout()) self.setLayout(QHBoxLayout())
self.layout().setContentsMargins(0, 0, 0, 0) self.layout().setContentsMargins(0, 0, 0, 0)
self.layout().setSpacing(spacing) self.layout().setSpacing(spacing)

5
bauh/view/qt/prepare.py
View File

@@ -5,8 +5,8 @@ from typing import Tuple, Optional
from PyQt5.QtCore import QSize, Qt, QThread, pyqtSignal, QCoreApplication from PyQt5.QtCore import QSize, Qt, QThread, pyqtSignal, QCoreApplication
from PyQt5.QtGui import QIcon, QCursor, QCloseEvent from PyQt5.QtGui import QIcon, QCursor, QCloseEvent
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy, QTableWidget, QHeaderView, QPushButton, QToolBar, \ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy, QTableWidget, QHeaderView, QPushButton, \
QProgressBar, QApplication, QPlainTextEdit, QToolButton, QHBoxLayout QProgressBar, QPlainTextEdit, QToolButton, QHBoxLayout
from bauh import __app_name__ from bauh import __app_name__
from bauh.api.abstract.context import ApplicationContext from bauh.api.abstract.context import ApplicationContext
@@ -209,7 +209,6 @@ class PreparePanel(QWidget, TaskManager):
self.progress_bar = QProgressBar() self.progress_bar = QProgressBar()
self.progress_bar.setObjectName('prepare_progress') 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.setTextVisible(False)
self.progress_bar.setVisible(False) self.progress_bar.setVisible(False)
self.progress_bar.setCursor(QCursor(Qt.WaitCursor)) self.progress_bar.setCursor(QCursor(Qt.WaitCursor))

26
bauh/view/qt/window.py
View File

@@ -29,7 +29,7 @@ from bauh.view.qt.about import AboutDialog
from bauh.view.qt.apps_table import PackagesTable, UpgradeToggleButton from bauh.view.qt.apps_table import PackagesTable, UpgradeToggleButton
from bauh.view.qt.commons import sum_updates_displayed from bauh.view.qt.commons import sum_updates_displayed
from bauh.view.qt.components import new_spacer, IconButton, QtComponentsManager, to_widget, QSearchBar, \ 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.dialog import ConfirmationDialog
from bauh.view.qt.history import HistoryDialog from bauh.view.qt.history import HistoryDialog
from bauh.view.qt.info import InfoDialog from bauh.view.qt.info import InfoDialog
@@ -350,21 +350,10 @@ class ManageWindow(QWidget):
self.container_bottom.setObjectName('container_bottom') self.container_bottom.setObjectName('container_bottom')
self.container_bottom.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) self.container_bottom.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
self.container_bottom.setLayout(QHBoxLayout()) self.container_bottom.setLayout(QHBoxLayout())
self.setContentsMargins(0, 0, 0, 0)
self.container_bottom.layout().setContentsMargins(0, 0, 0, 0) self.container_bottom.layout().setContentsMargins(0, 0, 0, 0)
self.container_bottom.layout().addWidget(new_spacer()) 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']: if config['suggestions']['enabled']:
bt_sugs = IconButton(action=lambda: self._begin_load_suggestions(filter_installed=True), bt_sugs = IconButton(action=lambda: self._begin_load_suggestions(filter_installed=True),
i18n=i18n, i18n=i18n,
@@ -406,6 +395,19 @@ class ManageWindow(QWidget):
self.layout.addWidget(self.container_bottom) 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) qt_utils.centralize(self)
self.filter_only_apps = True self.filter_only_apps = True

4
bauh/view/resources/style/default/default.qss
View File

@@ -28,6 +28,10 @@ QCheckBox::indicator {
height: 18px; height: 18px;
} }
QProgressBar {
max-height: 4px;
}
QTableWidget QToolButton { QTableWidget QToolButton {
padding: 5px; padding: 5px;
margin-top: 3px; margin-top: 3px;