From 14d144ea2251c5b7ae80c7dbbd4f8907bcfa232b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 10 Jan 2014 17:31:10 -0800 Subject: [PATCH] UI stuff, re-launch app from AppleScript after install (still needs a bit of work) --- .../Contents/Info.plist | 2 +- .../Contents/Resources/Scripts/main.scpt | Bin 3670 -> 4428 bytes ZeroTierUI/mainwindow.cpp | 9 +++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist index 20f6fcb0b..85ae12f70 100644 --- a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist +++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist @@ -42,7 +42,7 @@ positionOfDivider 333 savedFrame - 57 445 602 597 0 0 1920 1058 + 180 90 602 597 0 0 1280 778 selectedTabView event log diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt index 3ebf442fc7e267494ddedca9c85697b5c84792c7..54ac282be365aceadd1dbcef77d722dfe4d5cba4 100644 GIT binary patch literal 4428 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 if (ui->networkListWidget->verticalScrollBar()) @@ -112,6 +112,8 @@ void MainWindow::timerEvent(QTimerEvent *event) if (this->isHidden()) return; + if (pollServiceTimerId < 0) + return; if (!zeroTierClient) { std::string authToken; @@ -331,7 +333,10 @@ void MainWindow::doInstallDialog() { #ifdef __APPLE__ this->setEnabled(false); - this->setHidden(true); + if (pollServiceTimerId >= 0) { + this->killTimer(pollServiceTimerId); + pollServiceTimerId = -1; + } InstallDialog *id = new InstallDialog(this); id->setModal(true);