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 zcmc&%3wKq;75?tY3(n2la3LUIuptUd7ebfg&cE3Fn7PU!+-sFm&dOZSk@CmF~zgtRu+fiSY@|EH1ybjwV3lZcPLa2=Q z8GOf=zI=&vKauQC7~~uonSl}Vg?w%>0%>!tJsI*ZMCCJ|#n|Fl(3xDhaz$s*){?aI zA|CfpDsZRort3zEw+}=_722C@{PXYYkkFVgyPOJ`7|t_VoWK9CxTRSDjp;fu38_j zOe8|`osRhybTX4yE=C)I4MH|e8Y7>`#|C3u5VYkuj5P#HOExL_C&tM~K8vx%$+gLN ztUK0NU%jYaq}RS*>jvYT$Jw-Od<5gwqz35H;e&E;$-$U!+^aDp>dTYiCjL$Jo?($EhvQTF>RhB9`d zGnQ1KAc6ulc2X3RXl#rjP;>LK-jn@mZ2nPW_l0F2a!WBxjcty%$6Rd=YauzPh96MF zC-6EEg@#}a&%+cXE%I3mW#|+q{5(v=NtkK~b|K`^<6mN$Ay}P} zCY&6>$?8aPl=|{8#bBDVd;(c}KP>MLV!6RoHwl?UNrd9#B&AW5;x5+DrvMu$#emmZ z-k)nl+Dx931IV<*$#j4xR=$`^5hs!29Buro#HaA3x+qeVN8$6Dr8-f+>24&8-0!)%UzU;xUa6>%4I@Q?~%anIDVjn2%)vy)vnvNNU zV8d2~87Pmb$i_ ziz-8~OT8SY%WJ5XSA7;kg`(P7QO>Z{L{Ov5%#LCb0TTHiYC2CHZwF zxsul$%ryi{@+@ZN^W+tI+2A~+FJUg%mS5w1*�(R=f(^R*4I6p&{7)W)>>s#jw11 zOs_Y%(9vJP$ks-f9Z3JYDCYgJ(}udW-w#!!V!ns@w7w1t48aPZ3iIV}sF&?Ni=hNi z@77)w9k>V!4Z*I(Dkh_gvB(hYTCAcb7DupHEnE`i2As>4*vbI5FbEnb4HsABB1gk) z%#jzu^1`4ia-o}cF5Orf!BU-eSrp5-qyO)U{Ly;zWV=Rq0k7rqyuotEQ5}-TL3FG~5CD@0(Q7hR}cC$VAm-2>tf~Ror3-{rAgp8CngY z|9&ag0JAbb0QGyWj^uYBZU{C8bqr1-LZ(U9swh_BDlP%b`%gex$qy|%yEif7aTjrl zN1hAIbAv{_-8peFwbQAIoK7U86z{b^lkqbtSoblrh6M8~snt2M6wBns)(5E6yL^QrD%Cwa3RNv%=2569H!t%_Z9K_r-DvQ+-WORm#6z%8kycCNxW5So#KaDsWDbgNTqqx>4u#Qxu#>yKT^$DqngT*~eC zFSuN``7DlXx0gFBxt`={U!MNncDs$)L7rFGq1(Yr3a==-EJ>Eob$1;JT~ZY#*-)1k0;ge9#$TeM|^pd-ZsWNlAZ0Tm?w{@XHO|? z)n4m(T`dnATA?@^_!UH<#!{8T~2juWfNQ(bNo39D6;2CiP``qu# z{q!}6t+r>Zj;^*gpqJC#imCiXa1F9X$RBa7+$Z^ga%5>c9;bvCO#w{LhVPy_(^=Jm;C|f+)q8{C+ z9^I?9U#D?IE2aJ^8v$k38LV?`LZLLJ^;HOmuYUFlq&x^TJC78QX6n8gz+BurC|9st8MYTy%=PeYy7!!)(v7(RY{xvgJbQMm`3 zPP!}`*gb7eVfBvM_gK%U-dVfXmaonq$}_+hM#t+faG3J)HsAF|KiuH7Dx!U-r3 z5bY}rFtSkFYXgkZyWGNU#L6i Iu3ek|4F>N8v;Y7A literal 3670 zcmc&%X>(LX6g~42LU@mU$s@=jTUdsjFaZe&A_)*e*ajgW1Oz6@Kth%YnF&jkWl?_c zv*pjQ^n*V^44cR*i-7F1$|ADJB3w^*heCt|EQ(^L`t;s?``p|2_L~t)RxK)8n46!M zAJNGNke(%i5FDh1Sb${r{DA>-!)2E4R>Z366$aR|b)y2VyK)_w zUPU6YKGoD5&yX8hW4ATj(rW9*G!TOn!Kke_g$v6yxvCJhYGaH1&dr9n%-U1iV5_Fy zBylK)DS}a3Z)#>ZMks<|oGQdfA0sv6qXLYgu76x#Ti?LVd)_GyntTqAM4lq5hI){hEfWn)*RZ z`52=JhWeotd#qfL^9p0_Ro5-=VVokEt3DK?`swl8hPz@OGW4vZ&LVyYQ zng*2AB)@>6BAQ|&`)g?GF`8x#O|5}r7oyqpB&eno=e1@2+NiZzYX0L`&%A*%waMq= zQ>HbXALmM1(KCoK_NI8LQrxGOJq^@gl6j>WmvZEsc0}WzI-;|loW+0$vSQ7t>QtgO z-VondlT0OTLz!+UHVq-Uph-TjNgl)WJ|-%HAvwbJC&?K(tuP7c<#aQ;p*arS#J< zT@j1{6kv+{iefqLGHcHOitXJi;2~$AL=ntgEFcXtQK|^$E*8)>X8D+hA ze%ZA%v56XAWi?)esdB`VBW-GYg+0VHT3Dq|!Fh{4`PMgyg^)VNRAL*Z8kj6&(w>X+E5b7@|OJUP@R2aD}8Q7ph3pMH+Z zR0s5IU%h1x>gidlc$5eVm?HL2W%f|Ca5?D7!8Q-Iz#eK5mY~L`Kj5L(23Ttx`+tM$ z>t5wou*wX~XSn?twQ|5^_9WcaS}Du1O!m97|Cw-mfZjolYB;6C!AT8gG@RCMV{E9589()x1PNZ=5dQGKDa5vPjrzDA!dA_)^p4*S9a0Q#Nz8y ziCAM}Lvvjnu$jw!iQ)YDG{cVB@*@(mQ+DuTuaoUAt8LFvR9ox!3uB=}PprRRk`AMz z{x(QC44L|^-Rv-e>et(Phg#8Zi46|FI~ea|nb%7 diff --git a/ZeroTierUI/mainwindow.cpp b/ZeroTierUI/mainwindow.cpp index 913ced1c8..fc434782f 100644 --- a/ZeroTierUI/mainwindow.cpp +++ b/ZeroTierUI/mainwindow.cpp @@ -82,7 +82,7 @@ static void handleZTMessage(void *arg,unsigned long id,const char *line) MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), - pollServiceTimerId(0) + pollServiceTimerId(-1) { ui->setupUi(this); 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);