diff --git a/ui/designer/components/scoreEditor.ui b/ui/designer/components/scoreEditor.ui index 602b0c5..d96eeb9 100644 --- a/ui/designer/components/scoreEditor.ui +++ b/ui/designer/components/scoreEditor.ui @@ -6,14 +6,89 @@ 0 0 - 450 - 350 + 400 + 322 ScoreEditor + + + + formLabel.score + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Clear Type + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + ID + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + false + + + + + + + + 0 + 0 + + + + QLabel { color: gray } + + + None + + + + + + + false + + + + 100 + 0 + + + + 0 + + + 0 + + + 0 + + + @@ -21,7 +96,51 @@ - + + + + formLabel.date + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + warnIfIncomplete + + + + + + + formLabel.preview + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + MAX RECALL + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + setNone + + + + @@ -37,48 +156,8 @@ - - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - commitButton - - - - - - - false - - - - 100 - 0 - - - - - - + + 100 @@ -93,26 +172,6 @@ - - - - formLabel.score - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - setNone - - - true - - - @@ -120,23 +179,10 @@ - - - - Clear Type - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - FAR - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + false @@ -156,73 +202,6 @@ - - - - idAutoInsert - - - - - - - formLabel.date - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Modifier - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - setNone - - - true - - - - - - - setNone - - - true - - - - - - - ID - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - PURE - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -233,7 +212,81 @@ + + + + commitButton + + + + + + setNone + + + true + + + + + + + Modifier + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + false + + + + 100 + 0 + + + + + + + + setNone + + + true + + + + + + + formLabel.comment + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + idAutoInsert + + + + + + + setNone + + + + setNone @@ -259,40 +312,13 @@ - - - - false - - - - - + + setNone - - - - - - setNone - - - - - - - - 100 - 0 - - - - 0 - - - 0 + + true @@ -303,18 +329,18 @@ - - + + - warnIfIncomplete + FAR + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - false - + + 100 @@ -327,60 +353,18 @@ 0 - - 0 - - - + + - formLabel.comment + PURE Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - MAX RECALL - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - formLabel.preview - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - QLabel { color: gray } - - - None - - - true - - - diff --git a/ui/designer/components/scoreEditor_ui.py b/ui/designer/components/scoreEditor_ui.py index cbd9148..e846e0c 100644 --- a/ui/designer/components/scoreEditor_ui.py +++ b/ui/designer/components/scoreEditor_ui.py @@ -17,7 +17,7 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QPalette, QPixmap, QRadialGradient, QTransform) from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDateTimeEdit, QGridLayout, QLabel, QLineEdit, QPushButton, - QSizePolicy, QSpacerItem, QSpinBox, QWidget) + QSizePolicy, QSpinBox, QWidget) from ui.implements.components.focusSelectAllLineEdit import FocusSelectAllLineEdit @@ -25,126 +25,22 @@ class Ui_ScoreEditor(object): def setupUi(self, ScoreEditor): if not ScoreEditor.objectName(): ScoreEditor.setObjectName(u"ScoreEditor") - ScoreEditor.resize(450, 350) + ScoreEditor.resize(400, 322) ScoreEditor.setWindowTitle(u"ScoreEditor") self.gridLayout = QGridLayout(ScoreEditor) self.gridLayout.setObjectName(u"gridLayout") - self.scoreLineEdit = FocusSelectAllLineEdit(ScoreEditor) - self.scoreLineEdit.setObjectName(u"scoreLineEdit") - self.scoreLineEdit.setInputMask(u"B9'999'999;_") - - self.gridLayout.addWidget(self.scoreLineEdit, 1, 1, 1, 1) - - self.validateLabel = QLabel(ScoreEditor) - self.validateLabel.setObjectName(u"validateLabel") - sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.validateLabel.sizePolicy().hasHeightForWidth()) - self.validateLabel.setSizePolicy(sizePolicy) - self.validateLabel.setText(u"...") - self.validateLabel.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.validateLabel, 13, 1, 1, 1) - - self.commentLineEdit = QLineEdit(ScoreEditor) - self.commentLineEdit.setObjectName(u"commentLineEdit") - self.commentLineEdit.setEnabled(False) - - self.gridLayout.addWidget(self.commentLineEdit, 11, 1, 1, 1) - - self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) - - self.gridLayout.addItem(self.verticalSpacer, 6, 1, 1, 1) - - self.commitButton = QPushButton(ScoreEditor) - self.commitButton.setObjectName(u"commitButton") - - self.gridLayout.addWidget(self.commitButton, 13, 2, 1, 1) - - self.clearTypeComboBox = QComboBox(ScoreEditor) - self.clearTypeComboBox.setObjectName(u"clearTypeComboBox") - self.clearTypeComboBox.setEnabled(False) - self.clearTypeComboBox.setMinimumSize(QSize(100, 0)) - - self.gridLayout.addWidget(self.clearTypeComboBox, 10, 1, 1, 1) - - self.farSpinBox = QSpinBox(ScoreEditor) - self.farSpinBox.setObjectName(u"farSpinBox") - self.farSpinBox.setMinimumSize(QSize(100, 0)) - self.farSpinBox.setMinimum(0) - self.farSpinBox.setMaximum(0) - - self.gridLayout.addWidget(self.farSpinBox, 3, 1, 1, 1) - self.label = QLabel(ScoreEditor) self.label.setObjectName(u"label") self.label.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - self.commentNoneCheckBox = QCheckBox(ScoreEditor) - self.commentNoneCheckBox.setObjectName(u"commentNoneCheckBox") - self.commentNoneCheckBox.setChecked(True) - - self.gridLayout.addWidget(self.commentNoneCheckBox, 11, 2, 1, 1) - - self.farNoneCheckBox = QCheckBox(ScoreEditor) - self.farNoneCheckBox.setObjectName(u"farNoneCheckBox") - - self.gridLayout.addWidget(self.farNoneCheckBox, 3, 2, 1, 1) - self.label_8 = QLabel(ScoreEditor) self.label_8.setObjectName(u"label_8") self.label_8.setText(u"Clear Type") self.label_8.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - self.gridLayout.addWidget(self.label_8, 10, 0, 1, 1) - - self.label_3 = QLabel(ScoreEditor) - self.label_3.setObjectName(u"label_3") - self.label_3.setText(u"FAR") - self.label_3.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) - - self.lostSpinBox = QSpinBox(ScoreEditor) - self.lostSpinBox.setObjectName(u"lostSpinBox") - self.lostSpinBox.setMinimumSize(QSize(100, 0)) - self.lostSpinBox.setMinimum(0) - self.lostSpinBox.setMaximum(0) - - self.gridLayout.addWidget(self.lostSpinBox, 4, 1, 1, 1) - - self.idLabel = QLabel(ScoreEditor) - self.idLabel.setObjectName(u"idLabel") - - self.gridLayout.addWidget(self.idLabel, 0, 1, 1, 1) - - self.label_5 = QLabel(ScoreEditor) - self.label_5.setObjectName(u"label_5") - self.label_5.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_5, 5, 0, 1, 1) - - self.label_7 = QLabel(ScoreEditor) - self.label_7.setObjectName(u"label_7") - self.label_7.setText(u"Modifier") - self.label_7.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_7, 9, 0, 1, 1) - - self.maxRecallNoneCheckBox = QCheckBox(ScoreEditor) - self.maxRecallNoneCheckBox.setObjectName(u"maxRecallNoneCheckBox") - self.maxRecallNoneCheckBox.setChecked(True) - - self.gridLayout.addWidget(self.maxRecallNoneCheckBox, 8, 2, 1, 1) - - self.clearTypeNoneCheckBox = QCheckBox(ScoreEditor) - self.clearTypeNoneCheckBox.setObjectName(u"clearTypeNoneCheckBox") - self.clearTypeNoneCheckBox.setChecked(True) - - self.gridLayout.addWidget(self.clearTypeNoneCheckBox, 10, 2, 1, 1) + self.gridLayout.addWidget(self.label_8, 9, 0, 1, 1) self.label_10 = QLabel(ScoreEditor) self.label_10.setObjectName(u"label_10") @@ -153,71 +49,23 @@ class Ui_ScoreEditor(object): self.gridLayout.addWidget(self.label_10, 0, 0, 1, 1) - self.label_2 = QLabel(ScoreEditor) - self.label_2.setObjectName(u"label_2") - self.label_2.setText(u"PURE") - self.label_2.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) - - self.label_4 = QLabel(ScoreEditor) - self.label_4.setObjectName(u"label_4") - self.label_4.setText(u"LOST") - self.label_4.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1) - - self.modifierNoneCheckBox = QCheckBox(ScoreEditor) - self.modifierNoneCheckBox.setObjectName(u"modifierNoneCheckBox") - self.modifierNoneCheckBox.setChecked(True) - - self.gridLayout.addWidget(self.modifierNoneCheckBox, 9, 2, 1, 1) - - self.dateTimeEdit = QDateTimeEdit(ScoreEditor) - self.dateTimeEdit.setObjectName(u"dateTimeEdit") - sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) - sizePolicy1.setHorizontalStretch(0) - sizePolicy1.setVerticalStretch(0) - sizePolicy1.setHeightForWidth(self.dateTimeEdit.sizePolicy().hasHeightForWidth()) - self.dateTimeEdit.setSizePolicy(sizePolicy1) - self.dateTimeEdit.setDisplayFormat(u"yyyy/MM/dd HH:mm:ss") - self.dateTimeEdit.setCalendarPopup(False) - - self.gridLayout.addWidget(self.dateTimeEdit, 5, 1, 1, 1) - self.modifierComboBox = QComboBox(ScoreEditor) self.modifierComboBox.setObjectName(u"modifierComboBox") self.modifierComboBox.setEnabled(False) - self.gridLayout.addWidget(self.modifierComboBox, 9, 1, 1, 1) + self.gridLayout.addWidget(self.modifierComboBox, 8, 1, 1, 1) - self.dateNoneCheckBox = QCheckBox(ScoreEditor) - self.dateNoneCheckBox.setObjectName(u"dateNoneCheckBox") + self.previewLabel = QLabel(ScoreEditor) + self.previewLabel.setObjectName(u"previewLabel") + sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.previewLabel.sizePolicy().hasHeightForWidth()) + self.previewLabel.setSizePolicy(sizePolicy) + self.previewLabel.setStyleSheet(u"QLabel { color: gray }") + self.previewLabel.setText(u"None") - self.gridLayout.addWidget(self.dateNoneCheckBox, 5, 2, 1, 1) - - self.pureNoneCheckBox = QCheckBox(ScoreEditor) - self.pureNoneCheckBox.setObjectName(u"pureNoneCheckBox") - - self.gridLayout.addWidget(self.pureNoneCheckBox, 2, 2, 1, 1) - - self.pureSpinBox = QSpinBox(ScoreEditor) - self.pureSpinBox.setObjectName(u"pureSpinBox") - self.pureSpinBox.setMinimumSize(QSize(100, 0)) - self.pureSpinBox.setMinimum(0) - self.pureSpinBox.setMaximum(0) - - self.gridLayout.addWidget(self.pureSpinBox, 2, 1, 1, 1) - - self.lostNoneCheckBox = QCheckBox(ScoreEditor) - self.lostNoneCheckBox.setObjectName(u"lostNoneCheckBox") - - self.gridLayout.addWidget(self.lostNoneCheckBox, 4, 2, 1, 1) - - self.warnIfIncompleteCheckBox = QCheckBox(ScoreEditor) - self.warnIfIncompleteCheckBox.setObjectName(u"warnIfIncompleteCheckBox") - - self.gridLayout.addWidget(self.warnIfIncompleteCheckBox, 13, 0, 1, 1) + self.gridLayout.addWidget(self.previewLabel, 11, 1, 1, 1) self.maxRecallSpinBox = QSpinBox(ScoreEditor) self.maxRecallSpinBox.setObjectName(u"maxRecallSpinBox") @@ -227,39 +75,186 @@ class Ui_ScoreEditor(object): self.maxRecallSpinBox.setMaximum(0) self.maxRecallSpinBox.setValue(0) - self.gridLayout.addWidget(self.maxRecallSpinBox, 8, 1, 1, 1) + self.gridLayout.addWidget(self.maxRecallSpinBox, 7, 1, 1, 1) - self.label_9 = QLabel(ScoreEditor) - self.label_9.setObjectName(u"label_9") - self.label_9.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.scoreLineEdit = FocusSelectAllLineEdit(ScoreEditor) + self.scoreLineEdit.setObjectName(u"scoreLineEdit") + self.scoreLineEdit.setInputMask(u"B9'999'999;_") - self.gridLayout.addWidget(self.label_9, 11, 0, 1, 1) + self.gridLayout.addWidget(self.scoreLineEdit, 1, 1, 1, 1) + + self.label_5 = QLabel(ScoreEditor) + self.label_5.setObjectName(u"label_5") + self.label_5.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_5, 5, 0, 1, 1) + + self.warnIfIncompleteCheckBox = QCheckBox(ScoreEditor) + self.warnIfIncompleteCheckBox.setObjectName(u"warnIfIncompleteCheckBox") + + self.gridLayout.addWidget(self.warnIfIncompleteCheckBox, 12, 0, 1, 1) + + self.label_11 = QLabel(ScoreEditor) + self.label_11.setObjectName(u"label_11") + self.label_11.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_11, 11, 0, 1, 1) self.label_6 = QLabel(ScoreEditor) self.label_6.setObjectName(u"label_6") self.label_6.setText(u"MAX RECALL") self.label_6.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - self.gridLayout.addWidget(self.label_6, 8, 0, 1, 1) + self.gridLayout.addWidget(self.label_6, 7, 0, 1, 1) - self.label_11 = QLabel(ScoreEditor) - self.label_11.setObjectName(u"label_11") - self.label_11.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.dateNoneCheckBox = QCheckBox(ScoreEditor) + self.dateNoneCheckBox.setObjectName(u"dateNoneCheckBox") - self.gridLayout.addWidget(self.label_11, 12, 0, 1, 1) + self.gridLayout.addWidget(self.dateNoneCheckBox, 5, 2, 1, 1) - self.previewLabel = QLabel(ScoreEditor) - self.previewLabel.setObjectName(u"previewLabel") - sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum) + self.validateLabel = QLabel(ScoreEditor) + self.validateLabel.setObjectName(u"validateLabel") + sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.validateLabel.sizePolicy().hasHeightForWidth()) + self.validateLabel.setSizePolicy(sizePolicy1) + self.validateLabel.setText(u"...") + self.validateLabel.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.validateLabel, 12, 1, 1, 1) + + self.pureSpinBox = QSpinBox(ScoreEditor) + self.pureSpinBox.setObjectName(u"pureSpinBox") + self.pureSpinBox.setMinimumSize(QSize(100, 0)) + self.pureSpinBox.setMinimum(0) + self.pureSpinBox.setMaximum(0) + + self.gridLayout.addWidget(self.pureSpinBox, 2, 1, 1, 1) + + self.farNoneCheckBox = QCheckBox(ScoreEditor) + self.farNoneCheckBox.setObjectName(u"farNoneCheckBox") + + self.gridLayout.addWidget(self.farNoneCheckBox, 3, 2, 1, 1) + + self.commentLineEdit = QLineEdit(ScoreEditor) + self.commentLineEdit.setObjectName(u"commentLineEdit") + self.commentLineEdit.setEnabled(False) + + self.gridLayout.addWidget(self.commentLineEdit, 10, 1, 1, 1) + + self.lostSpinBox = QSpinBox(ScoreEditor) + self.lostSpinBox.setObjectName(u"lostSpinBox") + self.lostSpinBox.setMinimumSize(QSize(100, 0)) + self.lostSpinBox.setMinimum(0) + self.lostSpinBox.setMaximum(0) + + self.gridLayout.addWidget(self.lostSpinBox, 4, 1, 1, 1) + + self.label_4 = QLabel(ScoreEditor) + self.label_4.setObjectName(u"label_4") + self.label_4.setText(u"LOST") + self.label_4.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1) + + self.commitButton = QPushButton(ScoreEditor) + self.commitButton.setObjectName(u"commitButton") + + self.gridLayout.addWidget(self.commitButton, 12, 2, 1, 1) + + self.clearTypeNoneCheckBox = QCheckBox(ScoreEditor) + self.clearTypeNoneCheckBox.setObjectName(u"clearTypeNoneCheckBox") + self.clearTypeNoneCheckBox.setChecked(True) + + self.gridLayout.addWidget(self.clearTypeNoneCheckBox, 9, 2, 1, 1) + + self.label_7 = QLabel(ScoreEditor) + self.label_7.setObjectName(u"label_7") + self.label_7.setText(u"Modifier") + self.label_7.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_7, 8, 0, 1, 1) + + self.clearTypeComboBox = QComboBox(ScoreEditor) + self.clearTypeComboBox.setObjectName(u"clearTypeComboBox") + self.clearTypeComboBox.setEnabled(False) + self.clearTypeComboBox.setMinimumSize(QSize(100, 0)) + + self.gridLayout.addWidget(self.clearTypeComboBox, 9, 1, 1, 1) + + self.commentNoneCheckBox = QCheckBox(ScoreEditor) + self.commentNoneCheckBox.setObjectName(u"commentNoneCheckBox") + self.commentNoneCheckBox.setChecked(True) + + self.gridLayout.addWidget(self.commentNoneCheckBox, 10, 2, 1, 1) + + self.label_9 = QLabel(ScoreEditor) + self.label_9.setObjectName(u"label_9") + self.label_9.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_9, 10, 0, 1, 1) + + self.idLabel = QLabel(ScoreEditor) + self.idLabel.setObjectName(u"idLabel") + + self.gridLayout.addWidget(self.idLabel, 0, 1, 1, 1) + + self.pureNoneCheckBox = QCheckBox(ScoreEditor) + self.pureNoneCheckBox.setObjectName(u"pureNoneCheckBox") + + self.gridLayout.addWidget(self.pureNoneCheckBox, 2, 2, 1, 1) + + self.modifierNoneCheckBox = QCheckBox(ScoreEditor) + self.modifierNoneCheckBox.setObjectName(u"modifierNoneCheckBox") + self.modifierNoneCheckBox.setChecked(True) + + self.gridLayout.addWidget(self.modifierNoneCheckBox, 8, 2, 1, 1) + + self.dateTimeEdit = QDateTimeEdit(ScoreEditor) + self.dateTimeEdit.setObjectName(u"dateTimeEdit") + sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) sizePolicy2.setHorizontalStretch(0) sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth(self.previewLabel.sizePolicy().hasHeightForWidth()) - self.previewLabel.setSizePolicy(sizePolicy2) - self.previewLabel.setStyleSheet(u"QLabel { color: gray }") - self.previewLabel.setText(u"None") - self.previewLabel.setWordWrap(True) + sizePolicy2.setHeightForWidth(self.dateTimeEdit.sizePolicy().hasHeightForWidth()) + self.dateTimeEdit.setSizePolicy(sizePolicy2) + self.dateTimeEdit.setDisplayFormat(u"yyyy/MM/dd HH:mm:ss") + self.dateTimeEdit.setCalendarPopup(False) - self.gridLayout.addWidget(self.previewLabel, 12, 1, 1, 1) + self.gridLayout.addWidget(self.dateTimeEdit, 5, 1, 1, 1) + + self.maxRecallNoneCheckBox = QCheckBox(ScoreEditor) + self.maxRecallNoneCheckBox.setObjectName(u"maxRecallNoneCheckBox") + self.maxRecallNoneCheckBox.setChecked(True) + + self.gridLayout.addWidget(self.maxRecallNoneCheckBox, 7, 2, 1, 1) + + self.lostNoneCheckBox = QCheckBox(ScoreEditor) + self.lostNoneCheckBox.setObjectName(u"lostNoneCheckBox") + + self.gridLayout.addWidget(self.lostNoneCheckBox, 4, 2, 1, 1) + + self.label_3 = QLabel(ScoreEditor) + self.label_3.setObjectName(u"label_3") + self.label_3.setText(u"FAR") + self.label_3.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) + + self.farSpinBox = QSpinBox(ScoreEditor) + self.farSpinBox.setObjectName(u"farSpinBox") + self.farSpinBox.setMinimumSize(QSize(100, 0)) + self.farSpinBox.setMinimum(0) + self.farSpinBox.setMaximum(0) + + self.gridLayout.addWidget(self.farSpinBox, 3, 1, 1, 1) + + self.label_2 = QLabel(ScoreEditor) + self.label_2.setObjectName(u"label_2") + self.label_2.setText(u"PURE") + self.label_2.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) QWidget.setTabOrder(self.scoreLineEdit, self.pureSpinBox) QWidget.setTabOrder(self.pureSpinBox, self.pureNoneCheckBox) @@ -293,21 +288,21 @@ class Ui_ScoreEditor(object): # setupUi def retranslateUi(self, ScoreEditor): - self.commitButton.setText(QCoreApplication.translate("ScoreEditor", u"commitButton", None)) self.label.setText(QCoreApplication.translate("ScoreEditor", u"formLabel.score", None)) - self.commentNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.farNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.idLabel.setText(QCoreApplication.translate("ScoreEditor", u"idAutoInsert", None)) self.label_5.setText(QCoreApplication.translate("ScoreEditor", u"formLabel.date", None)) - self.maxRecallNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.clearTypeNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.modifierNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.dateNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.pureNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) - self.lostNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) self.warnIfIncompleteCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"warnIfIncomplete", None)) - self.label_9.setText(QCoreApplication.translate("ScoreEditor", u"formLabel.comment", None)) self.label_11.setText(QCoreApplication.translate("ScoreEditor", u"formLabel.preview", None)) + self.dateNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.farNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.commitButton.setText(QCoreApplication.translate("ScoreEditor", u"commitButton", None)) + self.clearTypeNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.commentNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.label_9.setText(QCoreApplication.translate("ScoreEditor", u"formLabel.comment", None)) + self.idLabel.setText(QCoreApplication.translate("ScoreEditor", u"idAutoInsert", None)) + self.pureNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.modifierNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.maxRecallNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) + self.lostNoneCheckBox.setText(QCoreApplication.translate("ScoreEditor", u"setNone", None)) pass # retranslateUi diff --git a/ui/implements/components/scoreEditor.py b/ui/implements/components/scoreEditor.py index dad5946..ad15b60 100644 --- a/ui/implements/components/scoreEditor.py +++ b/ui/implements/components/scoreEditor.py @@ -151,12 +151,19 @@ class ScoreEditor(Ui_ScoreEditor, QWidget): if score := self.value(): texts = [ f"({score.song_id}, {score.rating_class}), Score {score.score}", - f"PURE {score.pure}, FAR {score.far}, LOST {score.lost}, MR {score.max_recall}", - f"Date {score.date}, Clear type {score.clear_type}, Modifier {score.modifier}", + f"PURE {score.pure}, FAR {score.far}, LOST {score.lost}", + f"MAX RECALL {score.max_recall}", + f"Date {score.date}", + f"Clear type {score.clear_type}", + f"Modifier {score.modifier}", ] - self.previewLabel.setText("
".join(texts)) + self.previewLabel.setText( + f"{score.score}, P{score.pure} F{score.far} L{score.lost}, MR {score.max_recall}" + ) + self.previewLabel.setToolTip("
".join(texts)) else: self.previewLabel.setText("None") + self.previewLabel.setToolTip("") def validateBeforeAccept(self): return self.__validateBeforeAccept