electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed minifig wizard combobox not working with Qt6.

Browse Source
This commit is contained in:
Leonardo Zide
2025-12-06 17:30:34 -08:00
parent 561cf9cf52
commit 6b7f9faad1
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_minifigdialog.cpp
+11 -6
View File
@@ -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 (*.*)"));
common/lc_minifigdialog.h
+6 -6
View File
@@ -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);