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-- | src/leap/gui/loggerwindow.py | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 2 |
4 files changed, 4 insertions, 1 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/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 8283e72f..e8f91700 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -545,7 +545,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) |