[skip ci] refactor(ui): Always load all DB data

This commit is contained in:
Lars Toenning
2025-03-25 11:34:19 +01:00
parent d8b0748eb2
commit 3607385a90
3 changed files with 4 additions and 17 deletions

View File

@@ -33,6 +33,8 @@ namespace swift::gui::components
QStringListModel *lvm = new QStringListModel(ui->lv_Entities); QStringListModel *lvm = new QStringListModel(ui->lv_Entities);
ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons); ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
ui->lv_Entities->setModel(lvm); 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->bb_loadDataDialog->button(QDialogButtonBox::Apply)->setText("Load");
ui->wi_WorkStatus->setVisible(false); ui->wi_WorkStatus->setVisible(false);
ui->wi_Consolidate->setVisible(false); ui->wi_Consolidate->setVisible(false);
@@ -58,7 +60,6 @@ namespace swift::gui::components
m_autoConsolidate = false; m_autoConsolidate = false;
const QStringList entitiesStringList = CEntityFlags::entitiesToStringList(loadEntities); const QStringList entitiesStringList = CEntityFlags::entitiesToStringList(loadEntities);
this->entitiesModel()->setStringList(entitiesStringList); this->entitiesModel()->setStringList(entitiesStringList);
ui->lv_Entities->selectAll();
return true; return true;
} }
@@ -67,20 +68,12 @@ namespace swift::gui::components
return qobject_cast<QStringListModel *>(ui->lv_Entities->model()); return qobject_cast<QStringListModel *>(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) void CDbLoadDataDialog::onButtonClicked(QAbstractButton *button)
{ {
if (!button) { return; } if (!button) { return; }
if (button == ui->bb_loadDataDialog->button(QDialogButtonBox::Apply)) if (button == ui->bb_loadDataDialog->button(QDialogButtonBox::Apply))
{ {
const QStringList entityList = this->selectedEntities(); const QStringList entityList = entitiesModel()->stringList();
if (entityList.isEmpty()) { return; } if (entityList.isEmpty()) { return; }
const CEntityFlags::Entity loadEntities = CEntityFlags::multipleEntitiesByNames(entityList); const CEntityFlags::Entity loadEntities = CEntityFlags::multipleEntitiesByNames(entityList);
m_pendingEntities = sGui->getWebDataServices()->triggerLoadingDirectlyFromSharedFiles(loadEntities, false); m_pendingEntities = sGui->getWebDataServices()->triggerLoadingDirectlyFromSharedFiles(loadEntities, false);

View File

@@ -43,9 +43,6 @@ namespace swift::gui::components
//! The string list model //! The string list model
QStringListModel *entitiesModel() const; QStringListModel *entitiesModel() const;
//! All selected items
QStringList selectedEntities() const;
//! Button clicked //! Button clicked
void onButtonClicked(QAbstractButton *button); void onButtonClicked(QAbstractButton *button);

View File

@@ -22,14 +22,11 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="gb_Entities"> <widget class="QGroupBox" name="gb_Entities">
<property name="title">
<string>Entities</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QLabel" name="lbl_Load"> <widget class="QLabel" name="lbl_Load">
<property name="text"> <property name="text">
<string>New DB data. Load the given entities?</string> <string>The following new data is available in the swift database. Load it?</string>
</property> </property>
</widget> </widget>
</item> </item>