diff options
| -rw-r--r-- | changes/bug-3675_qfiledialog-and-qtreactor-freezes | 1 | ||||
| -rw-r--r-- | changes/bug_3711-warn-with-python3 | 1 | ||||
| -rwxr-xr-x | setup.py | 23 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/loggerwindow.py | 3 |
4 files changed, 27 insertions, 1 deletions
diff --git a/changes/bug-3675_qfiledialog-and-qtreactor-freezes b/changes/bug-3675_qfiledialog-and-qtreactor-freezes new file mode 100644 index 00000000..fa0ef6a2 --- /dev/null +++ b/changes/bug-3675_qfiledialog-and-qtreactor-freezes @@ -0,0 +1 @@ + o Fix save logs to file dialog freezing. Closes #3675. diff --git a/changes/bug_3711-warn-with-python3 b/changes/bug_3711-warn-with-python3 new file mode 100644 index 00000000..79271caf --- /dev/null +++ b/changes/bug_3711-warn-with-python3 @@ -0,0 +1 @@ + o Complain if setup.py is run with python3. Closes: #3711 @@ -1,10 +1,33 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# setup.py +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +""" +Setup file for bitmask. +""" from __future__ import print_function import sys +if not sys.version_info[0] == 2: + print("[ERROR] Sorry, Python 3 is not supported (yet). " + "Try running with python2: python2 setup.py ...") + exit() + try: from setuptools import setup, find_packages except ImportError: diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index 9b4ba55d..ece4cad6 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -146,7 +146,8 @@ class LoggerWindow(QtGui.QDialog): Lets the user save the current log to a file """ fileName, filtr = QtGui.QFileDialog.getSaveFileName( - self, self.tr("Save As")) + self, self.tr("Save As"), + options=QtGui.QFileDialog.DontUseNativeDialog) if fileName: try: |