flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 21:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #571, allow to select distributor by key or alias

Browse Source 
* removed redundant getId function
* functions for completer
This commit is contained in:
Klaus Basan
2016-01-12 01:16:44 +01:00
parent 0dda9024d1
commit 9f646f215c
6 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/blackgui/components/dbdistributorselectorcomponent.cpp
View File

@@ -54,27 +54,29 @@ namespace BlackGui
void CDbDistributorSelectorComponent::setDistributor(const CDistributor &distributor)
{
this->ui->le_Distributor->setText(distributor.getId());
ui->lbl_Description->setText(distributor.getDescription());
QString key(distributor.getDbKey());
if (key.isEmpty()) { return; }
if (distributor != m_currentDistributor)
{
this->ui->le_Distributor->setText(key);
m_currentDistributor = distributor;
emit changedDistributor(distributor);
}
}
void CDbDistributorSelectorComponent::setDistributor(const QString &distributorKey)
void CDbDistributorSelectorComponent::setDistributor(const QString &distributorKeyOrAlias)
{
QString key(distributorKey.toUpper().trimmed());
CDistributor d(getDistributors().findByKey(key));
ui->lbl_Description->setText("");
QString keyOrAlias(distributorKeyOrAlias.toUpper().trimmed());
if (this->m_currentDistributor.matchesKeyOrAlias(keyOrAlias)) { return; }
CDistributor d(getDistributors().findByKeyOrAlias(keyOrAlias));
if (d.hasCompleteData())
{
this->setDistributor(d);
}
else
{
this->ui->le_Distributor->setText(key);
this->ui->lbl_Description->setText("");
this->ui->le_Distributor->setText(keyOrAlias);
}
}
@@ -153,7 +155,9 @@ namespace BlackGui
{
if (count > 0)
{
QCompleter *c = new QCompleter(this->getDistributors().toDbKeyList(), this);
QStringList keysAndAliases(this->getDistributors().getDbKeysAndAliases());
keysAndAliases.sort(Qt::CaseInsensitive);
QCompleter *c = new QCompleter(keysAndAliases, this);
c->setCaseSensitivity(Qt::CaseInsensitive);
c->setCompletionMode(QCompleter::PopupCompletion);
c->setMaxVisibleItems(10);
@@ -175,13 +179,14 @@ namespace BlackGui
{
if (!hasProvider()) { return; }
QString key(this->ui->le_Distributor->text().trimmed().toUpper());
CDistributor d(this->getDistributors().findByKey(key));
if (key.isEmpty()) { return; }
CDistributor d(this->getDistributors().findByKeyOrAlias(key));
this->setDistributor(d);
}
void CDbDistributorSelectorComponent::ps_completerActivated(const QString &distributorKey)
void CDbDistributorSelectorComponent::ps_completerActivated(const QString &distributorKeyOrAlias)
{
this->setDistributor(distributorKey);
this->setDistributor(distributorKeyOrAlias);
}
} // ns