diff options
| -rw-r--r-- | changes/bug-3425_replace-wizard-images | 1 | ||||
| -rw-r--r-- | changes/bug_better_hideshow_handling | 3 | ||||
| -rw-r--r-- | changes/bug_load_kext | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 6 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/wizard.ui | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/wizard.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/platform_init/initializers.py | 4 |
7 files changed, 14 insertions, 6 deletions
diff --git a/changes/bug-3425_replace-wizard-images b/changes/bug-3425_replace-wizard-images new file mode 100644 index 00000000..cf5cbd9d --- /dev/null +++ b/changes/bug-3425_replace-wizard-images @@ -0,0 +1 @@ + o Replace wizard images with the rainbow mask. Closes #3425. diff --git a/changes/bug_better_hideshow_handling b/changes/bug_better_hideshow_handling new file mode 100644 index 00000000..3538087b --- /dev/null +++ b/changes/bug_better_hideshow_handling @@ -0,0 +1,3 @@ + o Activate window when setting it visible. Also display Hide/Show + message in the tray icon taking into account the window + activation. Fixes #3433.
\ No newline at end of file diff --git a/changes/bug_load_kext b/changes/bug_load_kext new file mode 100644 index 00000000..ba4a44cf --- /dev/null +++ b/changes/bug_load_kext @@ -0,0 +1,2 @@ + o OSX: Check for the tun.kext existence in /Library/Extensions + instead of /System/Library/Extensions. Fixes #3271.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 776323bc..6dd28f04 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -613,7 +613,7 @@ class MainWindow(QtGui.QMainWindow): self.tr("Hide Main Window"))[int(visible)] # set labels - visible = self.isVisible() + visible = self.isVisible() and self.isActiveWindow() self._action_visible.setText(get_action(visible)) def _toggle_visible(self): @@ -623,8 +623,10 @@ class MainWindow(QtGui.QMainWindow): Toggles the window visibility """ - if not self.isVisible(): + visible = self.isVisible() and self.isActiveWindow() + if not visible: self.show() + self.activateWindow() self.raise_() else: self.hide() diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui index a8f66bbc..5e0108dc 100644 --- a/src/leap/bitmask/gui/ui/wizard.ui +++ b/src/leap/bitmask/gui/ui/wizard.ui @@ -771,7 +771,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/leap-color-big.png</pixmap> + <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap> </property> </widget> </item> diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index fe653e91..ed6c1da0 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -77,7 +77,7 @@ class Wizard(QtGui.QWizard): self.ui.setupUi(self) self.setPixmap(QtGui.QWizard.LogoPixmap, - QtGui.QPixmap(":/images/leap-color-small.png")) + QtGui.QPixmap(":/images/mask-icon.png")) self.QUESTION_ICON = QtGui.QPixmap(":/images/Emblem-question.png") self.ERROR_ICON = QtGui.QPixmap(":/images/Dialog-error.png") diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index 7c46ee0a..831c6a1c 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -223,8 +223,8 @@ def _darwin_has_tun_kext(): """ # XXX we should be smarter here and use kextstats output. - has_kext = os.path.isdir("/System/Library/Extensions/tun.kext") - has_startup = os.path.isdir("/System/Library/StartupItems/tun") + has_kext = os.path.isdir("/Library/Extensions/tun.kext") + has_startup = os.path.isdir("/Library/StartupItems/tun") has_tun_and_startup = has_kext and has_startup logger.debug( 'platform initializer check: has tun_and_startup = %s' % |