summaryrefslogtreecommitdiff
path: root/ZeroTierUI/mainwindow.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2013-11-20 16:16:30 -0500
committerAdam Ierymenko <adam.ierymenko@gmail.com>2013-11-20 16:16:30 -0500
commitc979a695c5c58a62c7e3e08128860634b2fc421f (patch)
tree5df9e8b591c5dc1ace745a85bdbd7346a8c01616 /ZeroTierUI/mainwindow.cpp
parent902c8c38d261b1e73329ab4b9fefcfe11995c8b7 (diff)
downloadinfinitytier-c979a695c5c58a62c7e3e08128860634b2fc421f.tar.gz
infinitytier-c979a695c5c58a62c7e3e08128860634b2fc421f.zip
UI work, add name to listnetworks output in control bus interface.
Diffstat (limited to 'ZeroTierUI/mainwindow.cpp')
-rw-r--r--ZeroTierUI/mainwindow.cpp21
1 files changed, 17 insertions, 4 deletions
diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp
index 04a7919d..c618243a 100644
--- a/ZeroTierUI/mainwindow.cpp
+++ b/ZeroTierUI/mainwindow.cpp
@@ -127,6 +127,11 @@ void MainWindow::customEvent(QEvent *event)
if (hdr.size() >= 5)
this->myVersion = hdr[4].c_str();
} else if (hdr[1] == "listnetworks") {
+ const QObjectList &existingNetworks = ui->networksScrollAreaContentWidget->children();
+
+ for(unsigned long i=1;i<m->ztMessage.size();++i) {
+ std::vector<std::string> l(ZeroTier::Node::LocalClient::splitLine(m->ztMessage[i]));
+ }
} else if (hdr[1] == "listpeers") {
this->numPeers = 0;
for(unsigned long i=1;i<m->ztMessage.size();++i) {
@@ -151,6 +156,18 @@ void MainWindow::customEvent(QEvent *event)
void MainWindow::on_joinNetworkButton_clicked()
{
+ QString toJoin(ui->networkIdLineEdit->text());
+ ui->networkIdLineEdit->setText(QString());
+
+ if (!zeroTierClient) // sanity check
+ return;
+
+ if (toJoin.size() != 16) {
+ QMessageBox::information(this,"Invalid Network ID","The network ID you entered was not valid. Enter a 16-digit hexadecimal network ID, like '8056c2e21c000001'.",QMessageBox::Ok,QMessageBox::NoButton);
+ return;
+ }
+
+ zeroTierClient->send((QString("join ") + toJoin).toStdString());
}
void MainWindow::on_actionAbout_triggered()
@@ -165,10 +182,6 @@ void MainWindow::on_actionJoin_Network_triggered()
on_joinNetworkButton_clicked();
}
-void MainWindow::on_actionShow_Detailed_Status_triggered()
-{
-}
-
void MainWindow::on_networkIdLineEdit_textChanged(const QString &text)
{
QString newText;