summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-26 14:48:06 -0400
committerKali Kaneko <kali@leap.se>2014-02-26 14:48:06 -0400
commit48403c05ebc2515bf33ff26512218ad72489d01b (patch)
treea4568d2db5590386f2fd2faa16a097656cf1ad5d
parentf0346b77185dc353d6ac65308189fbe236ce2b44 (diff)
parent5eb6d978f9eb953d001f3be348df4b8506cbd721 (diff)
Merge remote-tracking branch 'ivan-github/bug/fix-qmessagebox-error-call' into develop
-rw-r--r--changes/feature-5163_add-pastebin-button1
-rw-r--r--src/leap/bitmask/gui/loggerwindow.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/feature-5163_add-pastebin-button b/changes/feature-5163_add-pastebin-button
new file mode 100644
index 00000000..ec44edaf
--- /dev/null
+++ b/changes/feature-5163_add-pastebin-button
@@ -0,0 +1 @@
+- Add pastebin button to upload logs from the logs window to ease bug report. Closes #5163.
diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index 9b6cef91..c01642fc 100644
--- a/src/leap/bitmask/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -237,7 +237,7 @@ class LoggerWindow(QtGui.QDialog):
"""
logger.error(repr(failure))
msg = self.tr("Sending logs to Pastebin failed!")
- show_err = lambda: QtGui.QMessageBox.error(
+ show_err = lambda: QtGui.QMessageBox.critical(
self, self.tr("Pastebin Error"), msg)
self._set_pastebin_sending(False)
self.reactor.callLater(0, show_err)