ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-20 13:33:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Ierymenko 2014-01-10 17:31:10 -08:00
parent 305ed0b3c5
commit 14d144ea22
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist
View File

@ -42,7 +42,7 @@
<key>positionOfDivider</key> <key>positionOfDivider</key>
<real>333</real> <real>333</real>
<key>savedFrame</key> <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> <key>selectedTabView</key>
<string>event log</string> <string>event log</string>
</dict> </dict>

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

Binary file not shown.

9
ZeroTierUI/mainwindow.cpp
View File

@ -82,7 +82,7 @@ static void handleZTMessage(void *arg,unsigned long id,const char *line)
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
pollServiceTimerId(0) pollServiceTimerId(-1)
{ {
ui->setupUi(this); ui->setupUi(this);
if (ui->networkListWidget->verticalScrollBar()) if (ui->networkListWidget->verticalScrollBar())
@ -112,6 +112,8 @@ void MainWindow::timerEvent(QTimerEvent *event)
if (this->isHidden()) if (this->isHidden())
return; return;
if (pollServiceTimerId < 0)
return;
if (!zeroTierClient) { if (!zeroTierClient) {
std::string authToken; std::string authToken;
@ -331,7 +333,10 @@ void MainWindow::doInstallDialog()
{ {
#ifdef __APPLE__ #ifdef __APPLE__
this->setEnabled(false); this->setEnabled(false);
this->setHidden(true); if (pollServiceTimerId >= 0) {
this->killTimer(pollServiceTimerId);
pollServiceTimerId = -1;
}
InstallDialog *id = new InstallDialog(this); InstallDialog *id = new InstallDialog(this);
id->setModal(true); id->setModal(true);