From 2b75d6b98e7a99afb2c115c1dff0e9b931cc31b6 Mon Sep 17 00:00:00 2001 From: jupfi Date: Sat, 22 Jul 2023 13:48:39 +0200 Subject: [PATCH] Added icons. --- .../resources/Garbage_16x16.png | Bin 0 -> 288 bytes .../resources/Pen_16x16.png | Bin 0 -> 241 bytes src/nqrduck_pulseprogrammer/view.py | 17 ++++++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/nqrduck_pulseprogrammer/resources/Garbage_16x16.png create mode 100644 src/nqrduck_pulseprogrammer/resources/Pen_16x16.png diff --git a/src/nqrduck_pulseprogrammer/resources/Garbage_16x16.png b/src/nqrduck_pulseprogrammer/resources/Garbage_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..b078ccaf7dab7e153bb6ff4854fd9d7355f9067e GIT binary patch literal 288 zcmV+*0pI?KP)Px#+DSw~R9J=WmoW;$KoCV=!~<9a6vQ(m+4j3mt(>+>jP9>o-8-nezwK5qfPMg^z<6`%rCfC^9n)`>_spN_5T_v;0)Pe`_X mCWAZB_21U_bljS2a0i|q5;5(jQD-0k0000?$z_Z(eQXJ|OsnA?CnBzF+LZx@=Kip7EEKX5QL2 zov+p9ko+^-H92WJI;NgEJdaIb|64|lzTU5ELPdWVh<`u*S~BMJx7RaQYZ#o0afwZs zw6kMVgK)86DC6>HN?lBGXO1r7t}qqv)=6OawTtP&9}R}@&y*?}-(F}6E@wyx51Uo= otD7tC!E@;!#cxxZ#648zorrd2Rk)aQ9O!HYPgg&ebxsLQ0As>mR{#J2 literal 0 HcmV?d00001 diff --git a/src/nqrduck_pulseprogrammer/view.py b/src/nqrduck_pulseprogrammer/view.py index 7627236..adc6c18 100644 --- a/src/nqrduck_pulseprogrammer/view.py +++ b/src/nqrduck_pulseprogrammer/view.py @@ -1,8 +1,9 @@ import logging import functools from collections import OrderedDict +from pathlib import Path from PyQt6.QtGui import QIcon -from PyQt6.QtWidgets import QTableWidget, QVBoxLayout, QPushButton, QHBoxLayout, QLabel, QDialog, QLineEdit, QDialogButtonBox, QWidget, QCheckBox, QToolButton, QFileDialog +from PyQt6.QtWidgets import QTableWidget, QVBoxLayout, QPushButton, QHBoxLayout, QLabel, QDialog, QLineEdit, QDialogButtonBox, QWidget, QCheckBox, QToolButton, QFileDialog, QSizePolicy from PyQt6.QtCore import pyqtSlot, pyqtSignal from nqrduck.module.module_view import ModuleView from nqrduck_spectrometer.pulseparameters import BooleanOption, NumericOption @@ -134,6 +135,7 @@ class PulseProgrammerView(ModuleView): event_options_widget.change_event_name.connect(self.module.controller.change_event_name) self.pulse_table.setCellWidget(row_idx, column_idx, event_options_widget) + self.pulse_table.setRowHeight(row_idx, event_options_widget.layout().sizeHint().height()) logger.debug("Adding button for event %s and parameter %s", event, parameter) logger.debug("Parameter object id: %s", id(event.parameters[parameter])) @@ -198,14 +200,27 @@ class EventOptionsWidget(QWidget): super().__init__() self.event = event + + self_path = Path(__file__).parent layout = QHBoxLayout() self.edit_button = QToolButton() + icon = QIcon(str(self_path / "resources/Pen_16x16.png")) + self.edit_button.setIcon(icon) + self.edit_button.setIconSize(icon.availableSizes()[0]) + self.edit_button.setFixedSize(icon.availableSizes()[0]) self.edit_button.clicked.connect(self.edit_event) + # Delete button self.delete_button = QToolButton() + icon = QIcon(str(self_path / "resources/Garbage_16x16.png")) + self.delete_button.setIcon(icon) + self.delete_button.setIconSize(icon.availableSizes()[0]) + self.delete_button.setFixedSize(icon.availableSizes()[0]) self.delete_button.clicked.connect(self.create_delete_event_dialog) + layout.addWidget(self.edit_button) layout.addWidget(self.delete_button) self.setLayout(layout) + self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) def edit_event(self): logger.debug("Edit button clicked for event %s", self.event.name)