diff options
| -rw-r--r-- | changes/bug-5395_update-bitmask-website-in-pkginfo | 1 | ||||
| -rw-r--r-- | changes/bug-5433_unescape-logs-for-pastebin | 1 | ||||
| -rw-r--r-- | changes/feature-5401_add-shortcut-for-help-menu | 1 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/loggerwindow.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 16 |
6 files changed, 8 insertions, 16 deletions
diff --git a/changes/bug-5395_update-bitmask-website-in-pkginfo b/changes/bug-5395_update-bitmask-website-in-pkginfo new file mode 100644 index 00000000..a762a8bb --- /dev/null +++ b/changes/bug-5395_update-bitmask-website-in-pkginfo @@ -0,0 +1 @@ +- Update bitmask url in PKG-INFO. Closes #5395. diff --git a/changes/bug-5433_unescape-logs-for-pastebin b/changes/bug-5433_unescape-logs-for-pastebin new file mode 100644 index 00000000..289dd64a --- /dev/null +++ b/changes/bug-5433_unescape-logs-for-pastebin @@ -0,0 +1 @@ +- Don't escape logs for pastebin. Closes #5433. diff --git a/changes/feature-5401_add-shortcut-for-help-menu b/changes/feature-5401_add-shortcut-for-help-menu new file mode 100644 index 00000000..9e33388b --- /dev/null +++ b/changes/feature-5401_add-shortcut-for-help-menu @@ -0,0 +1 @@ +- Add hotkey for the Help menu. Closes #5401. @@ -229,7 +229,7 @@ setup( author_email='info@leap.se', maintainer='Kali Kaneko', maintainer_email='kali@leap.se', - url='https://bitmask.rtfd.org', + url='https://bitmask.net', download_url=DOWNLOAD_URL, license='GPL-3+', packages=find_packages( diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index c01642fc..9f396574 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -127,7 +127,7 @@ class LoggerWindow(QtGui.QDialog): current_history = [] for line in history: self._add_log_line(line) - message = cgi.escape(line[LeapLogHandler.MESSAGE_KEY]) + message = line[LeapLogHandler.MESSAGE_KEY] current_history.append(message) self._current_history = "\n".join(current_history) @@ -222,7 +222,6 @@ class LoggerWindow(QtGui.QDialog): """ msg = self.tr("Your pastebin link <a href='{0}'>{0}</a>") msg = msg.format(link) - logger.debug(msg) show_info = lambda: QtGui.QMessageBox.information( self, self.tr("Pastebin OK"), msg) self._set_pastebin_sending(False) diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index ce05f8f3..d755115a 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -75,7 +75,7 @@ <x>0</x> <y>0</y> <width>524</width> - <height>651</height> + <height>667</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -85,8 +85,6 @@ <property name="margin"> <number>0</number> </property> - - <!-- LOGIN --> <item> <widget class="QFrame" name="frame"> <property name="sizePolicy"> @@ -134,7 +132,6 @@ </property> </layout> </item> - <item> <widget class="Line" name="lineUnderLogin"> <property name="orientation"> @@ -142,8 +139,6 @@ </property> </widget> </item> - - <!-- EIP --> <item> <widget class="QWidget" name="eipWidget" native="true"> <layout class="QVBoxLayout" name="eipVerticalLayout"> @@ -172,7 +167,6 @@ </layout> </widget> </item> - <item> <widget class="Line" name="lineUnderEIP"> <property name="orientation"> @@ -180,8 +174,6 @@ </property> </widget> </item> - - <!-- EMAIL --> <item> <widget class="QWidget" name="mailWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -204,7 +196,6 @@ </layout> </widget> </item> - <item> <widget class="Line" name="lineUnderEmail"> <property name="orientation"> @@ -212,7 +203,6 @@ </property> </widget> </item> - <item> <spacer name="verticalSpacer"> <property name="orientation"> @@ -307,7 +297,7 @@ <x>0</x> <y>0</y> <width>524</width> - <height>21</height> + <height>23</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -324,7 +314,7 @@ </widget> <widget class="QMenu" name="menuHelp"> <property name="title"> - <string>Help</string> + <string>&Help</string> </property> <addaction name="action_help"/> <addaction name="action_show_logs"/> |