diff --git a/.gitignore b/.gitignore index 6a09d086..aecb2fb2 100755 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ mac-tap/tuntap/tap.kext /zt1-*-install /file2lz4c .qmake.stash +*.autosave diff --git a/ZeroTierUI/networkwidget.ui b/ZeroTierUI/networkwidget.ui index 8b2c51fb..84c26829 100644 --- a/ZeroTierUI/networkwidget.ui +++ b/ZeroTierUI/networkwidget.ui @@ -40,28 +40,7 @@ - - - 0 - 0 - - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::AlignHCenter|Qt::AlignTop - - - 6 - - - 2 - + 0 @@ -74,152 +53,61 @@ 0 - - - - Network ID: - - - Qt::PlainText - - - - - - - - 75 - true - - - - Click to copy network ID to clipboard. - - - QPushButton { - border: 0; - padding: 0; - margin: 0; - text-align: left; - background-color: transparent; -} - -QPushButton:focus { - background-color: rgba(0,0,0,25); -} - -QPushButton:hover { - background-color: rgba(0,0,0,25); -} - - - - 0000000000000000 - - - true - - - - - - - Name: - - - Qt::PlainText - - - - + - - - 75 - true - - - - ? - - - Qt::PlainText - - - - - - - Type: - - - Qt::PlainText + + + 0 + 0 + - - - - - 75 - true + 15 - - ? - - - Qt::PlainText - - - - - - - Status: - - - Qt::PlainText + + background-color: rgba(0,0,0,25); +padding: 0.25em; +margin: 0; - - - - - Device: + networkname Qt::PlainText - - - - - - - 75 - true - - - - ? + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - Qt::PlainText + + Qt::NoTextInteraction - - + + - + 0 0 - - - 12 + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::AlignHCenter|Qt::AlignTop + + + 6 + + + 2 0 @@ -233,14 +121,65 @@ QPushButton:hover { 0 - - - - - 0 - 0 - + + + + Network ID: + + + Qt::PlainText + + + + + + + + 75 + true + + + + Click to copy network ID to clipboard. + + + QPushButton { + border: 0; + padding: 0; + margin: 0; + text-align: left; + background-color: transparent; +} + +QPushButton:focus { + background-color: rgba(0,0,0,25); +} + +QPushButton:hover { + background-color: rgba(0,0,0,25); +} + + + + 0000000000000000 + + + true + + + + + + Type: + + + Qt::PlainText + + + + + 75 @@ -255,40 +194,125 @@ QPushButton:hover { - - + + + + Status: + + + Qt::PlainText + + + + + 0 0 + + + 12 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 75 + true + + + + ? + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + + 8 + + + + (configuration is 0 seconds old) + + + Qt::PlainText + + + + + + + Qt::Horizontal + + + + 40 + 1 + + + + + + + + + + + Device: + + + Qt::PlainText + + + + + - 8 + 75 + true - (configuration is 0 seconds old) + ? Qt::PlainText - - - - Qt::Horizontal - - - - 40 - 1 - - - - @@ -455,7 +479,6 @@ QListWidget:hover { - networkIdPushButton ipListWidget leaveNetworkButton diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh index b9563a11..626db73f 100755 --- a/ext/installfiles/mac/uninstall.sh +++ b/ext/installfiles/mac/uninstall.sh @@ -10,11 +10,20 @@ if [ "$UID" -ne 0 ]; then exit 1 fi -echo +# Run with -q to be quieter and run without delay +quickAndQuiet=0 +if [ "$1" = "-q" ]; then + quickAndQuiet=1 + echo() { :; } +fi -echo "This will uninstall ZeroTier One, hit CTRL+C to abort." -echo "Waiting 5 seconds..." -sleep 5 +echo + +if [ $quickAndQuiet -eq 0 ]; then + echo "This will uninstall ZeroTier One, hit CTRL+C to abort." + echo "Waiting 5 seconds..." + sleep 5 +fi echo "Unloading and removing LaunchDaemons item..." launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist @@ -27,11 +36,11 @@ killall -KILL zerotier-one >>/dev/null 2>&1 sleep 1 echo "Unloading kernel extension..." -kextunload "$ztpath/tap.kext" +kextunload "$ztpath/tap.kext" >>/dev/null 2>&1 echo "Erasing UI app, binary, and support files..." -cd $ztpath -rm -rfv "$ztapp" zerotier-one *.persist authtoken.secret identity.public *.log *.pid *.kext *.sh +cd "$ztpath" +rm -rfv "$ztapp" zerotier-one *.persist authtoken.secret identity.public *.log *.pid *.kext *.sh networks.d updates.d shutdownIfUnreadable echo "Done." echo