From 77bab135465a14d13f7835c7a9c3a53dc04496dd Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 18 Nov 2013 12:01:33 -0500 Subject: [PATCH] More UI work, reorg Windows stuff... --- ZeroTierUI/ZeroTierUI.pro | 3 +- ZeroTierUI/mainwindow.cpp | 30 ++ ZeroTierUI/mainwindow.ui | 5 +- ZeroTierUI/network.cpp | 13 +- ZeroTierUI/network.h | 9 +- ZeroTierUI/network.ui | 256 +++++++++++++++++- .../SelfTest/SelfTest.vcxproj | 0 .../SelfTest/SelfTest.vcxproj.filters | 0 {vsprojects => windows}/SelfTest/targetver.h | 0 .../TapDriver Package.vcxproj | 0 .../TapDriver Package.vcxproj.filters | 0 .../TapDriver/TapDriver.vcxproj | 0 .../TapDriver/TapDriver.vcxproj.filters | 0 {vsprojects => windows}/TapDriver/config.h | 0 {vsprojects => windows}/TapDriver/constants.h | 0 {vsprojects => windows}/TapDriver/dhcp.c | 0 {vsprojects => windows}/TapDriver/dhcp.h | 0 {vsprojects => windows}/TapDriver/endian.h | 0 {vsprojects => windows}/TapDriver/error.c | 0 {vsprojects => windows}/TapDriver/error.h | 0 {vsprojects => windows}/TapDriver/instance.c | 0 {vsprojects => windows}/TapDriver/lock.h | 0 {vsprojects => windows}/TapDriver/macinfo.c | 0 {vsprojects => windows}/TapDriver/macinfo.h | 0 {vsprojects => windows}/TapDriver/mem.c | 0 {vsprojects => windows}/TapDriver/proto.h | 0 .../TapDriver/prototypes.h | 0 .../TapDriver/tap-windows.h | 0 {vsprojects => windows}/TapDriver/tapdrvr.c | 0 .../TapDriver/testcert.pfx | Bin {vsprojects => windows}/TapDriver/types.h | 0 .../TapDriver/ztTap100.inf | 0 ZeroTierOne.sln => windows/ZeroTierOne.sln | 8 +- .../ZeroTierOne/ZeroTierOne.vcxproj | 0 .../ZeroTierOne/ZeroTierOne.vcxproj.filters | 0 35 files changed, 301 insertions(+), 23 deletions(-) rename {vsprojects => windows}/SelfTest/SelfTest.vcxproj (100%) rename {vsprojects => windows}/SelfTest/SelfTest.vcxproj.filters (100%) rename {vsprojects => windows}/SelfTest/targetver.h (100%) rename {vsprojects => windows}/TapDriver Package/TapDriver Package.vcxproj (100%) rename {vsprojects => windows}/TapDriver Package/TapDriver Package.vcxproj.filters (100%) rename {vsprojects => windows}/TapDriver/TapDriver.vcxproj (100%) rename {vsprojects => windows}/TapDriver/TapDriver.vcxproj.filters (100%) rename {vsprojects => windows}/TapDriver/config.h (100%) rename {vsprojects => windows}/TapDriver/constants.h (100%) rename {vsprojects => windows}/TapDriver/dhcp.c (100%) rename {vsprojects => windows}/TapDriver/dhcp.h (100%) rename {vsprojects => windows}/TapDriver/endian.h (100%) rename {vsprojects => windows}/TapDriver/error.c (100%) rename {vsprojects => windows}/TapDriver/error.h (100%) rename {vsprojects => windows}/TapDriver/instance.c (100%) rename {vsprojects => windows}/TapDriver/lock.h (100%) rename {vsprojects => windows}/TapDriver/macinfo.c (100%) rename {vsprojects => windows}/TapDriver/macinfo.h (100%) rename {vsprojects => windows}/TapDriver/mem.c (100%) rename {vsprojects => windows}/TapDriver/proto.h (100%) rename {vsprojects => windows}/TapDriver/prototypes.h (100%) rename {vsprojects => windows}/TapDriver/tap-windows.h (100%) rename {vsprojects => windows}/TapDriver/tapdrvr.c (100%) rename {vsprojects => windows}/TapDriver/testcert.pfx (100%) rename {vsprojects => windows}/TapDriver/types.h (100%) rename {vsprojects => windows}/TapDriver/ztTap100.inf (100%) rename ZeroTierOne.sln => windows/ZeroTierOne.sln (98%) rename {vsprojects => windows}/ZeroTierOne/ZeroTierOne.vcxproj (100%) rename {vsprojects => windows}/ZeroTierOne/ZeroTierOne.vcxproj.filters (100%) diff --git a/ZeroTierUI/ZeroTierUI.pro b/ZeroTierUI/ZeroTierUI.pro index fcdba8cae..7c907c066 100644 --- a/ZeroTierUI/ZeroTierUI.pro +++ b/ZeroTierUI/ZeroTierUI.pro @@ -19,7 +19,8 @@ SOURCES += main.cpp\ HEADERS += mainwindow.h \ network.h \ - aboutwindow.h + aboutwindow.h \ + ../node/Node.hpp FORMS += mainwindow.ui \ network.ui \ diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp index 41d949870..bb2c263b2 100644 --- a/ZeroTierUI/mainwindow.cpp +++ b/ZeroTierUI/mainwindow.cpp @@ -28,6 +28,7 @@ void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionJoin_Network_triggered() { + // Does the same thing as clicking join button on main UI on_joinNetworkButton_clicked(); } @@ -37,6 +38,35 @@ void MainWindow::on_actionShow_Detailed_Status_triggered() void MainWindow::on_networkIdLineEdit_textChanged(const QString &text) { + QString newText; + for(QString::const_iterator i(text.begin());i!=text.end();++i) { + switch(i->toLatin1()) { + case '0': newText.append('0'); break; + case '1': newText.append('1'); break; + case '2': newText.append('2'); break; + case '3': newText.append('3'); break; + case '4': newText.append('4'); break; + case '5': newText.append('5'); break; + case '6': newText.append('6'); break; + case '7': newText.append('7'); break; + case '8': newText.append('8'); break; + case '9': newText.append('9'); break; + case 'a': newText.append('a'); break; + case 'b': newText.append('b'); break; + case 'c': newText.append('c'); break; + case 'd': newText.append('d'); break; + case 'e': newText.append('e'); break; + case 'f': newText.append('f'); break; + case 'A': newText.append('a'); break; + case 'B': newText.append('b'); break; + case 'C': newText.append('c'); break; + case 'D': newText.append('d'); break; + case 'E': newText.append('e'); break; + case 'F': newText.append('f'); break; + default: break; + } + } + ui->networkIdLineEdit->setText(newText); } void MainWindow::on_statusAndAddressButton_clicked() diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui index c9366ccfc..d4824d59b 100644 --- a/ZeroTierUI/mainwindow.ui +++ b/ZeroTierUI/mainwindow.ui @@ -64,6 +64,9 @@ + + 0 + 0 @@ -128,7 +131,7 @@ border: 0; - 0000000000 (OFFLINE, 0 peers) + 0000000000 (OFFLINE, 0 peers) Qt::ToolButtonTextOnly diff --git a/ZeroTierUI/network.cpp b/ZeroTierUI/network.cpp index fed644db1..3826a8dab 100644 --- a/ZeroTierUI/network.cpp +++ b/ZeroTierUI/network.cpp @@ -1,8 +1,10 @@ #include "network.h" #include "ui_network.h" +#include + Network::Network(QWidget *parent) : - QScrollArea(parent), + QWidget(parent), ui(new Ui::Network) { ui->setupUi(this); @@ -12,3 +14,12 @@ Network::~Network() { delete ui; } + +void Network::on_leaveNetworkButton_clicked() +{ +} + +void Network::on_networkIdPushButton_clicked() +{ + QApplication::clipboard()->setText(ui->networkIdPushButton->text()); +} diff --git a/ZeroTierUI/network.h b/ZeroTierUI/network.h index 9c7273a10..730b79825 100644 --- a/ZeroTierUI/network.h +++ b/ZeroTierUI/network.h @@ -1,13 +1,13 @@ #ifndef NETWORK_H #define NETWORK_H -#include +#include namespace Ui { class Network; } -class Network : public QScrollArea +class Network : public QWidget { Q_OBJECT @@ -15,6 +15,11 @@ public: explicit Network(QWidget *parent = 0); ~Network(); +private slots: + void on_leaveNetworkButton_clicked(); + + void on_networkIdPushButton_clicked(); + private: Ui::Network *ui; }; diff --git a/ZeroTierUI/network.ui b/ZeroTierUI/network.ui index cb8a93cae..1f80a4c82 100644 --- a/ZeroTierUI/network.ui +++ b/ZeroTierUI/network.ui @@ -1,31 +1,259 @@ Network - + 0 0 618 - 79 + 93 - - ScrollArea + + + 0 + 0 + - + + Network + + true - - - - 0 - 0 - 616 - 77 - + + + 6 - + + 6 + + + 0 + + + 6 + + + 0 + + + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::AlignHCenter|Qt::AlignTop + + + 6 + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Network ID: + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + Courier + 13 + 75 + true + + + + Click to Copy to Clipboard + + + border: 0; +padding: 0; +margin: 0; +text-align: left; + + + 0000000000000000 + + + true + + + + + + + Status: + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 75 + true + + + + OK + + + Qt::PlainText + + + + + + + Device: + + + Qt::PlainText + + + + + + + + 75 + true + + + + zt0 + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 10 + true + + + + padding: 0; margin: 0; + + + Leave Network + + + true + + + + + + + + + + + + + + 0 + 0 + + + + + Courier + 10 + + + + false + + + + diff --git a/vsprojects/SelfTest/SelfTest.vcxproj b/windows/SelfTest/SelfTest.vcxproj similarity index 100% rename from vsprojects/SelfTest/SelfTest.vcxproj rename to windows/SelfTest/SelfTest.vcxproj diff --git a/vsprojects/SelfTest/SelfTest.vcxproj.filters b/windows/SelfTest/SelfTest.vcxproj.filters similarity index 100% rename from vsprojects/SelfTest/SelfTest.vcxproj.filters rename to windows/SelfTest/SelfTest.vcxproj.filters diff --git a/vsprojects/SelfTest/targetver.h b/windows/SelfTest/targetver.h similarity index 100% rename from vsprojects/SelfTest/targetver.h rename to windows/SelfTest/targetver.h diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj b/windows/TapDriver Package/TapDriver Package.vcxproj similarity index 100% rename from vsprojects/TapDriver Package/TapDriver Package.vcxproj rename to windows/TapDriver Package/TapDriver Package.vcxproj diff --git a/vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters b/windows/TapDriver Package/TapDriver Package.vcxproj.filters similarity index 100% rename from vsprojects/TapDriver Package/TapDriver Package.vcxproj.filters rename to windows/TapDriver Package/TapDriver Package.vcxproj.filters diff --git a/vsprojects/TapDriver/TapDriver.vcxproj b/windows/TapDriver/TapDriver.vcxproj similarity index 100% rename from vsprojects/TapDriver/TapDriver.vcxproj rename to windows/TapDriver/TapDriver.vcxproj diff --git a/vsprojects/TapDriver/TapDriver.vcxproj.filters b/windows/TapDriver/TapDriver.vcxproj.filters similarity index 100% rename from vsprojects/TapDriver/TapDriver.vcxproj.filters rename to windows/TapDriver/TapDriver.vcxproj.filters diff --git a/vsprojects/TapDriver/config.h b/windows/TapDriver/config.h similarity index 100% rename from vsprojects/TapDriver/config.h rename to windows/TapDriver/config.h diff --git a/vsprojects/TapDriver/constants.h b/windows/TapDriver/constants.h similarity index 100% rename from vsprojects/TapDriver/constants.h rename to windows/TapDriver/constants.h diff --git a/vsprojects/TapDriver/dhcp.c b/windows/TapDriver/dhcp.c similarity index 100% rename from vsprojects/TapDriver/dhcp.c rename to windows/TapDriver/dhcp.c diff --git a/vsprojects/TapDriver/dhcp.h b/windows/TapDriver/dhcp.h similarity index 100% rename from vsprojects/TapDriver/dhcp.h rename to windows/TapDriver/dhcp.h diff --git a/vsprojects/TapDriver/endian.h b/windows/TapDriver/endian.h similarity index 100% rename from vsprojects/TapDriver/endian.h rename to windows/TapDriver/endian.h diff --git a/vsprojects/TapDriver/error.c b/windows/TapDriver/error.c similarity index 100% rename from vsprojects/TapDriver/error.c rename to windows/TapDriver/error.c diff --git a/vsprojects/TapDriver/error.h b/windows/TapDriver/error.h similarity index 100% rename from vsprojects/TapDriver/error.h rename to windows/TapDriver/error.h diff --git a/vsprojects/TapDriver/instance.c b/windows/TapDriver/instance.c similarity index 100% rename from vsprojects/TapDriver/instance.c rename to windows/TapDriver/instance.c diff --git a/vsprojects/TapDriver/lock.h b/windows/TapDriver/lock.h similarity index 100% rename from vsprojects/TapDriver/lock.h rename to windows/TapDriver/lock.h diff --git a/vsprojects/TapDriver/macinfo.c b/windows/TapDriver/macinfo.c similarity index 100% rename from vsprojects/TapDriver/macinfo.c rename to windows/TapDriver/macinfo.c diff --git a/vsprojects/TapDriver/macinfo.h b/windows/TapDriver/macinfo.h similarity index 100% rename from vsprojects/TapDriver/macinfo.h rename to windows/TapDriver/macinfo.h diff --git a/vsprojects/TapDriver/mem.c b/windows/TapDriver/mem.c similarity index 100% rename from vsprojects/TapDriver/mem.c rename to windows/TapDriver/mem.c diff --git a/vsprojects/TapDriver/proto.h b/windows/TapDriver/proto.h similarity index 100% rename from vsprojects/TapDriver/proto.h rename to windows/TapDriver/proto.h diff --git a/vsprojects/TapDriver/prototypes.h b/windows/TapDriver/prototypes.h similarity index 100% rename from vsprojects/TapDriver/prototypes.h rename to windows/TapDriver/prototypes.h diff --git a/vsprojects/TapDriver/tap-windows.h b/windows/TapDriver/tap-windows.h similarity index 100% rename from vsprojects/TapDriver/tap-windows.h rename to windows/TapDriver/tap-windows.h diff --git a/vsprojects/TapDriver/tapdrvr.c b/windows/TapDriver/tapdrvr.c similarity index 100% rename from vsprojects/TapDriver/tapdrvr.c rename to windows/TapDriver/tapdrvr.c diff --git a/vsprojects/TapDriver/testcert.pfx b/windows/TapDriver/testcert.pfx similarity index 100% rename from vsprojects/TapDriver/testcert.pfx rename to windows/TapDriver/testcert.pfx diff --git a/vsprojects/TapDriver/types.h b/windows/TapDriver/types.h similarity index 100% rename from vsprojects/TapDriver/types.h rename to windows/TapDriver/types.h diff --git a/vsprojects/TapDriver/ztTap100.inf b/windows/TapDriver/ztTap100.inf similarity index 100% rename from vsprojects/TapDriver/ztTap100.inf rename to windows/TapDriver/ztTap100.inf diff --git a/ZeroTierOne.sln b/windows/ZeroTierOne.sln similarity index 98% rename from ZeroTierOne.sln rename to windows/ZeroTierOne.sln index 90f8243bf..80c9c9d3b 100644 --- a/ZeroTierOne.sln +++ b/windows/ZeroTierOne.sln @@ -1,16 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "vsprojects\SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "vsprojects\TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "vsprojects\TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}" ProjectSection(ProjectDependencies) = postProject {689210B1-467C-4850-BB7D-2E10D5B4A3DA} = {689210B1-467C-4850-BB7D-2E10D5B4A3DA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "vsprojects\ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj similarity index 100% rename from vsprojects/ZeroTierOne/ZeroTierOne.vcxproj rename to windows/ZeroTierOne/ZeroTierOne.vcxproj diff --git a/vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters similarity index 100% rename from vsprojects/ZeroTierOne/ZeroTierOne.vcxproj.filters rename to windows/ZeroTierOne/ZeroTierOne.vcxproj.filters