Skip to content
Snippets Groups Projects
Commit 6bcbfa88 authored by Christian Dreher's avatar Christian Dreher
Browse files

feature: Allow setting a default combobox item for proxyfinder.

parent 56491433
No related branches found
No related tags found
No related merge requests found
...@@ -64,6 +64,11 @@ namespace armarx ...@@ -64,6 +64,11 @@ namespace armarx
ui->cbProxyName->setEditText(proxyName); ui->cbProxyName->setEditText(proxyName);
} }
void IceProxyFinderBase::setDefaultSelectedProxyAsItem(const QString& proxyName)
{
defaultItem = proxyName;
}
void IceProxyFinderBase::setSearchMask(const QString& searchMask) void IceProxyFinderBase::setSearchMask(const QString& searchMask)
{ {
ui->edtSearchMask->setText(searchMask); ui->edtSearchMask->setText(searchMask);
...@@ -107,11 +112,19 @@ namespace armarx ...@@ -107,11 +112,19 @@ namespace armarx
void IceProxyFinderBase::updateProxyListComboBox(const QStringList& proxyList) void IceProxyFinderBase::updateProxyListComboBox(const QStringList& proxyList)
{ {
ui->cbProxyName->clear(); ui->cbProxyName->clear();
if (not defaultItem.isEmpty())
{
ui->cbProxyName->addItem(defaultItem);
ui->cbProxyName->setCurrentIndex(0);
}
int i = 0; int i = 0;
for (; i < proxyList.size(); ++i) for (; i < proxyList.size(); ++i)
{ {
ui->cbProxyName->addItem(proxyList.at(i)); if (proxyList.at(i) != defaultItem)
{
ui->cbProxyName->addItem(proxyList.at(i));
}
} }
ui->btnRefresh->setEnabled(true); ui->btnRefresh->setEnabled(true);
......
...@@ -68,6 +68,7 @@ namespace armarx ...@@ -68,6 +68,7 @@ namespace armarx
virtual QStringList getProxyNameList(QString searchMask) const = 0; virtual QStringList getProxyNameList(QString searchMask) const = 0;
QString getSelectedProxyName() const; QString getSelectedProxyName() const;
void setDefaultSelectedProxy(const QString& proxyName); void setDefaultSelectedProxy(const QString& proxyName);
void setDefaultSelectedProxyAsItem(const QString& proxyName);
void setSearchMask(const QString& searchMask); void setSearchMask(const QString& searchMask);
void showSearchMaskField(bool show); void showSearchMaskField(bool show);
void showLabels(bool show); void showLabels(bool show);
...@@ -90,6 +91,7 @@ namespace armarx ...@@ -90,6 +91,7 @@ namespace armarx
IceManagerPtr icemanager; IceManagerPtr icemanager;
Ui::IceProxyFinder* ui; Ui::IceProxyFinder* ui;
RunningTask<IceProxyFinderBase>::pointer_type refreshProxyListTask; RunningTask<IceProxyFinderBase>::pointer_type refreshProxyListTask;
QString defaultItem;
}; };
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment