From 77bab135465a14d13f7835c7a9c3a53dc04496dd Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 18 Nov 2013 12:01:33 -0500 Subject: 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 | 254 +++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 296 insertions(+), 18 deletions(-) (limited to 'ZeroTierUI') diff --git a/ZeroTierUI/ZeroTierUI.pro b/ZeroTierUI/ZeroTierUI.pro index fcdba8ca..7c907c06 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 41d94987..bb2c263b 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 c9366ccf..d4824d59 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 fed644db..3826a8da 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 9c7273a1..730b7982 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 cb8a93ca..1f80a4c8 100644 --- a/ZeroTierUI/network.ui +++ b/ZeroTierUI/network.ui @@ -1,31 +1,259 @@ Network - + 0 0 618 - 79 + 93 + + + 0 + 0 + + - ScrollArea + 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 + + + + -- cgit v1.2.3