From 9ccf245373158b82baacb2545e226399149486da Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Mon, 30 Mar 2026 22:33:23 -0700 Subject: [PATCH] Renamed the lcEditGroupsDialog class. --- .../lc_editgroupsdialog.cpp | 26 +++++++++---------- .../lc_editgroupsdialog.h | 10 +++---- .../lc_editgroupsdialog.ui | 8 +++--- common/lc_model.cpp | 12 ++++----- leocad.pro | 6 ++--- resources/leocad_cs.ts | 8 +++--- resources/leocad_de.ts | 8 +++--- resources/leocad_es.ts | 8 +++--- resources/leocad_fr.ts | 8 +++--- resources/leocad_pt.ts | 8 +++--- resources/leocad_ru.ts | 8 +++--- resources/leocad_uk.ts | 8 +++--- 12 files changed, 59 insertions(+), 59 deletions(-) rename qt/lc_qeditgroupsdialog.cpp => common/lc_editgroupsdialog.cpp (87%) rename qt/lc_qeditgroupsdialog.h => common/lc_editgroupsdialog.h (70%) rename qt/lc_qeditgroupsdialog.ui => common/lc_editgroupsdialog.ui (92%) diff --git a/qt/lc_qeditgroupsdialog.cpp b/common/lc_editgroupsdialog.cpp similarity index 87% rename from qt/lc_qeditgroupsdialog.cpp rename to common/lc_editgroupsdialog.cpp index 1e08715e..e9b9f884 100644 --- a/qt/lc_qeditgroupsdialog.cpp +++ b/common/lc_editgroupsdialog.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" -#include "lc_qeditgroupsdialog.h" -#include "ui_lc_qeditgroupsdialog.h" +#include "lc_editgroupsdialog.h" +#include "ui_lc_editgroupsdialog.h" #include "lc_model.h" #include "piece.h" #include "group.h" @@ -24,7 +24,7 @@ public: QString Text = LineEdit->text().trimmed(); - lcQEditGroupsDialog* Dialog = qobject_cast(parent()); + lcEditGroupsDialog* Dialog = qobject_cast(parent()); if (Dialog && !Dialog->CanRenameGroup(Text)) return; @@ -33,16 +33,16 @@ public: } }; -lcQEditGroupsDialog::lcQEditGroupsDialog(QWidget* Parent, const lcModel* Model) +lcEditGroupsDialog::lcEditGroupsDialog(QWidget* Parent, const lcModel* Model) : QDialog(Parent), mModel(Model) { - ui = new Ui::lcQEditGroupsDialog; + ui = new Ui::lcEditGroupsDialog; ui->setupUi(this); QPushButton* NewGroup = ui->buttonBox->addButton(tr("&New Group"), QDialogButtonBox::ActionRole); - connect(NewGroup, &QPushButton::clicked, this, &lcQEditGroupsDialog::NewGroupClicked); + connect(NewGroup, &QPushButton::clicked, this, &lcEditGroupsDialog::NewGroupClicked); PopulateTree(); @@ -50,12 +50,12 @@ lcQEditGroupsDialog::lcQEditGroupsDialog(QWidget* Parent, const lcModel* Model) ui->treeWidget->expandAll(); } -lcQEditGroupsDialog::~lcQEditGroupsDialog() +lcEditGroupsDialog::~lcEditGroupsDialog() { delete ui; } -bool lcQEditGroupsDialog::CanRenameGroup(const QString& Text) const +bool lcEditGroupsDialog::CanRenameGroup(const QString& Text) const { if (Text.isEmpty()) return false; @@ -79,7 +79,7 @@ bool lcQEditGroupsDialog::CanRenameGroup(const QString& Text) const return ScanGroups(ui->treeWidget->invisibleRootItem()); } -void lcQEditGroupsDialog::NewGroupClicked() +void lcEditGroupsDialog::NewGroupClicked() { QTreeWidgetItem* CurrentItem = ui->treeWidget->currentItem(); @@ -126,9 +126,9 @@ void lcQEditGroupsDialog::NewGroupClicked() GroupItem->setExpanded(true); } -lcQEditGroupsDialog::GroupInfo lcQEditGroupsDialog::GetGroupInfo(QTreeWidgetItem* ParentItem) const +lcEditGroupsDialog::GroupInfo lcEditGroupsDialog::GetGroupInfo(QTreeWidgetItem* ParentItem) const { - lcQEditGroupsDialog::GroupInfo GroupInfo; + lcEditGroupsDialog::GroupInfo GroupInfo; GroupInfo.Name = ParentItem->text(0); @@ -153,12 +153,12 @@ lcQEditGroupsDialog::GroupInfo lcQEditGroupsDialog::GetGroupInfo(QTreeWidgetItem return GroupInfo; } -lcQEditGroupsDialog::GroupInfo lcQEditGroupsDialog::GetGroups() const +lcEditGroupsDialog::GroupInfo lcEditGroupsDialog::GetGroups() const { return GetGroupInfo(ui->treeWidget->invisibleRootItem()); } -void lcQEditGroupsDialog::PopulateTree() +void lcEditGroupsDialog::PopulateTree() { const std::vector>& Groups = mModel->GetGroups(); std::unordered_map AddedGroups; diff --git a/qt/lc_qeditgroupsdialog.h b/common/lc_editgroupsdialog.h similarity index 70% rename from qt/lc_qeditgroupsdialog.h rename to common/lc_editgroupsdialog.h index 11dd7cd8..082c8434 100644 --- a/qt/lc_qeditgroupsdialog.h +++ b/common/lc_editgroupsdialog.h @@ -1,16 +1,16 @@ #pragma once namespace Ui { -class lcQEditGroupsDialog; +class lcEditGroupsDialog; } -class lcQEditGroupsDialog : public QDialog +class lcEditGroupsDialog : public QDialog { Q_OBJECT public: - lcQEditGroupsDialog(QWidget* Parent, const lcModel* Model); - virtual ~lcQEditGroupsDialog(); + lcEditGroupsDialog(QWidget* Parent, const lcModel* Model); + virtual ~lcEditGroupsDialog(); struct GroupInfo { @@ -36,6 +36,6 @@ protected: GroupInfo GetGroupInfo(QTreeWidgetItem* ParentItem) const; void PopulateTree(); - Ui::lcQEditGroupsDialog* ui = nullptr; + Ui::lcEditGroupsDialog* ui = nullptr; const lcModel* mModel = nullptr; }; diff --git a/qt/lc_qeditgroupsdialog.ui b/common/lc_editgroupsdialog.ui similarity index 92% rename from qt/lc_qeditgroupsdialog.ui rename to common/lc_editgroupsdialog.ui index d2b58f15..cbe15c3e 100644 --- a/qt/lc_qeditgroupsdialog.ui +++ b/common/lc_editgroupsdialog.ui @@ -1,7 +1,7 @@ - lcQEditGroupsDialog - + lcEditGroupsDialog + 0 @@ -55,7 +55,7 @@ buttonBox accepted() - lcQEditGroupsDialog + lcEditGroupsDialog accept() @@ -71,7 +71,7 @@ buttonBox rejected() - lcQEditGroupsDialog + lcEditGroupsDialog reject() diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 2b9cece1..f712de75 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -18,7 +18,7 @@ #include "lc_qselectdialog.h" #include "lc_minifigdialog.h" #include "lc_groupdialog.h" -#include "lc_qeditgroupsdialog.h" +#include "lc_editgroupsdialog.h" #include "lc_qpropertiesdialog.h" #include "lc_qutils.h" #include "lc_lxf.h" @@ -2380,7 +2380,7 @@ void lcModel::RemoveFocusPieceFromGroup() void lcModel::ShowEditGroupsDialog() { - lcQEditGroupsDialog Dialog(gMainWindow, this); + lcEditGroupsDialog Dialog(gMainWindow, this); if (Dialog.exec() != QDialog::Accepted) return; @@ -2388,7 +2388,7 @@ void lcModel::ShowEditGroupsDialog() BeginHistorySequence(); BeginEditHistory(lcModelHistoryEditMerge::None); - std::function UpdateGroups=[this, &UpdateGroups](const lcQEditGroupsDialog::GroupInfo& GroupInfo, lcGroup* ParentGroup) + std::function UpdateGroups=[this, &UpdateGroups](const lcEditGroupsDialog::GroupInfo& GroupInfo, lcGroup* ParentGroup) { lcGroup* Group = GroupInfo.Group; @@ -2401,16 +2401,16 @@ void lcModel::ShowEditGroupsDialog() Group->mName = GroupInfo.Name; Group->mGroup = ParentGroup; - for (const lcQEditGroupsDialog::GroupInfo& ChildGroupInfo : GroupInfo.ChildGroups) + for (const lcEditGroupsDialog::GroupInfo& ChildGroupInfo : GroupInfo.ChildGroups) UpdateGroups(ChildGroupInfo, Group); for (lcPiece* Piece : GroupInfo.ChildPieces) Piece->SetGroup(Group); }; - lcQEditGroupsDialog::GroupInfo GroupInfo = Dialog.GetGroups(); + lcEditGroupsDialog::GroupInfo GroupInfo = Dialog.GetGroups(); - for (const lcQEditGroupsDialog::GroupInfo& ChildGroupInfo : GroupInfo.ChildGroups) + for (const lcEditGroupsDialog::GroupInfo& ChildGroupInfo : GroupInfo.ChildGroups) UpdateGroups(ChildGroupInfo, nullptr); for (lcPiece* Piece : GroupInfo.ChildPieces) diff --git a/leocad.pro b/leocad.pro index 599a4c6e..ea191f8c 100644 --- a/leocad.pro +++ b/leocad.pro @@ -191,6 +191,7 @@ SOURCES += \ common/lc_context.cpp \ common/lc_doublespinbox.cpp \ common/lc_edgecolordialog.cpp \ + common/lc_editgroupsdialog.cpp \ common/lc_file.cpp \ common/lc_filter.cpp \ common/lc_findreplacewidget.cpp \ @@ -232,7 +233,6 @@ SOURCES += \ common/lc_viewwidget.cpp \ common/lc_zipfile.cpp \ qt/qtmain.cpp \ - qt/lc_qeditgroupsdialog.cpp \ qt/lc_qselectdialog.cpp \ qt/lc_qpropertiesdialog.cpp \ qt/lc_qhtmldialog.cpp \ @@ -269,6 +269,7 @@ HEADERS += \ common/lc_context.h \ common/lc_doublespinbox.h \ common/lc_edgecolordialog.h \ + common/lc_editgroupsdialog.h \ common/lc_file.h \ common/lc_filter.h \ common/lc_findreplacewidget.h \ @@ -310,7 +311,6 @@ HEADERS += \ common/lc_viewsphere.h \ common/lc_viewwidget.h \ common/lc_zipfile.h \ - qt/lc_qeditgroupsdialog.h \ qt/lc_qselectdialog.h \ qt/lc_qpropertiesdialog.h \ qt/lc_qhtmldialog.h \ @@ -322,7 +322,6 @@ HEADERS += \ qt/lc_setsdatabasedialog.h \ common/lc_partpalettedialog.h FORMS += \ - qt/lc_qeditgroupsdialog.ui \ qt/lc_qselectdialog.ui \ qt/lc_qpropertiesdialog.ui \ qt/lc_qhtmldialog.ui \ @@ -334,6 +333,7 @@ FORMS += \ common/lc_aboutdialog.ui \ common/lc_arraydialog.ui \ common/lc_categorydialog.ui \ + common/lc_editgroupsdialog.ui \ common/lc_groupdialog.ui \ common/lc_minifigdialog.ui \ common/lc_modellistdialog.ui \ diff --git a/resources/leocad_cs.ts b/resources/leocad_cs.ts index 16352230..1aef3a31 100644 --- a/resources/leocad_cs.ts +++ b/resources/leocad_cs.ts @@ -6191,19 +6191,19 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Upravit skupiny - + New Group Nová skupina - + Group # Skupina # diff --git a/resources/leocad_de.ts b/resources/leocad_de.ts index bbc4f386..25670640 100644 --- a/resources/leocad_de.ts +++ b/resources/leocad_de.ts @@ -6165,19 +6165,19 @@ Anisotropic: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Gruppen bearbeiten - + New Group Neue Gruppe - + Group # Gruppe # diff --git a/resources/leocad_es.ts b/resources/leocad_es.ts index 5461ced7..b1bf37fd 100644 --- a/resources/leocad_es.ts +++ b/resources/leocad_es.ts @@ -6274,19 +6274,19 @@ Anisotropic: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Editar grupos - + New Group Nuevo grupo - + Group # Grupo # diff --git a/resources/leocad_fr.ts b/resources/leocad_fr.ts index bae82662..fe5ec3e6 100644 --- a/resources/leocad_fr.ts +++ b/resources/leocad_fr.ts @@ -6095,19 +6095,19 @@ Anisotropic: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Édition des groupes - + New Group Nouveau groupe - + Group # Groupe n° diff --git a/resources/leocad_pt.ts b/resources/leocad_pt.ts index 60bf2294..657b3e48 100644 --- a/resources/leocad_pt.ts +++ b/resources/leocad_pt.ts @@ -6095,19 +6095,19 @@ Anisotropic: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Editar Grupos - + New Group Novo Grupo - + Group # Grupo # diff --git a/resources/leocad_ru.ts b/resources/leocad_ru.ts index 9706d2f7..62d6cb07 100644 --- a/resources/leocad_ru.ts +++ b/resources/leocad_ru.ts @@ -6175,19 +6175,19 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Изменение групп - + New Group Создать группу - + Group # Группа № diff --git a/resources/leocad_uk.ts b/resources/leocad_uk.ts index 5ddc7880..8b55327f 100644 --- a/resources/leocad_uk.ts +++ b/resources/leocad_uk.ts @@ -6100,19 +6100,19 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQEditGroupsDialog + lcEditGroupsDialog - + Edit Groups Редагувати групи - + New Group Нова група - + Group # Група #