Ref T292, Ref T285 further form improvements

* avoid roundtrips by airline digest signal
* style such as removed "private slots"
* fixing distributor form's clear
This commit is contained in:
Klaus Basan
2018-07-25 02:32:29 +02:00
parent 94bf4b2249
commit 77f10938d9
7 changed files with 65 additions and 47 deletions

View File

@@ -34,14 +34,15 @@ namespace BlackGui
ui(new Ui::CDistributorForm)
{
ui->setupUi(this);
this->setFocusProxy(ui->distributor_Selector);
this->setFocusProxy(ui->comp_DistributorSelector);
ui->le_Updated->setReadOnly(true);
ui->distributor_Selector->withDistributorDescription(false);
ui->comp_DistributorSelector->withDistributorDescription(false);
ui->lai_Id->set(CIcons::appDistributors16(), "Id:");
// drag and drop
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CDistributorForm::ps_droppedCode);
connect(ui->distributor_Selector, &CDbDistributorSelectorComponent::changedDistributor, this, &CDistributorForm::setValue);
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CDistributorForm::onDroppedCode);
connect(ui->comp_DistributorSelector, &CDbDistributorSelectorComponent::changedDistributor, this, &CDistributorForm::setValue);
// connect(ui->comp_DistributorSelector, &CDbDistributorSelectorComponent::returnPressed, this, &CDistributorForm::onReturnPressed);
ui->drop_DropData->setInfoText("<drop distributor>");
ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId<CDistributor>(), qMetaTypeId<CDistributorList>()});
}
@@ -51,10 +52,10 @@ namespace BlackGui
bool CDistributorForm::setValue(const BlackMisc::Simulation::CDistributor &distributor)
{
const CDistributor currentDistributor(this->getValue());
if (currentDistributor == distributor) { return false; }
if (m_currentDistributor == distributor) { return false; }
m_currentDistributor = distributor;
ui->distributor_Selector->setDistributor(distributor);
ui->comp_DistributorSelector->setDistributor(distributor);
ui->le_Description->setText(distributor.getDescription());
ui->le_Alias1->setText(distributor.getAlias1());
ui->le_Alias2->setText(distributor.getAlias2());
@@ -69,7 +70,7 @@ namespace BlackGui
CDistributor CDistributorForm::getValue() const
{
CDistributor distributor(ui->distributor_Selector->getDistributor());
CDistributor distributor(ui->comp_DistributorSelector->getDistributor());
distributor.setAlias1(ui->le_Alias1->text());
distributor.setAlias2(ui->le_Alias2->text());
distributor.setDescription(ui->le_Description->text());
@@ -105,7 +106,7 @@ namespace BlackGui
ui->le_Alias1->setReadOnly(readOnly);
ui->le_Alias2->setReadOnly(readOnly);
ui->le_Description->setReadOnly(readOnly);
ui->distributor_Selector->setReadOnly(readOnly);
ui->comp_DistributorSelector->setReadOnly(readOnly);
ui->drop_DropData->setVisible(!readOnly);
this->forceStyleSheetUpdate();
}
@@ -113,17 +114,18 @@ namespace BlackGui
void CDistributorForm::setSelectOnly()
{
this->setReadOnly(true);
ui->distributor_Selector->setReadOnly(false);
ui->comp_DistributorSelector->setReadOnly(false);
ui->drop_DropData->setVisible(true);
}
void CDistributorForm::clear()
{
setValue(CDistributor());
ui->distributor_Selector->setReadOnly(false);
this->setValue(CDistributor());
ui->comp_DistributorSelector->clear();
ui->comp_DistributorSelector->setReadOnly(false);
}
void CDistributorForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped)
void CDistributorForm::onDroppedCode(const BlackMisc::CVariant &variantDropped)
{
CDistributor distributor;
if (variantDropped.canConvert<CDistributor>())
@@ -142,5 +144,10 @@ namespace BlackGui
}
this->setValue(distributor);
}
bool CDistributorForm::hasAnyUiDetailsValues() const
{
return !(ui->le_Alias1->text().isEmpty() && ui->le_Alias2->text().isEmpty() && ui->le_Description->text().isEmpty() && ui->le_Updated->text().isEmpty());
}
} // ns
} // ns