From 6e9c63f47b98fbfcd3a5104fbfa5cc9d9ffe5143 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 17 Jan 2013 07:31:59 +0900
Subject: osx fixed already running instance check

---
 src/leap/baseapp/dialogs.py |  9 ++++++---
 src/leap/baseapp/eip.py     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/dialogs.py b/src/leap/baseapp/dialogs.py
index 3cb539cf..d256fc99 100644
--- a/src/leap/baseapp/dialogs.py
+++ b/src/leap/baseapp/dialogs.py
@@ -23,7 +23,8 @@ class ErrorDialog(QDialog):
 
     def warningMessage(self, msg, label):
         msgBox = QMessageBox(QMessageBox.Warning,
-                             "QMessageBox.warning()", msg,
+                             "LEAP Client Error",
+                             msg,
                              QMessageBox.NoButton, self)
         msgBox.addButton("&Ok", QMessageBox.AcceptRole)
         if msgBox.exec_() == QMessageBox.AcceptRole:
@@ -34,7 +35,8 @@ class ErrorDialog(QDialog):
 
     def criticalMessage(self, msg, label):
         msgBox = QMessageBox(QMessageBox.Critical,
-                             "QMessageBox.critical()", msg,
+                             "LEAP Client Error",
+                             msg,
                              QMessageBox.NoButton, self)
         msgBox.addButton("&Ok", QMessageBox.AcceptRole)
         msgBox.exec_()
@@ -49,7 +51,8 @@ class ErrorDialog(QDialog):
 
     def confirmMessage(self, msg, label, action):
         msgBox = QMessageBox(QMessageBox.Critical,
-                             "QMessageBox.critical()", msg,
+                             self.tr("LEAP Client Error"),
+                             msg,
                              QMessageBox.NoButton, self)
         msgBox.addButton("&Ok", QMessageBox.AcceptRole)
         msgBox.addButton("&Cancel", QMessageBox.RejectRole)
diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 4fcbee3f..03a1d6c7 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -22,6 +22,7 @@ class EIPConductorAppMixin(object):
     Connects the eip connect/disconnect logic
     to the switches in the app (buttons/menu items).
     """
+    ERR_DIALOG = False
 
     def __init__(self, *args, **kwargs):
         opts = kwargs.pop('opts')
@@ -94,6 +95,15 @@ class EIPConductorAppMixin(object):
         in the future we plan to derive errors to
         our log viewer.
         """
+        if self.ERR_DIALOG:
+            logger.warning('another error dialog suppressed')
+            return
+
+        # XXX this is actually a one-shot.
+        # On the dialog there should be 
+        # a reset signal binded to the ok button
+        # or something like that.
+        self.ERR_DIALOG = True
 
         if getattr(error, 'usermessage', None):
             message = error.usermessage
@@ -105,6 +115,7 @@ class EIPConductorAppMixin(object):
         # launching dialog.
         # (so Qt tests can assert stuff)
 
+
         if error.critical:
             logger.critical(error.message)
             #critical error (non recoverable),
@@ -113,6 +124,7 @@ class EIPConductorAppMixin(object):
             ErrorDialog(errtype="critical",
                         msg=message,
                         label="critical error")
+
         elif error.warning:
             logger.warning(error.message)
 
-- 
cgit v1.2.3