ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-31 14:30:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI work...

Browse Source
This commit is contained in:
Adam Ierymenko 2013-11-20 18:29:02 -05:00
parent c979a695c5
commit 4d86b2f02f
5 changed files with 385 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ZeroTierUI/mainwindow.cpp
View File

@ -1,9 +1,11 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "aboutwindow.h" #include "aboutwindow.h"
#include "network.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <string> #include <string>
#include <map> #include <map>
#include <set>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>
@ -16,6 +18,7 @@
#include <QDebug> #include <QDebug>
#include <QProcess> #include <QProcess>
#include <QStringList> #include <QStringList>
#include <QVBoxLayout>
// Globally visible // Globally visible
ZeroTier::Node::LocalClient *zeroTierClient = (ZeroTier::Node::LocalClient *)0; ZeroTier::Node::LocalClient *zeroTierClient = (ZeroTier::Node::LocalClient *)0;
@ -127,11 +130,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") {
const QObjectList &existingNetworks = ui->networksScrollAreaContentWidget->children(); std::set<std::string> networkIds;
// 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>
if ((l.size() == 8)&&(l[2].length() == 16)) {
networkIds.insert(l[2]);
Network *nw = (Network *)0;
for(QObjectList::const_iterator n(ui->networksScrollAreaContentWidget->children().begin());n!=ui->networksScrollAreaContentWidget->children().end();++n) {
Network *n2 = (Network *)*n;
if ((n2)&&(n2->networkId() == l[2])) {
nw = n2;
break;
} }
}
if (!nw) {
nw = new Network(ui->networksScrollAreaContentWidget,l[2]);
}
nw->setNetworkName(l[3]);
nw->setStatus(l[4]);
nw->setNetworkType(l[5]);
nw->setNetworkDeviceName(l[6]);
nw->setIps(l[7]);
}
}
// 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) {
@ -212,6 +252,8 @@ void MainWindow::on_networkIdLineEdit_textChanged(const QString &text)
default: break; default: break;
} }
} }
if (newText.size() > 16)
newText.truncate(16);
ui->networkIdLineEdit->setText(newText); ui->networkIdLineEdit->setText(newText);
} }

28
ZeroTierUI/mainwindow.ui
View File

@ -45,6 +45,9 @@
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
@ -59,27 +62,16 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>654</width> <width>656</width>
<height>236</height> <height>238</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="sizePolicy">
<property name="spacing"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<number>0</number> <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

13
ZeroTierUI/network.cpp
View File

@ -29,14 +29,14 @@ void Network::setStatus(const std::string &status)
ui->statusLabel->setText(QString(status.c_str())); ui->statusLabel->setText(QString(status.c_str()));
} }
void Network::setNetworkName(const std::string &status) void Network::setNetworkName(const std::string &name)
{ {
ui->nameLabel->setText(QString(status.c_str())); ui->nameLabel->setText(QString(name.c_str()));
} }
void Network::setNetworkType(const std::string &type) void Network::setNetworkType(const std::string &type)
{ {
ui->networkTypeLabel->setText(QString(status.c_str())); ui->networkTypeLabel->setText(QString(type.c_str()));
if (type == "?") if (type == "?")
ui->networkTypeLabel->setToolTip("Waiting for configuration..."); ui->networkTypeLabel->setToolTip("Waiting for configuration...");
else if (type == "public") else if (type == "public")
@ -69,13 +69,12 @@ void Network::setIps(const std::string &commaSeparatedList)
ips = tmp; ips = tmp;
for(QStringList::iterator i(ips.begin());i!=ips.end();++i) { for(QStringList::iterator i(ips.begin());i!=ips.end();++i) {
if (ui->ipListWidget->findItems(*i).size() == 0) if (ui->ipListWidget->findItems(*i,Qt::MatchCaseSensitive).size() == 0)
ui->ipListWidget->addItem(*i); ui->ipListWidget->addItem(*i);
} }
QList<QListWidgetItem *> inList(ui->ipListWidget->items()); for(int i=0;i<ui->ipListWidget->count();++i) {
for(QList<QListWidgetItem *>::iterator i(inList.begin());i!=inList.end();++i) { QListWidgetItem *item = ui->ipListWidget->item(i);
QListWidgetItem *item = *i;
if (!ips.contains(item->text())) if (!ips.contains(item->text()))
ui->ipListWidget->removeItemWidget(item); ui->ipListWidget->removeItemWidget(item);
} }

2
ZeroTierUI/network.h
View File

@ -14,7 +14,7 @@ class Network : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit Network(QWidget *parent = 0,const std::string &nwid); explicit Network(QWidget *parent = 0,const std::string &nwid = std::string());
virtual ~Network(); virtual ~Network();
void setStatus(const std::string &status); void setStatus(const std::string &status);

244
ZeroTierUI/network.ui
View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>618</width> <width>580</width>
<height>108</height> <height>267</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,10 +19,34 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Network</string> <string>Network</string>
</property> </property>
<property name="widgetResizable" stdset="0"> <property name="styleSheet">
<bool>true</bool> <string notr="true"/>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <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">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
@ -30,16 +54,22 @@
<number>6</number> <number>6</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>6</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>6</number> <number>6</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="leftWidget" native="true"> <widget class="QWidget" name="leftWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum> <enum>QFormLayout::ExpandingFieldsGrow</enum>
@ -81,7 +111,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="networkIdPushButton"> <widget class="QPushButton" name="networkIdPushButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -121,6 +151,48 @@ text-align: left;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QLabel" name="nameLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>(name)</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Type:</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="networkTypeLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>public</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -179,7 +251,86 @@ text-align: left;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> </layout>
</widget>
</item>
<item>
<widget class="QWidget" name="rightWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<underline>false</underline>
</font>
</property>
<property name="text">
<string>IP Addresses</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="ipListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Courier</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="resizeMode">
<enum>QListView::Fixed</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="leaveNetworkButtonContainerWidget" native="true"> <widget class="QWidget" name="leaveNetworkButtonContainerWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -194,6 +345,9 @@ text-align: left;</string>
</size> </size>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -220,92 +374,28 @@ text-align: left;</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="leaveNetworkButton"> <widget class="QToolButton" name="leaveNetworkButton">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
<underline>true</underline> <underline>false</underline>
</font> </font>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">padding: 0; margin: 0;</string> <string notr="true">padding: 0.1em; margin:0;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Leave Network</string> <string>Leave Network</string>
</property> </property>
<property name="flat">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QLabel" name="nameLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>(name)</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Type:</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="networkTypeLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>public</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QListWidget" name="ipListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Courier</family>
<pointsize>10</pointsize>
</font>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>