From 00d70decb0d0a54235c3b002f6768d47e48b4bad Mon Sep 17 00:00:00 2001 From: jupfi Date: Wed, 16 Aug 2023 13:51:16 +0200 Subject: [PATCH] Changed to central asset organization. --- .../resources/ArrowLeft_12x12.png | Bin 202 -> 0 bytes .../resources/ArrowRight_12x12.png | Bin 206 -> 0 bytes .../resources/Garbage_12x12.png | Bin 212 -> 0 bytes .../resources/Load_16x16.png | Bin 216 -> 0 bytes .../resources/New_16x16.png | Bin 211 -> 0 bytes .../resources/Pen_12x12.png | Bin 226 -> 0 bytes .../resources/Save_16x16.png | Bin 286 -> 0 bytes src/nqrduck_pulseprogrammer/view.py | 21 ++++++++---------- 8 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 src/nqrduck_pulseprogrammer/resources/ArrowLeft_12x12.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/ArrowRight_12x12.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/Garbage_12x12.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/Load_16x16.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/New_16x16.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/Pen_12x12.png delete mode 100644 src/nqrduck_pulseprogrammer/resources/Save_16x16.png diff --git a/src/nqrduck_pulseprogrammer/resources/ArrowLeft_12x12.png b/src/nqrduck_pulseprogrammer/resources/ArrowLeft_12x12.png deleted file mode 100644 index df00d75a3943479957499a248cc39472fbbc196d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|T0C7GLp(Z@ z6C_xfc_lgnKF{Z|EjZxPl~lyQEw}SO4-i~mU2bRq1R2|QO-w!5@Ppy#)6f0!2ekZI z5>gTtH1kggW{I1w9wjA^st^=&@i@CgVT0l~$!2Ti5sK wY-T^gZqV>ZSVf*^-KLBe)0Ztyc)-YDxk&z8x&OlepnDiRUHx3vIVCg!0Fa_bLjV8( diff --git a/src/nqrduck_pulseprogrammer/resources/ArrowRight_12x12.png b/src/nqrduck_pulseprogrammer/resources/ArrowRight_12x12.png deleted file mode 100644 index 4d15121c02ea0026ee6e496f91804ac8cd83883f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Iy_w*Lp(Z@ z6C_xfc_mI>_&i_4c*cnh4Jr=X_}7KMPf7rS3pu5Sv&GKV9%wq^#vi>W;onDY9v&VI zyT+I9A30+mGpOcpGS1*nP`G%hp|O$C*zbiDJ5YXxp0e13OYZ+I6vU=jmM;9T``gq+ zg6v9bQ6Q8tDnm{r-UW|kb6k7 diff --git a/src/nqrduck_pulseprogrammer/resources/Garbage_12x12.png b/src/nqrduck_pulseprogrammer/resources/Garbage_12x12.png deleted file mode 100644 index c5c6650f5b25e2ca5543e789a1b629eaf3a095fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|`aE46Lp(Z@ zQxxR>xIZ=)THM*m!kxkP&p2V1+PfSvat^F{+v9VFnSi4(^dAa}W zwxn+vG6F0*J5)S+xtDBkXEgcF=*YdqHANDLJH^y*GIe zJfb<_fOEnXMvKb~Yah$8vDvV=$vSv;cL;5M2$B%#X$oXuxV=!(knz4<3($28p00i_ I>zopr0PLkoO8@`> diff --git a/src/nqrduck_pulseprogrammer/resources/New_16x16.png b/src/nqrduck_pulseprogrammer/resources/New_16x16.png deleted file mode 100644 index 6cc8455a159a9284529937a5dd8eebf08fee5215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`CF@#m;NtVyNUMYd%;FFwZ7RoT$>)9{rVrH{pag%M(5+zZhHYnl&u?Tjp1+v+OU!|V+U?=CL6(L)oEXwA9kT4yx5r3)5I8WCjid3! zo_38tOD8`$xvBVoGefkLLdaU)_1_MxV0M!=xTPh>x|o4MzCqefcEZ_2pu-qEUHx3v IIVCg!07gSbp#T5? diff --git a/src/nqrduck_pulseprogrammer/resources/Pen_12x12.png b/src/nqrduck_pulseprogrammer/resources/Pen_12x12.png deleted file mode 100644 index 8d96596ac48dfed7ae72dc6c568691e9aaa06649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|=6Jd|hIn)) zCrG?%n8=m(=XkoBu&B-fZjFxz>)F`Y+Sb&v@qj@3`kRIZKrrXb%$6jxv$Y4D+T_;g z9cN_=m3dHVS#{&^fdwBJBlX%F8NV{Rf~b#-p)q{SC0`-Nl((mYwO7RLX<9TPWcp!- zzo!>nFFy}5(m>}?mdK II;Vst0IKa!)Bpeg diff --git a/src/nqrduck_pulseprogrammer/resources/Save_16x16.png b/src/nqrduck_pulseprogrammer/resources/Save_16x16.png deleted file mode 100644 index 19ea5cfe856d587f1222a668e260e84196a6655d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)Px#*hxe|R9J=WmOTo>Fcg5lii4-n(aEJ}5gZ(gtA}xw9zgIe4xPkFPvI7a@}LQ( zNu(tS_S^D!`FY!CRjUA?vu k-GK9-aO}IH86951J diff --git a/src/nqrduck_pulseprogrammer/view.py b/src/nqrduck_pulseprogrammer/view.py index b11c0fb..08ebe50 100644 --- a/src/nqrduck_pulseprogrammer/view.py +++ b/src/nqrduck_pulseprogrammer/view.py @@ -7,6 +7,7 @@ from PyQt6.QtGui import QIcon from PyQt6.QtWidgets import QMessageBox, QGroupBox, QFormLayout, 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.assets.icons import Logos from nqrduck_spectrometer.pulseparameters import BooleanOption, NumericOption, FunctionOption logger = logging.getLogger(__name__) @@ -43,8 +44,7 @@ class PulseProgrammerView(ModuleView): # Add button for new event self.new_event_button = QPushButton("New event") # Add the New Icon to the button - self_path = Path(__file__).parent - icon = QIcon(str(self_path / "resources/New_16x16.png")) + icon = Logos.New16x16() self.new_event_button.setIconSize(icon.availableSizes()[0]) self.new_event_button.setIcon(icon) self.new_event_button.clicked.connect(self.on_new_event_button_clicked) @@ -54,8 +54,7 @@ class PulseProgrammerView(ModuleView): self.save_pulse_sequence_button = QPushButton("Save pulse sequence") self.save_pulse_sequence_button.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed) # Add the Save Icon to the button - self_path = Path(__file__).parent - icon = QIcon(str(self_path / "resources/Save_16x16.png")) + icon = Logos.Save16x16() self.save_pulse_sequence_button.setIconSize(icon.availableSizes()[0]) self.save_pulse_sequence_button.setIcon(icon) self.save_pulse_sequence_button.clicked.connect(self.on_save_button_clicked) @@ -64,7 +63,7 @@ class PulseProgrammerView(ModuleView): # Add button for load pulse sequence self.load_pulse_sequence_button = QPushButton("Load pulse sequence") # Add the Load Icon to the button - icon = QIcon(str(self_path / "resources/Load_16x16.png")) + icon = Logos.Load16x16() self.load_pulse_sequence_button.setIconSize(icon.availableSizes()[0]) self.load_pulse_sequence_button.setIcon(icon) self.load_pulse_sequence_button.clicked.connect(self.on_load_button_clicked) @@ -160,7 +159,7 @@ class PulseProgrammerView(ModuleView): logger.debug("Adding button for event %s and parameter %s", event, parameter) logger.debug("Parameter object id: %s", id(event.parameters[parameter])) button = QPushButton() - icon = QIcon(event.parameters[parameter].get_pixmap()) + icon = event.parameters[parameter].get_pixmap() logger.debug("Icon size: %s", icon.availableSizes()) button.setIcon(icon) button.setIconSize(icon.availableSizes()[0]) @@ -222,13 +221,11 @@ class EventOptionsWidget(QWidget): super().__init__() self.event = event - - self_path = Path(__file__).parent layout = QVBoxLayout() upper_layout = QHBoxLayout() # Edit button self.edit_button = QToolButton() - icon = QIcon(str(self_path / "resources/Pen_12x12.png")) + icon = Logos.Pen12x12() self.edit_button.setIcon(icon) self.edit_button.setIconSize(icon.availableSizes()[0]) self.edit_button.setFixedSize(icon.availableSizes()[0]) @@ -236,7 +233,7 @@ class EventOptionsWidget(QWidget): # Delete button self.delete_button = QToolButton() - icon = QIcon(str(self_path / "resources/Garbage_12x12.png")) + icon = Logos.Garbage12x12() self.delete_button.setIcon(icon) self.delete_button.setIconSize(icon.availableSizes()[0]) self.delete_button.setFixedSize(icon.availableSizes()[0]) @@ -248,7 +245,7 @@ class EventOptionsWidget(QWidget): lower_layout = QHBoxLayout() # Move left button self.move_left_button = QToolButton() - icon = QIcon(str(self_path / "resources/ArrowLeft_12x12.png")) + icon = Logos.ArrowLeft12x12() self.move_left_button.setIcon(icon) self.move_left_button.setIconSize(icon.availableSizes()[0]) self.move_left_button.setFixedSize(icon.availableSizes()[0]) @@ -256,7 +253,7 @@ class EventOptionsWidget(QWidget): # Move right button self.move_right_button = QToolButton() - icon = QIcon(str(self_path / "resources/ArrowRight_12x12.png")) + icon = Logos.ArrowRight12x12() self.move_right_button.setIcon(icon) self.move_right_button.setIconSize(icon.availableSizes()[0]) self.move_right_button.setFixedSize(icon.availableSizes()[0])