From 6b7f9faad1817c7b926827a64d3bb022c585cd08 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 6 Dec 2025 17:30:34 -0800 Subject: [PATCH] Fixed minifig wizard combobox not working with Qt6. --- common/lc_minifigdialog.cpp | 17 +++++++++++------ common/lc_minifigdialog.h | 12 ++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/common/lc_minifigdialog.cpp b/common/lc_minifigdialog.cpp index ac672477..8b43931c 100644 --- a/common/lc_minifigdialog.cpp +++ b/common/lc_minifigdialog.cpp @@ -4,7 +4,6 @@ #include "lc_viewwidget.h" #include "lc_colorpicker.h" #include "minifig.h" -#include "lc_application.h" #include "pieceinf.h" #include "lc_library.h" #include "lc_view.h" @@ -135,6 +134,12 @@ lcMinifigDialog::lcMinifigDialog(QWidget* Parent) mMinifigWizard->Calculate(); mView->GetCamera()->SetViewpoint(lcVector3(0.0f, -270.0f, 90.0f)); mView->ZoomExtents(); + + connect(ui->TemplateComboBox, &QComboBox::currentTextChanged, this, &lcMinifigDialog::TemplateComboBoxCurrentTextChanged); + connect(ui->TemplateSaveButton, &QPushButton::clicked, this, &lcMinifigDialog::TemplateSaveButtonClicked); + connect(ui->TemplateDeleteButton, &QPushButton::clicked, this, &lcMinifigDialog::TemplateDeleteButtonClicked); + connect(ui->TemplateImportButton, &QPushButton::clicked, this, &lcMinifigDialog::TemplateImportButtonClicked); + connect(ui->TemplateExportButton, &QPushButton::clicked, this, &lcMinifigDialog::TemplateExportButtonClicked); } lcMinifigDialog::~lcMinifigDialog() @@ -175,7 +180,7 @@ void lcMinifigDialog::UpdateTemplateCombo() ui->TemplateComboBox->setCurrentText(CurrentName); } -void lcMinifigDialog::on_TemplateComboBox_currentIndexChanged(const QString& TemplateName) +void lcMinifigDialog::TemplateComboBoxCurrentTextChanged(const QString& TemplateName) { const auto& Templates = mMinifigWizard->GetTemplates(); const auto& Position = Templates.find(TemplateName); @@ -234,7 +239,7 @@ void lcMinifigDialog::on_TemplateComboBox_currentIndexChanged(const QString& Tem mView->Redraw(); } -void lcMinifigDialog::on_TemplateSaveButton_clicked() +void lcMinifigDialog::TemplateSaveButtonClicked() { QString CurrentName = mCurrentTemplateName; bool Ok; @@ -280,7 +285,7 @@ void lcMinifigDialog::on_TemplateSaveButton_clicked() UpdateTemplateCombo(); } -void lcMinifigDialog::on_TemplateDeleteButton_clicked() +void lcMinifigDialog::TemplateDeleteButtonClicked() { if (mCurrentTemplateName.isEmpty() || mCurrentTemplateName == MinifigWizard::GetDefaultTemplateName()) return; @@ -299,7 +304,7 @@ void lcMinifigDialog::on_TemplateDeleteButton_clicked() UpdateTemplateCombo(); } -void lcMinifigDialog::on_TemplateImportButton_clicked() +void lcMinifigDialog::TemplateImportButtonClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import Templates"), "", tr("Minifig Template Files (*.minifig);;All Files (*.*)")); @@ -320,7 +325,7 @@ void lcMinifigDialog::on_TemplateImportButton_clicked() UpdateTemplateCombo(); } -void lcMinifigDialog::on_TemplateExportButton_clicked() +void lcMinifigDialog::TemplateExportButtonClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export Templates"), "", tr("Minifig Template Files (*.minifig);;All Files (*.*)")); diff --git a/common/lc_minifigdialog.h b/common/lc_minifigdialog.h index 50d484a0..b83e0886 100644 --- a/common/lc_minifigdialog.h +++ b/common/lc_minifigdialog.h @@ -16,16 +16,16 @@ class lcMinifigDialog : public QDialog public: explicit lcMinifigDialog(QWidget* Parent); - ~lcMinifigDialog(); + virtual ~lcMinifigDialog(); MinifigWizard* mMinifigWizard; protected slots: - void on_TemplateComboBox_currentIndexChanged(const QString& TemplateName); - void on_TemplateSaveButton_clicked(); - void on_TemplateDeleteButton_clicked(); - void on_TemplateImportButton_clicked(); - void on_TemplateExportButton_clicked(); + void TemplateComboBoxCurrentTextChanged(const QString& TemplateName); + void TemplateSaveButtonClicked(); + void TemplateDeleteButtonClicked(); + void TemplateImportButtonClicked(); + void TemplateExportButtonClicked(); void PieceButtonClicked(); void ColorChanged(int Index); void AngleChanged(double Value);