From bc61124f50f7db6ca80d33070befbd82dcc483a0 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Wed, 29 Apr 2026 20:43:00 -0700 Subject: [PATCH] Remove the Q prefix from dialog classes. --- common/lc_application.cpp | 2 +- common/lc_mainwindow.cpp | 2 +- common/lc_model.cpp | 4 +- common/project.cpp | 2 +- qt/lc_qhtmldialog.cpp | 12 +- qt/lc_qhtmldialog.h | 10 +- qt/lc_qhtmldialog.ui | 8 +- qt/lc_qimagedialog.cpp | 12 +- qt/lc_qimagedialog.h | 10 +- qt/lc_qimagedialog.ui | 8 +- qt/lc_qpreferencesdialog.cpp | 244 +++++++++++++++++------------------ qt/lc_qpreferencesdialog.h | 10 +- qt/lc_qpreferencesdialog.ui | 8 +- qt/lc_qpropertiesdialog.cpp | 8 +- qt/lc_qpropertiesdialog.h | 10 +- qt/lc_qpropertiesdialog.ui | 8 +- qt/lc_qselectdialog.cpp | 26 ++-- qt/lc_qselectdialog.h | 10 +- qt/lc_qselectdialog.ui | 8 +- qt/lc_qutils.cpp | 10 +- qt/lc_qutils.h | 4 +- resources/leocad_cs.ts | 10 +- resources/leocad_de.ts | 10 +- resources/leocad_es.ts | 10 +- resources/leocad_fr.ts | 10 +- resources/leocad_pt.ts | 10 +- resources/leocad_ru.ts | 10 +- resources/leocad_uk.ts | 10 +- resources/leocad_zh_CN.ts | 10 +- 29 files changed, 248 insertions(+), 248 deletions(-) diff --git a/common/lc_application.cpp b/common/lc_application.cpp index c113d580..9f8ef31a 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -1307,7 +1307,7 @@ void lcApplication::ShowPreferencesDialog() Options.MouseShortcutsModified = false; Options.MouseShortcutsDefault = false; - lcQPreferencesDialog Dialog(gMainWindow, &Options); + lcPreferencesDialog Dialog(gMainWindow, &Options); if (Dialog.exec() != QDialog::Accepted) return; diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index 99a4c471..f858e706 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -1313,7 +1313,7 @@ void lcMainWindow::ShowHTMLDialog() { lcHTMLExportOptions Options(lcGetActiveProject()); - lcQHTMLDialog Dialog(this, &Options); + lcHTMLDialog Dialog(this, &Options); if (Dialog.exec() != QDialog::Accepted) return; diff --git a/common/lc_model.cpp b/common/lc_model.cpp index f712de75..5d5679e3 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -5419,7 +5419,7 @@ void lcModel::ShowPropertiesDialog() GetPartsList(gDefaultColor, true, false, Options.PartsList); - lcQPropertiesDialog Dialog(gMainWindow, &Options); + lcPropertiesDialog Dialog(gMainWindow, &Options); if (Dialog.exec() != QDialog::Accepted) return; @@ -5439,7 +5439,7 @@ void lcModel::ShowSelectByNameDialog() return; } - lcQSelectDialog Dialog(gMainWindow, this); + lcSelectDialog Dialog(gMainWindow, this); if (Dialog.exec() != QDialog::Accepted) return; diff --git a/common/project.cpp b/common/project.cpp index 02908455..f47302e1 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -2603,7 +2603,7 @@ bool Project::ExportWavefront(const QString& FileName) void Project::SaveImage() { - lcQImageDialog Dialog(gMainWindow); + lcImageDialog Dialog(gMainWindow); if (Dialog.exec() != QDialog::Accepted) return; diff --git a/qt/lc_qhtmldialog.cpp b/qt/lc_qhtmldialog.cpp index ef5e8e64..d636ce7f 100644 --- a/qt/lc_qhtmldialog.cpp +++ b/qt/lc_qhtmldialog.cpp @@ -3,12 +3,12 @@ #include "ui_lc_qhtmldialog.h" #include "project.h" -lcQHTMLDialog::lcQHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options) - : QDialog(Parent), ui(new Ui::lcQHTMLDialog) +lcHTMLDialog::lcHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options) + : QDialog(Parent), ui(new Ui::lcHTMLDialog) { ui->setupUi(this); - connect(ui->outputFolderBrowse, &QPushButton::clicked, this, &lcQHTMLDialog::OutputFolderBrowseClicked); + connect(ui->outputFolderBrowse, &QPushButton::clicked, this, &lcHTMLDialog::OutputFolderBrowseClicked); ui->stepWidth->setValidator(new QIntValidator(0, 2048, ui->stepWidth)); ui->stepHeight->setValidator(new QIntValidator(0, 2048, ui->stepHeight)); @@ -34,12 +34,12 @@ lcQHTMLDialog::lcQHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options) ui->partsAtTheEnd->setChecked(mOptions->PartsListEnd); } -lcQHTMLDialog::~lcQHTMLDialog() +lcHTMLDialog::~lcHTMLDialog() { delete ui; } -void lcQHTMLDialog::accept() +void lcHTMLDialog::accept() { QString pathName = ui->outputFolder->text(); @@ -63,7 +63,7 @@ void lcQHTMLDialog::accept() QDialog::accept(); } -void lcQHTMLDialog::OutputFolderBrowseClicked() +void lcHTMLDialog::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 cf679814..d0c4d2d0 100644 --- a/qt/lc_qhtmldialog.h +++ b/qt/lc_qhtmldialog.h @@ -4,16 +4,16 @@ class lcHTMLExportOptions; namespace Ui { -class lcQHTMLDialog; +class lcHTMLDialog; } -class lcQHTMLDialog : public QDialog +class lcHTMLDialog : public QDialog { Q_OBJECT public: - explicit lcQHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options); - ~lcQHTMLDialog(); + explicit lcHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options); + ~lcHTMLDialog(); public slots: void accept() override; @@ -23,6 +23,6 @@ private slots: private: lcHTMLExportOptions* mOptions; - Ui::lcQHTMLDialog *ui; + Ui::lcHTMLDialog *ui; }; diff --git a/qt/lc_qhtmldialog.ui b/qt/lc_qhtmldialog.ui index 487a40b3..4b6f3a51 100644 --- a/qt/lc_qhtmldialog.ui +++ b/qt/lc_qhtmldialog.ui @@ -1,7 +1,7 @@ - lcQHTMLDialog - + lcHTMLDialog + 0 @@ -221,7 +221,7 @@ buttonBox accepted() - lcQHTMLDialog + lcHTMLDialog accept() @@ -237,7 +237,7 @@ buttonBox rejected() - lcQHTMLDialog + lcHTMLDialog reject() diff --git a/qt/lc_qimagedialog.cpp b/qt/lc_qimagedialog.cpp index c14c5211..874ecbaa 100644 --- a/qt/lc_qimagedialog.cpp +++ b/qt/lc_qimagedialog.cpp @@ -6,12 +6,12 @@ #include "lc_model.h" #include "lc_profile.h" -lcQImageDialog::lcQImageDialog(QWidget* Parent) - : QDialog(Parent), ui(new Ui::lcQImageDialog) +lcImageDialog::lcImageDialog(QWidget* Parent) + : QDialog(Parent), ui(new Ui::lcImageDialog) { ui->setupUi(this); - connect(ui->fileNameBrowse, &QPushButton::clicked, this, &lcQImageDialog::FileNameBrowseClicked); + connect(ui->fileNameBrowse, &QPushButton::clicked, this, &lcImageDialog::FileNameBrowseClicked); ui->width->setValidator(new QIntValidator(1, 32768, this)); ui->height->setValidator(new QIntValidator(1, 32768, this)); @@ -34,12 +34,12 @@ lcQImageDialog::lcQImageDialog(QWidget* Parent) ui->rangeCurrent->setChecked(true); } -lcQImageDialog::~lcQImageDialog() +lcImageDialog::~lcImageDialog() { delete ui; } -void lcQImageDialog::accept() +void lcImageDialog::accept() { QString fileName = ui->fileName->text(); @@ -114,7 +114,7 @@ void lcQImageDialog::accept() QDialog::accept(); } -void lcQImageDialog::FileNameBrowseClicked() +void lcImageDialog::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 99b702a2..2b9d5640 100644 --- a/qt/lc_qimagedialog.h +++ b/qt/lc_qimagedialog.h @@ -3,16 +3,16 @@ #include namespace Ui { -class lcQImageDialog; +class lcImageDialog; } -class lcQImageDialog : public QDialog +class lcImageDialog : public QDialog { Q_OBJECT public: - lcQImageDialog(QWidget* Parent); - ~lcQImageDialog(); + lcImageDialog(QWidget* Parent); + ~lcImageDialog(); QString mFileName; int mWidth; @@ -27,6 +27,6 @@ private slots: void FileNameBrowseClicked(); private: - Ui::lcQImageDialog *ui; + Ui::lcImageDialog *ui; }; diff --git a/qt/lc_qimagedialog.ui b/qt/lc_qimagedialog.ui index 86c36eb5..b94f51c8 100644 --- a/qt/lc_qimagedialog.ui +++ b/qt/lc_qimagedialog.ui @@ -1,7 +1,7 @@ - lcQImageDialog - + lcImageDialog + 0 @@ -216,7 +216,7 @@ buttonBox accepted() - lcQImageDialog + lcImageDialog accept() @@ -232,7 +232,7 @@ buttonBox rejected() - lcQImageDialog + lcImageDialog reject() diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 7cd0f410..18ac5749 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -19,8 +19,8 @@ static const char* gLanguageLocales[] = "", "cs_CZ", "de_DE", "en_US", "fr_FR", "pt_PT", "es_ES", "zh_CN" }; -lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogOptions* Options) - : QDialog(Parent), mOptions(Options), ui(new Ui::lcQPreferencesDialog) +lcPreferencesDialog::lcPreferencesDialog(QWidget* Parent, lcPreferencesDialogOptions* Options) + : QDialog(Parent), mOptions(Options), ui(new Ui::lcPreferencesDialog) { ui->setupUi(this); @@ -40,75 +40,75 @@ 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->partsLibraryBrowse, &QPushButton::clicked, this, &lcPreferencesDialog::PartsLibraryBrowseClicked); + connect(ui->partsArchiveBrowse, &QPushButton::clicked, this, &lcPreferencesDialog::PartsArchiveBrowseClicked); + connect(ui->ColorConfigBrowseButton, &QPushButton::clicked, this, &lcPreferencesDialog::ColorConfigBrowseButtonClicked); + connect(ui->MinifigSettingsBrowseButton, &QPushButton::clicked, this, &lcPreferencesDialog::MinifigSettingsBrowseButtonClicked); + connect(ui->povrayExecutableBrowse, &QPushButton::clicked, this, &lcPreferencesDialog::PovrayExecutableBrowseClicked); + connect(ui->lgeoPathBrowse, &QPushButton::clicked, this, &lcPreferencesDialog::LgeoPathBrowseClicked); + connect(ui->ColorTheme, QOverload::of(&QComboBox::currentIndexChanged), this, &lcPreferencesDialog::ColorThemeCurrentIndexChanged); + connect(ui->AutomateEdgeColor, &QCheckBox::toggled, this, &lcPreferencesDialog::AutomateEdgeColorToggled); + connect(ui->BlenderAddonSettingsButton, &QPushButton::clicked, this, &lcPreferencesDialog::BlenderAddonSettingsButtonClicked); + connect(ui->studStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcPreferencesDialog::StudStyleComboCurrentIndexChanged); + connect(ui->antiAliasing, &QCheckBox::toggled, this, &lcPreferencesDialog::AntiAliasingToggled); + connect(ui->edgeLines, &QCheckBox::toggled, this, &lcPreferencesDialog::EdgeLinesToggled); + connect(ui->ConditionalLinesCheckBox, &QCheckBox::toggled, this, &lcPreferencesDialog::ConditionalLinesCheckBoxToggled); + connect(ui->LineWidthSlider, QOverload::of(&QSlider::valueChanged), this, &lcPreferencesDialog::LineWidthSliderValueChanged); + connect(ui->MeshLODSlider, QOverload::of(&QSlider::valueChanged), this, &lcPreferencesDialog::MeshLODSliderValueChanged); + connect(ui->FadeSteps, &QCheckBox::toggled, this, &lcPreferencesDialog::FadeStepsToggled); + connect(ui->HighlightNewParts, &QCheckBox::toggled, this, &lcPreferencesDialog::HighlightNewPartsToggled); + connect(ui->gridStuds, &QCheckBox::toggled, this, &lcPreferencesDialog::GridStudsToggled); + connect(ui->gridLines, &QCheckBox::toggled, this, &lcPreferencesDialog::GridLinesToggled); + connect(ui->ViewSphereSizeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcPreferencesDialog::ViewSphereSizeComboCurrentIndexChanged); + connect(ui->PreviewViewSphereSizeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &lcPreferencesDialog::PreviewViewSphereSizeComboCurrentIndexChanged); + connect(ui->newCategory, &QPushButton::clicked, this, &lcPreferencesDialog::NewCategoryClicked); + connect(ui->editCategory, &QPushButton::clicked, this, &lcPreferencesDialog::EditCategoryClicked); + connect(ui->deleteCategory, &QPushButton::clicked, this, &lcPreferencesDialog::DeleteCategoryClicked); + connect(ui->importCategories, &QPushButton::clicked, this, &lcPreferencesDialog::ImportCategoriesClicked); + connect(ui->exportCategories, &QPushButton::clicked, this, &lcPreferencesDialog::ExportCategoriesClicked); + connect(ui->resetCategories, &QPushButton::clicked, this, &lcPreferencesDialog::ResetCategoriesClicked); + connect(ui->shortcutAssign, &QPushButton::clicked, this, &lcPreferencesDialog::ShortcutAssignClicked); + connect(ui->shortcutRemove, &QPushButton::clicked, this, &lcPreferencesDialog::ShortcutRemoveClicked); + connect(ui->shortcutsImport, &QPushButton::clicked, this, &lcPreferencesDialog::ShortcutsImportClicked); + connect(ui->shortcutsExport, &QPushButton::clicked, this, &lcPreferencesDialog::ShortcutsExportClicked); + connect(ui->shortcutsReset, &QPushButton::clicked, this, &lcPreferencesDialog::ShortcutsResetClicked); + connect(ui->KeyboardFilterEdit, &QLineEdit::textEdited, this, &lcPreferencesDialog::KeyboardFilterEditTextEdited); + connect(ui->mouseAssign, &QPushButton::clicked, this, &lcPreferencesDialog::MouseAssignClicked); + connect(ui->mouseRemove, &QPushButton::clicked, this, &lcPreferencesDialog::MouseRemoveClicked); + connect(ui->MouseImportButton, &QPushButton::clicked, this, &lcPreferencesDialog::MouseImportButtonClicked); + connect(ui->MouseExportButton, &QPushButton::clicked, this, &lcPreferencesDialog::MouseExportButtonClicked); + connect(ui->mouseReset, &QPushButton::clicked, this, &lcPreferencesDialog::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); - connect(ui->ActiveViewColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->InactiveViewColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->AxesColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->TextColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->MarqueeBorderColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->MarqueeFillColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->OverlayColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->FadeStepsColor, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->HighlightNewPartsColor, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->gridStudColor, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->gridLineColor, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ViewSphereColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ViewSphereTextColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ViewSphereHighlightColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ObjectSelectedColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ObjectFocusedColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->CameraColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->LightColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ControlPointColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->ControlPointFocusedColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::ColorButtonClicked); - connect(ui->categoriesTree, &QTreeWidget::itemSelectionChanged, this, &lcQPreferencesDialog::updateParts); - connect(ui->categoriesTree->model(), &QAbstractItemModel::rowsInserted, this, &lcQPreferencesDialog::CategoriesDropped); + connect(ui->BackgroundSolidColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->BackgroundGradient1ColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->BackgroundGradient2ColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ActiveViewColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->InactiveViewColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->AxesColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->TextColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->MarqueeBorderColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->MarqueeFillColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->OverlayColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->FadeStepsColor, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->HighlightNewPartsColor, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->gridStudColor, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->gridLineColor, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ViewSphereColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ViewSphereTextColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ViewSphereHighlightColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ObjectSelectedColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ObjectFocusedColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->CameraColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->LightColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ControlPointColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->ControlPointFocusedColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::ColorButtonClicked); + connect(ui->categoriesTree, &QTreeWidget::itemSelectionChanged, this, &lcPreferencesDialog::updateParts); + connect(ui->categoriesTree->model(), &QAbstractItemModel::rowsInserted, this, &lcPreferencesDialog::CategoriesDropped); ui->shortcutEdit->installEventFilter(this); - connect(ui->commandList, &QTreeWidget::currentItemChanged, this, &lcQPreferencesDialog::commandChanged); - connect(ui->mouseTree, &QTreeWidget::currentItemChanged, this, &lcQPreferencesDialog::MouseTreeItemChanged); - connect(ui->HighContrastButton, &QToolButton::clicked, this, &lcQPreferencesDialog::AutomateEdgeColor); - connect(ui->AutomateEdgeColorButton, &QToolButton::clicked, this, &lcQPreferencesDialog::AutomateEdgeColor); + connect(ui->commandList, &QTreeWidget::currentItemChanged, this, &lcPreferencesDialog::commandChanged); + connect(ui->mouseTree, &QTreeWidget::currentItemChanged, this, &lcPreferencesDialog::MouseTreeItemChanged); + connect(ui->HighContrastButton, &QToolButton::clicked, this, &lcPreferencesDialog::AutomateEdgeColor); + connect(ui->AutomateEdgeColorButton, &QToolButton::clicked, this, &lcPreferencesDialog::AutomateEdgeColor); ui->partsLibrary->setText(mOptions->LibraryPath); ui->ColorConfigEdit->setText(mOptions->ColorConfigPath); @@ -299,7 +299,7 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(0)); updateCommandList(); - new lcQTreeWidgetColumnStretcher(ui->commandList, 0); + new lcTreeWidgetColumnStretcher(ui->commandList, 0); commandChanged(nullptr); UpdateMouseTree(); @@ -309,12 +309,12 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO MouseTreeItemChanged(nullptr); } -lcQPreferencesDialog::~lcQPreferencesDialog() +lcPreferencesDialog::~lcPreferencesDialog() { delete ui; } -void lcQPreferencesDialog::accept() +void lcPreferencesDialog::accept() { int gridLineSpacing = ui->gridLineSpacing->text().toInt(); if (gridLineSpacing < 1) @@ -408,7 +408,7 @@ void lcQPreferencesDialog::accept() QDialog::accept(); } -void lcQPreferencesDialog::PartsLibraryBrowseClicked() +void lcPreferencesDialog::PartsLibraryBrowseClicked() { QString result = QFileDialog::getExistingDirectory(this, tr("Select Parts Library Folder"), ui->partsLibrary->text()); @@ -416,7 +416,7 @@ void lcQPreferencesDialog::PartsLibraryBrowseClicked() ui->partsLibrary->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::PartsArchiveBrowseClicked() +void lcPreferencesDialog::PartsArchiveBrowseClicked() { QString result = QFileDialog::getOpenFileName(this, tr("Select Parts Library Archive"), ui->partsLibrary->text(), tr("Supported Archives (*.zip *.bin);;All Files (*.*)")); @@ -424,7 +424,7 @@ void lcQPreferencesDialog::PartsArchiveBrowseClicked() ui->partsLibrary->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::BlenderAddonSettingsButtonClicked() +void lcPreferencesDialog::BlenderAddonSettingsButtonClicked() { int Width = 1280; int Height = 720; @@ -441,7 +441,7 @@ void lcQPreferencesDialog::BlenderAddonSettingsButtonClicked() Q_UNUSED(Scale) } -void lcQPreferencesDialog::ColorConfigBrowseButtonClicked() +void lcPreferencesDialog::ColorConfigBrowseButtonClicked() { QString Result = QFileDialog::getOpenFileName(this, tr("Select Color Configuration File"), ui->ColorConfigEdit->text(), tr("Settings Files (*.ldr);;All Files (*.*)")); @@ -449,7 +449,7 @@ void lcQPreferencesDialog::ColorConfigBrowseButtonClicked() ui->ColorConfigEdit->setText(QDir::toNativeSeparators(Result)); } -void lcQPreferencesDialog::MinifigSettingsBrowseButtonClicked() +void lcPreferencesDialog::MinifigSettingsBrowseButtonClicked() { QString Result = QFileDialog::getOpenFileName(this, tr("Select Minifig Settings File"), ui->MinifigSettingsEdit->text(), tr("Settings Files (*.ini);;All Files (*.*)")); @@ -457,7 +457,7 @@ void lcQPreferencesDialog::MinifigSettingsBrowseButtonClicked() ui->MinifigSettingsEdit->setText(QDir::toNativeSeparators(Result)); } -void lcQPreferencesDialog::PovrayExecutableBrowseClicked() +void lcPreferencesDialog::PovrayExecutableBrowseClicked() { #ifdef Q_OS_WIN QString filter(tr("Executable Files (*.exe);;All Files (*.*)")); @@ -471,7 +471,7 @@ void lcQPreferencesDialog::PovrayExecutableBrowseClicked() ui->povrayExecutable->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::LgeoPathBrowseClicked() +void lcPreferencesDialog::LgeoPathBrowseClicked() { QString result = QFileDialog::getExistingDirectory(this, tr("Open LGEO Folder"), ui->lgeoPath->text()); @@ -479,7 +479,7 @@ void lcQPreferencesDialog::LgeoPathBrowseClicked() ui->lgeoPath->setText(QDir::toNativeSeparators(result)); } -void lcQPreferencesDialog::ColorThemeCurrentIndexChanged(int Index) +void lcPreferencesDialog::ColorThemeCurrentIndexChanged(int Index) { Q_UNUSED(Index); @@ -487,7 +487,7 @@ void lcQPreferencesDialog::ColorThemeCurrentIndexChanged(int Index) mOptions->Preferences.SetInterfaceColors(static_cast(ui->ColorTheme->currentIndex())); } -void lcQPreferencesDialog::ColorButtonClicked() +void lcPreferencesDialog::ColorButtonClicked() { QObject* Button = sender(); QString Title; @@ -633,12 +633,12 @@ void lcQPreferencesDialog::ColorButtonClicked() ((QToolButton*)Button)->setIcon(pix); } -void lcQPreferencesDialog::AntiAliasingToggled() +void lcPreferencesDialog::AntiAliasingToggled() { ui->antiAliasingSamples->setEnabled(ui->antiAliasing->isChecked()); } -void lcQPreferencesDialog::EdgeLinesToggled() +void lcPreferencesDialog::EdgeLinesToggled() { const bool Enable = ui->edgeLines->isChecked() || ui->ConditionalLinesCheckBox->isChecked(); @@ -646,7 +646,7 @@ void lcQPreferencesDialog::EdgeLinesToggled() ui->LineWidthLabel->setEnabled(Enable); } -void lcQPreferencesDialog::ConditionalLinesCheckBoxToggled() +void lcPreferencesDialog::ConditionalLinesCheckBoxToggled() { const bool Enable = ui->edgeLines->isChecked() || ui->ConditionalLinesCheckBox->isChecked(); @@ -654,60 +654,60 @@ void lcQPreferencesDialog::ConditionalLinesCheckBoxToggled() ui->LineWidthLabel->setEnabled(Enable); } -void lcQPreferencesDialog::LineWidthSliderValueChanged() +void lcPreferencesDialog::LineWidthSliderValueChanged() { float Value = mLineWidthRange[0] + static_cast(ui->LineWidthSlider->value()) * mLineWidthGranularity; ui->LineWidthLabel->setText(QString::number(Value)); } -void lcQPreferencesDialog::MeshLODSliderValueChanged() +void lcPreferencesDialog::MeshLODSliderValueChanged() { float Value = ui->MeshLODSlider->value() * mMeshLODMultiplier; ui->MeshLODLabel->setText(QString::number(static_cast(Value))); } -void lcQPreferencesDialog::FadeStepsToggled() +void lcPreferencesDialog::FadeStepsToggled() { ui->FadeStepsColor->setEnabled(ui->FadeSteps->isChecked()); } -void lcQPreferencesDialog::HighlightNewPartsToggled() +void lcPreferencesDialog::HighlightNewPartsToggled() { ui->HighlightNewPartsColor->setEnabled(ui->HighlightNewParts->isChecked()); } -void lcQPreferencesDialog::GridStudsToggled() +void lcPreferencesDialog::GridStudsToggled() { ui->gridStudColor->setEnabled(ui->gridStuds->isChecked()); } -void lcQPreferencesDialog::GridLinesToggled() +void lcPreferencesDialog::GridLinesToggled() { ui->gridLineColor->setEnabled(ui->gridLines->isChecked()); ui->gridLineSpacing->setEnabled(ui->gridLines->isChecked()); } -void lcQPreferencesDialog::PreviewViewSphereSizeComboCurrentIndexChanged(int Index) +void lcPreferencesDialog::PreviewViewSphereSizeComboCurrentIndexChanged(int Index) { ui->PreviewViewSphereLocationCombo->setEnabled(Index != 0); } -void lcQPreferencesDialog::ViewSphereSizeComboCurrentIndexChanged(int Index) +void lcPreferencesDialog::ViewSphereSizeComboCurrentIndexChanged(int Index) { ui->ViewSphereLocationCombo->setEnabled(Index != 0); } -void lcQPreferencesDialog::AutomateEdgeColorToggled() +void lcPreferencesDialog::AutomateEdgeColorToggled() { ui->AutomateEdgeColorButton->setEnabled(ui->AutomateEdgeColor->isChecked()); } -void lcQPreferencesDialog::StudStyleComboCurrentIndexChanged(int index) +void lcPreferencesDialog::StudStyleComboCurrentIndexChanged(int index) { ui->HighContrastButton->setEnabled(lcIsHighContrast(static_cast(index))); } -void lcQPreferencesDialog::AutomateEdgeColor() +void lcPreferencesDialog::AutomateEdgeColor() { lcAutomateEdgeColorDialog Dialog(this, sender() == ui->HighContrastButton); if (Dialog.exec() == QDialog::Accepted) @@ -725,7 +725,7 @@ void lcQPreferencesDialog::AutomateEdgeColor() } } -void lcQPreferencesDialog::updateCategories() +void lcPreferencesDialog::updateCategories() { QTreeWidgetItem* CategoryItem; QTreeWidget* CategoriesTree = ui->categoriesTree; @@ -745,7 +745,7 @@ void lcQPreferencesDialog::updateCategories() CategoryItem->setFlags(CategoryItem->flags() & ~Qt::ItemFlag::ItemIsDropEnabled); } -void lcQPreferencesDialog::updateParts() +void lcPreferencesDialog::updateParts() { lcPiecesLibrary *Library = lcGetPiecesLibrary(); QTreeWidget *tree = ui->partsTree; @@ -800,7 +800,7 @@ void lcQPreferencesDialog::updateParts() tree->resizeColumnToContents(1); } -void lcQPreferencesDialog::CategoriesDropped(const QModelIndex& Parent, int First, int Last) +void lcPreferencesDialog::CategoriesDropped(const QModelIndex& Parent, int First, int Last) { std::vector Categories; @@ -821,7 +821,7 @@ void lcQPreferencesDialog::CategoriesDropped(const QModelIndex& Parent, int Firs mOptions->Categories = std::move(Categories); } -void lcQPreferencesDialog::NewCategoryClicked() +void lcPreferencesDialog::NewCategoryClicked() { lcLibraryCategory category; @@ -837,7 +837,7 @@ void lcQPreferencesDialog::NewCategoryClicked() ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(static_cast(mOptions->Categories.size()) - 1)); } -void lcQPreferencesDialog::EditCategoryClicked() +void lcPreferencesDialog::EditCategoryClicked() { QList selectedItems = ui->categoriesTree->selectedItems(); @@ -861,7 +861,7 @@ void lcQPreferencesDialog::EditCategoryClicked() ui->categoriesTree->setCurrentItem(ui->categoriesTree->topLevelItem(categoryIndex)); } -void lcQPreferencesDialog::DeleteCategoryClicked() +void lcPreferencesDialog::DeleteCategoryClicked() { QList selectedItems = ui->categoriesTree->selectedItems(); @@ -885,7 +885,7 @@ void lcQPreferencesDialog::DeleteCategoryClicked() updateCategories(); } -void lcQPreferencesDialog::ImportCategoriesClicked() +void lcPreferencesDialog::ImportCategoriesClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import Categories"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -904,7 +904,7 @@ void lcQPreferencesDialog::ImportCategoriesClicked() mOptions->CategoriesDefault = false; } -void lcQPreferencesDialog::ExportCategoriesClicked() +void lcPreferencesDialog::ExportCategoriesClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export Categories"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -918,7 +918,7 @@ void lcQPreferencesDialog::ExportCategoriesClicked() } } -void lcQPreferencesDialog::ResetCategoriesClicked() +void lcPreferencesDialog::ResetCategoriesClicked() { if (QMessageBox::question(this, "LeoCAD", tr("Are you sure you want to load the default categories?"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; @@ -931,7 +931,7 @@ void lcQPreferencesDialog::ResetCategoriesClicked() updateCategories(); } -bool lcQPreferencesDialog::eventFilter(QObject *object, QEvent *event) +bool lcPreferencesDialog::eventFilter(QObject *object, QEvent *event) { Q_UNUSED(object); @@ -970,7 +970,7 @@ bool lcQPreferencesDialog::eventFilter(QObject *object, QEvent *event) return QDialog::eventFilter(object, event); } -void lcQPreferencesDialog::updateCommandList() +void lcPreferencesDialog::updateCommandList() { ui->commandList->clear(); QMap sections; @@ -1042,7 +1042,7 @@ void lcQPreferencesDialog::updateCommandList() } } -void lcQPreferencesDialog::setShortcutModified(QTreeWidgetItem *treeItem, bool modified) +void lcPreferencesDialog::setShortcutModified(QTreeWidgetItem *treeItem, bool modified) { QFont font = treeItem->font(0); font.setItalic(modified); @@ -1051,7 +1051,7 @@ void lcQPreferencesDialog::setShortcutModified(QTreeWidgetItem *treeItem, bool m treeItem->setFont(1, font); } -void lcQPreferencesDialog::commandChanged(QTreeWidgetItem *current) +void lcPreferencesDialog::commandChanged(QTreeWidgetItem *current) { if (!current || !current->data(0, Qt::UserRole).isValid()) { @@ -1067,7 +1067,7 @@ void lcQPreferencesDialog::commandChanged(QTreeWidgetItem *current) ui->shortcutEdit->setText(key.toString(QKeySequence::NativeText)); } -void lcQPreferencesDialog::KeyboardFilterEditTextEdited(const QString& Text) +void lcPreferencesDialog::KeyboardFilterEditTextEdited(const QString& Text) { if (Text.isEmpty()) { @@ -1100,7 +1100,7 @@ void lcQPreferencesDialog::KeyboardFilterEditTextEdited(const QString& Text) } } -void lcQPreferencesDialog::ShortcutAssignClicked() +void lcPreferencesDialog::ShortcutAssignClicked() { QTreeWidgetItem* CurrentItem = ui->commandList->currentItem(); @@ -1168,14 +1168,14 @@ void lcQPreferencesDialog::ShortcutAssignClicked() mOptions->KeyboardShortcutsDefault = false; } -void lcQPreferencesDialog::ShortcutRemoveClicked() +void lcPreferencesDialog::ShortcutRemoveClicked() { ui->shortcutEdit->setText(QString()); ShortcutAssignClicked(); } -void lcQPreferencesDialog::ShortcutsImportClicked() +void lcPreferencesDialog::ShortcutsImportClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1195,7 +1195,7 @@ void lcQPreferencesDialog::ShortcutsImportClicked() mOptions->KeyboardShortcutsDefault = false; } -void lcQPreferencesDialog::ShortcutsExportClicked() +void lcPreferencesDialog::ShortcutsExportClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1209,7 +1209,7 @@ void lcQPreferencesDialog::ShortcutsExportClicked() } } -void lcQPreferencesDialog::ShortcutsResetClicked() +void lcPreferencesDialog::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; @@ -1221,7 +1221,7 @@ void lcQPreferencesDialog::ShortcutsResetClicked() mOptions->KeyboardShortcutsDefault = true; } -void lcQPreferencesDialog::UpdateMouseTree() +void lcPreferencesDialog::UpdateMouseTree() { ui->mouseTree->clear(); @@ -1229,7 +1229,7 @@ void lcQPreferencesDialog::UpdateMouseTree() UpdateMouseTreeItem(ToolIdx); } -void lcQPreferencesDialog::UpdateMouseTreeItem(int ItemIndex) +void lcPreferencesDialog::UpdateMouseTreeItem(int ItemIndex) { auto GetShortcutText = [](Qt::MouseButton Button, Qt::KeyboardModifiers Modifiers) { @@ -1269,7 +1269,7 @@ void lcQPreferencesDialog::UpdateMouseTreeItem(int ItemIndex) new QTreeWidgetItem(ui->mouseTree, QStringList() << tr(gToolNames[ItemIndex]) << Shortcut1 << Shortcut2); } -void lcQPreferencesDialog::MouseAssignClicked() +void lcPreferencesDialog::MouseAssignClicked() { QTreeWidgetItem* Current = ui->mouseTree->currentItem(); @@ -1347,7 +1347,7 @@ void lcQPreferencesDialog::MouseAssignClicked() UpdateMouseTreeItem(ItemIndex); } -void lcQPreferencesDialog::MouseRemoveClicked() +void lcPreferencesDialog::MouseRemoveClicked() { QTreeWidgetItem* Current = ui->mouseTree->currentItem(); @@ -1367,7 +1367,7 @@ void lcQPreferencesDialog::MouseRemoveClicked() MouseTreeItemChanged(Current); } -void lcQPreferencesDialog::MouseImportButtonClicked() +void lcPreferencesDialog::MouseImportButtonClicked() { QString FileName = QFileDialog::getOpenFileName(this, tr("Import Shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1388,7 +1388,7 @@ void lcQPreferencesDialog::MouseImportButtonClicked() mOptions->MouseShortcutsDefault = false; } -void lcQPreferencesDialog::MouseExportButtonClicked() +void lcPreferencesDialog::MouseExportButtonClicked() { QString FileName = QFileDialog::getSaveFileName(this, tr("Export Shortcuts"), "", tr("Text Files (*.txt);;All Files (*.*)")); @@ -1399,7 +1399,7 @@ void lcQPreferencesDialog::MouseExportButtonClicked() QMessageBox::warning(this, "LeoCAD", tr("Error saving mouse shortcuts file.")); } -void lcQPreferencesDialog::MouseResetClicked() +void lcPreferencesDialog::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; @@ -1411,7 +1411,7 @@ void lcQPreferencesDialog::MouseResetClicked() mOptions->MouseShortcutsDefault = true; } -void lcQPreferencesDialog::MouseTreeItemChanged(QTreeWidgetItem* Current) +void lcPreferencesDialog::MouseTreeItemChanged(QTreeWidgetItem* Current) { if (!Current) { diff --git a/qt/lc_qpreferencesdialog.h b/qt/lc_qpreferencesdialog.h index 523710b1..72c3c629 100644 --- a/qt/lc_qpreferencesdialog.h +++ b/qt/lc_qpreferencesdialog.h @@ -35,16 +35,16 @@ struct lcPreferencesDialogOptions namespace Ui { -class lcQPreferencesDialog; +class lcPreferencesDialog; } -class lcQPreferencesDialog : public QDialog +class lcPreferencesDialog : public QDialog { Q_OBJECT public: - lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogOptions* Options); - ~lcQPreferencesDialog(); + lcPreferencesDialog(QWidget* Parent, lcPreferencesDialogOptions* Options); + ~lcPreferencesDialog(); lcPreferencesDialogOptions* mOptions; @@ -105,7 +105,7 @@ private slots: void MouseTreeItemChanged(QTreeWidgetItem* Current); private: - Ui::lcQPreferencesDialog *ui; + Ui::lcPreferencesDialog *ui; void updateCategories(); void updateCommandList(); diff --git a/qt/lc_qpreferencesdialog.ui b/qt/lc_qpreferencesdialog.ui index d28579a3..bf66731d 100644 --- a/qt/lc_qpreferencesdialog.ui +++ b/qt/lc_qpreferencesdialog.ui @@ -1,7 +1,7 @@ - lcQPreferencesDialog - + lcPreferencesDialog + 0 @@ -2069,7 +2069,7 @@ buttonBox accepted() - lcQPreferencesDialog + lcPreferencesDialog accept() @@ -2085,7 +2085,7 @@ buttonBox rejected() - lcQPreferencesDialog + lcPreferencesDialog reject() diff --git a/qt/lc_qpropertiesdialog.cpp b/qt/lc_qpropertiesdialog.cpp index 4c551fc5..9a98eae0 100644 --- a/qt/lc_qpropertiesdialog.cpp +++ b/qt/lc_qpropertiesdialog.cpp @@ -36,8 +36,8 @@ public: bool mLast; }; -lcQPropertiesDialog::lcQPropertiesDialog(QWidget* Parent, lcPropertiesDialogOptions* Options) - : QDialog(Parent), mOptions(Options), ui(new Ui::lcQPropertiesDialog) +lcPropertiesDialog::lcPropertiesDialog(QWidget* Parent, lcPropertiesDialogOptions* Options) + : QDialog(Parent), mOptions(Options), ui(new Ui::lcPropertiesDialog) { ui->setupUi(this); @@ -140,12 +140,12 @@ lcQPropertiesDialog::lcQPropertiesDialog(QWidget* Parent, lcPropertiesDialogOpti PartsTable->setItem((int)InfoTotals.size(), ColorCount + 1, Item); } -lcQPropertiesDialog::~lcQPropertiesDialog() +lcPropertiesDialog::~lcPropertiesDialog() { delete ui; } -void lcQPropertiesDialog::accept() +void lcPropertiesDialog::accept() { mOptions->Properties.mDescription = ui->DescriptionEdit->text(); mOptions->Properties.mAuthor = ui->AuthorEdit->text(); diff --git a/qt/lc_qpropertiesdialog.h b/qt/lc_qpropertiesdialog.h index dfd37b09..34fe95cf 100644 --- a/qt/lc_qpropertiesdialog.h +++ b/qt/lc_qpropertiesdialog.h @@ -11,16 +11,16 @@ struct lcPropertiesDialogOptions namespace Ui { -class lcQPropertiesDialog; +class lcPropertiesDialog; } -class lcQPropertiesDialog : public QDialog +class lcPropertiesDialog : public QDialog { Q_OBJECT public: - lcQPropertiesDialog(QWidget* Parent, lcPropertiesDialogOptions* Options); - ~lcQPropertiesDialog(); + lcPropertiesDialog(QWidget* Parent, lcPropertiesDialogOptions* Options); + ~lcPropertiesDialog(); lcPropertiesDialogOptions* mOptions; @@ -28,6 +28,6 @@ public slots: void accept() override; private: - Ui::lcQPropertiesDialog* ui; + Ui::lcPropertiesDialog* ui; }; diff --git a/qt/lc_qpropertiesdialog.ui b/qt/lc_qpropertiesdialog.ui index 9c8106a4..8784cf45 100644 --- a/qt/lc_qpropertiesdialog.ui +++ b/qt/lc_qpropertiesdialog.ui @@ -1,7 +1,7 @@ - lcQPropertiesDialog - + lcPropertiesDialog + 0 @@ -139,7 +139,7 @@ buttonBox accepted() - lcQPropertiesDialog + lcPropertiesDialog accept() @@ -155,7 +155,7 @@ buttonBox rejected() - lcQPropertiesDialog + lcPropertiesDialog reject() diff --git a/qt/lc_qselectdialog.cpp b/qt/lc_qselectdialog.cpp index ff64141f..358612ad 100644 --- a/qt/lc_qselectdialog.cpp +++ b/qt/lc_qselectdialog.cpp @@ -7,26 +7,26 @@ #include "light.h" #include "group.h" -lcQSelectDialog::lcQSelectDialog(QWidget* Parent, lcModel* Model) - : QDialog(Parent), ui(new Ui::lcQSelectDialog) +lcSelectDialog::lcSelectDialog(QWidget* Parent, lcModel* Model) + : QDialog(Parent), ui(new Ui::lcSelectDialog) { 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); + connect(ui->selectAll, &QPushButton::clicked, this, &lcSelectDialog::SelectAllClicked); + connect(ui->selectNone, &QPushButton::clicked, this, &lcSelectDialog::SelectNoneClicked); + connect(ui->selectInvert, &QPushButton::clicked, this, &lcSelectDialog::SelectInvertClicked); + connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &lcSelectDialog::ItemChanged); AddChildren(ui->treeWidget->invisibleRootItem(), nullptr, Model); ui->treeWidget->expandAll(); } -lcQSelectDialog::~lcQSelectDialog() +lcSelectDialog::~lcSelectDialog() { delete ui; } -void lcQSelectDialog::accept() +void lcSelectDialog::accept() { mObjects.clear(); @@ -56,7 +56,7 @@ void lcQSelectDialog::accept() QDialog::accept(); } -void lcQSelectDialog::SelectAllClicked() +void lcSelectDialog::SelectAllClicked() { ui->treeWidget->blockSignals(true); @@ -80,7 +80,7 @@ void lcQSelectDialog::SelectAllClicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::SelectNoneClicked() +void lcSelectDialog::SelectNoneClicked() { ui->treeWidget->blockSignals(true); @@ -104,7 +104,7 @@ void lcQSelectDialog::SelectNoneClicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::SelectInvertClicked() +void lcSelectDialog::SelectInvertClicked() { ui->treeWidget->blockSignals(true); @@ -128,7 +128,7 @@ void lcQSelectDialog::SelectInvertClicked() ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::ItemChanged(QTreeWidgetItem *item, int column) +void lcSelectDialog::ItemChanged(QTreeWidgetItem *item, int column) { Q_UNUSED(column); @@ -171,7 +171,7 @@ void lcQSelectDialog::ItemChanged(QTreeWidgetItem *item, int column) ui->treeWidget->blockSignals(false); } -void lcQSelectDialog::AddChildren(QTreeWidgetItem* ParentItem, lcGroup* ParentGroup, lcModel* Model) +void lcSelectDialog::AddChildren(QTreeWidgetItem* ParentItem, lcGroup* ParentGroup, lcModel* Model) { const std::vector>& Groups = Model->GetGroups(); diff --git a/qt/lc_qselectdialog.h b/qt/lc_qselectdialog.h index 044e7ad1..30469bad 100644 --- a/qt/lc_qselectdialog.h +++ b/qt/lc_qselectdialog.h @@ -3,16 +3,16 @@ #include namespace Ui { -class lcQSelectDialog; +class lcSelectDialog; } -class lcQSelectDialog : public QDialog +class lcSelectDialog : public QDialog { Q_OBJECT public: - lcQSelectDialog(QWidget* Parent, lcModel* Model); - ~lcQSelectDialog(); + lcSelectDialog(QWidget* Parent, lcModel* Model); + ~lcSelectDialog(); std::vector mObjects; @@ -31,7 +31,7 @@ private slots: void ItemChanged(QTreeWidgetItem *item, int column); private: - Ui::lcQSelectDialog *ui; + Ui::lcSelectDialog *ui; void AddChildren(QTreeWidgetItem* ParentItem, lcGroup* ParentGroup, lcModel* Model); }; diff --git a/qt/lc_qselectdialog.ui b/qt/lc_qselectdialog.ui index f3a58562..64918bb6 100644 --- a/qt/lc_qselectdialog.ui +++ b/qt/lc_qselectdialog.ui @@ -1,7 +1,7 @@ - lcQSelectDialog - + lcSelectDialog + 0 @@ -68,7 +68,7 @@ buttonBox accepted() - lcQSelectDialog + lcSelectDialog accept() @@ -84,7 +84,7 @@ buttonBox rejected() - lcQSelectDialog + lcSelectDialog reject() diff --git a/qt/lc_qutils.cpp b/qt/lc_qutils.cpp index ee944023..9cd7a929 100644 --- a/qt/lc_qutils.cpp +++ b/qt/lc_qutils.cpp @@ -138,17 +138,17 @@ bool lcRunElevatedProcess(const LPCWSTR ExeName, const LPCWSTR Arguments, const #endif // Resize all columns to content except for one stretching column. (taken from QT creator) -lcQTreeWidgetColumnStretcher::lcQTreeWidgetColumnStretcher(QTreeWidget *treeWidget, int columnToStretch) +lcTreeWidgetColumnStretcher::lcTreeWidgetColumnStretcher(QTreeWidget *treeWidget, int columnToStretch) : QObject(treeWidget->header()), mColumnToStretch(columnToStretch), mInteractiveResize(false), mStretchWidth(0) { parent()->installEventFilter(this); - connect(treeWidget->header(), &QHeaderView::sectionResized, this, &lcQTreeWidgetColumnStretcher::SectionResized); + connect(treeWidget->header(), &QHeaderView::sectionResized, this, &lcTreeWidgetColumnStretcher::SectionResized); QHideEvent fake; - lcQTreeWidgetColumnStretcher::eventFilter(parent(), &fake); + lcTreeWidgetColumnStretcher::eventFilter(parent(), &fake); } -void lcQTreeWidgetColumnStretcher::SectionResized(int LogicalIndex, int OldSize, int NewSize) +void lcTreeWidgetColumnStretcher::SectionResized(int LogicalIndex, int OldSize, int NewSize) { Q_UNUSED(OldSize) @@ -163,7 +163,7 @@ void lcQTreeWidgetColumnStretcher::SectionResized(int LogicalIndex, int OldSize, } } -bool lcQTreeWidgetColumnStretcher::eventFilter(QObject* Object, QEvent* Event) +bool lcTreeWidgetColumnStretcher::eventFilter(QObject* Object, QEvent* Event) { if (Object == parent()) { diff --git a/qt/lc_qutils.h b/qt/lc_qutils.h index 5e7716a2..c2f1ed9b 100644 --- a/qt/lc_qutils.h +++ b/qt/lc_qutils.h @@ -19,12 +19,12 @@ bool lcRunElevatedProcess(const LPCWSTR ExeName, const LPCWSTR Arguments, const #endif -class lcQTreeWidgetColumnStretcher : public QObject +class lcTreeWidgetColumnStretcher : public QObject { Q_OBJECT public: - lcQTreeWidgetColumnStretcher(QTreeWidget* TreeWidget, int ColumnToStretch); + lcTreeWidgetColumnStretcher(QTreeWidget* TreeWidget, int ColumnToStretch); bool eventFilter(QObject* Object, QEvent* Event) override; diff --git a/resources/leocad_cs.ts b/resources/leocad_cs.ts index f6c7aba8..5e7bbf3e 100644 --- a/resources/leocad_cs.ts +++ b/resources/leocad_cs.ts @@ -6246,7 +6246,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6361,7 +6361,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6700,7 +6700,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7810,7 +7810,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -8050,7 +8050,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_de.ts b/resources/leocad_de.ts index afe08fb4..35ad87c9 100644 --- a/resources/leocad_de.ts +++ b/resources/leocad_de.ts @@ -6220,7 +6220,7 @@ Anisotropic: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6335,7 +6335,7 @@ Anisotropic: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6633,7 +6633,7 @@ Anisotropic: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7701,7 +7701,7 @@ Anisotropic: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7940,7 +7940,7 @@ Anisotropic: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_es.ts b/resources/leocad_es.ts index 4d408e69..89755538 100644 --- a/resources/leocad_es.ts +++ b/resources/leocad_es.ts @@ -6329,7 +6329,7 @@ Anisotropic: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6444,7 +6444,7 @@ Anisotropic: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6742,7 +6742,7 @@ Anisotropic: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7842,7 +7842,7 @@ Anisotropic: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -8083,7 +8083,7 @@ Anisotropic: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_fr.ts b/resources/leocad_fr.ts index f691f20d..aea1bb32 100644 --- a/resources/leocad_fr.ts +++ b/resources/leocad_fr.ts @@ -6150,7 +6150,7 @@ Anisotropic: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6265,7 +6265,7 @@ Anisotropic: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6523,7 +6523,7 @@ Anisotropic: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7583,7 +7583,7 @@ Anisotropic: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7814,7 +7814,7 @@ Anisotropic: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_pt.ts b/resources/leocad_pt.ts index 5b968687..593b079b 100644 --- a/resources/leocad_pt.ts +++ b/resources/leocad_pt.ts @@ -6150,7 +6150,7 @@ Anisotropic: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6265,7 +6265,7 @@ Anisotropic: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6523,7 +6523,7 @@ Anisotropic: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7583,7 +7583,7 @@ Anisotropic: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7810,7 +7810,7 @@ Anisotropic: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_ru.ts b/resources/leocad_ru.ts index a4b6ad6b..44f2473e 100644 --- a/resources/leocad_ru.ts +++ b/resources/leocad_ru.ts @@ -6230,7 +6230,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6345,7 +6345,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6643,7 +6643,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7711,7 +7711,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7952,7 +7952,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_uk.ts b/resources/leocad_uk.ts index 4508c8c7..7e60f7d1 100644 --- a/resources/leocad_uk.ts +++ b/resources/leocad_uk.ts @@ -6155,7 +6155,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6270,7 +6270,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6568,7 +6568,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7637,7 +7637,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7876,7 +7876,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQSelectDialog + lcSelectDialog Select Objects diff --git a/resources/leocad_zh_CN.ts b/resources/leocad_zh_CN.ts index 461e9464..dce606a2 100644 --- a/resources/leocad_zh_CN.ts +++ b/resources/leocad_zh_CN.ts @@ -6076,7 +6076,7 @@ Anisotropic: %5 - lcQHTMLDialog + lcHTMLDialog HTML Options @@ -6191,7 +6191,7 @@ Anisotropic: %5 - lcQImageDialog + lcImageDialog Save Image @@ -6449,7 +6449,7 @@ Anisotropic: %5 - lcQPreferencesDialog + lcPreferencesDialog Preferences @@ -7509,7 +7509,7 @@ Anisotropic: %5 - lcQPropertiesDialog + lcPropertiesDialog Properties @@ -7738,7 +7738,7 @@ Anisotropic: %5 - lcQSelectDialog + lcSelectDialog Select Objects