summaryrefslogtreecommitdiff
path: root/ZeroTierUI/networkwidget.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-08-19 17:42:17 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-08-19 17:42:17 -0700
commit351b7f3a09cfffa04dc5b62349806f256b9f3d2d (patch)
tree8d91b60f6eaf06892e32a749ab54ec20eff35e36 /ZeroTierUI/networkwidget.cpp
parent721625d51248bb7152bce7ed9b5eadab324d43dd (diff)
downloadinfinitytier-351b7f3a09cfffa04dc5b62349806f256b9f3d2d.tar.gz
infinitytier-351b7f3a09cfffa04dc5b62349806f256b9f3d2d.zip
UI stuff and sign .dmg on build.
Diffstat (limited to 'ZeroTierUI/networkwidget.cpp')
-rw-r--r--ZeroTierUI/networkwidget.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/ZeroTierUI/networkwidget.cpp b/ZeroTierUI/networkwidget.cpp
index c667777b..947f636b 100644
--- a/ZeroTierUI/networkwidget.cpp
+++ b/ZeroTierUI/networkwidget.cpp
@@ -53,8 +53,8 @@ NetworkWidget::NetworkWidget(QWidget *parent,const std::string &nwid) :
QFontMetrics fm(ui->ipListWidget->font());
int lineHeight = ui->ipListWidget->spacing() + fm.height();
- ui->ipListWidget->setMinimumHeight(lineHeight * 4);
- ui->ipListWidget->setMaximumHeight(lineHeight * 4);
+ ui->ipListWidget->setMinimumHeight(lineHeight * 6);
+ ui->ipListWidget->setMaximumHeight(lineHeight * 6);
#ifdef __APPLE__
QWidgetList widgets = this->findChildren<QWidget*>();
@@ -145,6 +145,11 @@ void NetworkWidget::setIps(const std::string &commaSeparatedList)
}
}
+void NetworkWidget::setMAC(const std::string &mac)
+{
+ ui->macLabel->setText(QString(mac.c_str()));
+}
+
const std::string &NetworkWidget::networkId()
{
return networkIdStr;