Browse Source

UI stuff, re-launch app from AppleScript after install (still needs a bit of work)

Adam Ierymenko 11 years ago
parent
commit
14d144ea22

+ 1 - 1
ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist

@@ -42,7 +42,7 @@
 		<key>positionOfDivider</key>
 		<real>333</real>
 		<key>savedFrame</key>
-		<string>57 445 602 597 0 0 1920 1058 </string>
+		<string>180 90 602 597 0 0 1280 778 </string>
 		<key>selectedTabView</key>
 		<string>event log</string>
 	</dict>

BIN
ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt


+ 7 - 2
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);