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

[fix][ui] row buttons are not well aligned

Browse Source
This commit is contained in:
Vinícius Moreira
2020-01-30 13:09:15 -03:00
parent da12327165
commit a77c3f81bb
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bauh/view/qt/apps_table.py
View File

@@ -30,17 +30,18 @@ class UpdateToggleButton(QWidget):
def __init__(self, app_view: PackageView, root: QWidget, i18n: I18n, checked: bool = True, clickable: bool = True): def __init__(self, app_view: PackageView, root: QWidget, i18n: I18n, checked: bool = True, clickable: bool = True):
super(UpdateToggleButton, self).__init__() super(UpdateToggleButton, self).__init__()
self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
self.app_view = app_view self.app_view = app_view
self.root = root self.root = root
layout = QHBoxLayout() layout = QHBoxLayout()
layout.setContentsMargins(2, 2, 2, 0) layout.setContentsMargins(0, 0, 0, 0)
layout.setAlignment(Qt.AlignCenter) layout.setAlignment(Qt.AlignCenter)
self.setLayout(layout) self.setLayout(layout)
self.bt = QToolButton() self.bt = QToolButton()
self.bt.setCheckable(clickable) self.bt.setCheckable(clickable)
self.bt.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
if clickable: if clickable:
self.bt.clicked.connect(self.change_state) self.bt.clicked.connect(self.change_state)
@@ -248,26 +249,35 @@ class AppsTable(QTableWidget):
col_update = None col_update = None
if update_check_enabled and pkg.model.update: if update_check_enabled and pkg.model.update:
col_update = UpdateToggleButton(pkg, self.window, self.i18n, pkg.update_checked) col_update = QToolBar()
col_update.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
col_update.addWidget(UpdateToggleButton(pkg, self.window, self.i18n, pkg.update_checked))
self.setCellWidget(pkg.table_index, 7, col_update) self.setCellWidget(pkg.table_index, 7, col_update)
def _gen_row_button(self, text: str, style: str, callback) -> QWidget: def _gen_row_button(self, text: str, style: str, callback) -> QWidget:
col = QWidget() col = QWidget()
col_bt = QPushButton() col.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
col_bt = QToolButton()
col_bt.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
col_bt.setText(text) col_bt.setText(text)
col_bt.setStyleSheet('QPushButton { ' + style + '}') col_bt.setStyleSheet('QToolButton { ' + style + '}')
col_bt.clicked.connect(callback) col_bt.clicked.connect(callback)
layout = QHBoxLayout() layout = QHBoxLayout()
layout.setContentsMargins(2, 2, 2, 0) layout.setContentsMargins(0, 0, 0, 0)
layout.setAlignment(Qt.AlignCenter) layout.setAlignment(Qt.AlignCenter)
layout.addWidget(col_bt)
col.setLayout(layout)
layout.addWidget(col_bt)
col.setLayout(layout)
return col return col
def _set_col_installed(self, col: int, pkg: PackageView): def _set_col_installed(self, col: int, pkg: PackageView):
toolbar = QToolBar()
toolbar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
if pkg.model.installed: if pkg.model.installed:
if pkg.model.can_be_uninstalled(): if pkg.model.can_be_uninstalled():
def uninstall(): def uninstall():
@@ -287,7 +297,8 @@ class AppsTable(QTableWidget):
else: else:
item = None item = None
self.setCellWidget(pkg.table_index, col, item) toolbar.addWidget(item)
self.setCellWidget(pkg.table_index, col, toolbar)
def _set_col_type(self, col: int, pkg: PackageView): def _set_col_type(self, col: int, pkg: PackageView):

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

@@ -366,7 +366,7 @@ class InputFilter(QLineEdit):
class IconButton(QWidget): class IconButton(QWidget):
def __init__(self, icon: QIcon, action, i18n: I18n, background: str = None, align: int = Qt.AlignCenter, tooltip: str = None): def __init__(self, icon: QIcon, action, i18n: I18n, background: str = None, align: int = Qt.AlignCenter, tooltip: str = None, expanding: bool = False):
super(IconButton, self).__init__() super(IconButton, self).__init__()
self.bt = QToolButton() self.bt = QToolButton()
self.bt.setIcon(icon) self.bt.setIcon(icon)
@@ -374,7 +374,7 @@ class IconButton(QWidget):
self.i18n = i18n self.i18n = i18n
self.default_tootip = tooltip self.default_tootip = tooltip
self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
self.bt.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) self.bt.setSizePolicy(QSizePolicy.Expanding if expanding else QSizePolicy.Minimum, QSizePolicy.Minimum)
if background: if background:
style = 'QToolButton { color: white; background: ' + background + '} ' style = 'QToolButton { color: white; background: ' + background + '} '