Merge branch 'pre-release-0.2.0' into release-0.2.0

This merge contains today's state of develop branch,
minus soledad and email components.

1 files changed, 41 insertions, 1 deletions

diff --git a/src/leap/app.py b/src/leap/app.py
index a1251ca8..eb38751c 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -1,13 +1,25 @@
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
+from functools import partial
 import logging
+import signal
+
 # This is only needed for Python v2 but is harmless for Python v3.
 import sip
 sip.setapi('QVariant', 2)
 sip.setapi('QString', 2)
 from PyQt4.QtGui import (QApplication, QSystemTrayIcon, QMessageBox)
+from PyQt4 import QtCore
 
 from leap import __version__ as VERSION
 from leap.baseapp.mainwindow import LeapWindow
+from leap.gui import locale_rc
+
+
+def sigint_handler(*args, **kwargs):
+    logger = kwargs.get('logger', None)
+    logger.debug('SIGINT catched. shutting down...')
+    mainwindow = args[0]
+    mainwindow.shutdownSignal.emit()
 
 
 def main():
@@ -36,7 +48,6 @@ def main():
     console.setFormatter(formatter)
     logger.addHandler(console)
 
-    #logger.debug(opts)
     logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
     logger.info('LEAP client version %s', VERSION)
     logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
@@ -51,6 +62,16 @@ def main():
     logger.info('Starting app')
     app = QApplication(sys.argv)
 
+    # To test:
+    # $ LANG=es ./app.py
+    locale = QtCore.QLocale.system().name()
+    qtTranslator = QtCore.QTranslator()
+    if qtTranslator.load("qt_%s" % locale, ":/translations"):
+        app.installTranslator(qtTranslator)
+    appTranslator = QtCore.QTranslator()
+    if appTranslator.load("leap_client_%s" % locale, ":/translations"):
+        app.installTranslator(appTranslator)
+
     # needed for initializing qsettings
     # it will write .config/leap/leap.conf
     # top level app settings
@@ -59,6 +80,10 @@ def main():
     app.setApplicationName("leap")
     app.setOrganizationDomain("leap.se")
 
+    # XXX we could check here
+    # if leap-client is already running, and abort
+    # gracefully in that case.
+
     if not QSystemTrayIcon.isSystemTrayAvailable():
         QMessageBox.critical(None, "Systray",
                              "I couldn't detect"
@@ -68,12 +93,27 @@ def main():
         QApplication.setQuitOnLastWindowClosed(False)
 
     window = LeapWindow(opts)
+
+    # this dummy timer ensures that
+    # control is given to the outside loop, so we
+    # can hook our sigint handler.
+    timer = QtCore.QTimer()
+    timer.start(500)
+    timer.timeout.connect(lambda: None)
+
+    sigint_window = partial(sigint_handler, window, logger=logger)
+    signal.signal(signal.SIGINT, sigint_window)
+
     if debug:
         # we only show the main window
         # if debug mode active.
         # if not, it will be set visible
         # from the systray menu.
         window.show()
+        if sys.platform == "darwin":
+            window.raise_()
+
+    # run main loop
     sys.exit(app.exec_())
 
 if __name__ == "__main__":