From fb961d2cabe8ac8f902bce49eaf20497866cd453 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 29 Apr 2023 20:10:50 -0700 Subject: [PATCH] Moved model list dialog. --- .../lc_modellistdialog.cpp | 36 +++++++++---------- .../lc_modellistdialog.h | 10 +++--- .../lc_modellistdialog.ui | 8 ++--- common/project.cpp | 2 +- leocad.pro | 6 ++-- resources/leocad_cs.ts | 2 +- resources/leocad_de.ts | 2 +- resources/leocad_es.ts | 2 +- resources/leocad_fr.ts | 2 +- resources/leocad_pt.ts | 2 +- resources/leocad_uk.ts | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) rename qt/lc_qmodellistdialog.cpp => common/lc_modellistdialog.cpp (89%) rename qt/lc_qmodellistdialog.h => common/lc_modellistdialog.h (78%) rename qt/lc_qmodellistdialog.ui => common/lc_modellistdialog.ui (95%) diff --git a/qt/lc_qmodellistdialog.cpp b/common/lc_modellistdialog.cpp similarity index 89% rename from qt/lc_qmodellistdialog.cpp rename to common/lc_modellistdialog.cpp index bc55203f..39b60e2e 100644 --- a/qt/lc_qmodellistdialog.cpp +++ b/common/lc_modellistdialog.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" -#include "lc_qmodellistdialog.h" -#include "ui_lc_qmodellistdialog.h" +#include "lc_modellistdialog.h" +#include "ui_lc_modellistdialog.h" #include "project.h" #include "lc_profile.h" #include "lc_model.h" @@ -11,8 +11,8 @@ enum class lcModelListRole DuplicateModel }; -lcQModelListDialog::lcQModelListDialog(QWidget* Parent, const lcArray Models) - : QDialog(Parent), ui(new Ui::lcQModelListDialog) +lcModelListDialog::lcModelListDialog(QWidget* Parent, const lcArray Models) + : QDialog(Parent), ui(new Ui::lcModelListDialog) { mActiveModelItem = nullptr; @@ -33,17 +33,17 @@ lcQModelListDialog::lcQModelListDialog(QWidget* Parent, const lcArray UpdateButtons(); } -lcQModelListDialog::~lcQModelListDialog() +lcModelListDialog::~lcModelListDialog() { delete ui; } -int lcQModelListDialog::GetActiveModelIndex() const +int lcModelListDialog::GetActiveModelIndex() const { return ui->ModelList->row(mActiveModelItem); } -std::vector lcQModelListDialog::GetResults() const +std::vector lcModelListDialog::GetResults() const { std::vector Models; Models.reserve(ui->ModelList->count()); @@ -64,7 +64,7 @@ std::vector lcQModelListDialog::GetResults() const return Models; } -void lcQModelListDialog::UpdateButtons() +void lcModelListDialog::UpdateButtons() { int ModelCount = ui->ModelList->count(); @@ -92,7 +92,7 @@ void lcQModelListDialog::UpdateButtons() ui->MoveDown->setEnabled(MoveDown); } -void lcQModelListDialog::accept() +void lcModelListDialog::accept() { if (ui->SetActiveModel->isChecked()) mActiveModelItem = ui->ModelList->currentItem(); @@ -103,7 +103,7 @@ void lcQModelListDialog::accept() QDialog::accept(); } -void lcQModelListDialog::on_NewModel_clicked() +void lcModelListDialog::on_NewModel_clicked() { QStringList ModelNames; @@ -120,7 +120,7 @@ void lcQModelListDialog::on_NewModel_clicked() UpdateButtons(); } -void lcQModelListDialog::on_DeleteModel_clicked() +void lcModelListDialog::on_DeleteModel_clicked() { if (ui->ModelList->count() == 1) { @@ -156,7 +156,7 @@ void lcQModelListDialog::on_DeleteModel_clicked() UpdateButtons(); } -void lcQModelListDialog::on_RenameModel_clicked() +void lcModelListDialog::on_RenameModel_clicked() { QList SelectedItems = ui->ModelList->selectedItems(); @@ -180,7 +180,7 @@ void lcQModelListDialog::on_RenameModel_clicked() } } -void lcQModelListDialog::on_ExportModel_clicked() +void lcModelListDialog::on_ExportModel_clicked() { QList SelectedItems = ui->ModelList->selectedItems(); @@ -239,7 +239,7 @@ void lcQModelListDialog::on_ExportModel_clicked() } } -void lcQModelListDialog::on_DuplicateModel_clicked() +void lcModelListDialog::on_DuplicateModel_clicked() { QList SelectedItems = ui->ModelList->selectedItems(); @@ -279,7 +279,7 @@ void lcQModelListDialog::on_DuplicateModel_clicked() UpdateButtons(); } -void lcQModelListDialog::on_MoveUp_clicked() +void lcModelListDialog::on_MoveUp_clicked() { bool Blocked = ui->ModelList->blockSignals(true); @@ -302,7 +302,7 @@ void lcQModelListDialog::on_MoveUp_clicked() UpdateButtons(); } -void lcQModelListDialog::on_MoveDown_clicked() +void lcModelListDialog::on_MoveDown_clicked() { bool Blocked = ui->ModelList->blockSignals(true); @@ -325,14 +325,14 @@ void lcQModelListDialog::on_MoveDown_clicked() UpdateButtons(); } -void lcQModelListDialog::on_ModelList_itemDoubleClicked(QListWidgetItem* Item) +void lcModelListDialog::on_ModelList_itemDoubleClicked(QListWidgetItem* Item) { mActiveModelItem = Item; accept(); } -void lcQModelListDialog::on_ModelList_itemSelectionChanged() +void lcModelListDialog::on_ModelList_itemSelectionChanged() { UpdateButtons(); } diff --git a/qt/lc_qmodellistdialog.h b/common/lc_modellistdialog.h similarity index 78% rename from qt/lc_qmodellistdialog.h rename to common/lc_modellistdialog.h index 41e6169e..1055f3ba 100644 --- a/qt/lc_qmodellistdialog.h +++ b/common/lc_modellistdialog.h @@ -4,7 +4,7 @@ namespace Ui { - class lcQModelListDialog; + class lcModelListDialog; } struct lcModelListDialogEntry @@ -14,13 +14,13 @@ struct lcModelListDialogEntry lcModel* DuplicateSource; }; -class lcQModelListDialog : public QDialog +class lcModelListDialog : public QDialog { Q_OBJECT public: - lcQModelListDialog(QWidget* Parent, const lcArray Models); - ~lcQModelListDialog(); + lcModelListDialog(QWidget* Parent, const lcArray Models); + ~lcModelListDialog(); int GetActiveModelIndex() const; std::vector GetResults() const; @@ -40,6 +40,6 @@ public slots: private: QListWidgetItem* mActiveModelItem; void UpdateButtons(); - Ui::lcQModelListDialog* ui; + Ui::lcModelListDialog* ui; }; diff --git a/qt/lc_qmodellistdialog.ui b/common/lc_modellistdialog.ui similarity index 95% rename from qt/lc_qmodellistdialog.ui rename to common/lc_modellistdialog.ui index bdd83562..785483d6 100644 --- a/qt/lc_qmodellistdialog.ui +++ b/common/lc_modellistdialog.ui @@ -1,7 +1,7 @@ - lcQModelListDialog - + lcModelListDialog + 0 @@ -126,7 +126,7 @@ buttonBox accepted() - lcQModelListDialog + lcModelListDialog accept() @@ -142,7 +142,7 @@ buttonBox rejected() - lcQModelListDialog + lcModelListDialog reject() diff --git a/common/project.cpp b/common/project.cpp index eff545df..c9054207 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -272,7 +272,7 @@ lcModel* Project::CreateNewModel(bool ShowModel) void Project::ShowModelListDialog() { - lcQModelListDialog Dialog(gMainWindow, mModels); + lcModelListDialog Dialog(gMainWindow, mModels); if (Dialog.exec() != QDialog::Accepted) return; diff --git a/leocad.pro b/leocad.pro index 338d73a6..6bcda6ab 100644 --- a/leocad.pro +++ b/leocad.pro @@ -196,6 +196,7 @@ SOURCES += \ common/lc_meshloader.cpp \ common/lc_minifigdialog.cpp \ common/lc_model.cpp \ + common/lc_modellistdialog.cpp \ common/lc_pagesetupdialog.cpp \ common/lc_partselectionwidget.cpp \ common/lc_previewwidget.cpp \ @@ -228,7 +229,6 @@ SOURCES += \ qt/lc_qutils.cpp \ qt/lc_qpropertiestree.cpp \ qt/lc_qcolorpicker.cpp \ - qt/lc_qmodellistdialog.cpp \ qt/lc_renderdialog.cpp \ qt/lc_setsdatabasedialog.cpp \ common/lc_partpalettedialog.cpp @@ -267,6 +267,7 @@ HEADERS += \ common/lc_meshloader.h \ common/lc_minifigdialog.h \ common/lc_model.h \ + common/lc_modellistdialog.h \ common/lc_pagesetupdialog.h \ common/lc_previewwidget.h \ common/lc_profile.h \ @@ -297,7 +298,6 @@ HEADERS += \ qt/lc_qutils.h \ qt/lc_qpropertiestree.h \ qt/lc_qcolorpicker.h \ - qt/lc_qmodellistdialog.h \ qt/lc_renderdialog.h \ qt/lc_setsdatabasedialog.h \ common/lc_partpalettedialog.h @@ -311,12 +311,12 @@ FORMS += \ qt/lc_qcategorydialog.ui \ qt/lc_qimagedialog.ui \ qt/lc_qupdatedialog.ui \ - qt/lc_qmodellistdialog.ui \ qt/lc_renderdialog.ui \ qt/lc_setsdatabasedialog.ui \ common/lc_aboutdialog.ui \ common/lc_groupdialog.ui \ common/lc_minifigdialog.ui \ + common/lc_modellistdialog.ui \ common/lc_pagesetupdialog.ui \ common/lc_partpalettedialog.ui OTHER_FILES += diff --git a/resources/leocad_cs.ts b/resources/leocad_cs.ts index 8682dc5f..46f74801 100644 --- a/resources/leocad_cs.ts +++ b/resources/leocad_cs.ts @@ -6557,7 +6557,7 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - lcQModelListDialog + lcModelListDialog Submodels diff --git a/resources/leocad_de.ts b/resources/leocad_de.ts index d968fcba..3ecdefe3 100644 --- a/resources/leocad_de.ts +++ b/resources/leocad_de.ts @@ -6495,7 +6495,7 @@ Anisotropic: %5 - lcQModelListDialog + lcModelListDialog Submodels diff --git a/resources/leocad_es.ts b/resources/leocad_es.ts index 23fd2e27..0fdd8cbb 100644 --- a/resources/leocad_es.ts +++ b/resources/leocad_es.ts @@ -6604,7 +6604,7 @@ Anisotropic: %5 - lcQModelListDialog + lcModelListDialog Submodels diff --git a/resources/leocad_fr.ts b/resources/leocad_fr.ts index aec58a3f..c644bb35 100644 --- a/resources/leocad_fr.ts +++ b/resources/leocad_fr.ts @@ -6389,7 +6389,7 @@ Anisotropic: %5 - lcQModelListDialog + lcModelListDialog Submodels diff --git a/resources/leocad_pt.ts b/resources/leocad_pt.ts index c37ef8ff..f9e96e18 100644 --- a/resources/leocad_pt.ts +++ b/resources/leocad_pt.ts @@ -6389,7 +6389,7 @@ Anisotropic: %5 - lcQModelListDialog + lcModelListDialog Submodels diff --git a/resources/leocad_uk.ts b/resources/leocad_uk.ts index 9d79a077..738ca1e0 100644 --- a/resources/leocad_uk.ts +++ b/resources/leocad_uk.ts @@ -6430,7 +6430,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - lcQModelListDialog + lcModelListDialog Submodels