diff --git a/ZeroTierUI/aboutwindow.cpp b/ZeroTierUI/aboutwindow.cpp
index 1a2b22907..b5e9454f7 100644
--- a/ZeroTierUI/aboutwindow.cpp
+++ b/ZeroTierUI/aboutwindow.cpp
@@ -9,23 +9,9 @@ AboutWindow::AboutWindow(QWidget *parent) :
ui(new Ui::AboutWindow)
{
ui->setupUi(this);
-#ifndef __APPLE__
- ui->uninstallButton->hide();
-#endif
}
AboutWindow::~AboutWindow()
{
delete ui;
}
-
-void AboutWindow::on_uninstallButton_clicked()
-{
- // Apple only... other OSes have more intrinsic mechanisms for uninstalling.
- QMessageBox::information(
- this,
- "Uninstalling ZeroTier One",
- QString("Uninstalling ZeroTier One is easy!\n\nJust remove ZeroTier One from your Applications folder and the service will automatically shut down within a few seconds. Then, on your next reboot, all other support files will be automatically deleted.\n\nIf you wish to uninstall the service and support files now, you can run the 'uninstall.sh' script found in ") + ZeroTier::ZT_DEFAULTS.defaultHomePath.c_str() + " using the 'sudo' command in a terminal.",
- QMessageBox::Ok,
- QMessageBox::NoButton);
-}
diff --git a/ZeroTierUI/aboutwindow.h b/ZeroTierUI/aboutwindow.h
index 6c883b9ba..93845a046 100644
--- a/ZeroTierUI/aboutwindow.h
+++ b/ZeroTierUI/aboutwindow.h
@@ -15,9 +15,6 @@ public:
explicit AboutWindow(QWidget *parent = 0);
virtual ~AboutWindow();
-private slots:
- void on_uninstallButton_clicked();
-
private:
Ui::AboutWindow *ui;
};
diff --git a/ZeroTierUI/aboutwindow.ui b/ZeroTierUI/aboutwindow.ui
index 84aab4347..ae7585580 100644
--- a/ZeroTierUI/aboutwindow.ui
+++ b/ZeroTierUI/aboutwindow.ui
@@ -197,16 +197,6 @@ Version: 1.0
- -
-
-
- Uninstall
-
-
- false
-
-
-
diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui
index c51036246..cbd240a2b 100644
--- a/ZeroTierUI/mainwindow.ui
+++ b/ZeroTierUI/mainwindow.ui
@@ -39,6 +39,9 @@
Qt::NoFocus
+
+ QFrame::NoFrame
+
Qt::ScrollBarAlwaysOff
@@ -48,14 +51,11 @@
QAbstractItemView::NoEditTriggers
-
- true
-
- QAbstractItemView::NoSelection
+ QAbstractItemView::SingleSelection
- QAbstractItemView::SelectRows
+ QAbstractItemView::SelectItems
QAbstractItemView::ScrollPerPixel
@@ -134,8 +134,11 @@
Enter Hexadecimal Network ID
+
+ 16
+
- true
+ false
(Numeric ID of Network to Join)
@@ -162,12 +165,6 @@
Join Network
-
- false
-
-
-
-
Join
diff --git a/ZeroTierUI/networkwidget.ui b/ZeroTierUI/networkwidget.ui
index 9d0df100b..f515f2d8c 100644
--- a/ZeroTierUI/networkwidget.ui
+++ b/ZeroTierUI/networkwidget.ui
@@ -19,9 +19,6 @@
Network
-
-
-
6
@@ -341,6 +338,9 @@
Double-click to Copy IP Address to Clipboard.
+
+ QFrame::NoFrame
+
QAbstractItemView::NoEditTriggers