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

Merge branch 'staging' into fpakpart

Browse Source 
# Conflicts:
#	bauh/view/qt/apps_table.py
#	bauh/view/qt/window.py
This commit is contained in:
Vinicius Moreira
2020-01-11 15:47:01 -03:00
parent 79b7b85f49 ef764482b1
commit bf1e998449
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ 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.Fixed) self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.app_view = app_view self.app_view = app_view
self.root = root self.root = root
@@ -75,11 +75,11 @@ class AppsTable(QTableWidget):
self.setShowGrid(False) self.setShowGrid(False)
self.verticalHeader().setVisible(False) self.verticalHeader().setVisible(False)
self.horizontalHeader().setVisible(False) self.horizontalHeader().setVisible(False)
self.horizontalHeader().setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) self.horizontalHeader().setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.setSelectionBehavior(QTableView.SelectRows) self.setSelectionBehavior(QTableView.SelectRows)
self.setHorizontalHeaderLabels(['' for _ in range(self.columnCount())]) self.setHorizontalHeaderLabels(['' for _ in range(self.columnCount())])
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.icon_logo = QIcon(resource.get_path('img/logo.svg')) self.icon_logo = QIcon(resource.get_path('img/logo.svg'))
self.pixmap_verified = QIcon(resource.get_path('img/verified.svg')).pixmap(QSize(10, 10)) self.pixmap_verified = QIcon(resource.get_path('img/verified.svg')).pixmap(QSize(10, 10))
@@ -256,7 +256,7 @@ class AppsTable(QTableWidget):
col = QWidget() col = QWidget()
col_bt = QPushButton() col_bt = QPushButton()
col_bt.setText(text) col_bt.setText(text)
col_bt.setStyleSheet('QPushButton { ' + style + '} QPushButton:disabled { background: grey }') col_bt.setStyleSheet('QPushButton { ' + style + '}')
col_bt.clicked.connect(callback) col_bt.clicked.connect(callback)
layout = QHBoxLayout() layout = QHBoxLayout()
@@ -269,11 +269,16 @@ class AppsTable(QTableWidget):
def _set_col_installed(self, col: int, pkg: PackageView): def _set_col_installed(self, col: int, pkg: PackageView):
if pkg.model.installed: if pkg.model.installed:
def uninstall(): if pkg.model.can_be_uninstalled():
self._uninstall_app(pkg) def uninstall():
self._uninstall_app(pkg)
item = self._gen_row_button(self.i18n['uninstall'].capitalize(), INSTALL_BT_STYLE.format(back='#cc0000'), uninstall) item = self._gen_row_button(self.i18n['uninstall'].capitalize(), INSTALL_BT_STYLE.format(back='#cc0000'), uninstall)
item.setEnabled(pkg.model.can_be_uninstalled()) else:
item = QLabel()
item.setPixmap((QPixmap(resource.get_path('img/checked.svg'))))
item.setAlignment(Qt.AlignCenter)
item.setToolTip(self.i18n['installed'])
elif pkg.model.can_be_installed(): elif pkg.model.can_be_installed():
def install(): def install():
self._install_app(pkg) self._install_app(pkg)
@@ -421,7 +426,7 @@ class AppsTable(QTableWidget):
def _set_col_settings(self, col: int, pkg: PackageView): def _set_col_settings(self, col: int, pkg: PackageView):
item = QToolBar() item = QToolBar()
item.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) item.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
if pkg.model.installed: if pkg.model.installed:
def run(): def run():

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

@@ -136,7 +136,7 @@ class ManageWindow(QWidget):
self.layout.addWidget(self.toolbar_top) self.layout.addWidget(self.toolbar_top)
self.toolbar = QToolBar() self.toolbar = QToolBar()
self.toolbar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) self.toolbar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.toolbar.setStyleSheet('QToolBar {spacing: 4px; margin-top: 15px; margin-bottom: 5px}') self.toolbar.setStyleSheet('QToolBar {spacing: 4px; margin-top: 15px; margin-bottom: 5px}')
self.checkbox_updates = QCheckBox() self.checkbox_updates = QCheckBox()
@@ -322,9 +322,9 @@ class ManageWindow(QWidget):
self.ref_combo_styles = self.toolbar_bottom.addWidget(self.combo_styles) self.ref_combo_styles = self.toolbar_bottom.addWidget(self.combo_styles)
bt_settings = IconButton(QIcon(resource.get_path('img/app_settings.svg')), bt_settings = IconButton(QIcon(resource.get_path('img/app_settings.svg')),
i18n=self.i18n,
action=self._show_settings_menu, action=self._show_settings_menu,
background='#12ABAB', background='#12ABAB',
i18n=self.i18n,
tooltip=self.i18n['manage_window.bt_settings.tooltip']) tooltip=self.i18n['manage_window.bt_settings.tooltip'])
self.ref_bt_settings = self.toolbar_bottom.addWidget(bt_settings) self.ref_bt_settings = self.toolbar_bottom.addWidget(bt_settings)