From 1d2c01c47c716c4fe60ae4c183928915613ca366 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Wed, 29 Apr 2026 20:25:23 -0700 Subject: [PATCH] Refactor Qt signal connections to use explicit connect() calls Replace automatic 'on_' naming convention with explicit connect() calls in constructors. Functions renamed to use Pascal case without underscore separators. Slots moved from public to private where appropriate. Changes made to 8 dialog files: - lc_modellistdialog.h/cpp: Renamed 9 slot functions - lc_partpalettedialog.h/cpp: Renamed 7 slot functions - lc_qhtmldialog.h/cpp: Renamed 1 slot function - lc_qimagedialog.h/cpp: Renamed 1 slot function - lc_qpreferencesdialog.h/cpp: Renamed 40 slot functions - lc_qselectdialog.h/cpp: Renamed 4 slot functions - lc_renderdialog.h/cpp: Renamed 1 slot function - lc_setsdatabasedialog.h/cpp: Renamed 1 slot function Total: 64 slot functions refactored Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- common/lc_modellistdialog.cpp | 28 +++++-- common/lc_modellistdialog.h | 20 +++-- common/lc_partpalettedialog.cpp | 22 +++-- common/lc_partpalettedialog.h | 16 ++-- qt/lc_qhtmldialog.cpp | 4 +- qt/lc_qhtmldialog.h | 4 +- qt/lc_qimagedialog.cpp | 4 +- qt/lc_qimagedialog.h | 4 +- qt/lc_qpreferencesdialog.cpp | 141 ++++++++++++++++++++------------ qt/lc_qpreferencesdialog.h | 78 +++++++++--------- qt/lc_qselectdialog.cpp | 15 ++-- qt/lc_qselectdialog.h | 10 ++- qt/lc_renderdialog.cpp | 3 +- qt/lc_renderdialog.h | 4 +- qt/lc_setsdatabasedialog.cpp | 5 +- qt/lc_setsdatabasedialog.h | 2 +- 16 files changed, 220 insertions(+), 140 deletions(-) diff --git a/common/lc_modellistdialog.cpp b/common/lc_modellistdialog.cpp index 3ffc3baa..6173b2d1 100644 --- a/common/lc_modellistdialog.cpp +++ b/common/lc_modellistdialog.cpp @@ -18,6 +18,16 @@ lcModelListDialog::lcModelListDialog(QWidget* Parent, const std::vectorsetupUi(this); + connect(ui->NewModel, &QPushButton::clicked, this, &lcModelListDialog::NewModelClicked); + connect(ui->DeleteModel, &QPushButton::clicked, this, &lcModelListDialog::DeleteModelClicked); + connect(ui->RenameModel, &QPushButton::clicked, this, &lcModelListDialog::RenameModelClicked); + connect(ui->ExportModel, &QPushButton::clicked, this, &lcModelListDialog::ExportModelClicked); + connect(ui->DuplicateModel, &QPushButton::clicked, this, &lcModelListDialog::DuplicateModelClicked); + connect(ui->MoveUp, &QPushButton::clicked, this, &lcModelListDialog::MoveUpClicked); + connect(ui->MoveDown, &QPushButton::clicked, this, &lcModelListDialog::MoveDownClicked); + connect(ui->ModelList, &QListWidget::itemDoubleClicked, this, &lcModelListDialog::ModelListItemDoubleClicked); + connect(ui->ModelList, &QListWidget::itemSelectionChanged, this, &lcModelListDialog::ModelListItemSelectionChanged); + lcModel* ActiveModel = lcGetActiveProject()->GetActiveModel(); int ActiveModelIndex = -1; @@ -110,7 +120,7 @@ void lcModelListDialog::accept() QDialog::accept(); } -void lcModelListDialog::on_NewModel_clicked() +void lcModelListDialog::NewModelClicked() { QStringList ModelNames; @@ -127,7 +137,7 @@ void lcModelListDialog::on_NewModel_clicked() UpdateButtons(); } -void lcModelListDialog::on_DeleteModel_clicked() +void lcModelListDialog::DeleteModelClicked() { if (ui->ModelList->count() == 1) { @@ -163,7 +173,7 @@ void lcModelListDialog::on_DeleteModel_clicked() UpdateButtons(); } -void lcModelListDialog::on_RenameModel_clicked() +void lcModelListDialog::RenameModelClicked() { const QList SelectedItems = ui->ModelList->selectedItems(); @@ -187,7 +197,7 @@ void lcModelListDialog::on_RenameModel_clicked() } } -void lcModelListDialog::on_ExportModel_clicked() +void lcModelListDialog::ExportModelClicked() { const QList SelectedItems = ui->ModelList->selectedItems(); @@ -246,7 +256,7 @@ void lcModelListDialog::on_ExportModel_clicked() } } -void lcModelListDialog::on_DuplicateModel_clicked() +void lcModelListDialog::DuplicateModelClicked() { const QList SelectedItems = ui->ModelList->selectedItems(); @@ -286,7 +296,7 @@ void lcModelListDialog::on_DuplicateModel_clicked() UpdateButtons(); } -void lcModelListDialog::on_MoveUp_clicked() +void lcModelListDialog::MoveUpClicked() { bool Blocked = ui->ModelList->blockSignals(true); @@ -309,7 +319,7 @@ void lcModelListDialog::on_MoveUp_clicked() UpdateButtons(); } -void lcModelListDialog::on_MoveDown_clicked() +void lcModelListDialog::MoveDownClicked() { bool Blocked = ui->ModelList->blockSignals(true); @@ -332,14 +342,14 @@ void lcModelListDialog::on_MoveDown_clicked() UpdateButtons(); } -void lcModelListDialog::on_ModelList_itemDoubleClicked(QListWidgetItem* Item) +void lcModelListDialog::ModelListItemDoubleClicked(QListWidgetItem* Item) { mActiveModelItem = Item; accept(); } -void lcModelListDialog::on_ModelList_itemSelectionChanged() +void lcModelListDialog::ModelListItemSelectionChanged() { UpdateButtons(); } diff --git a/common/lc_modellistdialog.h b/common/lc_modellistdialog.h index 53c30c80..53835874 100644 --- a/common/lc_modellistdialog.h +++ b/common/lc_modellistdialog.h @@ -25,15 +25,17 @@ public: public slots: void accept() override; - void on_NewModel_clicked(); - void on_DeleteModel_clicked(); - void on_RenameModel_clicked(); - void on_ExportModel_clicked(); - void on_DuplicateModel_clicked(); - void on_MoveUp_clicked(); - void on_MoveDown_clicked(); - void on_ModelList_itemDoubleClicked(QListWidgetItem* Item); - void on_ModelList_itemSelectionChanged(); + +private slots: + void NewModelClicked(); + void DeleteModelClicked(); + void RenameModelClicked(); + void ExportModelClicked(); + void DuplicateModelClicked(); + void MoveUpClicked(); + void MoveDownClicked(); + void ModelListItemDoubleClicked(QListWidgetItem* Item); + void ModelListItemSelectionChanged(); private: QListWidgetItem* mActiveModelItem; diff --git a/common/lc_partpalettedialog.cpp b/common/lc_partpalettedialog.cpp index 20cdb5bf..762ac775 100644 --- a/common/lc_partpalettedialog.cpp +++ b/common/lc_partpalettedialog.cpp @@ -9,6 +9,14 @@ lcPartPaletteDialog::lcPartPaletteDialog(QWidget* Parent, std::vectorsetupUi(this); + connect(ui->NewButton, &QPushButton::clicked, this, &lcPartPaletteDialog::NewButtonClicked); + connect(ui->DeleteButton, &QPushButton::clicked, this, &lcPartPaletteDialog::DeleteButtonClicked); + connect(ui->RenameButton, &QPushButton::clicked, this, &lcPartPaletteDialog::RenameButtonClicked); + connect(ui->ImportButton, &QPushButton::clicked, this, &lcPartPaletteDialog::ImportButtonClicked); + connect(ui->MoveUpButton, &QPushButton::clicked, this, &lcPartPaletteDialog::MoveUpButtonClicked); + connect(ui->MoveDownButton, &QPushButton::clicked, this, &lcPartPaletteDialog::MoveDownButtonClicked); + connect(ui->PaletteList, QOverload::of(&QListWidget::currentRowChanged), this, &lcPartPaletteDialog::PaletteListCurrentRowChanged); + for (const lcPartPalette& Palette : PartPalettes) { QListWidgetItem* Item = new QListWidgetItem(Palette.Name); @@ -61,7 +69,7 @@ void lcPartPaletteDialog::accept() QDialog::accept(); } -void lcPartPaletteDialog::on_NewButton_clicked() +void lcPartPaletteDialog::NewButtonClicked() { bool Ok = false; @@ -77,7 +85,7 @@ void lcPartPaletteDialog::on_NewButton_clicked() UpdateButtons(); } -void lcPartPaletteDialog::on_DeleteButton_clicked() +void lcPartPaletteDialog::DeleteButtonClicked() { QList SelectedItems = ui->PaletteList->selectedItems(); @@ -94,7 +102,7 @@ void lcPartPaletteDialog::on_DeleteButton_clicked() UpdateButtons(); } -void lcPartPaletteDialog::on_RenameButton_clicked() +void lcPartPaletteDialog::RenameButtonClicked() { QList SelectedItems = ui->PaletteList->selectedItems(); @@ -113,7 +121,7 @@ void lcPartPaletteDialog::on_RenameButton_clicked() SelectedItems[0]->setText(Name); } -void lcPartPaletteDialog::on_ImportButton_clicked() +void lcPartPaletteDialog::ImportButtonClicked() { lcSetsDatabaseDialog Dialog(this); @@ -147,7 +155,7 @@ void lcPartPaletteDialog::on_ImportButton_clicked() UpdateButtons(); } -void lcPartPaletteDialog::on_MoveUpButton_clicked() +void lcPartPaletteDialog::MoveUpButtonClicked() { QList SelectedItems = ui->PaletteList->selectedItems(); @@ -166,7 +174,7 @@ void lcPartPaletteDialog::on_MoveUpButton_clicked() UpdateButtons(); } -void lcPartPaletteDialog::on_MoveDownButton_clicked() +void lcPartPaletteDialog::MoveDownButtonClicked() { QList SelectedItems = ui->PaletteList->selectedItems(); @@ -182,7 +190,7 @@ void lcPartPaletteDialog::on_MoveDownButton_clicked() UpdateButtons(); } -void lcPartPaletteDialog::on_PaletteList_currentRowChanged(int CurrentRow) +void lcPartPaletteDialog::PaletteListCurrentRowChanged(int CurrentRow) { Q_UNUSED(CurrentRow); diff --git a/common/lc_partpalettedialog.h b/common/lc_partpalettedialog.h index 18cd15b9..fdf8e01e 100644 --- a/common/lc_partpalettedialog.h +++ b/common/lc_partpalettedialog.h @@ -16,13 +16,15 @@ public: protected slots: void accept() override; - void on_NewButton_clicked(); - void on_DeleteButton_clicked(); - void on_RenameButton_clicked(); - void on_ImportButton_clicked(); - void on_MoveUpButton_clicked(); - void on_MoveDownButton_clicked(); - void on_PaletteList_currentRowChanged(int CurrentRow); + +private slots: + void NewButtonClicked(); + void DeleteButtonClicked(); + void RenameButtonClicked(); + void ImportButtonClicked(); + void MoveUpButtonClicked(); + void MoveDownButtonClicked(); + void PaletteListCurrentRowChanged(int CurrentRow); private: void UpdateButtons(); diff --git a/qt/lc_qhtmldialog.cpp b/qt/lc_qhtmldialog.cpp index 05a91986..ef5e8e64 100644 --- a/qt/lc_qhtmldialog.cpp +++ b/qt/lc_qhtmldialog.cpp @@ -8,6 +8,8 @@ lcQHTMLDialog::lcQHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options) { ui->setupUi(this); + connect(ui->outputFolderBrowse, &QPushButton::clicked, this, &lcQHTMLDialog::OutputFolderBrowseClicked); + ui->stepWidth->setValidator(new QIntValidator(0, 2048, ui->stepWidth)); ui->stepHeight->setValidator(new QIntValidator(0, 2048, ui->stepHeight)); @@ -61,7 +63,7 @@ void lcQHTMLDialog::accept() QDialog::accept(); } -void lcQHTMLDialog::on_outputFolderBrowse_clicked() +void lcQHTMLDialog::OutputFolderBrowseClicked() { QString result = QFileDialog::getExistingDirectory(this, tr("Select Output Folder"), ui->outputFolder->text()); diff --git a/qt/lc_qhtmldialog.h b/qt/lc_qhtmldialog.h index e1550529..cf679814 100644 --- a/qt/lc_qhtmldialog.h +++ b/qt/lc_qhtmldialog.h @@ -17,7 +17,9 @@ public: public slots: void accept() override; - void on_outputFolderBrowse_clicked(); + +private slots: + void OutputFolderBrowseClicked(); private: lcHTMLExportOptions* mOptions; diff --git a/qt/lc_qimagedialog.cpp b/qt/lc_qimagedialog.cpp index c1435012..c14c5211 100644 --- a/qt/lc_qimagedialog.cpp +++ b/qt/lc_qimagedialog.cpp @@ -11,6 +11,8 @@ lcQImageDialog::lcQImageDialog(QWidget* Parent) { ui->setupUi(this); + connect(ui->fileNameBrowse, &QPushButton::clicked, this, &lcQImageDialog::FileNameBrowseClicked); + ui->width->setValidator(new QIntValidator(1, 32768, this)); ui->height->setValidator(new QIntValidator(1, 32768, this)); ui->firstStep->setValidator(new QIntValidator(this)); @@ -112,7 +114,7 @@ void lcQImageDialog::accept() QDialog::accept(); } -void lcQImageDialog::on_fileNameBrowse_clicked() +void lcQImageDialog::FileNameBrowseClicked() { QString result = QFileDialog::getSaveFileName(this, tr("Save Image File"), ui->fileName->text(), tr("Supported Image Files (*.bmp *.png *.jpg);;BMP Files (*.bmp);;PNG Files (*.png);;JPEG Files (*.jpg);;All Files (*.*)")); diff --git a/qt/lc_qimagedialog.h b/qt/lc_qimagedialog.h index 1cd94144..99b702a2 100644 --- a/qt/lc_qimagedialog.h +++ b/qt/lc_qimagedialog.h @@ -22,7 +22,9 @@ public: public slots: void accept() override; - void on_fileNameBrowse_clicked(); + +private slots: + void FileNameBrowseClicked(); private: Ui::lcQImageDialog *ui; diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 5d32155e..7cd0f410 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -40,6 +40,45 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO ui->Language->addItem("Espa\u00f1ol"); ui->Language->addItem("\u7b80\u4f53\u4e2d\u6587"); + connect(ui->partsLibraryBrowse, &QPushButton::clicked, this, &lcQPreferencesDialog::PartsLibraryBrowseClicked); + connect(ui->partsArchiveBrowse, &QPushButton::clicked, this, &lcQPreferencesDialog::PartsArchiveBrowseClicked); + connect(ui->ColorConfigBrowseButton, &QPushButton::clicked, this, &lcQPreferencesDialog::ColorConfigBrowseButtonClicked); + connect(ui->MinifigSettingsBrowseButton, &QPushButton::clicked, this, &lcQPreferencesDialog::MinifigSettingsBrowseButtonClicked); + connect(ui->povrayExecutableBrowse, &QPushButton::clicked, this, &lcQPreferencesDialog::PovrayExecutableBrowseClicked); + connect(ui->lgeoPathBrowse, &QPushButton::clicked, this, &lcQPreferencesDialog::LgeoPathBrowseClicked); + connect(ui->ColorTheme, QOverload::of(&QComboBox::currentIndexChanged), this, &lcQPreferencesDialog::ColorThemeCurrentIndexChanged); + connect(ui->AutomateEdgeColor, &QCheckBox::toggled, this, &lcQPreferencesDialog::AutomateEdgeColorToggled); + connect(ui->BlenderAddonSettingsButton, &QPushButton::clicked, this, &lcQPreferencesDialog::BlenderAddonSettingsButtonClicked); + connect(ui->studStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcQPreferencesDialog::StudStyleComboCurrentIndexChanged); + connect(ui->antiAliasing, &QCheckBox::toggled, this, &lcQPreferencesDialog::AntiAliasingToggled); + connect(ui->edgeLines, &QCheckBox::toggled, this, &lcQPreferencesDialog::EdgeLinesToggled); + connect(ui->ConditionalLinesCheckBox, &QCheckBox::toggled, this, &lcQPreferencesDialog::ConditionalLinesCheckBoxToggled); + connect(ui->LineWidthSlider, QOverload::of(&QSlider::valueChanged), this, &lcQPreferencesDialog::LineWidthSliderValueChanged); + connect(ui->MeshLODSlider, QOverload::of(&QSlider::valueChanged), this, &lcQPreferencesDialog::MeshLODSliderValueChanged); + connect(ui->FadeSteps, &QCheckBox::toggled, this, &lcQPreferencesDialog::FadeStepsToggled); + connect(ui->HighlightNewParts, &QCheckBox::toggled, this, &lcQPreferencesDialog::HighlightNewPartsToggled); + connect(ui->gridStuds, &QCheckBox::toggled, this, &lcQPreferencesDialog::GridStudsToggled); + connect(ui->gridLines, &QCheckBox::toggled, this, &lcQPreferencesDialog::GridLinesToggled); + connect(ui->ViewSphereSizeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcQPreferencesDialog::ViewSphereSizeComboCurrentIndexChanged); + connect(ui->PreviewViewSphereSizeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcQPreferencesDialog::PreviewViewSphereSizeComboCurrentIndexChanged); + connect(ui->newCategory, &QPushButton::clicked, this, &lcQPreferencesDialog::NewCategoryClicked); + connect(ui->editCategory, &QPushButton::clicked, this, &lcQPreferencesDialog::EditCategoryClicked); + connect(ui->deleteCategory, &QPushButton::clicked, this, &lcQPreferencesDialog::DeleteCategoryClicked); + connect(ui->importCategories, &QPushButton::clicked, this, &lcQPreferencesDialog::ImportCategoriesClicked); + connect(ui->exportCategories, &QPushButton::clicked, this, &lcQPreferencesDialog::ExportCategoriesClicked); + connect(ui->resetCategories, &QPushButton::clicked, this, &lcQPreferencesDialog::ResetCategoriesClicked); + connect(ui->shortcutAssign, &QPushButton::clicked, this, &lcQPreferencesDialog::ShortcutAssignClicked); + connect(ui->shortcutRemove, &QPushButton::clicked, this, &lcQPreferencesDialog::ShortcutRemoveClicked); + connect(ui->shortcutsImport, &QPushButton::clicked, this, &lcQPreferencesDialog::ShortcutsImportClicked); + connect(ui->shortcutsExport, &QPushButton::clicked, this, &lcQPreferencesDialog::ShortcutsExportClicked); + connect(ui->shortcutsReset, &QPushButton::clicked, this, &lcQPreferencesDialog::ShortcutsResetClicked); + connect(ui->KeyboardFilterEdit, &QLineEdit::textEdited, this, &lcQPreferencesDialog::KeyboardFilterEditTextEdited); + connect(ui->mouseAssign, &QPushButton::clicked, this, &lcQPreferencesDialog::MouseAssignClicked); + connect(ui->mouseRemove, &QPushButton::clicked, this, &lcQPreferencesDialog::MouseRemoveClicked); + connect(ui->MouseImportButton, &QPushButton::clicked, this, &lcQPreferencesDialog::MouseImportButtonClicked); + connect(ui->MouseExportButton, &QPushButton::clicked, this, &lcQPreferencesDialog::MouseExportButtonClicked); + connect(ui->mouseReset, &QPushButton::clicked, this, &lcQPreferencesDialog::MouseResetClicked); + connect(ui->BackgroundSolidColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); connect(ui->BackgroundGradient1ColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); connect(ui->BackgroundGradient2ColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); @@ -243,18 +282,18 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO SetButtonPixmap(mOptions->Preferences.mControlPointColor, ui->ControlPointColorButton); SetButtonPixmap(mOptions->Preferences.mControlPointFocusedColor, ui->ControlPointFocusedColorButton); - on_studStyleCombo_currentIndexChanged(ui->studStyleCombo->currentIndex()); - on_antiAliasing_toggled(); - on_AutomateEdgeColor_toggled(); - on_edgeLines_toggled(); - on_LineWidthSlider_valueChanged(); - on_MeshLODSlider_valueChanged(); - on_FadeSteps_toggled(); - on_HighlightNewParts_toggled(); - on_gridStuds_toggled(); - on_gridLines_toggled(); - on_ViewSphereSizeCombo_currentIndexChanged(ui->ViewSphereSizeCombo->currentIndex()); - on_PreviewViewSphereSizeCombo_currentIndexChanged(ui->PreviewViewSphereSizeCombo->currentIndex()); + StudStyleComboCurrentIndexChanged(ui->studStyleCombo->currentIndex()); + AntiAliasingToggled(); + AutomateEdgeColorToggled(); + EdgeLinesToggled(); + LineWidthSliderValueChanged(); + MeshLODSliderValueChanged(); + FadeStepsToggled(); + HighlightNewPartsToggled(); + GridStudsToggled(); + GridLinesToggled(); + ViewSphereSizeComboCurrentIndexChanged(ui->ViewSphereSizeCombo->currentIndex()); + PreviewViewSphereSizeComboCurrentIndexChanged(ui->PreviewViewSphereSizeCombo->currentIndex()); updateCategories(); ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(0)); @@ -369,7 +408,7 @@ void lcQPreferencesDialog::accept() QDialog::accept(); } -void lcQPreferencesDialog::on_partsLibraryBrowse_clicked() +void lcQPreferencesDialog::PartsLibraryBrowseClicked() { QString result = QFileDialog::getExistingDirectory(this, tr("Select Parts Library Folder"), ui->partsLibrary->text()); @@ -377,7 +416,7 @@ void lcQPreferencesDialog::on_partsLibraryBrowse_clicked() ui->partsLibrary->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::on_partsArchiveBrowse_clicked() +void lcQPreferencesDialog::PartsArchiveBrowseClicked() { QString result = QFileDialog::getOpenFileName(this, tr("Select Parts Library Archive"), ui->partsLibrary->text(), tr("Supported Archives (*.zip *.bin);;All Files (*.*)")); @@ -385,7 +424,7 @@ void lcQPreferencesDialog::on_partsArchiveBrowse_clicked() ui->partsLibrary->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::on_BlenderAddonSettingsButton_clicked() +void lcQPreferencesDialog::BlenderAddonSettingsButtonClicked() { int Width = 1280; int Height = 720; @@ -402,7 +441,7 @@ void lcQPreferencesDialog::on_BlenderAddonSettingsButton_clicked() Q_UNUSED(Scale) } -void lcQPreferencesDialog::on_ColorConfigBrowseButton_clicked() +void lcQPreferencesDialog::ColorConfigBrowseButtonClicked() { QString Result = QFileDialog::getOpenFileName(this, tr("Select Color Configuration File"), ui->ColorConfigEdit->text(), tr("Settings Files (*.ldr);;All Files (*.*)")); @@ -410,7 +449,7 @@ void lcQPreferencesDialog::on_ColorConfigBrowseButton_clicked() ui->ColorConfigEdit->setText(QDir::toNativeSeparators(Result)); } -void lcQPreferencesDialog::on_MinifigSettingsBrowseButton_clicked() +void lcQPreferencesDialog::MinifigSettingsBrowseButtonClicked() { QString Result = QFileDialog::getOpenFileName(this, tr("Select Minifig Settings File"), ui->MinifigSettingsEdit->text(), tr("Settings Files (*.ini);;All Files (*.*)")); @@ -418,7 +457,7 @@ void lcQPreferencesDialog::on_MinifigSettingsBrowseButton_clicked() ui->MinifigSettingsEdit->setText(QDir::toNativeSeparators(Result)); } -void lcQPreferencesDialog::on_povrayExecutableBrowse_clicked() +void lcQPreferencesDialog::PovrayExecutableBrowseClicked() { #ifdef Q_OS_WIN QString filter(tr("Executable Files (*.exe);;All Files (*.*)")); @@ -432,7 +471,7 @@ void lcQPreferencesDialog::on_povrayExecutableBrowse_clicked() ui->povrayExecutable->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::on_lgeoPathBrowse_clicked() +void lcQPreferencesDialog::LgeoPathBrowseClicked() { QString result = QFileDialog::getExistingDirectory(this, tr("Open LGEO Folder"), ui->lgeoPath->text()); @@ -440,7 +479,7 @@ void lcQPreferencesDialog::on_lgeoPathBrowse_clicked() ui->lgeoPath->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::on_ColorTheme_currentIndexChanged(int Index) +void lcQPreferencesDialog::ColorThemeCurrentIndexChanged(int Index) { Q_UNUSED(Index); @@ -594,12 +633,12 @@ void lcQPreferencesDialog::ColorButtonClicked() ((QToolButton*)Button)->setIcon(pix); } -void lcQPreferencesDialog::on_antiAliasing_toggled() +void lcQPreferencesDialog::AntiAliasingToggled() { ui->antiAliasingSamples->setEnabled(ui->antiAliasing->isChecked()); } -void lcQPreferencesDialog::on_edgeLines_toggled() +void lcQPreferencesDialog::EdgeLinesToggled() { const bool Enable = ui->edgeLines->isChecked() || ui->ConditionalLinesCheckBox->isChecked(); @@ -607,7 +646,7 @@ void lcQPreferencesDialog::on_edgeLines_toggled() ui->LineWidthLabel->setEnabled(Enable); } -void lcQPreferencesDialog::on_ConditionalLinesCheckBox_toggled() +void lcQPreferencesDialog::ConditionalLinesCheckBoxToggled() { const bool Enable = ui->edgeLines->isChecked() || ui->ConditionalLinesCheckBox->isChecked(); @@ -615,55 +654,55 @@ void lcQPreferencesDialog::on_ConditionalLinesCheckBox_toggled() ui->LineWidthLabel->setEnabled(Enable); } -void lcQPreferencesDialog::on_LineWidthSlider_valueChanged() +void lcQPreferencesDialog::LineWidthSliderValueChanged() { float Value = mLineWidthRange[0] + static_cast(ui->LineWidthSlider->value()) * mLineWidthGranularity; ui->LineWidthLabel->setText(QString::number(Value)); } -void lcQPreferencesDialog::on_MeshLODSlider_valueChanged() +void lcQPreferencesDialog::MeshLODSliderValueChanged() { float Value = ui->MeshLODSlider->value() * mMeshLODMultiplier; ui->MeshLODLabel->setText(QString::number(static_cast(Value))); } -void lcQPreferencesDialog::on_FadeSteps_toggled() +void lcQPreferencesDialog::FadeStepsToggled() { ui->FadeStepsColor->setEnabled(ui->FadeSteps->isChecked()); } -void lcQPreferencesDialog::on_HighlightNewParts_toggled() +void lcQPreferencesDialog::HighlightNewPartsToggled() { ui->HighlightNewPartsColor->setEnabled(ui->HighlightNewParts->isChecked()); } -void lcQPreferencesDialog::on_gridStuds_toggled() +void lcQPreferencesDialog::GridStudsToggled() { ui->gridStudColor->setEnabled(ui->gridStuds->isChecked()); } -void lcQPreferencesDialog::on_gridLines_toggled() +void lcQPreferencesDialog::GridLinesToggled() { ui->gridLineColor->setEnabled(ui->gridLines->isChecked()); ui->gridLineSpacing->setEnabled(ui->gridLines->isChecked()); } -void lcQPreferencesDialog::on_PreviewViewSphereSizeCombo_currentIndexChanged(int Index) +void lcQPreferencesDialog::PreviewViewSphereSizeComboCurrentIndexChanged(int Index) { ui->PreviewViewSphereLocationCombo->setEnabled(Index != 0); } -void lcQPreferencesDialog::on_ViewSphereSizeCombo_currentIndexChanged(int Index) +void lcQPreferencesDialog::ViewSphereSizeComboCurrentIndexChanged(int Index) { ui->ViewSphereLocationCombo->setEnabled(Index != 0); } -void lcQPreferencesDialog::on_AutomateEdgeColor_toggled() +void lcQPreferencesDialog::AutomateEdgeColorToggled() { ui->AutomateEdgeColorButton->setEnabled(ui->AutomateEdgeColor->isChecked()); } -void lcQPreferencesDialog::on_studStyleCombo_currentIndexChanged(int index) +void lcQPreferencesDialog::StudStyleComboCurrentIndexChanged(int index) { ui->HighContrastButton->setEnabled(lcIsHighContrast(static_cast(index))); } @@ -782,7 +821,7 @@ void lcQPreferencesDialog::CategoriesDropped(const QModelIndex& Parent, int Firs mOptions->Categories = std::move(Categories); } -void lcQPreferencesDialog::on_newCategory_clicked() +void lcQPreferencesDialog::NewCategoryClicked() { lcLibraryCategory category; @@ -798,7 +837,7 @@ void lcQPreferencesDialog::on_newCategory_clicked() ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(static_cast(mOptions->Categories.size()) - 1)); } -void lcQPreferencesDialog::on_editCategory_clicked() +void lcQPreferencesDialog::EditCategoryClicked() { QList selectedItems = ui->categoriesTree->selectedItems(); @@ -822,7 +861,7 @@ void lcQPreferencesDialog::on_editCategory_clicked() ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(categoryIndex)); } -void lcQPreferencesDialog::on_deleteCategory_clicked() +void lcQPreferencesDialog::DeleteCategoryClicked() { QList selectedItems = ui->categoriesTree->selectedItems(); @@ -846,7 +885,7 @@ void lcQPreferencesDialog::on_deleteCategory_clicked() updateCategories(); } -void lcQPreferencesDialog::on_importCategories_clicked() +void lcQPreferencesDialog::ImportCategoriesClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import Categories"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -865,7 +904,7 @@ void lcQPreferencesDialog::on_importCategories_clicked() mOptions->CategoriesDefault = false; } -void lcQPreferencesDialog::on_exportCategories_clicked() +void lcQPreferencesDialog::ExportCategoriesClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export Categories"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -879,7 +918,7 @@ void lcQPreferencesDialog::on_exportCategories_clicked() } } -void lcQPreferencesDialog::on_resetCategories_clicked() +void lcQPreferencesDialog::ResetCategoriesClicked() { if (QMessageBox::question(this, "LeoCAD", tr("Are you sure you want to load the default categories?"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; @@ -1028,7 +1067,7 @@ void lcQPreferencesDialog::commandChanged(QTreeWidgetItem *current) ui->shortcutEdit->setText(key.toString(QKeySequence::NativeText)); } -void lcQPreferencesDialog::on_KeyboardFilterEdit_textEdited(const QString& Text) +void lcQPreferencesDialog::KeyboardFilterEditTextEdited(const QString& Text) { if (Text.isEmpty()) { @@ -1061,7 +1100,7 @@ void lcQPreferencesDialog::on_KeyboardFilterEdit_textEdited(const QString& Text) } } -void lcQPreferencesDialog::on_shortcutAssign_clicked() +void lcQPreferencesDialog::ShortcutAssignClicked() { QTreeWidgetItem* CurrentItem = ui->commandList->currentItem(); @@ -1129,14 +1168,14 @@ void lcQPreferencesDialog::on_shortcutAssign_clicked() mOptions->KeyboardShortcutsDefault = false; } -void lcQPreferencesDialog::on_shortcutRemove_clicked() +void lcQPreferencesDialog::ShortcutRemoveClicked() { ui->shortcutEdit->setText(QString()); - on_shortcutAssign_clicked(); + ShortcutAssignClicked(); } -void lcQPreferencesDialog::on_shortcutsImport_clicked() +void lcQPreferencesDialog::ShortcutsImportClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1156,7 +1195,7 @@ void lcQPreferencesDialog::on_shortcutsImport_clicked() mOptions->KeyboardShortcutsDefault = false; } -void lcQPreferencesDialog::on_shortcutsExport_clicked() +void lcQPreferencesDialog::ShortcutsExportClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1170,7 +1209,7 @@ void lcQPreferencesDialog::on_shortcutsExport_clicked() } } -void lcQPreferencesDialog::on_shortcutsReset_clicked() +void lcQPreferencesDialog::ShortcutsResetClicked() { if (QMessageBox::question(this, "LeoCAD", tr("Are you sure you want to load the default keyboard shortcuts?"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; @@ -1230,7 +1269,7 @@ void lcQPreferencesDialog::UpdateMouseTreeItem(int ItemIndex) new QTreeWidgetItem(ui->mouseTree, QStringList() << tr(gToolNames[ItemIndex]) << Shortcut1 << Shortcut2); } -void lcQPreferencesDialog::on_mouseAssign_clicked() +void lcQPreferencesDialog::MouseAssignClicked() { QTreeWidgetItem* Current = ui->mouseTree->currentItem(); @@ -1308,7 +1347,7 @@ void lcQPreferencesDialog::on_mouseAssign_clicked() UpdateMouseTreeItem(ItemIndex); } -void lcQPreferencesDialog::on_mouseRemove_clicked() +void lcQPreferencesDialog::MouseRemoveClicked() { QTreeWidgetItem* Current = ui->mouseTree->currentItem(); @@ -1328,7 +1367,7 @@ void lcQPreferencesDialog::on_mouseRemove_clicked() MouseTreeItemChanged(Current); } -void lcQPreferencesDialog::on_MouseImportButton_clicked() +void lcQPreferencesDialog::MouseImportButtonClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import Shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1349,7 +1388,7 @@ void lcQPreferencesDialog::on_MouseImportButton_clicked() mOptions->MouseShortcutsDefault = false; } -void lcQPreferencesDialog::on_MouseExportButton_clicked() +void lcQPreferencesDialog::MouseExportButtonClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export Shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1360,7 +1399,7 @@ void lcQPreferencesDialog::on_MouseExportButton_clicked() QMessageBox::warning(this, "LeoCAD", tr("Error saving mouse shortcuts file.")); } -void lcQPreferencesDialog::on_mouseReset_clicked() +void lcQPreferencesDialog::MouseResetClicked() { if (QMessageBox::question(this, "LeoCAD", tr("Are you sure you want to load the default mouse shortcuts?"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; diff --git a/qt/lc_qpreferencesdialog.h b/qt/lc_qpreferencesdialog.h index 75c42f4c..523710b1 100644 --- a/qt/lc_qpreferencesdialog.h +++ b/qt/lc_qpreferencesdialog.h @@ -57,49 +57,51 @@ public: public slots: void accept() override; - void on_partsLibraryBrowse_clicked(); - void on_partsArchiveBrowse_clicked(); - void on_ColorConfigBrowseButton_clicked(); - void on_MinifigSettingsBrowseButton_clicked(); - void on_povrayExecutableBrowse_clicked(); - void on_lgeoPathBrowse_clicked(); - void on_ColorTheme_currentIndexChanged(int Index); + +private slots: + void PartsLibraryBrowseClicked(); + void PartsArchiveBrowseClicked(); + void ColorConfigBrowseButtonClicked(); + void MinifigSettingsBrowseButtonClicked(); + void PovrayExecutableBrowseClicked(); + void LgeoPathBrowseClicked(); + void ColorThemeCurrentIndexChanged(int Index); void ColorButtonClicked(); void AutomateEdgeColor(); - void on_AutomateEdgeColor_toggled(); - void on_BlenderAddonSettingsButton_clicked(); - void on_studStyleCombo_currentIndexChanged(int index); - void on_antiAliasing_toggled(); - void on_edgeLines_toggled(); - void on_ConditionalLinesCheckBox_toggled(); - void on_LineWidthSlider_valueChanged(); - void on_MeshLODSlider_valueChanged(); - void on_FadeSteps_toggled(); - void on_HighlightNewParts_toggled(); - void on_gridStuds_toggled(); - void on_gridLines_toggled(); - void on_ViewSphereSizeCombo_currentIndexChanged(int Index); - void on_PreviewViewSphereSizeCombo_currentIndexChanged(int Index); + void AutomateEdgeColorToggled(); + void BlenderAddonSettingsButtonClicked(); + void StudStyleComboCurrentIndexChanged(int index); + void AntiAliasingToggled(); + void EdgeLinesToggled(); + void ConditionalLinesCheckBoxToggled(); + void LineWidthSliderValueChanged(); + void MeshLODSliderValueChanged(); + void FadeStepsToggled(); + void HighlightNewPartsToggled(); + void GridStudsToggled(); + void GridLinesToggled(); + void ViewSphereSizeComboCurrentIndexChanged(int Index); + void PreviewViewSphereSizeComboCurrentIndexChanged(int Index); void updateParts(); void CategoriesDropped(const QModelIndex& Parent, int First, int Last); - void on_newCategory_clicked(); - void on_editCategory_clicked(); - void on_deleteCategory_clicked(); - void on_importCategories_clicked(); - void on_exportCategories_clicked(); - void on_resetCategories_clicked(); - void on_shortcutAssign_clicked(); - void on_shortcutRemove_clicked(); - void on_shortcutsImport_clicked(); - void on_shortcutsExport_clicked(); - void on_shortcutsReset_clicked(); + void NewCategoryClicked(); + void EditCategoryClicked(); + void DeleteCategoryClicked(); + void ImportCategoriesClicked(); + void ExportCategoriesClicked(); + void ResetCategoriesClicked(); + void ShortcutAssignClicked(); + void ShortcutRemoveClicked(); + void ShortcutsImportClicked(); + void ShortcutsExportClicked(); + void ShortcutsResetClicked(); void commandChanged(QTreeWidgetItem *current); - void on_KeyboardFilterEdit_textEdited(const QString& Text); - void on_mouseAssign_clicked(); - void on_mouseRemove_clicked(); - void on_MouseImportButton_clicked(); - void on_MouseExportButton_clicked(); - void on_mouseReset_clicked(); + void KeyboardFilterEditTextEdited(const QString& Text); + void MouseAssignClicked(); + void MouseRemoveClicked(); + void MouseImportButtonClicked(); + void MouseExportButtonClicked(); + void MouseResetClicked(); void MouseTreeItemChanged(QTreeWidgetItem* Current); private: diff --git a/qt/lc_qselectdialog.cpp b/qt/lc_qselectdialog.cpp index 1096f8a3..ff64141f 100644 --- a/qt/lc_qselectdialog.cpp +++ b/qt/lc_qselectdialog.cpp @@ -12,10 +12,13 @@ lcQSelectDialog::lcQSelectDialog(QWidget* Parent, lcModel* Model) { ui->setupUi(this); + connect(ui->selectAll, &QPushButton::clicked, this, &lcQSelectDialog::SelectAllClicked); + connect(ui->selectNone, &QPushButton::clicked, this, &lcQSelectDialog::SelectNoneClicked); + connect(ui->selectInvert, &QPushButton::clicked, this, &lcQSelectDialog::SelectInvertClicked); + connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &lcQSelectDialog::ItemChanged); + AddChildren(ui->treeWidget->invisibleRootItem(), nullptr, Model); ui->treeWidget->expandAll(); - - connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &lcQSelectDialog::itemChanged); } lcQSelectDialog::~lcQSelectDialog() @@ -53,7 +56,7 @@ void lcQSelectDialog::accept() QDialog::accept(); } -void lcQSelectDialog::on_selectAll_clicked() +void lcQSelectDialog::SelectAllClicked() { ui->treeWidget->blockSignals(true); @@ -77,7 +80,7 @@ void lcQSelectDialog::on_selectAll_clicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::on_selectNone_clicked() +void lcQSelectDialog::SelectNoneClicked() { ui->treeWidget->blockSignals(true); @@ -101,7 +104,7 @@ void lcQSelectDialog::on_selectNone_clicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::on_selectInvert_clicked() +void lcQSelectDialog::SelectInvertClicked() { ui->treeWidget->blockSignals(true); @@ -125,7 +128,7 @@ void lcQSelectDialog::on_selectInvert_clicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::itemChanged(QTreeWidgetItem *item, int column) +void lcQSelectDialog::ItemChanged(QTreeWidgetItem *item, int column) { Q_UNUSED(column); diff --git a/qt/lc_qselectdialog.h b/qt/lc_qselectdialog.h index fbdff6e1..044e7ad1 100644 --- a/qt/lc_qselectdialog.h +++ b/qt/lc_qselectdialog.h @@ -23,10 +23,12 @@ public: public slots: void accept() override; - void on_selectAll_clicked(); - void on_selectNone_clicked(); - void on_selectInvert_clicked(); - void itemChanged(QTreeWidgetItem *item, int column); + +private slots: + void SelectAllClicked(); + void SelectNoneClicked(); + void SelectInvertClicked(); + void ItemChanged(QTreeWidgetItem *item, int column); private: Ui::lcQSelectDialog *ui; diff --git a/qt/lc_renderdialog.cpp b/qt/lc_renderdialog.cpp index 17e7a06c..5564beb1 100644 --- a/qt/lc_renderdialog.cpp +++ b/qt/lc_renderdialog.cpp @@ -68,6 +68,7 @@ lcRenderDialog::lcRenderDialog(QWidget* Parent, lcRenderDialogMode RenderDialogM connect(mSettingsButton, &QPushButton::clicked, this, &lcRenderDialog::SettingsButtonClicked); connect(mLogButton, &QPushButton::clicked, this, &lcRenderDialog::LogButtonClicked); connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &lcRenderDialog::reject); + connect(ui->OutputBrowseButton, &QPushButton::clicked, this, &lcRenderDialog::OutputBrowseButtonClicked); if (mDialogMode == lcRenderDialogMode::RenderPOVRay) { @@ -795,7 +796,7 @@ void lcRenderDialog::ShowResult() WriteStdOut(); } -void lcRenderDialog::on_OutputBrowseButton_clicked() +void lcRenderDialog::OutputBrowseButtonClicked() { const QString Result = QFileDialog::getSaveFileName(this, tr("Select Output File"), ui->OutputEdit->text(), tr("Supported Image Files (*.bmp *.png *.jpg);;BMP Files (*.bmp);;PNG Files (*.png);;JPEG Files (*.jpg);;All Files (*.*)")); diff --git a/qt/lc_renderdialog.h b/qt/lc_renderdialog.h index 115c31c9..9779029d 100644 --- a/qt/lc_renderdialog.h +++ b/qt/lc_renderdialog.h @@ -69,7 +69,9 @@ public: public slots: void reject() override; - void on_OutputBrowseButton_clicked(); + +private slots: + void OutputBrowseButtonClicked(); void Update(); protected slots: diff --git a/qt/lc_setsdatabasedialog.cpp b/qt/lc_setsdatabasedialog.cpp index d377cf32..58e38238 100644 --- a/qt/lc_setsdatabasedialog.cpp +++ b/qt/lc_setsdatabasedialog.cpp @@ -15,6 +15,7 @@ lcSetsDatabaseDialog::lcSetsDatabaseDialog(QWidget* Parent) connect(ui->SetsTree, &QTreeWidget::itemDoubleClicked, this, &lcSetsDatabaseDialog::accept); connect(this, &QDialog::finished, this, &lcSetsDatabaseDialog::Finished); connect(mHttpManager, &lcHttpManager::DownloadFinished, this, &lcSetsDatabaseDialog::DownloadFinished); + connect(ui->SearchButton, &QPushButton::clicked, this, &lcSetsDatabaseDialog::SearchButtonClicked); mKeyListReply = mHttpManager->DownloadFile(QLatin1String("https://www.leocad.org/rebrickable.json")); } @@ -46,7 +47,7 @@ bool lcSetsDatabaseDialog::eventFilter(QObject* Object, QEvent* Event) if (Key == Qt::Key_Return || Key == Qt::Key_Enter) { KeyEvent->accept(); - on_SearchButton_clicked(); + SearchButtonClicked(); return true; } } @@ -105,7 +106,7 @@ void lcSetsDatabaseDialog::Finished(int Result) } } -void lcSetsDatabaseDialog::on_SearchButton_clicked() +void lcSetsDatabaseDialog::SearchButtonClicked() { QString Keyword = ui->SearchEdit->text(); diff --git a/qt/lc_setsdatabasedialog.h b/qt/lc_setsdatabasedialog.h index 42828b44..77b7f478 100644 --- a/qt/lc_setsdatabasedialog.h +++ b/qt/lc_setsdatabasedialog.h @@ -29,7 +29,7 @@ public: public slots: void DownloadFinished(lcHttpReply* Reply); - void on_SearchButton_clicked(); + void SearchButtonClicked(); void accept() override; void Finished(int Result);