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

Renamed the lcEditGroupsDialog class.

Browse Source
This commit is contained in:
Leonardo Zide
2026-03-30 22:33:23 -07:00
parent e6de72146f
commit 9ccf245373
12 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qt/lc_qeditgroupsdialog.cpp → common/lc_editgroupsdialog.cpp
+13 -13
View File
@@ -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<lcQEditGroupsDialog*>(parent());
lcEditGroupsDialog* Dialog = qobject_cast<lcEditGroupsDialog*>(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<std::unique_ptr<lcGroup>>& Groups = mModel->GetGroups();
std::unordered_map<lcGroup*, QTreeWidgetItem*> AddedGroups;
qt/lc_qeditgroupsdialog.h → common/lc_editgroupsdialog.h
+5 -5
View File
@@ -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;
};
qt/lc_qeditgroupsdialog.ui → common/lc_editgroupsdialog.ui
+4 -4
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>lcQEditGroupsDialog</class>
<widget class="QDialog" name="lcQEditGroupsDialog">
<class>lcEditGroupsDialog</class>
<widget class="QDialog" name="lcEditGroupsDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -55,7 +55,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>lcQEditGroupsDialog</receiver>
<receiver>lcEditGroupsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -71,7 +71,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>lcQEditGroupsDialog</receiver>
<receiver>lcEditGroupsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
common/lc_model.cpp
+6 -6
View File
@@ -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<void(const lcQEditGroupsDialog::GroupInfo&, lcGroup*)> UpdateGroups=[this, &UpdateGroups](const lcQEditGroupsDialog::GroupInfo& GroupInfo, lcGroup* ParentGroup)
std::function<void(const lcEditGroupsDialog::GroupInfo&, lcGroup*)> 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)
leocad.pro
+3 -3
View File
@@ -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 \
resources/leocad_cs.ts
+4 -4
View File
@@ -6191,19 +6191,19 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Upravit skupiny</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Nová skupina</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Skupina #</translation>
</message>
resources/leocad_de.ts
+4 -4
View File
@@ -6165,19 +6165,19 @@ Anisotropic: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Gruppen bearbeiten</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Neue Gruppe</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Gruppe #</translation>
</message>
resources/leocad_es.ts
+4 -4
View File
@@ -6274,19 +6274,19 @@ Anisotropic: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Editar grupos</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Nuevo grupo</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Grupo #</translation>
</message>
resources/leocad_fr.ts
+4 -4
View File
@@ -6095,19 +6095,19 @@ Anisotropic: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Édition des groupes</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Nouveau groupe</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Groupe n°</translation>
</message>
resources/leocad_pt.ts
+4 -4
View File
@@ -6095,19 +6095,19 @@ Anisotropic: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Editar Grupos</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Novo Grupo</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Grupo #</translation>
</message>
resources/leocad_ru.ts
+4 -4
View File
@@ -6175,19 +6175,19 @@ GL_EXT_texture_filter_anisotropic extension: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Изменение групп</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Создать группу</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Группа №</translation>
</message>
resources/leocad_uk.ts
+4 -4
View File
@@ -6100,19 +6100,19 @@ GL_EXT_texture_filter_anisotropic extension: %5
</message>
</context>
<context>
<name>lcQEditGroupsDialog</name>
<name>lcEditGroupsDialog</name>
<message>
<location filename="../qt/lc_qeditgroupsdialog.ui" line="14"/>
<location filename="../common/lc_editgroupsdialog.ui" line="14"/>
<source>Edit Groups</source>
<translation>Редагувати групи</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="20"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="20"/>
<source>New Group</source>
<translation>Нова група</translation>
</message>
<message>
<location filename="../qt/lc_qeditgroupsdialog.cpp" line="59"/>
<location filename="../common/lc_editgroupsdialog.cpp" line="59"/>
<source>Group #</source>
<translation>Група #</translation>
</message>