Merge branch 'feature/systray-menu' into develop

Close #536.
Cleaning up of the systray menu.
Main window starts hidden if not in debug mode.

Incidentally, some fixes related to the subprocess invocation and termination, removing many of the annoying hangs during debug.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/leap/app.py b/src/leap/app.py
index 1aebfca2..fe88a002 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -36,6 +36,9 @@ def main():
     console.setFormatter(formatter)
     logger.addHandler(console)
 
+    logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
+    logger.info('LEAP client version %s', VERSION)
+    logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
     logfile = getattr(opts, 'log_file', False)
     if logfile:
         logger.debug('setting logfile to %s ', logfile)
@@ -44,10 +47,7 @@ def main():
         fileh.setFormatter(formatter)
         logger.addHandler(fileh)
 
-    #logger.debug('args: %s' % opts)
     logger.info('Starting app')
-    logger.info('Running client version %s', VERSION)
-
     app = QApplication(sys.argv)
     unitychecks.do_check()
 
@@ -60,7 +60,8 @@ def main():
         QApplication.setQuitOnLastWindowClosed(False)
 
     window = LeapWindow(opts)
-    window.show()
+    if debug:
+        window.show()
     sys.exit(app.exec_())
 
 if __name__ == "__main__":