diff --git a/soitool/modules/module_predefined_codes.py b/soitool/modules/module_predefined_codes.py index 2b16384696da299d9fff1cdf60642e479020ee43..67281cf4ada4b5826d4a3040bed0020c7d3653f6 100644 --- a/soitool/modules/module_predefined_codes.py +++ b/soitool/modules/module_predefined_codes.py @@ -14,12 +14,12 @@ from PySide2.QtWidgets import ( QListWidgetItem, QAbstractItemView, QFormLayout, - QPushButton, QSpinBox, ) from PySide2 import QtGui from PySide2.QtCore import Qt from soitool.modules.module_base import ModuleBase, HEADLINE_FONT, resize_table +from soitool.accept_reject_dialog import AcceptRejectDialog ALPHABET = string.ascii_uppercase HEADLINE = "FORHĂ…NDSAVTALTE KODER" @@ -406,7 +406,7 @@ class PredefinedCodesModule(ModuleBase, QWidget, metaclass=Meta): # Modify dialog dialog.edit_column_height.setMinimum(self.minimum_column_height) dialog.edit_column_height.setValue(self.maximum_column_height) - dialog.button_create.setText("Oppdater") + dialog.button_ok.setText("Oppdater") dialog.button_cancel.show() dialog_code = dialog.exec_() @@ -508,7 +508,7 @@ class PredefinedCodesTable(QTableWidget): self.setItem(i, 0, item_code) -class PredefinedCodesSettings(QDialog): +class PredefinedCodesSettings(AcceptRejectDialog): """Dialog for setup and adjustment of PredefinedCodesModule. Parameters @@ -569,11 +569,8 @@ class PredefinedCodesSettings(QDialog): item.setFlags(item.flags() ^ Qt.ItemIsEditable) self.list_category_order.insertItem(i, item) - # Buttons for accept and reject - self.button_create = QPushButton("Opprett") - self.button_create.clicked.connect(self.accept) - self.button_cancel = QPushButton("Avbryt") - self.button_cancel.clicked.connect(self.reject) + self.button_ok.setText("Opprett") + # Hide cancel-button, it is only used when modifying an existing # PredefinedCodesModule self.button_cancel.hide() @@ -597,14 +594,8 @@ class PredefinedCodesSettings(QDialog): self.label_category_order, self.list_category_order ) - # Layout for buttons - self.button_layout = QHBoxLayout() - self.button_layout.addWidget(self.button_create) - self.button_layout.addWidget(self.button_cancel) - # Main layout self.main_layout = QVBoxLayout() self.main_layout.addLayout(self.form_layout) - self.main_layout.addLayout(self.button_layout) - self.setLayout(self.main_layout) + self.layout_content.addLayout(self.main_layout)