From a3384aaea90d493ec2deba8ceefa71d62d72c583 Mon Sep 17 00:00:00 2001 From: Jan Feil <11638228+jfeil@users.noreply.github.com> Date: Fri, 22 Apr 2022 19:35:49 +0200 Subject: [PATCH] Replace rulegroup with question_group (naming refactoring) --- ...oup_editor.ui => question_group_editor.ui} | 4 +- res/regeltest_setup.ui | 20 ++--- res/regeltest_setup_widget.ui | 34 ++++----- src/MainWidgets.py | 74 +++++++++---------- src/main_application.py | 8 +- src/question_table.py | 2 +- src/regeltestcreator.py | 53 ++++++------- src/ui_question_group_editor.py | 58 +++++++++++++++ src/ui_regeltest_setup.py | 23 +++--- src/ui_regeltest_setup_widget.py | 47 ++++++------ src/ui_rulegroup_editor.py | 58 --------------- 11 files changed, 193 insertions(+), 188 deletions(-) rename res/{rulegroup_editor.ui => question_group_editor.ui} (95%) create mode 100644 src/ui_question_group_editor.py delete mode 100644 src/ui_rulegroup_editor.py diff --git a/res/rulegroup_editor.ui b/res/question_group_editor.ui similarity index 95% rename from res/rulegroup_editor.ui rename to res/question_group_editor.ui index 1c6b3cf..87a31fc 100644 --- a/res/rulegroup_editor.ui +++ b/res/question_group_editor.ui @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - + 0 diff --git a/res/regeltest_setup.ui b/res/regeltest_setup.ui index bd70c8a..8090d71 100644 --- a/res/regeltest_setup.ui +++ b/res/regeltest_setup.ui @@ -6,7 +6,7 @@ 0 0 - 400 + 370 525 @@ -46,17 +46,19 @@ - - - Shuffle rulegroups - - + + + Fragegruppen vermischen + + - - Mix multiple choice and text questions within rulegroup - + + Multiple choice und Textfragen + innerhalb einer Fragengruppe mischen + + diff --git a/res/regeltest_setup_widget.ui b/res/regeltest_setup_widget.ui index f4560e3..1c59ad4 100644 --- a/res/regeltest_setup_widget.ui +++ b/res/regeltest_setup_widget.ui @@ -1,25 +1,25 @@ - RegeltestSetup_Rulegroup - - - - 0 - 0 - 400 - 88 - - - - Form + RegeltestSetup_QuestionGroup + + + + 0 + 0 + 400 + 88 + + + + Form - - - 01 - Das Spielfeld - - + + + 01 - Das Spielfeld + + diff --git a/src/MainWidgets.py b/src/MainWidgets.py index d05b639..6fa12e9 100644 --- a/src/MainWidgets.py +++ b/src/MainWidgets.py @@ -15,8 +15,8 @@ from src.filter_editor import FilterEditor from src.question_table import RuleSortFilterProxyModel, QuestionGroupTableView, QuestionGroupDataModel from src.ui_first_setup_widget import Ui_FirstSetupWidget +from src.ui_question_group_editor import Ui_QuestionGroupEditor from src.ui_question_overview_widget import Ui_QuestionOverviewWidget -from src.ui_rulegroup_editor import Ui_RulegroupEditor if TYPE_CHECKING: from src.main_application import MainWindow @@ -28,29 +28,29 @@ class EditorResult(Enum): Canceled = auto() -class QuestionGroupEditor(QDialog, Ui_RulegroupEditor): +class QuestionGroupEditor(QDialog, Ui_QuestionGroupEditor): def __init__(self, id: int = 1, name: str = "", parent=None): super(QuestionGroupEditor, self).__init__(parent=parent) - self.ui = Ui_RulegroupEditor() + self.ui = Ui_QuestionGroupEditor() self.ui.setupUi(self) self.id = id self.name = name @property def id(self): - return self.ui.rulegroup_id.value() + return self.ui.question_group_id.value() @id.setter def id(self, value): - self.ui.rulegroup_id.setValue(value) + self.ui.question_group_id.setValue(value) @property def name(self): - return self.ui.rulegroup_name.text() + return self.ui.question_group_name.text() @name.setter def name(self, value): - self.ui.rulegroup_name.setText(value) + self.ui.question_group_name.setText(value) class QuestionOverviewWidget(QWidget, Ui_QuestionOverviewWidget): @@ -63,7 +63,7 @@ def __init__(self, main_window: MainWindow): self.ui.tabWidget.clear() self.ui.tabWidget.setTabsClosable(True) self.ui.tabWidget.tabCloseRequested.connect(self.delete_question_group) - self.ui.tabWidget.tabBarDoubleClicked.connect(self.rename_rulegroup) + self.ui.tabWidget.tabBarDoubleClicked.connect(self.rename_question_group) self.ui.filter_list.clear() delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.ui.filter_list, None, None, Qt.WidgetShortcut) @@ -72,7 +72,7 @@ def __init__(self, main_window: MainWindow): self.ui.filter_list.itemDoubleClicked.connect(self.add_filter) self.ui.add_filter.clicked.connect(self.add_filter) - self.ruletabs = [] # type: List[Tuple[QuestionGroup, QSortFilterProxyModel, QuestionGroupDataModel]] + self.question_group_tabs = [] # type: List[Tuple[QuestionGroup, QSortFilterProxyModel, QuestionGroupDataModel]] self.questions = {} # type: Dict[QTreeWidgetItem, str] def delete_selected_filter(self): @@ -98,28 +98,28 @@ def delete_question_group(self, index_tabwidget: int): msgBox.setDefaultButton(QMessageBox.Cancel) ret = msgBox.exec() if ret == QMessageBox.Yes: - rulegroup, _, _ = self.ruletabs[index_tabwidget] - self.ruletabs.pop(index_tabwidget) - db.delete(rulegroup) + question_group, _, _ = self.question_group_tabs[index_tabwidget] + self.question_group_tabs.pop(index_tabwidget) + db.delete(question_group) self.ui.tabWidget.removeTab(index_tabwidget) - if not self.ruletabs: + if not self.question_group_tabs: self.main_window.initialize() - def create_question_group_tab(self, rulegroup: QuestionGroup): + def create_question_group_tab(self, question_group: QuestionGroup): tab = QWidget() view = QuestionGroupTableView(tab) - model = QuestionGroupDataModel(rulegroup, view) + model = QuestionGroupDataModel(question_group, view) filter_model = RuleSortFilterProxyModel() filter_model.setSourceModel(model) view.setModel(filter_model) view.sortByColumn(0, Qt.AscendingOrder) - self.ruletabs.append((rulegroup, filter_model, model)) + self.question_group_tabs.append((question_group, filter_model, model)) self.ui.tabWidget.addTab(tab, "") self._update_tabtitle(self.ui.tabWidget.indexOf(tab)) - def _rulegroup_editor(self, question_group: Union[QuestionGroup, None], - editor: QuestionGroupEditor) -> EditorResult: + def _question_group_editor(self, question_group: Union[QuestionGroup, None], + editor: QuestionGroupEditor) -> EditorResult: if editor.exec() == QDialog.Accepted: if question_group and question_group.id == editor.id: # ID was not changed -> update of title @@ -132,27 +132,27 @@ def _rulegroup_editor(self, question_group: Union[QuestionGroup, None], else: return EditorResult.Canceled - def rename_rulegroup(self, index): - if not self.ruletabs: + def rename_question_group(self, index): + if not self.question_group_tabs: return - rulegroup, _, _ = self.ruletabs[index] - editor = QuestionGroupEditor(id=rulegroup.id, name=rulegroup.name) - result = self._rulegroup_editor(rulegroup, editor) + question_group, _, _ = self.question_group_tabs[index] + editor = QuestionGroupEditor(id=question_group.id, name=question_group.name) + result = self._question_group_editor(question_group, editor) while result == EditorResult.Invalid: - result = self._rulegroup_editor(rulegroup, editor) + result = self._question_group_editor(question_group, editor) if result == EditorResult.Success: - rulegroup.id = editor.id - rulegroup.name = editor.name + question_group.id = editor.id + question_group.name = editor.name self._update_tabtitle(index) db.commit() def add_question_group(self): editor = QuestionGroupEditor(id=db.get_new_question_group_id()) - result = self._rulegroup_editor(None, editor) + result = self._question_group_editor(None, editor) while result == EditorResult.Invalid: - result = self._rulegroup_editor(None, editor) + result = self._question_group_editor(None, editor) if result == EditorResult.Success: - if not self.ruletabs: + if not self.question_group_tabs: self.ui.tabWidget.setTabsClosable(True) self.ui.add_filter.setDisabled(False) self.ui.tabWidget.clear() @@ -162,8 +162,8 @@ def add_question_group(self): self.create_question_group_tab(question_group) def _update_tabtitle(self, index): - rulegroup, _, _ = self.ruletabs[index] - self.ui.tabWidget.setTabText(index, f"{rulegroup.id:02d} {rulegroup.name}") + question_group, _, _ = self.question_group_tabs[index] + self.ui.tabWidget.setTabText(index, f"{question_group.id:02d} {question_group.name}") def add_filter(self, list_entry: Union[QListWidgetItem, bool] = False): if not list_entry or type(list_entry) == bool: @@ -175,7 +175,7 @@ def add_filter(self, list_entry: Union[QListWidgetItem, bool] = False): index = self.ui.filter_list.indexFromItem(list_entry).row() current_configuration = RuleSortFilterProxyModel.filters[index][1] edit_mode = True - first_ruletab = self.ruletabs[0][2] + first_ruletab = self.question_group_tabs[0][2] properties = {} for i in range(first_ruletab.columnCount()): properties.update(first_ruletab.headerData(i, Qt.Horizontal, Qt.UserRole)) @@ -209,18 +209,18 @@ def add_filter(self, list_entry: Union[QListWidgetItem, bool] = False): self.refresh_column_filter() def refresh_column_filter(self): - for (_, filter_model, _) in self.ruletabs: + for (_, filter_model, _) in self.question_group_tabs: filter_model = filter_model # type: RuleSortFilterProxyModel filter_model.invalidateFilter() - def create_ruletabs(self, rulegroups: List[QuestionGroup]): + def create_ruletabs(self, question_groups: List[QuestionGroup]): self.ui.tabWidget.setTabsClosable(True) self.ui.add_filter.setDisabled(False) - for rulegroup in rulegroups: - self.create_question_group_tab(rulegroup) + for question_group in question_groups: + self.create_question_group_tab(question_group) def reset(self): - for (_, _, model) in self.ruletabs: + for (_, _, model) in self.question_group_tabs: model.reset() diff --git a/src/main_application.py b/src/main_application.py index 48982dc..1704851 100644 --- a/src/main_application.py +++ b/src/main_application.py @@ -41,9 +41,9 @@ def load_dataset(parent: QWidget, reset_cursor=True) -> bool: def read_in(file_path: str): with open(file_path, 'r+', encoding='iso-8859-1') as file: soup = BeautifulSoup(file, "lxml") - rulegroups = create_question_groups(soup.find("gruppen")) + question_groups = create_question_groups(soup.find("gruppen")) questions, mchoice = create_questions_and_mchoice(soup("regelsatz")) - return rulegroups, questions, mchoice + return question_groups, questions, mchoice file_name = QFileDialog.getOpenFileName(parent, caption="Fragendatei öffnen", filter="DFB Regeldaten (*.xml)") if len(file_name) == 0 or file_name[0] == "": @@ -65,8 +65,8 @@ def save_dataset(parent: QWidget): QApplication.setOverrideCursor(Qt.WaitCursor) dataset = "\n\ \n\n" - for rulegroup in db.get_all_question_groups(): - dataset += rulegroup.export() + for question_group in db.get_all_question_groups(): + dataset += question_group.export() dataset += "\n" for question in db.get_question_multiplechoice(): question_set = question[0].export() diff --git a/src/question_table.py b/src/question_table.py index 469e9f0..6377593 100644 --- a/src/question_table.py +++ b/src/question_table.py @@ -140,7 +140,7 @@ def removeRow(self, row: int, def insertRow(self, row: int, parent: Union[PySide6.QtCore.QModelIndex, PySide6.QtCore.QPersistentModelIndex] = ...) -> bool: new_question = Question() - new_question.rulegroup = db.get_question_group(self.question_group.id) + new_question.question_group = db.get_question_group(self.question_group.id) new_question.question_id = db.get_new_question_id(self.question_group.id) editor = QuestionEditor(new_question) if editor.exec() == QDialog.Accepted: diff --git a/src/regeltestcreator.py b/src/regeltestcreator.py index 089ef67..5176208 100644 --- a/src/regeltestcreator.py +++ b/src/regeltestcreator.py @@ -11,7 +11,7 @@ from src.datatypes import Question, QuestionGroup from src.ui_regeltest_save import Ui_RegeltestSave from src.ui_regeltest_setup import Ui_RegeltestSetup -from src.ui_regeltest_setup_widget import Ui_RegeltestSetup_Rulegroup +from src.ui_regeltest_setup_widget import Ui_RegeltestSetup_QuestionGroup class RegeltestCreator(QListWidget): @@ -74,37 +74,38 @@ def create_save(self): self.ui.output_edit.setText(file_name[0]) -class RegeltestSetupRulegroup(QWidget, Ui_RegeltestSetup_Rulegroup): +class RegeltestSetupQuestionGroup(QWidget, Ui_RegeltestSetup_QuestionGroup): changed = Signal() - def __init__(self, parent, rulegroup_parameters: Tuple[QuestionGroup, int, int]): - super(RegeltestSetupRulegroup, self).__init__(parent) - self.ui = Ui_RegeltestSetup_Rulegroup() + def __init__(self, parent, question_group_parameters: Tuple[QuestionGroup, int, int]): + super(RegeltestSetupQuestionGroup, self).__init__(parent) + self.ui = Ui_RegeltestSetup_QuestionGroup() self.ui.setupUi(self) suffix = " von %d" - self.rulegroup = rulegroup_parameters[0] - self.ui.label_rulegroup.setText(f"{rulegroup_parameters[0].id:02d} - {rulegroup_parameters[0].name}") - if rulegroup_parameters[1] == 0: + self.question_group = question_group_parameters[0] + self.ui.label_question_group.setText( + f"{question_group_parameters[0].id:02d} - {question_group_parameters[0].name}") + if question_group_parameters[1] == 0: # No Textquestion self.ui.spinBox_textquestion.setHidden(True) self.ui.label_2.setHidden(True) self.ui.horizontalLayout.removeItem(self.ui.right_spacer) - self.ui.spinBox_textquestion.setRange(0, rulegroup_parameters[1]) - self.ui.spinBox_textquestion.setSuffix(suffix % rulegroup_parameters[1]) - if rulegroup_parameters[2] == 0: + self.ui.spinBox_textquestion.setRange(0, question_group_parameters[1]) + self.ui.spinBox_textquestion.setSuffix(suffix % question_group_parameters[1]) + if question_group_parameters[2] == 0: # No mchoice question self.ui.spinBox_mchoice.setHidden(True) self.ui.label_3.setHidden(True) self.ui.horizontalLayout.removeItem(self.ui.left_spacer) - self.ui.spinBox_mchoice.setRange(0, rulegroup_parameters[2]) - self.ui.spinBox_mchoice.setSuffix(suffix % rulegroup_parameters[2]) + self.ui.spinBox_mchoice.setRange(0, question_group_parameters[2]) + self.ui.spinBox_mchoice.setSuffix(suffix % question_group_parameters[2]) self.ui.spinBox_textquestion.valueChanged.connect(self.changed) self.ui.spinBox_mchoice.valueChanged.connect(self.changed) def get_parameters(self) -> Tuple[QuestionGroup, int, int]: - return self.rulegroup, self.ui.spinBox_textquestion.value(), self.ui.spinBox_mchoice.value() + return self.question_group, self.ui.spinBox_textquestion.value(), self.ui.spinBox_mchoice.value() class RegeltestSetup(QDialog, Ui_RegeltestSetup): @@ -114,7 +115,7 @@ def __init__(self, parent): self.ui.setupUi(self) self.ui.tabWidget.clear() - self.rulegroup_widgets = [] # type: List[RegeltestSetupRulegroup] + self.question_group_widgets = [] # type: List[RegeltestSetupQuestionGroup] parameters = db.get_question_group_config() divisor = 5 @@ -132,8 +133,8 @@ def __init__(self, parent): def updated(self): question_count = 0 - for rulegroup_widget in self.rulegroup_widgets: - _, text, mchoice = rulegroup_widget.get_parameters() + for question_group_widget in self.question_group_widgets: + _, text, mchoice = question_group_widget.get_parameters() question_count += text + mchoice self.ui.statistics.setText(f"{question_count} Fragen aktuell ausgewählt ({question_count * 2} Punkte)") @@ -143,30 +144,30 @@ def create_tab(self, title: str, parameters: List[Tuple[QuestionGroup, int, int] self.ui.tabWidget.addTab(tab_widget, title) layout = QVBoxLayout(tab_widget) for parameter in parameters: - rulegroup = RegeltestSetupRulegroup(tab_widget, parameter) - rulegroup.changed.connect(self.updated) - layout.addWidget(rulegroup) - self.rulegroup_widgets += [rulegroup] + question_group = RegeltestSetupQuestionGroup(tab_widget, parameter) + question_group.changed.connect(self.updated) + layout.addWidget(question_group) + self.question_group_widgets += [question_group] layout.addItem(QSpacerItem(20, 257, QSizePolicy.Minimum, QSizePolicy.Expanding)) def collect_questions(self): questions = [] - for rulegroup_widget in self.rulegroup_widgets: - rulegroup, text, mchoice = rulegroup_widget.get_parameters() + for question_group_widget in self.question_group_widgets: + question_group, text, mchoice = question_group_widget.get_parameters() text_questions = [] mchoice_questions = [] if text: - text_questions = db.get_questions_by_foreignkey(rulegroup.id, mchoice=False, + text_questions = db.get_questions_by_foreignkey(question_group.id, mchoice=False, randomize=True)[ 0:text] if mchoice: - mchoice_questions = db.get_questions_by_foreignkey(rulegroup.id, mchoice=True, + mchoice_questions = db.get_questions_by_foreignkey(question_group.id, mchoice=True, randomize=True)[ 0:mchoice] text_questions += mchoice_questions if self.ui.checkbox_textmchoice.isChecked(): random.shuffle(text_questions) questions += text_questions - if self.ui.checkbox_rulegroups.isChecked(): + if self.ui.checkbox_question_groups.isChecked(): random.shuffle(questions) return questions diff --git a/src/ui_question_group_editor.py b/src/ui_question_group_editor.py new file mode 100644 index 0000000..f10e22a --- /dev/null +++ b/src/ui_question_group_editor.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'question_group_editor.ui' +## +## Created by: Qt User Interface Compiler version 6.2.4 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide6.QtCore import (QCoreApplication, QMetaObject, Qt) +from PySide6.QtWidgets import (QAbstractSpinBox, QDialogButtonBox, QGridLayout, QLineEdit, QSizePolicy, + QSpinBox) + + +class Ui_QuestionGroupEditor(object): + def setupUi(self, QuestionGroupEditor): + if not QuestionGroupEditor.objectName(): + QuestionGroupEditor.setObjectName(u"QuestionGroupEditor") + QuestionGroupEditor.resize(293, 69) + self.gridLayout = QGridLayout(QuestionGroupEditor) + self.gridLayout.setObjectName(u"gridLayout") + self.question_group_name = QLineEdit(QuestionGroupEditor) + self.question_group_name.setObjectName(u"question_group_name") + + self.gridLayout.addWidget(self.question_group_name, 1, 1, 1, 1) + + self.buttonBox = QDialogButtonBox(QuestionGroupEditor) + self.buttonBox.setObjectName(u"buttonBox") + self.buttonBox.setOrientation(Qt.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok) + + self.gridLayout.addWidget(self.buttonBox, 2, 1, 1, 1) + + self.question_group_id = QSpinBox(QuestionGroupEditor) + self.question_group_id.setObjectName(u"question_group_id") + sizePolicy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.question_group_id.sizePolicy().hasHeightForWidth()) + self.question_group_id.setSizePolicy(sizePolicy) + self.question_group_id.setMinimum(1) + self.question_group_id.setMaximum(99) + self.question_group_id.setStepType(QAbstractSpinBox.DefaultStepType) + + self.gridLayout.addWidget(self.question_group_id, 1, 0, 1, 1) + + self.retranslateUi(QuestionGroupEditor) + self.buttonBox.accepted.connect(QuestionGroupEditor.accept) + self.buttonBox.rejected.connect(QuestionGroupEditor.reject) + + QMetaObject.connectSlotsByName(QuestionGroupEditor) + + # setupUi + + def retranslateUi(self, QuestionGroupEditor): + QuestionGroupEditor.setWindowTitle(QCoreApplication.translate("QuestionGroupEditor", u"Regelgruppe", None)) + # retranslateUi diff --git a/src/ui_regeltest_setup.py b/src/ui_regeltest_setup.py index dd5c5dd..17508ad 100644 --- a/src/ui_regeltest_setup.py +++ b/src/ui_regeltest_setup.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'regeltest_setup.ui' ## -## Created by: Qt User Interface Compiler version 6.2.2 +## Created by: Qt User Interface Compiler version 6.2.4 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -12,12 +12,11 @@ from PySide6.QtWidgets import (QCheckBox, QDialogButtonBox, QLabel, QSizePolicy, QSpacerItem, QTabWidget, QVBoxLayout, QWidget) - class Ui_RegeltestSetup(object): def setupUi(self, RegeltestSetup): if not RegeltestSetup.objectName(): RegeltestSetup.setObjectName(u"RegeltestSetup") - RegeltestSetup.resize(400, 525) + RegeltestSetup.resize(370, 525) self.verticalLayout = QVBoxLayout(RegeltestSetup) self.verticalLayout.setObjectName(u"verticalLayout") self.tabWidget = QTabWidget(RegeltestSetup) @@ -39,10 +38,10 @@ def setupUi(self, RegeltestSetup): self.verticalLayout.addWidget(self.statistics) - self.checkbox_rulegroups = QCheckBox(RegeltestSetup) - self.checkbox_rulegroups.setObjectName(u"checkbox_rulegroups") + self.checkbox_question_groups = QCheckBox(RegeltestSetup) + self.checkbox_question_groups.setObjectName(u"checkbox_question_groups") - self.verticalLayout.addWidget(self.checkbox_rulegroups) + self.verticalLayout.addWidget(self.checkbox_question_groups) self.checkbox_textmchoice = QCheckBox(RegeltestSetup) self.checkbox_textmchoice.setObjectName(u"checkbox_textmchoice") @@ -73,11 +72,13 @@ def setupUi(self, RegeltestSetup): def retranslateUi(self, RegeltestSetup): RegeltestSetup.setWindowTitle(QCoreApplication.translate("RegeltestSetup", u"Setup Regeltest", None)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QCoreApplication.translate("RegeltestSetup", u"Tab 2", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), + QCoreApplication.translate("RegeltestSetup", u"Tab 2", None)) self.statistics.setText("") - self.checkbox_rulegroups.setText(QCoreApplication.translate("RegeltestSetup", u"Shuffle rulegroups", None)) - self.checkbox_textmchoice.setText(QCoreApplication.translate("RegeltestSetup", - u"Mix multiple choice and text questions within question_group", - None)) + self.checkbox_question_groups.setText( + QCoreApplication.translate("RegeltestSetup", u"Fragegruppen vermischen", None)) + self.checkbox_textmchoice.setText( + QCoreApplication.translate("RegeltestSetup", u"Multiple choice und Textfragen \n" + "innerhalb einer Fragengruppe mischen", None)) # retranslateUi diff --git a/src/ui_regeltest_setup_widget.py b/src/ui_regeltest_setup_widget.py index b262a3e..b9bf90a 100644 --- a/src/ui_regeltest_setup_widget.py +++ b/src/ui_regeltest_setup_widget.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'regeltest_setup_widget.ui' ## -## Created by: Qt User Interface Compiler version 6.2.2 +## Created by: Qt User Interface Compiler version 6.2.4 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -14,19 +14,19 @@ QWidget) -class Ui_RegeltestSetup_Rulegroup(object): - def setupUi(self, RegeltestSetup_Rulegroup): - if not RegeltestSetup_Rulegroup.objectName(): - RegeltestSetup_Rulegroup.setObjectName(u"RegeltestSetup_Rulegroup") - RegeltestSetup_Rulegroup.resize(400, 88) - self.verticalLayout = QVBoxLayout(RegeltestSetup_Rulegroup) +class Ui_RegeltestSetup_QuestionGroup(object): + def setupUi(self, RegeltestSetup_QuestionGroup): + if not RegeltestSetup_QuestionGroup.objectName(): + RegeltestSetup_QuestionGroup.setObjectName(u"RegeltestSetup_QuestionGroup") + RegeltestSetup_QuestionGroup.resize(400, 88) + self.verticalLayout = QVBoxLayout(RegeltestSetup_QuestionGroup) self.verticalLayout.setObjectName(u"verticalLayout") - self.label_rulegroup = QLabel(RegeltestSetup_Rulegroup) - self.label_rulegroup.setObjectName(u"label_rulegroup") + self.label_question_group = QLabel(RegeltestSetup_QuestionGroup) + self.label_question_group.setObjectName(u"label_question_group") - self.verticalLayout.addWidget(self.label_rulegroup) + self.verticalLayout.addWidget(self.label_question_group) - self.widget_2 = QWidget(RegeltestSetup_Rulegroup) + self.widget_2 = QWidget(RegeltestSetup_QuestionGroup) self.widget_2.setObjectName(u"widget_2") self.horizontalLayout = QHBoxLayout(self.widget_2) self.horizontalLayout.setObjectName(u"horizontalLayout") @@ -61,26 +61,27 @@ def setupUi(self, RegeltestSetup_Rulegroup): self.verticalLayout.addWidget(self.widget_2) - self.line = QFrame(RegeltestSetup_Rulegroup) + self.line = QFrame(RegeltestSetup_QuestionGroup) self.line.setObjectName(u"line") self.line.setFrameShape(QFrame.HLine) self.line.setFrameShadow(QFrame.Sunken) self.verticalLayout.addWidget(self.line) + self.retranslateUi(RegeltestSetup_QuestionGroup) - self.retranslateUi(RegeltestSetup_Rulegroup) + QMetaObject.connectSlotsByName(RegeltestSetup_QuestionGroup) - QMetaObject.connectSlotsByName(RegeltestSetup_Rulegroup) # setupUi - def retranslateUi(self, RegeltestSetup_Rulegroup): - RegeltestSetup_Rulegroup.setWindowTitle(QCoreApplication.translate("RegeltestSetup_Rulegroup", u"Form", None)) - self.label_rulegroup.setText( - QCoreApplication.translate("RegeltestSetup_Rulegroup", u"01 - Das Spielfeld", None)) - self.label_2.setText(QCoreApplication.translate("RegeltestSetup_Rulegroup", u"Textfragen", None)) - self.spinBox_textquestion.setSuffix(QCoreApplication.translate("RegeltestSetup_Rulegroup", u" out of 32", None)) - self.label_3.setText(QCoreApplication.translate("RegeltestSetup_Rulegroup", u"Multiple choice", None)) - self.spinBox_mchoice.setSuffix(QCoreApplication.translate("RegeltestSetup_Rulegroup", u" out of 8", None)) + def retranslateUi(self, RegeltestSetup_QuestionGroup): + RegeltestSetup_QuestionGroup.setWindowTitle( + QCoreApplication.translate("RegeltestSetup_QuestionGroup", u"Form", None)) + self.label_question_group.setText( + QCoreApplication.translate("RegeltestSetup_QuestionGroup", u"01 - Das Spielfeld", None)) + self.label_2.setText(QCoreApplication.translate("RegeltestSetup_QuestionGroup", u"Textfragen", None)) + self.spinBox_textquestion.setSuffix( + QCoreApplication.translate("RegeltestSetup_QuestionGroup", u" out of 32", None)) + self.label_3.setText(QCoreApplication.translate("RegeltestSetup_QuestionGroup", u"Multiple choice", None)) + self.spinBox_mchoice.setSuffix(QCoreApplication.translate("RegeltestSetup_QuestionGroup", u" out of 8", None)) # retranslateUi - diff --git a/src/ui_rulegroup_editor.py b/src/ui_rulegroup_editor.py deleted file mode 100644 index 2e7bc80..0000000 --- a/src/ui_rulegroup_editor.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################ -## Form generated from reading UI file 'rulegroup_editor.ui' -## -## Created by: Qt User Interface Compiler version 6.2.4 -## -## WARNING! All changes made in this file will be lost when recompiling UI file! -################################################################################ - -from PySide6.QtCore import (QCoreApplication, QMetaObject, Qt) -from PySide6.QtWidgets import (QAbstractSpinBox, QDialogButtonBox, QGridLayout, QLineEdit, QSizePolicy, - QSpinBox) - - -class Ui_RulegroupEditor(object): - def setupUi(self, RulegroupEditor): - if not RulegroupEditor.objectName(): - RulegroupEditor.setObjectName(u"QuestionGroupEditor") - RulegroupEditor.resize(293, 69) - self.gridLayout = QGridLayout(RulegroupEditor) - self.gridLayout.setObjectName(u"gridLayout") - self.rulegroup_name = QLineEdit(RulegroupEditor) - self.rulegroup_name.setObjectName(u"rulegroup_name") - - self.gridLayout.addWidget(self.rulegroup_name, 1, 1, 1, 1) - - self.buttonBox = QDialogButtonBox(RulegroupEditor) - self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok) - - self.gridLayout.addWidget(self.buttonBox, 2, 1, 1, 1) - - self.rulegroup_id = QSpinBox(RulegroupEditor) - self.rulegroup_id.setObjectName(u"rulegroup_id") - sizePolicy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.rulegroup_id.sizePolicy().hasHeightForWidth()) - self.rulegroup_id.setSizePolicy(sizePolicy) - self.rulegroup_id.setMinimum(1) - self.rulegroup_id.setMaximum(99) - self.rulegroup_id.setStepType(QAbstractSpinBox.DefaultStepType) - - self.gridLayout.addWidget(self.rulegroup_id, 1, 0, 1, 1) - - self.retranslateUi(RulegroupEditor) - self.buttonBox.accepted.connect(RulegroupEditor.accept) - self.buttonBox.rejected.connect(RulegroupEditor.reject) - - QMetaObject.connectSlotsByName(RulegroupEditor) - - # setupUi - - def retranslateUi(self, RulegroupEditor): - RulegroupEditor.setWindowTitle(QCoreApplication.translate("QuestionGroupEditor", u"Regelgruppe", None)) - # retranslateUi