From b0897bf52db1c8b7c0968ebda16eac0ed66b6aa1 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Mon, 30 Sep 2024 10:03:29 +0200 Subject: [PATCH] [icons] revert back to the qt resource system for icons --- pyrelacs/app.py | 2 +- pyrelacs/ui/about.py | 5 +---- pyrelacs/ui/mainwindow.py | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pyrelacs/app.py b/pyrelacs/app.py index a95c4da..792f96d 100644 --- a/pyrelacs/app.py +++ b/pyrelacs/app.py @@ -8,7 +8,7 @@ from .ui.mainwindow import PyRelacs from .util.logging import config_logging log = config_logging() -from . import resources +from . import resources # best created with pyside6-rcc resources.qrc -o resources.py (rcc produces an error...) def main(): app = QApplication(sys.argv) diff --git a/pyrelacs/ui/about.py b/pyrelacs/ui/about.py index 1636d65..5ad40f7 100644 --- a/pyrelacs/ui/about.py +++ b/pyrelacs/ui/about.py @@ -1,5 +1,3 @@ -import pathlib - from PyQt6.QtGui import QPixmap from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QVBoxLayout, QWidget from PyQt6.QtCore import Qt @@ -40,8 +38,7 @@ class About(QWidget): rtd_link.setAlignment(Qt.AlignmentFlag.AlignCenter) iconlabel = QLabel() - _root = pathlib.Path(__file__).parent.parent - pixmap = QPixmap(str(pathlib.Path.joinpath(_root, "icons/relacstuxheader.png"))) + pixmap = QPixmap(":/icons/relacstuxheader.png") s = pixmap.size() new_height = int(s.height() * 300/s.width()) pixmap = pixmap.scaled(300, new_height, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.FastTransformation) diff --git a/pyrelacs/ui/mainwindow.py b/pyrelacs/ui/mainwindow.py index 24dc71e..041ced7 100644 --- a/pyrelacs/ui/mainwindow.py +++ b/pyrelacs/ui/mainwindow.py @@ -68,7 +68,7 @@ class PyRelacs(QMainWindow): ) def create_actions(self): - self._rlx_exitaction = QAction(QIcon(str(path.joinpath(_root, "icons/exit.png"))), "Exit", self) + self._rlx_exitaction = QAction(QIcon(":/icons/exit.png"), "Exit", self) self._rlx_exitaction.setStatusTip("Close relacs") self._rlx_exitaction.setShortcut(QKeySequence("Alt+q")) self._rlx_exitaction.triggered.connect(self.on_exit) @@ -78,17 +78,17 @@ class PyRelacs(QMainWindow): self._rlx_aboutaction.setEnabled(True) self._rlx_aboutaction.triggered.connect(self.on_about) - self._daq_connectaction = QAction(QIcon(str(path.joinpath(_root, "icons/connect.png"))), "Connect DAQ", self) + self._daq_connectaction = QAction(QIcon(":icons/connect.png"), "Connect DAQ", self) self._daq_connectaction.setStatusTip("Connect to daq device") # self._daq_connectaction.setShortcut(QKeySequence("Alt+d")) self._daq_connectaction.triggered.connect(self.connect_dac) - self._daq_disconnectaction = QAction(QIcon(str(path.joinpath(_root, "icons/disconnect.png"))), "Disconnect DAQ", self) + self._daq_disconnectaction = QAction(QIcon(":/icons/disconnect.png"), "Disconnect DAQ", self) self._daq_disconnectaction.setStatusTip("Disconnect the DAQ device") # self._daq_connectaction.setShortcut(QKeySequence("Alt+d")) self._daq_disconnectaction.triggered.connect(self.disconnect_dac) - self._daq_calibaction = QAction(QIcon(str(path.joinpath(_root, "icons/calibration.png"))), "Plot calibration", self) + self._daq_calibaction = QAction(QIcon(":/icons/calibration.png"), "Plot calibration", self) self._daq_calibaction.setStatusTip("Calibrate the attenuator device") # self._daq_calibaction.setShortcut(QKeySequence("Alt+d")) self._daq_calibaction.triggered.connect(self.plot_calibration)