void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Network list update works in UI.

Browse source
This commit is contained in:
Adam Ierymenko 2013-11-21 13:45:44 -05:00
parent 4d86b2f02f
commit e3b0197e57
4 changed files with 347 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ZeroTierUI/mainwindow.cpp
View file

@ -8,6 +8,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>
#include <utility>
#include <QClipboard> #include <QClipboard>
#include <QMutex> #include <QMutex>
@ -130,48 +131,48 @@ void MainWindow::customEvent(QEvent *event)
if (hdr.size() >= 5) if (hdr.size() >= 5)
this->myVersion = hdr[4].c_str(); this->myVersion = hdr[4].c_str();
} else if (hdr[1] == "listnetworks") { } else if (hdr[1] == "listnetworks") {
std::set<std::string> networkIds; std::map< std::string,std::vector<std::string> > byNwid;
// Add/update network widgets in scroll area
for(unsigned long i=1;i<m->ztMessage.size();++i) { for(unsigned long i=1;i<m->ztMessage.size();++i) {
std::vector<std::string> l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i])); std::vector<std::string> l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i]));
// 200 listnetworks <nwid> <name> <status> <type> <dev> <ips> // 200 listnetworks <nwid> <name> <status> <type> <dev> <ips>
if ((l.size() == 8)&&(l[2].length() == 16)) { if ((l.size() == 8)&&(l[2].length() == 16))
networkIds.insert(l[2]); byNwid[l[2]] = l;
Network *nw = (Network *)0; }
for(QObjectList::const_iterator n(ui->networksScrollAreaContentWidget->children().begin());n!=ui->networksScrollAreaContentWidget->children().end();++n) {
Network *n2 = (Network *)*n; std::map< std::string,std::pair<int,Network *> > existingByNwid;
if ((n2)&&(n2->networkId() == l[2])) { for(int r=0;r<ui->networkListWidget->count();++r) {
nw = n2; Network *nw = (Network *)ui->networkListWidget->itemWidget(ui->networkListWidget->item(r));
break; existingByNwid[nw->networkId()] = std::make_pair(r,nw);
}
for(std::map< std::string,std::pair<int,Network *> >::iterator i(existingByNwid.begin());i!=existingByNwid.end();++i) {
if (byNwid.count(i->first)) {
std::vector<std::string> &l = byNwid[i->first];
i->second.second->setNetworkName(l[3]);
i->second.second->setStatus(l[4]);
i->second.second->setNetworkType(l[5]);
i->second.second->setNetworkDeviceName(l[6]);
i->second.second->setIps(l[7]);
} else {
delete ui->networkListWidget->takeItem(i->second.first);
} }
} }
if (!nw) {
nw = new Network(ui->networksScrollAreaContentWidget,l[2]); for(std::map< std::string,std::vector<std::string> >::iterator i(byNwid.begin());i!=byNwid.end();++i) {
} if (!existingByNwid.count(i->first)) {
std::vector<std::string> &l = i->second;
Network *nw = new Network((QWidget *)0,i->first);
nw->setNetworkName(l[3]); nw->setNetworkName(l[3]);
nw->setStatus(l[4]); nw->setStatus(l[4]);
nw->setNetworkType(l[5]); nw->setNetworkType(l[5]);
nw->setNetworkDeviceName(l[6]); nw->setNetworkDeviceName(l[6]);
nw->setIps(l[7]); nw->setIps(l[7]);
QListWidgetItem *item = new QListWidgetItem();
item->setSizeHint(nw->sizeHint());
ui->networkListWidget->addItem(item);
ui->networkListWidget->setItemWidget(item,nw);
} }
} }
// Remove widgets for networks no longer in the list
for(QObjectList::const_iterator n(ui->networksScrollAreaContentWidget->children().begin());n!=ui->networksScrollAreaContentWidget->children().end();++n) {
Network *n2 = (Network *)*n;
if ((n2)&&(!networkIds.count(n2->networkId())))
n2->deleteLater();
}
// Update layout
QVBoxLayout *layout = new QVBoxLayout();
layout->setSpacing(0);
layout->setMargin(0);
for(QObjectList::const_iterator n(ui->networksScrollAreaContentWidget->children().begin());n!=ui->networksScrollAreaContentWidget->children().end();++n)
layout->addWidget((QWidget *)*n);
delete ui->networksScrollAreaContentWidget->layout();
ui->networksScrollAreaContentWidget->setLayout(layout);
} else if (hdr[1] == "listpeers") { } else if (hdr[1] == "listpeers") {
this->numPeers = 0; this->numPeers = 0;
for(unsigned long i=1;i<m->ztMessage.size();++i) { for(unsigned long i=1;i<m->ztMessage.size();++i) {

45
ZeroTierUI/mainwindow.ui
View file

@ -35,45 +35,32 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QScrollArea" name="networksScrollArea"> <widget class="QListWidget" name="networkListWidget">
<property name="sizePolicy"> <property name="focusPolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <enum>Qt::NoFocus</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string/>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<property name="widgetResizable"> <property name="autoScroll">
<bool>false</bool>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="alternatingRowColors">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="alignment"> <property name="selectionMode">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <enum>QAbstractItemView::NoSelection</enum>
</property> </property>
<widget class="QWidget" name="networksScrollAreaContentWidget"> <property name="selectionBehavior">
<property name="geometry"> <enum>QAbstractItemView::SelectRows</enum>
<rect>
<x>0</x>
<y>0</y>
<width>656</width>
<height>238</height>
</rect>
</property> </property>
<property name="sizePolicy"> <property name="verticalScrollMode">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <enum>QAbstractItemView::ScrollPerPixel</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget> </widget>
</widget>
</item> </item>
<item> <item>
<widget class="QWidget" name="bottomContainerWidget" native="true"> <widget class="QWidget" name="bottomContainerWidget" native="true">

4
ZeroTierUI/network.cpp
View file

@ -17,6 +17,10 @@ Network::Network(QWidget *parent,const std::string &nwid) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->networkIdPushButton->setText(QString(nwid.c_str())); ui->networkIdPushButton->setText(QString(nwid.c_str()));
QFontMetrics fm(ui->ipListWidget->font());
int lineHeight = ui->ipListWidget->spacing() + fm.height();
ui->ipListWidget->setMinimumHeight(lineHeight * 3);
ui->ipListWidget->setMaximumHeight(lineHeight * 3);
} }
Network::~Network() Network::~Network()

62
ZeroTierUI/network.ui
View file

@ -7,11 +7,11 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>580</width> <width>580</width>
<height>267</height> <height>253</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -22,30 +22,6 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -118,8 +94,6 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Courier</family>
<pointsize>13</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
@ -128,10 +102,7 @@
<string>Click to Copy to Clipboard</string> <string>Click to Copy to Clipboard</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">border: 0; <string notr="true">border: 0; padding: 0; margin: 0; text-align: left;</string>
padding: 0;
margin: 0;
text-align: left;</string>
</property> </property>
<property name="text"> <property name="text">
<string>0000000000000000</string> <string>0000000000000000</string>
@ -160,7 +131,7 @@ text-align: left;</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>(name)</string> <string>?</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -186,7 +157,7 @@ text-align: left;</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>public</string> <string>?</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -218,7 +189,7 @@ text-align: left;</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>OK</string> <string>?</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -244,7 +215,7 @@ text-align: left;</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>zt0</string> <string>?</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -257,14 +228,17 @@ text-align: left;</string>
<item> <item>
<widget class="QWidget" name="rightWidget" native="true"> <widget class="QWidget" name="rightWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>3</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@ -286,7 +260,7 @@ text-align: left;</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>IP Addresses</string> <string>IP Address Assignments</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -313,6 +287,9 @@ text-align: left;</string>
<pointsize>12</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
@ -322,8 +299,8 @@ text-align: left;</string>
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum> <enum>QAbstractItemView::SingleSelection</enum>
</property> </property>
<property name="resizeMode"> <property name="horizontalScrollMode">
<enum>QListView::Fixed</enum> <enum>QAbstractItemView::ScrollPerPixel</enum>
</property> </property>
<property name="sortingEnabled"> <property name="sortingEnabled">
<bool>true</bool> <bool>true</bool>
@ -397,9 +374,6 @@ text-align: left;</string>
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>