excel2moodle 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

excel2moodle/ui/{windowEquationChecker.py → UI_equationChecker.py}

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'equationChecker.ui'
+## Form generated from reading UI file 'UI_equationChecker.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.1
+## Created by: Qt User Interface Compiler version 6.9.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -16,13 +16,15 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QFrame, QGridLayout, QLabel,
-    QLineEdit, QPushButton, QSizePolicy, QSpacerItem,
-    QSpinBox, QTextEdit, QVBoxLayout, QWidget)
+    QLineEdit, QPlainTextEdit, QPushButton, QSizePolicy,
+    QSpacerItem, QSpinBox, QTextEdit, QVBoxLayout,
+    QWidget)
 
 class Ui_EquationChecker(object):
     def setupUi(self, EquationChecker):
         if not EquationChecker.objectName():
             EquationChecker.setObjectName(u"EquationChecker")
+        EquationChecker.setWindowModality(Qt.WindowModality.WindowModal)
         EquationChecker.resize(1213, 898)
         icon = QIcon(QIcon.fromTheme(QIcon.ThemeIcon.ListRemove))
         EquationChecker.setWindowIcon(icon)
@@ -31,56 +33,52 @@ class Ui_EquationChecker(object):
         self.verticalLayout.setObjectName(u"verticalLayout")
         self.gridLayout = QGridLayout()
         self.gridLayout.setObjectName(u"gridLayout")
-        self.label_6 = QLabel(EquationChecker)
-        self.label_6.setObjectName(u"label_6")
-        font = QFont()
-        font.setPointSize(15)
-        self.label_6.setFont(font)
-
-        self.gridLayout.addWidget(self.label_6, 0, 3, 1, 1)
-
-        self.qNumber = QSpinBox(EquationChecker)
-        self.qNumber.setObjectName(u"qNumber")
-        self.qNumber.setMinimumSize(QSize(150, 0))
-
-        self.gridLayout.addWidget(self.qNumber, 2, 1, 1, 1)
-
-        self.lineFirstResult = QLineEdit(EquationChecker)
-        self.lineFirstResult.setObjectName(u"lineFirstResult")
-        self.lineFirstResult.setEnabled(True)
-        font1 = QFont()
-        font1.setBold(True)
-        self.lineFirstResult.setFont(font1)
-        self.lineFirstResult.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.lineFirstResult.setReadOnly(True)
-
-        self.gridLayout.addWidget(self.lineFirstResult, 1, 4, 1, 1)
-
         self.label_2 = QLabel(EquationChecker)
         self.label_2.setObjectName(u"label_2")
         self.label_2.setMinimumSize(QSize(200, 0))
+        self.label_2.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
-        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_2, 3, 0, 1, 1)
 
-        self.catNumber = QSpinBox(EquationChecker)
-        self.catNumber.setObjectName(u"catNumber")
+        self.equationText = QPlainTextEdit(EquationChecker)
+        self.equationText.setObjectName(u"equationText")
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.equationText.sizePolicy().hasHeightForWidth())
+        self.equationText.setSizePolicy(sizePolicy)
+        self.equationText.setMinimumSize(QSize(0, 20))
+        self.equationText.setBaseSize(QSize(0, 20))
 
-        self.gridLayout.addWidget(self.catNumber, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.equationText, 3, 1, 1, 1)
 
-        self.label_3 = QLabel(EquationChecker)
-        self.label_3.setObjectName(u"label_3")
+        self.label_4 = QLabel(EquationChecker)
+        self.label_4.setObjectName(u"label_4")
 
-        self.gridLayout.addWidget(self.label_3, 1, 3, 1, 1)
+        self.gridLayout.addWidget(self.label_4, 4, 3, 1, 1)
 
-        self.label_5 = QLabel(EquationChecker)
-        self.label_5.setObjectName(u"label_5")
-        self.label_5.setFont(font)
+        self.lineCalculatedRes = QLineEdit(EquationChecker)
+        self.lineCalculatedRes.setObjectName(u"lineCalculatedRes")
+        font = QFont()
+        font.setBold(True)
+        self.lineCalculatedRes.setFont(font)
+        self.lineCalculatedRes.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.lineCalculatedRes.setReadOnly(True)
+        self.lineCalculatedRes.setClearButtonEnabled(False)
 
-        self.gridLayout.addWidget(self.label_5, 0, 1, 1, 1)
+        self.gridLayout.addWidget(self.lineCalculatedRes, 4, 4, 1, 1)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+        self.lineCheckResult = QLineEdit(EquationChecker)
+        self.lineCheckResult.setObjectName(u"lineCheckResult")
+        font1 = QFont()
+        font1.setBold(True)
+        font1.setItalic(True)
+        self.lineCheckResult.setFont(font1)
+        self.lineCheckResult.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
+        self.lineCheckResult.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.lineCheckResult.setReadOnly(True)
 
-        self.gridLayout.addItem(self.horizontalSpacer, 1, 2, 1, 1)
+        self.gridLayout.addWidget(self.lineCheckResult, 5, 4, 1, 1)
 
         self.buttonRunCheck = QPushButton(EquationChecker)
         self.buttonRunCheck.setObjectName(u"buttonRunCheck")
@@ -89,7 +87,7 @@ class Ui_EquationChecker(object):
         font2.setBold(True)
         self.buttonRunCheck.setFont(font2)
 
-        self.gridLayout.addWidget(self.buttonRunCheck, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.buttonRunCheck, 5, 1, 1, 1)
 
         self.label_8 = QLabel(EquationChecker)
         self.label_8.setObjectName(u"label_8")
@@ -97,39 +95,60 @@ class Ui_EquationChecker(object):
         font3.setPointSize(12)
         self.label_8.setFont(font3)
 
-        self.gridLayout.addWidget(self.label_8, 4, 3, 1, 1)
+        self.gridLayout.addWidget(self.label_8, 5, 3, 1, 1)
 
-        self.lineCheckResult = QLineEdit(EquationChecker)
-        self.lineCheckResult.setObjectName(u"lineCheckResult")
-        font4 = QFont()
-        font4.setBold(True)
-        font4.setItalic(True)
-        self.lineCheckResult.setFont(font4)
-        self.lineCheckResult.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.lineCheckResult.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.lineCheckResult.setReadOnly(True)
+        self.variableText = QTextEdit(EquationChecker)
+        self.variableText.setObjectName(u"variableText")
 
-        self.gridLayout.addWidget(self.lineCheckResult, 4, 4, 1, 1)
+        self.gridLayout.addWidget(self.variableText, 3, 3, 1, 1)
 
-        self.lineCalculatedRes = QLineEdit(EquationChecker)
-        self.lineCalculatedRes.setObjectName(u"lineCalculatedRes")
-        self.lineCalculatedRes.setFont(font1)
-        self.lineCalculatedRes.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.lineCalculatedRes.setReadOnly(True)
-        self.lineCalculatedRes.setClearButtonEnabled(False)
+        self.label_9 = QLabel(EquationChecker)
+        self.label_9.setObjectName(u"label_9")
+        self.label_9.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
-        self.gridLayout.addWidget(self.lineCalculatedRes, 3, 4, 1, 1)
+        self.gridLayout.addWidget(self.label_9, 3, 2, 1, 1)
 
-        self.label_4 = QLabel(EquationChecker)
-        self.label_4.setObjectName(u"label_4")
+        self.label_10 = QLabel(EquationChecker)
+        self.label_10.setObjectName(u"label_10")
+
+        self.gridLayout.addWidget(self.label_10, 2, 0, 1, 1)
+
+        self.answerPart = QSpinBox(EquationChecker)
+        self.answerPart.setObjectName(u"answerPart")
+
+        self.gridLayout.addWidget(self.answerPart, 2, 1, 1, 1)
+
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.gridLayout.addItem(self.horizontalSpacer, 2, 2, 1, 1)
+
+        self.label_3 = QLabel(EquationChecker)
+        self.label_3.setObjectName(u"label_3")
+
+        self.gridLayout.addWidget(self.label_3, 2, 3, 1, 1)
+
+        self.lineFirstResult = QLineEdit(EquationChecker)
+        self.lineFirstResult.setObjectName(u"lineFirstResult")
+        self.lineFirstResult.setEnabled(True)
+        self.lineFirstResult.setFont(font)
+        self.lineFirstResult.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.lineFirstResult.setReadOnly(True)
+
+        self.gridLayout.addWidget(self.lineFirstResult, 2, 4, 1, 1)
 
-        self.gridLayout.addWidget(self.label_4, 3, 3, 1, 1)
+        self.label_6 = QLabel(EquationChecker)
+        self.label_6.setObjectName(u"label_6")
+        font4 = QFont()
+        font4.setPointSize(15)
+        self.label_6.setFont(font4)
 
-        self.label = QLabel(EquationChecker)
-        self.label.setObjectName(u"label")
-        self.label.setMinimumSize(QSize(100, 0))
+        self.gridLayout.addWidget(self.label_6, 1, 3, 1, 1)
+
+        self.label_5 = QLabel(EquationChecker)
+        self.label_5.setObjectName(u"label_5")
+        self.label_5.setFont(font4)
 
-        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_5, 1, 1, 1, 1)
 
 
         self.verticalLayout.addLayout(self.gridLayout)
@@ -169,19 +188,20 @@ class Ui_EquationChecker(object):
 
     def retranslateUi(self, EquationChecker):
         EquationChecker.setWindowTitle(QCoreApplication.translate("EquationChecker", u"Equation Checker", None))
-        self.label_6.setText(QCoreApplication.translate("EquationChecker", u"Output", None))
+        self.label_2.setText(QCoreApplication.translate("EquationChecker", u"Equation:", None))
+        self.label_4.setText(QCoreApplication.translate("EquationChecker", u"calculated first Result", None))
+        self.lineCalculatedRes.setText(QCoreApplication.translate("EquationChecker", u"0.00", None))
+        self.lineCheckResult.setText("")
+        self.lineCheckResult.setPlaceholderText(QCoreApplication.translate("EquationChecker", u"waiting for check", None))
+        self.buttonRunCheck.setText(QCoreApplication.translate("EquationChecker", u"Run Check now", None))
+        self.label_8.setText(QCoreApplication.translate("EquationChecker", u"Check", None))
+        self.label_9.setText(QCoreApplication.translate("EquationChecker", u"Variables:", None))
+        self.label_10.setText(QCoreApplication.translate("EquationChecker", u"Answer Part (Cloze)", None))
+        self.label_3.setText(QCoreApplication.translate("EquationChecker", u"firstResult from spreadsheet", None))
         self.lineFirstResult.setText(QCoreApplication.translate("EquationChecker", u"0.00", None))
         self.lineFirstResult.setPlaceholderText(QCoreApplication.translate("EquationChecker", u"waiting", None))
-        self.label_2.setText(QCoreApplication.translate("EquationChecker", u"Question Number", None))
-        self.label_3.setText(QCoreApplication.translate("EquationChecker", u"firstResult from spreadsheet", None))
+        self.label_6.setText(QCoreApplication.translate("EquationChecker", u"Output", None))
         self.label_5.setText(QCoreApplication.translate("EquationChecker", u"Input", None))
-        self.buttonRunCheck.setText(QCoreApplication.translate("EquationChecker", u"Run Check now", None))
-        self.label_8.setText(QCoreApplication.translate("EquationChecker", u"Check", None))
-        self.lineCheckResult.setText("")
-        self.lineCheckResult.setPlaceholderText(QCoreApplication.translate("EquationChecker", u"waiting for check", None))
-        self.lineCalculatedRes.setText(QCoreApplication.translate("EquationChecker", u"0.00", None))
-        self.label_4.setText(QCoreApplication.translate("EquationChecker", u"calculated first Result", None))
-        self.label.setText(QCoreApplication.translate("EquationChecker", u"Category Number", None))
         self.label_7.setText(QCoreApplication.translate("EquationChecker", u"Calculated Values with corresponding properties", None))
     # retranslateUi
 

excel2moodle/ui/{exportSettingsDialog.py → UI_exportSettingsDialog.py}

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'exportSettingsDialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.0
+## Created by: Qt User Interface Compiler version 6.9.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -15,8 +15,9 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QAbstractButton, QApplication, QCheckBox, QDialog,
-    QDialogButtonBox, QFormLayout, QHBoxLayout, QLabel,
+from PySide6.QtWidgets import (QAbstractButton, QAbstractSpinBox, QApplication, QCheckBox,
+    QDialog, QDialogButtonBox, QDoubleSpinBox, QFormLayout,
+    QFrame, QHBoxLayout, QLabel, QPushButton,
     QSizePolicy, QSpinBox, QWidget)
 
 class Ui_ExportDialog(object):
@@ -49,6 +50,51 @@ class Ui_ExportDialog(object):
 
         self.formLayout_2.setWidget(1, QFormLayout.ItemRole.FieldRole, self.checkBoxIncludeCategories)
 
+        self.label = QLabel(ExportDialog)
+        self.label.setObjectName(u"label")
+
+        self.formLayout_2.setWidget(2, QFormLayout.ItemRole.LabelRole, self.label)
+
+        self.btnExportFile = QPushButton(ExportDialog)
+        self.btnExportFile.setObjectName(u"btnExportFile")
+        self.btnExportFile.setMinimumSize(QSize(200, 0))
+
+        self.formLayout_2.setWidget(2, QFormLayout.ItemRole.FieldRole, self.btnExportFile)
+
+        self.line_2 = QFrame(ExportDialog)
+        self.line_2.setObjectName(u"line_2")
+        self.line_2.setFrameShape(QFrame.Shape.HLine)
+        self.line_2.setFrameShadow(QFrame.Shadow.Sunken)
+
+        self.formLayout_2.setWidget(3, QFormLayout.ItemRole.LabelRole, self.line_2)
+
+        self.label_2 = QLabel(ExportDialog)
+        self.label_2.setObjectName(u"label_2")
+        font = QFont()
+        font.setPointSize(12)
+        self.label_2.setFont(font)
+
+        self.formLayout_2.setWidget(4, QFormLayout.ItemRole.LabelRole, self.label_2)
+
+        self.questionCount = QSpinBox(ExportDialog)
+        self.questionCount.setObjectName(u"questionCount")
+        self.questionCount.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.questionCount.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.NoButtons)
+        self.questionCount.setMaximum(999)
+
+        self.formLayout_2.setWidget(5, QFormLayout.ItemRole.LabelRole, self.questionCount)
+
+        self.pointCount = QDoubleSpinBox(ExportDialog)
+        self.pointCount.setObjectName(u"pointCount")
+        self.pointCount.setLayoutDirection(Qt.LayoutDirection.RightToLeft)
+        self.pointCount.setAutoFillBackground(True)
+        self.pointCount.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.pointCount.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.NoButtons)
+        self.pointCount.setDecimals(1)
+        self.pointCount.setMaximum(1000.000000000000000)
+
+        self.formLayout_2.setWidget(5, QFormLayout.ItemRole.FieldRole, self.pointCount)
+
 
         self.horizontalLayout.addLayout(self.formLayout_2)
 
@@ -73,7 +119,12 @@ class Ui_ExportDialog(object):
 #if QT_CONFIG(tooltip)
         self.label_9.setToolTip(QCoreApplication.translate("ExportDialog", u"If enabled, all questions will be categorized, when importing into moodle. Otherwise they will all be imported into one category", None))
 #endif // QT_CONFIG(tooltip)
-        self.label_9.setText(QCoreApplication.translate("ExportDialog", u"Include Questions in Categories", None))
+        self.label_9.setText(QCoreApplication.translate("ExportDialog", u"Include Categories", None))
         self.checkBoxIncludeCategories.setText("")
+        self.label.setText(QCoreApplication.translate("ExportDialog", u"Export File:", None))
+        self.btnExportFile.setText("")
+        self.label_2.setText(QCoreApplication.translate("ExportDialog", u"Export Information:", None))
+        self.questionCount.setSuffix(QCoreApplication.translate("ExportDialog", u"   Qst.", None))
+        self.pointCount.setSuffix(QCoreApplication.translate("ExportDialog", u"  Pts.", None))
     # retranslateUi
 

excel2moodle/ui/{windowMain.py → UI_mainWindow.py}

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'mainWindow.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.0
+## Created by: Qt User Interface Compiler version 6.9.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -20,9 +20,9 @@ from PySide6.QtWidgets import (QAbstractItemView, QAbstractSpinBox, QApplication
     QDoubleSpinBox, QFormLayout, QFrame, QGraphicsView,
     QGridLayout, QHeaderView, QLabel, QLayout,
     QLineEdit, QMainWindow, QMenu, QMenuBar,
-    QPushButton, QSizePolicy, QSplitter, QStatusBar,
-    QTextEdit, QToolBar, QTreeWidget, QTreeWidgetItem,
-    QVBoxLayout, QWidget)
+    QPushButton, QSizePolicy, QSpinBox, QSplitter,
+    QStatusBar, QTextEdit, QToolBar, QTreeWidget,
+    QTreeWidgetItem, QVBoxLayout, QWidget)
 
 class Ui_MoodleTestGenerator(object):
     def setupUi(self, MoodleTestGenerator):
@@ -78,30 +78,20 @@ class Ui_MoodleTestGenerator(object):
         self.gridLayout = QGridLayout()
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setVerticalSpacing(6)
-        self.line_4 = QFrame(self.layoutWidget)
-        self.line_4.setObjectName(u"line_4")
-        self.line_4.setFrameShape(QFrame.Shape.VLine)
-        self.line_4.setFrameShadow(QFrame.Shadow.Sunken)
+        self.buttonExport = QPushButton(self.layoutWidget)
+        self.buttonExport.setObjectName(u"buttonExport")
 
-        self.gridLayout.addWidget(self.line_4, 1, 3, 1, 1)
+        self.gridLayout.addWidget(self.buttonExport, 0, 2, 1, 1)
 
         self.checkBoxQuestionListSelectAll = QCheckBox(self.layoutWidget)
         self.checkBoxQuestionListSelectAll.setObjectName(u"checkBoxQuestionListSelectAll")
 
         self.gridLayout.addWidget(self.checkBoxQuestionListSelectAll, 1, 0, 1, 1)
 
-        self.questionCounter = QDoubleSpinBox(self.layoutWidget)
-        self.questionCounter.setObjectName(u"questionCounter")
-        self.questionCounter.setMaximumSize(QSize(120, 16777215))
-        font = QFont()
-        font.setPointSize(13)
-        self.questionCounter.setFont(font)
-        self.questionCounter.setReadOnly(True)
-        self.questionCounter.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.NoButtons)
-        self.questionCounter.setDecimals(0)
-        self.questionCounter.setMaximum(300.000000000000000)
+        self.buttonSpreadsheet = QPushButton(self.layoutWidget)
+        self.buttonSpreadsheet.setObjectName(u"buttonSpreadsheet")
 
-        self.gridLayout.addWidget(self.questionCounter, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.buttonSpreadsheet, 0, 0, 1, 1)
 
         self.pointCounter = QDoubleSpinBox(self.layoutWidget)
         self.pointCounter.setObjectName(u"pointCounter")
@@ -113,10 +103,10 @@ class Ui_MoodleTestGenerator(object):
         self.pointCounter.setSizePolicy(sizePolicy)
         self.pointCounter.setMaximumSize(QSize(120, 16777215))
         self.pointCounter.setBaseSize(QSize(190, 0))
-        font1 = QFont()
-        font1.setPointSize(13)
-        font1.setBold(False)
-        self.pointCounter.setFont(font1)
+        font = QFont()
+        font.setPointSize(12)
+        font.setBold(False)
+        self.pointCounter.setFont(font)
         self.pointCounter.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
         self.pointCounter.setAutoFillBackground(False)
         self.pointCounter.setInputMethodHints(Qt.InputMethodHint.ImhNone)
@@ -129,15 +119,22 @@ class Ui_MoodleTestGenerator(object):
 
         self.gridLayout.addWidget(self.pointCounter, 1, 2, 1, 1)
 
-        self.buttonSpreadsheet = QPushButton(self.layoutWidget)
-        self.buttonSpreadsheet.setObjectName(u"buttonSpreadsheet")
+        self.line_4 = QFrame(self.layoutWidget)
+        self.line_4.setObjectName(u"line_4")
+        self.line_4.setFrameShape(QFrame.Shape.VLine)
+        self.line_4.setFrameShadow(QFrame.Shadow.Sunken)
 
-        self.gridLayout.addWidget(self.buttonSpreadsheet, 0, 0, 1, 1)
+        self.gridLayout.addWidget(self.line_4, 1, 3, 1, 1)
 
-        self.buttonExport = QPushButton(self.layoutWidget)
-        self.buttonExport.setObjectName(u"buttonExport")
+        self.questionCounter = QSpinBox(self.layoutWidget)
+        self.questionCounter.setObjectName(u"questionCounter")
+        self.questionCounter.setMaximumSize(QSize(120, 16777215))
+        font1 = QFont()
+        font1.setPointSize(12)
+        self.questionCounter.setFont(font1)
+        self.questionCounter.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.NoButtons)
 
-        self.gridLayout.addWidget(self.buttonExport, 0, 2, 1, 1)
+        self.gridLayout.addWidget(self.questionCounter, 1, 1, 1, 1)
 
 
         self.verticalLayout_4.addLayout(self.gridLayout)
@@ -335,22 +332,18 @@ class Ui_MoodleTestGenerator(object):
 #if QT_CONFIG(shortcut)
         self.actionDocumentation.setShortcut(QCoreApplication.translate("MoodleTestGenerator", u"F1", None))
 #endif // QT_CONFIG(shortcut)
-        self.checkBoxQuestionListSelectAll.setText(QCoreApplication.translate("MoodleTestGenerator", u"Select all", None))
 #if QT_CONFIG(tooltip)
-        self.questionCounter.setToolTip(QCoreApplication.translate("MoodleTestGenerator", u"The number of selected questions", None))
+        self.buttonExport.setToolTip(QCoreApplication.translate("MoodleTestGenerator", u"Export the selected questions  to a xml file", None))
 #endif // QT_CONFIG(tooltip)
-        self.questionCounter.setPrefix("")
-        self.questionCounter.setSuffix(QCoreApplication.translate("MoodleTestGenerator", u"  Qst.", None))
+        self.buttonExport.setText(QCoreApplication.translate("MoodleTestGenerator", u"Export", None))
+        self.checkBoxQuestionListSelectAll.setText(QCoreApplication.translate("MoodleTestGenerator", u"Select all", None))
+        self.buttonSpreadsheet.setText(QCoreApplication.translate("MoodleTestGenerator", u"Open Spreadsheet", None))
 #if QT_CONFIG(tooltip)
         self.pointCounter.setToolTip(QCoreApplication.translate("MoodleTestGenerator", u"The total number of points of all selected questions.", None))
 #endif // QT_CONFIG(tooltip)
         self.pointCounter.setPrefix("")
         self.pointCounter.setSuffix(QCoreApplication.translate("MoodleTestGenerator", u"  Pts.", None))
-        self.buttonSpreadsheet.setText(QCoreApplication.translate("MoodleTestGenerator", u"Open Spreadsheet", None))
-#if QT_CONFIG(tooltip)
-        self.buttonExport.setToolTip(QCoreApplication.translate("MoodleTestGenerator", u"Export the selected questions  to a xml file", None))
-#endif // QT_CONFIG(tooltip)
-        self.buttonExport.setText(QCoreApplication.translate("MoodleTestGenerator", u"Export", None))
+        self.questionCounter.setSuffix(QCoreApplication.translate("MoodleTestGenerator", u"   Qst.", None))
         ___qtreewidgetitem = self.treeWidget.headerItem()
         ___qtreewidgetitem.setText(3, QCoreApplication.translate("MoodleTestGenerator", u"Variants", None));
         ___qtreewidgetitem.setText(2, QCoreApplication.translate("MoodleTestGenerator", u"Points", None));

excel2moodle/ui/appUi.py

@@ -13,15 +13,15 @@ from PySide6.QtCore import QRunnable, Qt, QThreadPool
 from excel2moodle import mainLogger
 from excel2moodle.core.category import Category
 from excel2moodle.core.dataStructure import QuestionDB
-from excel2moodle.core.settings import Settings, SettingsKey
-from excel2moodle.extra import equationVerification as eqVerif
+from excel2moodle.core.settings import Settings, Tags
 from excel2moodle.logger import LogWindowHandler
+from excel2moodle.question_types.mc import MCQuestion
+from excel2moodle.question_types.nf import NFQuestion
 from excel2moodle.ui import dialogs
+from excel2moodle.ui.equationChecker import EqCheckerWindow
 from excel2moodle.ui.treewidget import CategoryItem, QuestionItem
+from excel2moodle.ui.UI_mainWindow import Ui_MoodleTestGenerator
 from excel2moodle.ui.windowDoc import DocumentationWindow
-from excel2moodle.ui.windowMain import Ui_MoodleTestGenerator
-
-from .windowEquationChecker import Ui_EquationChecker
 
 logger = logging.getLogger(__name__)
 
@@ -41,6 +41,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.setupUi(self)
         self.exportDialog = dialogs.ExportDialog(self)
         self.questionPreview = dialogs.QuestionPreview(self)
+        self.eqChecker = EqCheckerWindow()
         self.connectEvents()
         logger.info("Settings are stored under: %s", self.settings.fileName())
         self.ui.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
@@ -48,10 +49,10 @@ class MainWindow(QtWidgets.QMainWindow):
             QtWidgets.QHeaderView.ResizeToContents,
         )
         self.exportDialog.ui.checkBoxIncludeCategories.setChecked(
-            self.settings.get(SettingsKey.INCLUDEINCATS),
+            self.settings.get(Tags.INCLUDEINCATS),
         )
         self.exportDialog.ui.spinBoxDefaultQVariant.setValue(
-            self.settings.get(SettingsKey.QUESTIONVARIANT)
+            self.settings.get(Tags.QUESTIONVARIANT)
         )
         self.ui.pointCounter.setReadOnly(True)
         self.ui.questionCounter.setReadOnly(True)
@@ -91,7 +92,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     @QtCore.Slot()
     def setQVariantDefault(self, value: int) -> None:
-        self.settings.set(SettingsKey.QUESTIONVARIANT, value)
+        self.settings.set(Tags.QUESTIONVARIANT, value)
 
     @QtCore.Slot()
     def parseSpreadsheetAll(self) -> None:
@@ -110,9 +111,9 @@ class MainWindow(QtWidgets.QMainWindow):
         logger.debug("Slot, new Spreadsheet triggered")
         self.spreadSheetPath = sheet
         self.mainPath = sheet.parent
-        svgFolder = self.mainPath / self.settings.get(SettingsKey.PICTURESUBFOLDER)
+        svgFolder = self.mainPath / self.settings.get(Tags.PICTURESUBFOLDER)
         svgFolder.resolve()
-        self.settings.set(SettingsKey.PICTUREFOLDER, svgFolder)
+        self.settings.set(Tags.PICTUREFOLDER, svgFolder)
         self.ui.buttonSpreadsheet.setText(f"../{sheet.name}")
         self.parseSpreadsheetAll()
 
@@ -121,9 +122,9 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def setIncludeCategoriesSetting(self) -> None:
         if self.exportDialog.ui.checkBoxIncludeCategories.isChecked():
-            self.settings.set(SettingsKey.INCLUDEINCATS, True)
+            self.settings.set(Tags.INCLUDEINCATS, True)
         else:
-            self.settings.set(SettingsKey.INCLUDEINCATS, False)
+            self.settings.set(Tags.INCLUDEINCATS, False)
 
     def closeEvent(self, event) -> None:
         self.settings.setValue("windowSize", self.size())
@@ -140,6 +141,8 @@ class MainWindow(QtWidgets.QMainWindow):
             count += q.getQuestion().points
         self.ui.pointCounter.setValue(count)
         self.ui.questionCounter.setValue(questions)
+        if self.eqChecker.isVisible():
+            self.openEqCheckerDlg()
 
     @QtCore.Slot()
     def toggleQuestionSelectionState(self, state) -> None:
@@ -154,17 +157,16 @@ class MainWindow(QtWidgets.QMainWindow):
     @QtCore.Slot()
     def onButGenTest(self) -> None:
         """Open a file Dialog so the export file may be choosen."""
-        self.exportDialog.exec()
-        path = QtWidgets.QFileDialog.getSaveFileName(
-            self,
-            "Select Output File",
-            dir=f"{self.mainPath / 'Testfile.xml'}",
-            filter="xml Files (*.xml)",
-        )
-        self.exportFile = Path(path[0])
-        logger.info("New Export File is set %s", self.exportFile)
         selection: list[QuestionItem] = self.ui.treeWidget.selectedItems()
-        self.testDB.appendQuestions(selection, self.exportFile)
+        self.exportDialog.exportFile = Path(self.mainPath / "TestFile.xml")
+        self.exportDialog.ui.questionCount.setValue(self.ui.questionCounter.value())
+        self.exportDialog.ui.pointCount.setValue(self.ui.pointCounter.value())
+        if self.exportDialog.exec():
+            self.exportFile = self.exportDialog.exportFile
+            logger.info("New Export File is set %s", self.exportFile)
+            self.testDB.appendQuestions(selection, self.exportFile)
+        else:
+            logger.info("Aborting Export")
 
     @QtCore.Slot()
     def actionSpreadsheet(self) -> None:
@@ -206,10 +208,17 @@ class MainWindow(QtWidgets.QMainWindow):
 
     @QtCore.Slot()
     def openEqCheckerDlg(self) -> None:
-        logger.debug("opening wEquationChecker \n")
-        self.uiEqChecker = EqCheckerWindow()
-        self.uiEqChecker.excelFile = self.excelPath
-        self.uiEqChecker.show()
+        item = self.ui.treeWidget.currentItem()
+        if isinstance(item, QuestionItem):
+            question = item.getQuestion()
+            if isinstance(question, (NFQuestion, MCQuestion)):
+                logger.debug("Can't check an MC or NF Question")
+            else:
+                logger.debug("opening wEquationChecker \n")
+                self.eqChecker.setup(item.getQuestion())
+                self.eqChecker.show()
+        else:
+            logger.debug("No Question Item selected: %s", type(item))
 
     @QtCore.Slot()
     def openAboutDlg(self) -> None:
@@ -242,43 +251,3 @@ class ParseAllThread(QRunnable):
         self.testDB.asyncInitAllCategories(self.mainApp.spreadSheetPath)
         self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
         self.testDB.parseAllQuestions()
-
-
-class EqCheckerWindow(QtWidgets.QWidget):
-    def __init__(self) -> None:
-        super().__init__()
-        self.excelFile = Path()
-        self.ui = Ui_EquationChecker()
-        self.ui.setupUi(self)
-        self.ui.buttonRunCheck.clicked.connect(
-            lambda: self.onButRunCheck(
-                self.ui.catNumber.value(),
-                self.ui.qNumber.value(),
-            ),
-        )
-
-    def onButRunCheck(self, catN: int, qN: int) -> None:
-        """Is Triggered by the ``Run Check now`` Button and runs the Equation Check."""
-        self.ui.textResultsOutput.clear()
-        bullets, results, firstResult = eqVerif.equationChecker(
-            f"KAT_{catN}",
-            qN,
-            self.excelFile,
-        )
-        check = False
-        self.ui.lineFirstResult.setText(f"{firstResult}")
-        for i, calculation in enumerate(results):
-            if i == 0 and firstResult != 0:
-                check = eqVerif.checkResult(firstResult, calculation)
-                self.ui.lineCalculatedRes.setText(f"{calculation}")
-            self.ui.textResultsOutput.append(
-                f"Ergebnis {i + 1}: \t{calculation}\n\tMit den Werten: \n{bullets[i]}\n",
-            )
-
-        if check:
-            self.ui.lineCheckResult.setText("[OK]")
-            logger.info(
-                "Das erste berechnete Ergebnis stimmt mit dem Wert in 'firstResult' überein\n",
-            )
-        else:
-            self.ui.lineCheckResult.setText("[ERROR]")