Thread: [fwbuilder-commits] r2290 - branches/v3_1/src/gui
Brought to you by:
mikehorn
From: <a2...@in...> - 2009-12-29 03:30:09
|
Author: a2k Date: 2009-12-28 19:29:36 -0800 (Mon, 28 Dec 2009) New Revision: 2290 Modified: branches/v3_1/src/gui/FirewallSelectorWidget.cpp branches/v3_1/src/gui/InterfaceEditorWidget.cpp Log: Fixed #1030 Modified: branches/v3_1/src/gui/FirewallSelectorWidget.cpp =================================================================== --- branches/v3_1/src/gui/FirewallSelectorWidget.cpp 2009-12-29 02:40:52 UTC (rev 2289) +++ branches/v3_1/src/gui/FirewallSelectorWidget.cpp 2009-12-29 03:29:36 UTC (rev 2290) @@ -43,6 +43,19 @@ void FirewallSelectorWidget::setFirewallList(list<Firewall*> firewalls, bool select) { + QSet<Firewall*> nonuniq; + foreach (Firewall* fw1, firewalls) + { + foreach (Firewall* fw2, firewalls) + { + if (fw1 != fw2 && fw1->getName() == fw2->getName() && fw2->getLibraryName() != fw1->getLibraryName()) + { + nonuniq.insert(fw1); + nonuniq.insert(fw2); + } + } + } + this->clear(); Firewall *fw; for (list<Firewall*>::iterator it = firewalls.begin(); it != firewalls.end(); it++) @@ -50,6 +63,8 @@ fw = *it; QTableWidgetItem *title = new QTableWidgetItem(QIcon(":/Icons/Firewall/icon"), QString::fromUtf8(fw->getName().c_str())); + if (nonuniq.contains(fw)) + title->setText((fw->getLibraryName() + " / " + fw->getName()).c_str()); title->setFlags(Qt::ItemIsEnabled); QCheckBox *box = new QCheckBox(this); connect(box, SIGNAL(toggled(bool)), this, SLOT(usageChanged(bool))); Modified: branches/v3_1/src/gui/InterfaceEditorWidget.cpp =================================================================== --- branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-12-29 02:40:52 UTC (rev 2289) +++ branches/v3_1/src/gui/InterfaceEditorWidget.cpp 2009-12-29 03:29:36 UTC (rev 2290) @@ -467,4 +467,5 @@ void InterfaceEditorWidget::setExplanation(const QString& text) { this->m_ui->explanation->setText(text); + this->m_ui->explanation->setFont(QApplication::font()); } |