From 3607385a90567d442488cd5fcfd49ead07e6b524 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Tue, 25 Mar 2025 11:34:19 +0100 Subject: [PATCH] [skip ci] refactor(ui): Always load all DB data --- src/gui/components/dbloaddatadialog.cpp | 13 +++---------- src/gui/components/dbloaddatadialog.h | 3 --- src/gui/components/dbloaddatadialog.ui | 5 +---- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/gui/components/dbloaddatadialog.cpp b/src/gui/components/dbloaddatadialog.cpp index 78f8c7c3b..84f81a64b 100644 --- a/src/gui/components/dbloaddatadialog.cpp +++ b/src/gui/components/dbloaddatadialog.cpp @@ -33,6 +33,8 @@ namespace swift::gui::components QStringListModel *lvm = new QStringListModel(ui->lv_Entities); ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons); ui->lv_Entities->setModel(lvm); + ui->lv_Entities->setDisabled(true); + ui->lv_Entities->setSelectionMode(QAbstractItemView::NoSelection); ui->bb_loadDataDialog->button(QDialogButtonBox::Apply)->setText("Load"); ui->wi_WorkStatus->setVisible(false); ui->wi_Consolidate->setVisible(false); @@ -58,7 +60,6 @@ namespace swift::gui::components m_autoConsolidate = false; const QStringList entitiesStringList = CEntityFlags::entitiesToStringList(loadEntities); this->entitiesModel()->setStringList(entitiesStringList); - ui->lv_Entities->selectAll(); return true; } @@ -67,20 +68,12 @@ namespace swift::gui::components return qobject_cast(ui->lv_Entities->model()); } - QStringList CDbLoadDataDialog::selectedEntities() const - { - QStringList entities; - const QModelIndexList indexes = ui->lv_Entities->selectionModel()->selectedIndexes(); - for (const QModelIndex &index : indexes) { entities.append(index.data(Qt::DisplayRole).toString()); } - return entities; - } - void CDbLoadDataDialog::onButtonClicked(QAbstractButton *button) { if (!button) { return; } if (button == ui->bb_loadDataDialog->button(QDialogButtonBox::Apply)) { - const QStringList entityList = this->selectedEntities(); + const QStringList entityList = entitiesModel()->stringList(); if (entityList.isEmpty()) { return; } const CEntityFlags::Entity loadEntities = CEntityFlags::multipleEntitiesByNames(entityList); m_pendingEntities = sGui->getWebDataServices()->triggerLoadingDirectlyFromSharedFiles(loadEntities, false); diff --git a/src/gui/components/dbloaddatadialog.h b/src/gui/components/dbloaddatadialog.h index 10f90b957..b42ff41ad 100644 --- a/src/gui/components/dbloaddatadialog.h +++ b/src/gui/components/dbloaddatadialog.h @@ -43,9 +43,6 @@ namespace swift::gui::components //! The string list model QStringListModel *entitiesModel() const; - //! All selected items - QStringList selectedEntities() const; - //! Button clicked void onButtonClicked(QAbstractButton *button); diff --git a/src/gui/components/dbloaddatadialog.ui b/src/gui/components/dbloaddatadialog.ui index f77ed282e..21e5168f7 100644 --- a/src/gui/components/dbloaddatadialog.ui +++ b/src/gui/components/dbloaddatadialog.ui @@ -22,14 +22,11 @@ - - Entities - - New DB data. Load the given entities? + The following new data is available in the swift database. Load it?