diff options
| -rw-r--r-- | changes/bug_3147-wrong-systray-icon-on-startup | 1 | ||||
| -rw-r--r-- | changes/bug_3151-parse-return-in-logger | 1 | ||||
| -rw-r--r-- | changes/bug_osx_bundle | 2 | ||||
| -rw-r--r-- | src/leap/gui/loggerwindow.py | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 2 | ||||
| -rw-r--r-- | src/leap/services/eip/vpnlaunchers.py | 9 |
6 files changed, 11 insertions, 5 deletions
diff --git a/changes/bug_3147-wrong-systray-icon-on-startup b/changes/bug_3147-wrong-systray-icon-on-startup new file mode 100644 index 00000000..8f9d6f26 --- /dev/null +++ b/changes/bug_3147-wrong-systray-icon-on-startup @@ -0,0 +1 @@ + o Bugfix: wrong systray icon on startup. Closes #3147. diff --git a/changes/bug_3151-parse-return-in-logger b/changes/bug_3151-parse-return-in-logger new file mode 100644 index 00000000..734588aa --- /dev/null +++ b/changes/bug_3151-parse-return-in-logger @@ -0,0 +1 @@ + o Bugfix: parse line return in the logger window. Closes #3151. diff --git a/changes/bug_osx_bundle b/changes/bug_osx_bundle new file mode 100644 index 00000000..d059468d --- /dev/null +++ b/changes/bug_osx_bundle @@ -0,0 +1,2 @@ + o OSX: Make the install_path relative to the launcher path instead + of absolute.
\ No newline at end of file diff --git a/src/leap/gui/loggerwindow.py b/src/leap/gui/loggerwindow.py index dd724ac7..dc1e273d 100644 --- a/src/leap/gui/loggerwindow.py +++ b/src/leap/gui/loggerwindow.py @@ -78,6 +78,7 @@ class LoggerWindow(QtGui.QWidget): """ level = log[LeapLogHandler.RECORD_KEY].levelname message = log[LeapLogHandler.MESSAGE_KEY] + message = message.replace('\n', '<br>\n') if self._logs_to_display[level]: self.ui.txtLogHistory.append(message) diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 93a1eafa..7bcd54b0 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -548,7 +548,7 @@ class MainWindow(QtGui.QMainWindow): systrayMenu.addAction(self.ui.action_quit) self._systray = QtGui.QSystemTrayIcon(self) self._systray.setContextMenu(systrayMenu) - self._systray.setIcon(self._status_panel.ERROR_ICON) + self._systray.setIcon(self._status_panel.ERROR_ICON_TRAY) self._systray.setVisible(True) self._systray.activated.connect(self._tray_activated) diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py index a1f7e4cf..116a8790 100644 --- a/src/leap/services/eip/vpnlaunchers.py +++ b/src/leap/services/eip/vpnlaunchers.py @@ -472,8 +472,8 @@ class DarwinVPNLauncher(VPNLauncher): INSTALL_MSG = ("\"LEAP needs administrative privileges to install " "missing scripts and fix permissions.\"") - INSTALL_PATH = "/Applications/LEAP Client.app" - INSTALL_PATH_ESCAPED = "/Applications/LEAP\ Client.app" + INSTALL_PATH = os.path.realpath(os.getcwd() + "/../../") + INSTALL_PATH_ESCAPED = os.path.realpath(os.getcwd() + "/../../") OPENVPN_BIN = 'openvpn.leap' OPENVPN_PATH = "%s/Contents/Resources/openvpn" % (INSTALL_PATH,) OPENVPN_PATH_ESCAPED = "%s/Contents/Resources/openvpn" % ( @@ -620,12 +620,13 @@ class DarwinVPNLauncher(VPNLauncher): if _has_updown_scripts(self.UP_SCRIPT): args += [ - '--up', self.UP_SCRIPT, + '--up', '\"%s\"' % (self.UP_SCRIPT,), ] if _has_updown_scripts(self.DOWN_SCRIPT): args += [ - '--down', self.DOWN_SCRIPT] + '--down', '\"%s\"' % (self.DOWN_SCRIPT,) + ] # should have the down script too if _has_updown_scripts(self.OPENVPN_DOWN_PLUGIN): |