summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/platform_init
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-15 10:32:37 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-15 10:32:37 -0300
commite8c028f3eb6cd0681f039c456dc1ac45c98d598f (patch)
treeb7e84ebafad106726308d3c87f58ad1d900d66d7 /src/leap/bitmask/platform_init
parent159dbe295148975bdfe9a50f871254aa9adf2328 (diff)
parentfb9bad95cc4bd2769af5f91c2f0cac1be4c3c617 (diff)
Merge branch 'release-0.6.1'0.6.1
Diffstat (limited to 'src/leap/bitmask/platform_init')
-rw-r--r--src/leap/bitmask/platform_init/__init__.py6
-rw-r--r--src/leap/bitmask/platform_init/initializers.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/bitmask/platform_init/__init__.py b/src/leap/bitmask/platform_init/__init__.py
index 2a262a30..a9a97af9 100644
--- a/src/leap/bitmask/platform_init/__init__.py
+++ b/src/leap/bitmask/platform_init/__init__.py
@@ -22,7 +22,7 @@ import platform
_system = platform.system()
-IS_WIN = True if _system == "Windows" else False
-IS_MAC = True if _system == "Darwin" else False
-IS_LINUX = True if _system == "Linux" else False
+IS_LINUX = _system == "Linux"
+IS_MAC = _system == "Darwin"
IS_UNIX = IS_MAC or IS_LINUX
+IS_WIN = _system == "Windows"
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index e4d6f9b3..f56b9330 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -106,6 +106,7 @@ def get_missing_helpers_dialog():
msg.setStandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
msg.addButton("No, don't ask again", QtGui.QMessageBox.RejectRole)
msg.setDefaultButton(QtGui.QMessageBox.Yes)
+ msg.setEscapeButton(QtGui.QMessageBox.No)
return msg