Skip to content

Commit ed0b6ca

Browse files
authored
Merge pull request #134 from dihm/pyqt6
Add PyQt6 support
2 parents b7ea3f4 + 836c082 commit ed0b6ca

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

lyse/__main__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ def paintEvent(self, event):
103103
def changeEvent(self, event):
104104

105105
# theme update only for PySide6/PyQt6
106-
if QT_ENV.endswith('6') and event.type() == QtCore.QEvent.Type.ThemeChange:
106+
if (QT_ENV.endswith('6')
107+
and (event.type() == QtCore.QEvent.Type.ApplicationPaletteChange
108+
or event.type() == QtCore.QEvent.Type.StyleChange)):
109+
107110
for widget in self.findChildren(QtWidgets.QWidget):
108111
# Complex widgets, like TreeView and TableView require triggering styleSheet and palette updates
109112
widget.setStyleSheet(widget.styleSheet())

lyse/widgets.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ def __init__(self, app, view, model, col_status, role_status_percent):
4949
self.ROLE_STATUS_PERCENT = role_status_percent
5050
QtWidgets.QStyledItemDelegate.__init__(self)
5151

52-
def sizeHint(self, *args):
52+
def sizeHint(self, *args, **kwargs):
5353
fontmetrics = QtGui.QFontMetrics(self.view.font())
5454
text_height = fontmetrics.height()
5555
row_height = text_height + self.EXTRA_ROW_HEIGHT
56-
size = QtWidgets.QStyledItemDelegate.sizeHint(self, *args)
56+
size = QtWidgets.QStyledItemDelegate.sizeHint(self, *args, **kwargs)
5757
return QtCore.QSize(size.width(), row_height)
5858

5959
def paint(self, painter, option, index):
@@ -97,8 +97,8 @@ class TableView(QtWidgets.QTableView):
9797
are forced to duplicate code instead of sharing code with the extremely
9898
similar TreeView class in this module"""
9999

100-
def __init__(self, *args):
101-
QtWidgets.QTableView.__init__(self, *args)
100+
def __init__(self, *args, **kwargs):
101+
QtWidgets.QTableView.__init__(self, *args, **kwargs)
102102
self._pressed_index = None
103103
self._double_click = False
104104

@@ -143,8 +143,8 @@ class TreeView(QtWidgets.QTreeView):
143143
click on a valid index, and doubleLeftClicked(index) (in addition) on
144144
double click."""
145145

146-
def __init__(self, *args):
147-
QtWidgets.QTreeView.__init__(self, *args)
146+
def __init__(self, *args, **kwargs):
147+
QtWidgets.QTreeView.__init__(self, *args, **kwargs)
148148
self._pressed_index = None
149149
self._double_click = False
150150

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
"matplotlib",
3535
"numpy",
3636
"pandas>=1.5",
37-
"qtutils>=4.0.0",
37+
"qtutils>=4.1.3",
3838
"scipy",
3939
"tzlocal",
4040
"zprocess>=2.2.2",

0 commit comments

Comments
 (0)