From e1bacf0530db63f10ce2a10b9b0bd9f9901b7252 Mon Sep 17 00:00:00 2001 From: Vibe Nuage Agent Date: Tue, 13 Oct 2026 06:22:47 +0000 Subject: [PATCH 1/2] Add ui_report_comparisons.ui template, icon button and Files label Add the missing Qt Designer template for the Coder Comparisons dialog (it was the only dialog without a .ui source in src/GUI_UIs) and regenerate the .py file with pyuic6, so future .ui edits no longer conflict with hand-edited generated code. Following review feedback: - replace the 'Select files' text button with a 32x32 icon button (mdi6.file-document-multiple-outline, set in reports.py like the other icon buttons) - add a label next to it showing 'Files: All' or 'Files: N' (number of selected files) Co-authored-by: qwertygc --- src/GUI_UIs/ui_report_comparisons.ui | 259 +++++++++++++++++++++ src/qualcoder/GUI/ui_report_comparisons.py | 60 ++--- 2 files changed, 282 insertions(+), 37 deletions(-) create mode 100644 src/GUI_UIs/ui_report_comparisons.ui diff --git a/src/GUI_UIs/ui_report_comparisons.ui b/src/GUI_UIs/ui_report_comparisons.ui new file mode 100644 index 00000000..8dfcb06b --- /dev/null +++ b/src/GUI_UIs/ui_report_comparisons.ui @@ -0,0 +1,259 @@ + + + Dialog_reportComparisons + + + Qt::WindowModality::NonModal + + + + 0 + 0 + 804 + 606 + + + + Coder Comparisons + + + + + + + 0 + 100 + + + + + 16777215 + 132 + + + + + + + + + 10 + 30 + 32 + 28 + + + + + 32 + 28 + + + + + 32 + 28 + + + + Coder + + + + + + + + + 50 + 27 + 221 + 32 + + + + Select two coders + + + + + + 10 + 0 + 491 + 22 + + + + Coder comparisons - text files + + + + + + 10 + 60 + 751 + 32 + + + + + 0 + 32 + + + + + 16777213 + 32 + + + + Coders selected: + + + true + + + + + + 280 + 27 + 32 + 32 + + + + Run comparison + + + + + + + + + 320 + 27 + 32 + 32 + + + + Clear selection + + + + + + + + + 360 + 27 + 32 + 32 + + + + Export Excel + + + + + + + + + 400 + 27 + 32 + 32 + + + + Statistics help + + + + + + + + + 440 + 27 + 32 + 32 + + + + Select text files for the comparison subcorpus + + + + + + + + + 482 + 27 + 280 + 32 + + + + Files: All + + + + + + + + + + + + 1 + + + 1 + + + 1 + + + 1 + + + 2 + + + + + + 1 + + + + + + + + + + + comboBox_coders + pushButton_run + pushButton_clear + pushButton_export + pushButton_help1 + treeWidget + + + + diff --git a/src/qualcoder/GUI/ui_report_comparisons.py b/src/qualcoder/GUI/ui_report_comparisons.py index 490a3077..07465a10 100644 --- a/src/qualcoder/GUI/ui_report_comparisons.py +++ b/src/qualcoder/GUI/ui_report_comparisons.py @@ -1,6 +1,6 @@ -# Form implementation generated from reading ui file 'ui_report_comparisons.ui' +# Form implementation generated from reading ui file 'src/GUI_UIs/ui_report_comparisons.ui' # -# Created by: PyQt6 UI code generator 6.10.2 +# Created by: PyQt6 UI code generator 6.11.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -21,14 +21,6 @@ def setupUi(self, Dialog_reportComparisons): self.groupBox.setMaximumSize(QtCore.QSize(16777215, 132)) self.groupBox.setTitle("") self.groupBox.setObjectName("groupBox") - self.pushButton_export = QtWidgets.QPushButton(parent=self.groupBox) - self.pushButton_export.setGeometry(QtCore.QRect(360, 27, 32, 32)) - self.pushButton_export.setText("") - self.pushButton_export.setObjectName("pushButton_export") - self.pushButton_run = QtWidgets.QPushButton(parent=self.groupBox) - self.pushButton_run.setGeometry(QtCore.QRect(280, 27, 32, 32)) - self.pushButton_run.setText("") - self.pushButton_run.setObjectName("pushButton_run") self.label_coders = QtWidgets.QLabel(parent=self.groupBox) self.label_coders.setGeometry(QtCore.QRect(10, 30, 32, 28)) self.label_coders.setMinimumSize(QtCore.QSize(32, 28)) @@ -38,10 +30,6 @@ def setupUi(self, Dialog_reportComparisons): self.comboBox_coders = QtWidgets.QComboBox(parent=self.groupBox) self.comboBox_coders.setGeometry(QtCore.QRect(50, 27, 221, 32)) self.comboBox_coders.setObjectName("comboBox_coders") - self.pushButton_clear = QtWidgets.QPushButton(parent=self.groupBox) - self.pushButton_clear.setGeometry(QtCore.QRect(320, 27, 32, 32)) - self.pushButton_clear.setText("") - self.pushButton_clear.setObjectName("pushButton_clear") self.label_title = QtWidgets.QLabel(parent=self.groupBox) self.label_title.setGeometry(QtCore.QRect(10, 0, 491, 22)) self.label_title.setObjectName("label_title") @@ -51,19 +39,29 @@ def setupUi(self, Dialog_reportComparisons): self.label_selections.setMaximumSize(QtCore.QSize(16777213, 32)) self.label_selections.setWordWrap(True) self.label_selections.setObjectName("label_selections") + self.pushButton_run = QtWidgets.QPushButton(parent=self.groupBox) + self.pushButton_run.setGeometry(QtCore.QRect(280, 27, 32, 32)) + self.pushButton_run.setText("") + self.pushButton_run.setObjectName("pushButton_run") + self.pushButton_clear = QtWidgets.QPushButton(parent=self.groupBox) + self.pushButton_clear.setGeometry(QtCore.QRect(320, 27, 32, 32)) + self.pushButton_clear.setText("") + self.pushButton_clear.setObjectName("pushButton_clear") + self.pushButton_export = QtWidgets.QPushButton(parent=self.groupBox) + self.pushButton_export.setGeometry(QtCore.QRect(360, 27, 32, 32)) + self.pushButton_export.setText("") + self.pushButton_export.setObjectName("pushButton_export") self.pushButton_help1 = QtWidgets.QPushButton(parent=self.groupBox) self.pushButton_help1.setGeometry(QtCore.QRect(400, 27, 32, 32)) self.pushButton_help1.setText("") self.pushButton_help1.setObjectName("pushButton_help1") - self.label_files = QtWidgets.QLabel(parent=self.groupBox) - self.label_files.setGeometry(QtCore.QRect(10, 97, 751, 32)) - self.label_files.setMinimumSize(QtCore.QSize(0, 32)) - self.label_files.setMaximumSize(QtCore.QSize(16777213, 32)) - self.label_files.setWordWrap(True) - self.label_files.setObjectName("label_files") self.pushButton_files = QtWidgets.QPushButton(parent=self.groupBox) - self.pushButton_files.setGeometry(QtCore.QRect(440, 27, 110, 32)) + self.pushButton_files.setGeometry(QtCore.QRect(440, 27, 32, 32)) + self.pushButton_files.setText("") self.pushButton_files.setObjectName("pushButton_files") + self.label_files = QtWidgets.QLabel(parent=self.groupBox) + self.label_files.setGeometry(QtCore.QRect(482, 27, 280, 32)) + self.label_files.setObjectName("label_files") self.verticalLayout.addWidget(self.groupBox) self.groupBox_2 = QtWidgets.QGroupBox(parent=Dialog_reportComparisons) self.groupBox_2.setTitle("") @@ -89,25 +87,13 @@ def setupUi(self, Dialog_reportComparisons): def retranslateUi(self, Dialog_reportComparisons): _translate = QtCore.QCoreApplication.translate Dialog_reportComparisons.setWindowTitle(_translate("Dialog_reportComparisons", "Coder Comparisons")) - self.pushButton_export.setToolTip(_translate("Dialog_reportComparisons", "Export Excel")) - self.pushButton_run.setToolTip(_translate("Dialog_reportComparisons", "Run comparison")) self.label_coders.setToolTip(_translate("Dialog_reportComparisons", "Coder")) self.comboBox_coders.setToolTip(_translate("Dialog_reportComparisons", "Select two coders")) - self.pushButton_clear.setToolTip(_translate("Dialog_reportComparisons", "Clear selection")) self.label_title.setText(_translate("Dialog_reportComparisons", "Coder comparisons - text files")) self.label_selections.setText(_translate("Dialog_reportComparisons", "Coders selected:")) + self.pushButton_run.setToolTip(_translate("Dialog_reportComparisons", "Run comparison")) + self.pushButton_clear.setToolTip(_translate("Dialog_reportComparisons", "Clear selection")) + self.pushButton_export.setToolTip(_translate("Dialog_reportComparisons", "Export Excel")) self.pushButton_help1.setToolTip(_translate("Dialog_reportComparisons", "Statistics help")) - self.pushButton_files.setText(_translate("Dialog_reportComparisons", "Select files")) self.pushButton_files.setToolTip(_translate("Dialog_reportComparisons", "Select text files for the comparison subcorpus")) - self.label_files.setText(_translate("Dialog_reportComparisons", "Files: all text files")) - - -if __name__ == "__main__": - import sys - app = QtWidgets.QApplication(sys.argv) - Dialog_reportComparisons = QtWidgets.QDialog() - ui = Ui_Dialog_reportComparisons() - ui.setupUi(Dialog_reportComparisons) - Dialog_reportComparisons.show() - sys.exit(app.exec()) - + self.label_files.setText(_translate("Dialog_reportComparisons", "Files: All")) From e8ecb31b567232651d7445cfc0372503b0783a44 Mon Sep 17 00:00:00 2001 From: Vibe Nuage Agent Date: Tue, 13 Oct 2026 06:27:32 +0000 Subject: [PATCH 2/2] Set the file-document-multiple-outline icon on the files button The .ui template only carries an empty 32x32 button; icons are set in code via qtawesome like every other icon button in the project. Co-authored-by: qwertygc --- src/qualcoder/reports.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qualcoder/reports.py b/src/qualcoder/reports.py index 757b087d..edfb0a56 100644 --- a/src/qualcoder/reports.py +++ b/src/qualcoder/reports.py @@ -842,6 +842,7 @@ def __init__(self, app, parent_textedit): self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowType.WindowContextHelpButtonHint) self.ui.pushButton_run.setEnabled(False) self.ui.pushButton_run.pressed.connect(self.calculate_statistics) + self.ui.pushButton_files.setIcon(qta.icon('mdi6.file-document-multiple-outline', options=[{'scale_factor': 1.4}])) self.ui.pushButton_files.pressed.connect(self.select_files) self.ui.pushButton_run.setIcon(qta.icon('mdi6.play', options=[{'scale_factor': 1.4}])) self.ui.pushButton_clear.pressed.connect(self.clear_selection)