Own model set dialog / dialog improvements

* better terms
* clear button to clear own model set
This commit is contained in:
Klaus Basan
2019-04-15 19:32:43 +02:00
parent 1af80575b7
commit 8eb3bd5278
4 changed files with 47 additions and 21 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>480</height>
<width>720</width>
<height>500</height>
</rect>
</property>
<property name="windowTitle">

View File

@@ -79,17 +79,19 @@ namespace BlackGui
//! \fixme hardcoded style sheet
ui->pb_SaveAsSetForSimulator->setStyleSheet("padding-left: 3px; padding-right: 3px;");
connect(ui->pb_CreateNewSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->pb_LoadExistingSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->pb_SaveAsSetForSimulator, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->pb_ShowStatistics, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->pb_CopyFromAnotherSwift, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->pb_FirstSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CDbOwnModelSetComponent::setSimulator, Qt::QueuedConnection);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::modelDataChanged, this, &CDbOwnModelSetComponent::onRowCountChanged);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::modelChanged, this, &CDbOwnModelSetComponent::viewModelChanged);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::jsonModelsForSimulatorLoaded, this, &CDbOwnModelSetComponent::onJsonDataLoaded);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::requestUpdate, this, &CDbOwnModelSetComponent::updateViewToCurrentModels);
connect(ui->pb_CreateNewSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_LoadExistingSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_ShowStatistics, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_FirstSet, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_Clear, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_CopyFromAnotherSwift, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->pb_SaveAsSetForSimulator, &QPushButton::clicked, this, &CDbOwnModelSetComponent::buttonClicked, Qt::QueuedConnection);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CDbOwnModelSetComponent::setSimulator, Qt::QueuedConnection);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::modelDataChanged, this, &CDbOwnModelSetComponent::onRowCountChanged, Qt::QueuedConnection);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::modelChanged, this, &CDbOwnModelSetComponent::viewModelChanged, Qt::QueuedConnection);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::requestUpdate, this, &CDbOwnModelSetComponent::updateViewToCurrentModels, Qt::QueuedConnection);
connect(ui->tvp_OwnModelSet, &CAircraftModelView::jsonModelsForSimulatorLoaded, this, &CDbOwnModelSetComponent::onJsonDataLoaded, Qt::QueuedConnection);
this->triggerSetSimulatorDeferred(simulator);
}
@@ -265,6 +267,12 @@ namespace BlackGui
this->copyFromAnotherSwift();
return;
}
if (sender == ui->pb_Clear)
{
ui->tvp_OwnModelSet->clear();
return;
}
}
void CDbOwnModelSetComponent::onRowCountChanged(int count, bool withFilter)

View File

@@ -116,6 +116,13 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_Clear">
<property name="text">
<string>clear set</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_CreateNewSet">
<property name="minimumSize">
@@ -196,6 +203,17 @@
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tvp_OwnModelSet</tabstop>
<tabstop>le_Simulator</tabstop>
<tabstop>pb_ShowStatistics</tabstop>
<tabstop>pb_Clear</tabstop>
<tabstop>pb_CreateNewSet</tabstop>
<tabstop>pb_FirstSet</tabstop>
<tabstop>pb_CopyFromAnotherSwift</tabstop>
<tabstop>pb_LoadExistingSet</tabstop>
<tabstop>pb_SaveAsSetForSimulator</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>350</width>
<height>376</height>
<width>600</width>
<height>400</height>
</rect>
</property>
<property name="minimumSize">
@@ -176,7 +176,7 @@
<item row="3" column="1">
<widget class="QRadioButton" name="rb_DistributorsSelected">
<property name="text">
<string>selected</string>
<string>selected from below</string>
</property>
<attribute name="buttonGroup">
<string notr="true">bg_Distributors</string>
@@ -186,7 +186,7 @@
<item row="3" column="3">
<widget class="QRadioButton" name="rb_DistributorsAll">
<property name="text">
<string>all</string>
<string>all from below</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -202,7 +202,7 @@
<item>
<widget class="QGroupBox" name="gb_Distributors">
<property name="title">
<string>Distributors</string>
<string>Distributor selection</string>
</property>
<layout class="QVBoxLayout" name="vl_Distributors">
<item>
@@ -305,9 +305,9 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="bg_SourceSet"/>
<buttongroup name="bg_Distributors"/>
<buttongroup name="bg_Mode"/>
<buttongroup name="bg_Displayed"/>
<buttongroup name="bg_SourceSet"/>
<buttongroup name="bg_Mode"/>
<buttongroup name="bg_Distributors"/>
</buttongroups>
</ui>