diff --git a/pyproject.toml b/pyproject.toml index 0e13256..25b529b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ dependencies = [ "labscript_utils>=3.1.0b1", "labscript-c-extensions", "pyqtgraph>=0.11.1", - "qtutils>=2.0.0", + "qtutils>=4.0.0", "zprocess", "numpy>=1.15", "scipy", diff --git a/runviewer/__main__.py b/runviewer/__main__.py index bbccb2a..8aa1bb2 100644 --- a/runviewer/__main__.py +++ b/runviewer/__main__.py @@ -1671,7 +1671,7 @@ def handler(self, h5_filepath): splash.hide() def execute_program(): - qapplication.exec_() + qapplication.exec() # Let the interpreter run every 500ms so it sees Ctrl-C interrupts: timer = QTimer() diff --git a/runviewer/main.ui b/runviewer/main.ui index c2db1d2..60d7f0a 100644 --- a/runviewer/main.ui +++ b/runviewer/main.ui @@ -29,28 +29,28 @@ QPushButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #f6f7fa, stop: 1 #dadbde); - border: 1px solid #8f8f91; + stop: 0 palette(light), stop: 1 palette(window)); + border: 1px solid palette(dark); border-radius: 3px; } QPushButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); - border: 1px solid #8f8f91; + stop: 0 palette(window), stop: 1 palette(light)); + border: 1px solid palette(dark); border-radius: 3px; } QPushButton:checked { - background-color: #dadbde; - border: 1px solid #8f8f91; + background-color: palette(window); + border: 1px solid palette(dark); border-radius: 3px; } QPushButton:hover:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); - border: 1px solid #8f8f91; + stop: 0 palette(window), stop: 1 palette(light)); + border: 1px solid palette(dark); border-radius: 3px; } @@ -61,28 +61,28 @@ QToolButton { QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #f6f7fa, stop: 1 #dadbde); - border: 1px solid #8f8f91; + stop: 0 palette(light), stop: 1 palette(window)); + border: 1px solid palette(dark); border-radius: 3px; } QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); - border: 1px solid #8f8f91; + stop: 0 palette(window), stop: 1 palette(light)); + border: 1px solid palette(dark); border-radius: 3px; } QToolButton:checked { - background-color: #dadbde; - border: 1px solid #8f8f91; + background-color: palette(window); + border: 1px solid palette(dark); border-radius: 3px; } QToolButton:hover:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); - border: 1px solid #8f8f91; + stop: 0 palette(window), stop: 1 palette(light)); + border: 1px solid palette(dark); border-radius: 3px; }