summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-10-13 22:28:21 -0700
committerMicah Lee <micah@micahflee.com>2020-10-13 22:28:21 -0700
commitcb0494d46f3149f9219c342ea8b19416f9b7c9ac (patch)
tree6acc2b1fe3f079fb2dff7a23cb7d56e4a332e71f
parentb42f92d714145dcc6282773e61f68c00b4b79a28 (diff)
downloadonionshare-cb0494d46f3149f9219c342ea8b19416f9b7c9ac.tar.gz
onionshare-cb0494d46f3149f9219c342ea8b19416f9b7c9ac.zip
Port from PyQt5 to PySide2
-rw-r--r--desktop/README.md23
-rw-r--r--desktop/pyproject.toml12
-rw-r--r--desktop/src/onionshare/__init__.py1
-rw-r--r--desktop/src/onionshare/__main__.py2
-rw-r--r--desktop/src/onionshare/main_window.py2
-rw-r--r--desktop/src/onionshare/resources/onionshare-128.pngbin0 -> 12788 bytes
-rw-r--r--desktop/src/onionshare/resources/onionshare-16.pngbin0 -> 2437 bytes
-rw-r--r--desktop/src/onionshare/resources/onionshare-256.pngbin0 -> 19034 bytes
-rw-r--r--desktop/src/onionshare/resources/onionshare-32.pngbin0 -> 4051 bytes
-rw-r--r--desktop/src/onionshare/resources/onionshare-512.pngbin0 -> 24613 bytes
-rw-r--r--desktop/src/onionshare/resources/onionshare-64.pngbin0 -> 8486 bytes
-rw-r--r--desktop/src/onionshare/settings_dialog.py4
-rw-r--r--desktop/src/onionshare/tab/mode/__init__.py18
-rw-r--r--desktop/src/onionshare/tab/mode/chat_mode/__init__.py6
-rw-r--r--desktop/src/onionshare/tab/mode/file_selection.py6
-rw-r--r--desktop/src/onionshare/tab/mode/history.py2
-rw-r--r--desktop/src/onionshare/tab/mode/mode_settings_widget.py4
-rw-r--r--desktop/src/onionshare/tab/mode/receive_mode/__init__.py2
-rw-r--r--desktop/src/onionshare/tab/mode/share_mode/__init__.py4
-rw-r--r--desktop/src/onionshare/tab/mode/share_mode/threads.py6
-rw-r--r--desktop/src/onionshare/tab/mode/website_mode/__init__.py6
-rw-r--r--desktop/src/onionshare/tab/server_status.py18
-rw-r--r--desktop/src/onionshare/tab/tab.py8
-rw-r--r--desktop/src/onionshare/tab_widget.py6
-rw-r--r--desktop/src/onionshare/threads.py20
-rw-r--r--desktop/src/onionshare/tor_connection_dialog.py12
-rw-r--r--desktop/src/onionshare/update_checker.py18
-rw-r--r--desktop/src/onionshare/widgets.py2
-rw-r--r--desktop/tests/gui_base_test.py2
-rw-r--r--desktop/tests/test_gui_receive.py2
-rw-r--r--desktop/tests/test_gui_share.py2
-rw-r--r--desktop/tests/test_gui_tabs.py2
-rw-r--r--desktop/tests/test_gui_website.py2
33 files changed, 86 insertions, 106 deletions
diff --git a/desktop/README.md b/desktop/README.md
index bba11d41..83f0843d 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -8,29 +8,6 @@
If you're using Linux, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager.
-Then download Qt 5.14.0 for Linux:
-
-```sh
-cd ~/Downloads
-wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run
-```
-
-If you'd like to check to make sure you have the exact installer I have, here is the sha256 checksum:
-
-```sh
-sha256sum qt-opensource-linux-x64-5.14.0.run
-4379f147c6793ec7e7349d2f9ee7d53b8ab6ea4e4edf8ee0574a75586a6a6e0e qt-opensource-linux-x64-5.14.0.run
-```
-
-Then make it executable and install Qt:
-
-```sh
-chmod +x qt-opensource-linux-x64-5.14.0.run
-./qt-opensource-linux-x64-5.14.0.run
-```
-
-You have to create a Qt account and login to install Qt. Choose the default installation folder in your home directory. The only component you need is `Qt 5.14.0` > `Desktop gcc 64-bit`.
-
#### macOS
#### Windows
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
index 0dcaa5e6..3675de73 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -1,6 +1,6 @@
[tool.briefcase]
project_name = "OnionShare"
-bundle = "org.onionshare.OnionShare"
+bundle = "org.onionshare"
version = "2.3.dev1"
url = "https://onionshare.org"
license = "GPLv3"
@@ -21,9 +21,8 @@ requires = [
"flask-socketio",
"psutil",
"pycryptodome",
- "PyQt5==5.14",
- "PyQt5-sip",
"PySocks",
+ "pyside2",
"qrcode",
"requests",
"stem",
@@ -35,7 +34,12 @@ requires = []
[tool.briefcase.app.onionshare.linux]
requires = []
-system_requires = ["tor", "obfs4proxy"]
+system_requires = [
+ "tor",
+ "obfs4proxy",
+ "gcc",
+ "python3-dev",
+]
[tool.briefcase.app.onionshare.windows]
requires = ["pywin32"]
diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py
index a86c6bbc..e69de29b 100644
--- a/desktop/src/onionshare/__init__.py
+++ b/desktop/src/onionshare/__init__.py
@@ -1 +0,0 @@
-from .__main__ import *
diff --git a/desktop/src/onionshare/__main__.py b/desktop/src/onionshare/__main__.py
index f0d9a3b0..9489481d 100644
--- a/desktop/src/onionshare/__main__.py
+++ b/desktop/src/onionshare/__main__.py
@@ -27,7 +27,7 @@ import signal
import json
import psutil
import getpass
-from PyQt5 import QtCore, QtWidgets
+from PySide2 import QtCore, QtWidgets
from onionshare_cli.common import Common
diff --git a/desktop/src/onionshare/main_window.py b/desktop/src/onionshare/main_window.py
index 26cad2fa..38a6b275 100644
--- a/desktop/src/onionshare/main_window.py
+++ b/desktop/src/onionshare/main_window.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.web import Web
diff --git a/desktop/src/onionshare/resources/onionshare-128.png b/desktop/src/onionshare/resources/onionshare-128.png
new file mode 100644
index 00000000..856ab4e7
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-128.png
Binary files differ
diff --git a/desktop/src/onionshare/resources/onionshare-16.png b/desktop/src/onionshare/resources/onionshare-16.png
new file mode 100644
index 00000000..dea20940
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-16.png
Binary files differ
diff --git a/desktop/src/onionshare/resources/onionshare-256.png b/desktop/src/onionshare/resources/onionshare-256.png
new file mode 100644
index 00000000..b47cd94a
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-256.png
Binary files differ
diff --git a/desktop/src/onionshare/resources/onionshare-32.png b/desktop/src/onionshare/resources/onionshare-32.png
new file mode 100644
index 00000000..14c849c9
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-32.png
Binary files differ
diff --git a/desktop/src/onionshare/resources/onionshare-512.png b/desktop/src/onionshare/resources/onionshare-512.png
new file mode 100644
index 00000000..a4810d04
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-512.png
Binary files differ
diff --git a/desktop/src/onionshare/resources/onionshare-64.png b/desktop/src/onionshare/resources/onionshare-64.png
new file mode 100644
index 00000000..8468dc52
--- /dev/null
+++ b/desktop/src/onionshare/resources/onionshare-64.png
Binary files differ
diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py
index f22e2464..91691cc6 100644
--- a/desktop/src/onionshare/settings_dialog.py
+++ b/desktop/src/onionshare/settings_dialog.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
import sys
import platform
import datetime
@@ -41,7 +41,7 @@ class SettingsDialog(QtWidgets.QDialog):
Settings dialog.
"""
- settings_saved = QtCore.pyqtSignal()
+ settings_saved = QtCore.Signal()
def __init__(self, common):
super(SettingsDialog, self).__init__()
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py
index 06500aea..f92632f0 100644
--- a/desktop/src/onionshare/tab/mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/__init__.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.common import AutoStopTimer
@@ -36,14 +36,14 @@ class Mode(QtWidgets.QWidget):
The class that all modes inherit from
"""
- start_server_finished = QtCore.pyqtSignal()
- stop_server_finished = QtCore.pyqtSignal()
- starting_server_step2 = QtCore.pyqtSignal()
- starting_server_step3 = QtCore.pyqtSignal()
- starting_server_error = QtCore.pyqtSignal(str)
- starting_server_early = QtCore.pyqtSignal()
- set_server_active = QtCore.pyqtSignal(bool)
- change_persistent = QtCore.pyqtSignal(int, bool)
+ start_server_finished = QtCore.Signal()
+ stop_server_finished = QtCore.Signal()
+ starting_server_step2 = QtCore.Signal()
+ starting_server_step3 = QtCore.Signal()
+ starting_server_error = QtCore.Signal(str)
+ starting_server_early = QtCore.Signal()
+ set_server_active = QtCore.Signal(bool)
+ change_persistent = QtCore.Signal(int, bool)
def __init__(self, tab):
super(Mode, self).__init__()
diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
index f96e2e77..25a02969 100644
--- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
@@ -22,7 +22,7 @@ import os
import random
import string
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.onion import *
from onionshare_cli.common import Common
@@ -39,8 +39,8 @@ class ChatMode(Mode):
Parts of the main window UI for sharing files.
"""
- success = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ error = QtCore.Signal(str)
def init(self):
"""
diff --git a/desktop/src/onionshare/tab/mode/file_selection.py b/desktop/src/onionshare/tab/mode/file_selection.py
index faefda0e..54d9ea83 100644
--- a/desktop/src/onionshare/tab/mode/file_selection.py
+++ b/desktop/src/onionshare/tab/mode/file_selection.py
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
import os
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from ... import strings
from ...widgets import Alert, AddFileDialog
@@ -104,8 +104,8 @@ class FileList(QtWidgets.QListWidget):
The list of files and folders in the GUI.
"""
- files_dropped = QtCore.pyqtSignal()
- files_updated = QtCore.pyqtSignal()
+ files_dropped = QtCore.Signal()
+ files_updated = QtCore.Signal()
def __init__(self, common, background_image_filename, header_text, parent=None):
super(FileList, self).__init__(parent)
diff --git a/desktop/src/onionshare/tab/mode/history.py b/desktop/src/onionshare/tab/mode/history.py
index caa36387..3e9c0571 100644
--- a/desktop/src/onionshare/tab/mode/history.py
+++ b/desktop/src/onionshare/tab/mode/history.py
@@ -22,7 +22,7 @@ import time
import subprocess
import os
from datetime import datetime
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from ... import strings
from ...widgets import Alert
diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py
index 8c070897..39226540 100644
--- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py
+++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets
+from PySide2 import QtCore, QtWidgets
from ... import strings
@@ -28,7 +28,7 @@ class ModeSettingsWidget(QtWidgets.QWidget):
All of the common settings for each mode are in this widget
"""
- change_persistent = QtCore.pyqtSignal(int, bool)
+ change_persistent = QtCore.Signal(int, bool)
def __init__(self, common, tab, mode_settings):
super(ModeSettingsWidget, self).__init__()
diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
index 35b4b7e9..95d1ecbe 100644
--- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
import os
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.web import Web
diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
index 3c34ab46..ccf85dbd 100644
--- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
import os
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.onion import *
from onionshare_cli.common import Common
@@ -427,7 +427,7 @@ class ShareMode(Mode):
class ZipProgressBar(QtWidgets.QProgressBar):
- update_processed_size_signal = QtCore.pyqtSignal(int)
+ update_processed_size_signal = QtCore.Signal(int)
def __init__(self, common, total_files_size):
super(ZipProgressBar, self).__init__()
diff --git a/desktop/src/onionshare/tab/mode/share_mode/threads.py b/desktop/src/onionshare/tab/mode/share_mode/threads.py
index 500b6525..860c2d26 100644
--- a/desktop/src/onionshare/tab/mode/share_mode/threads.py
+++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore
+from PySide2 import QtCore
class CompressThread(QtCore.QThread):
@@ -26,8 +26,8 @@ class CompressThread(QtCore.QThread):
Compresses files to be shared
"""
- success = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ error = QtCore.Signal(str)
def __init__(self, mode):
super(CompressThread, self).__init__()
diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
index 6d3d62a7..325b22f1 100644
--- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
@@ -22,7 +22,7 @@ import os
import random
import string
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.onion import *
from onionshare_cli.common import Common
@@ -41,8 +41,8 @@ class WebsiteMode(Mode):
Parts of the main window UI for sharing files.
"""
- success = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ error = QtCore.Signal(str)
def init(self):
"""
diff --git a/desktop/src/onionshare/tab/server_status.py b/desktop/src/onionshare/tab/server_status.py
index d14aa41c..a1041c92 100644
--- a/desktop/src/onionshare/tab/server_status.py
+++ b/desktop/src/onionshare/tab/server_status.py
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import platform
import textwrap
-from PyQt5 import QtCore, QtWidgets, QtGui
-from PyQt5.QtCore import Qt
+from PySide2 import QtCore, QtWidgets, QtGui
+from PySide2.QtCore import Qt
from .. import strings
from ..widgets import Alert
@@ -34,13 +34,13 @@ class ServerStatus(QtWidgets.QWidget):
The server status chunk of the GUI.
"""
- server_started = QtCore.pyqtSignal()
- server_started_finished = QtCore.pyqtSignal()
- server_stopped = QtCore.pyqtSignal()
- server_canceled = QtCore.pyqtSignal()
- button_clicked = QtCore.pyqtSignal()
- url_copied = QtCore.pyqtSignal()
- hidservauth_copied = QtCore.pyqtSignal()
+ server_started = QtCore.Signal()
+ server_started_finished = QtCore.Signal()
+ server_stopped = QtCore.Signal()
+ server_canceled = QtCore.Signal()
+ button_clicked = QtCore.Signal()
+ url_copied = QtCore.Signal()
+ hidservauth_copied = QtCore.Signal()
STATUS_STOPPED = 0
STATUS_WORKING = 1
diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py
index b3f9533d..a511557b 100644
--- a/desktop/src/onionshare/tab/tab.py
+++ b/desktop/src/onionshare/tab/tab.py
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
import queue
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.onionshare import OnionShare
from onionshare_cli.web import Web
@@ -80,9 +80,9 @@ class Tab(QtWidgets.QWidget):
A GUI tab, you know, sort of like in a web browser
"""
- change_title = QtCore.pyqtSignal(int, str)
- change_icon = QtCore.pyqtSignal(int, str)
- change_persistent = QtCore.pyqtSignal(int, bool)
+ change_title = QtCore.Signal(int, str)
+ change_icon = QtCore.Signal(int, str)
+ change_persistent = QtCore.Signal(int, bool)
def __init__(
self,
diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py
index 911fbc2e..452b56bb 100644
--- a/desktop/src/onionshare/tab_widget.py
+++ b/desktop/src/onionshare/tab_widget.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.mode_settings import ModeSettings
@@ -33,7 +33,7 @@ class TabWidget(QtWidgets.QTabWidget):
A custom tab widget, that has a "+" button for adding new tabs
"""
- bring_to_front = QtCore.pyqtSignal()
+ bring_to_front = QtCore.Signal()
def __init__(self, common, system_tray, status_bar):
super(TabWidget, self).__init__()
@@ -259,7 +259,7 @@ class TabBar(QtWidgets.QTabBar):
A custom tab bar
"""
- move_new_tab_button = QtCore.pyqtSignal()
+ move_new_tab_button = QtCore.Signal()
def __init__(self):
super(TabBar, self).__init__()
diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py
index bbd8b640..338bbf27 100644
--- a/desktop/src/onionshare/threads.py
+++ b/desktop/src/onionshare/threads.py
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
import json
import os
-from PyQt5 import QtCore
+from PySide2 import QtCore
from onionshare_cli.onion import (
TorTooOld,
@@ -44,9 +44,9 @@ class OnionThread(QtCore.QThread):
Starts the onion service, and waits for it to finish
"""
- success = QtCore.pyqtSignal()
- success_early = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ success_early = QtCore.Signal()
+ error = QtCore.Signal(str)
def __init__(self, mode):
super(OnionThread, self).__init__()
@@ -114,8 +114,8 @@ class WebThread(QtCore.QThread):
Starts the web service
"""
- success = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ error = QtCore.Signal(str)
def __init__(self, mode):
super(WebThread, self).__init__()
@@ -133,8 +133,8 @@ class AutoStartTimer(QtCore.QThread):
Waits for a prescribed time before allowing a share to start
"""
- success = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ success = QtCore.Signal()
+ error = QtCore.Signal(str)
def __init__(self, mode, canceled=False):
super(AutoStartTimer, self).__init__()
@@ -180,8 +180,8 @@ class EventHandlerThread(QtCore.QThread):
{"type": "new_share_tab", "filenames": ["file1", "file2"]}
"""
- new_tab = QtCore.pyqtSignal()
- new_share_tab = QtCore.pyqtSignal(list)
+ new_tab = QtCore.Signal()
+ new_share_tab = QtCore.Signal(list)
def __init__(self, common):
super(EventHandlerThread, self).__init__()
diff --git a/desktop/src/onionshare/tor_connection_dialog.py b/desktop/src/onionshare/tor_connection_dialog.py
index 7cd09eff..d5fa72a0 100644
--- a/desktop/src/onionshare/tor_connection_dialog.py
+++ b/desktop/src/onionshare/tor_connection_dialog.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
from onionshare_cli.onion import *
@@ -32,7 +32,7 @@ class TorConnectionDialog(QtWidgets.QProgressDialog):
Connecting to Tor dialog.
"""
- open_settings = QtCore.pyqtSignal()
+ open_settings = QtCore.Signal()
def __init__(self, common, custom_settings=False):
super(TorConnectionDialog, self).__init__(None)
@@ -123,10 +123,10 @@ class TorConnectionDialog(QtWidgets.QProgressDialog):
class TorConnectionThread(QtCore.QThread):
- tor_status_update = QtCore.pyqtSignal(str, str)
- connected_to_tor = QtCore.pyqtSignal()
- canceled_connecting_to_tor = QtCore.pyqtSignal()
- error_connecting_to_tor = QtCore.pyqtSignal(str)
+ tor_status_update = QtCore.Signal(str, str)
+ connected_to_tor = QtCore.Signal()
+ canceled_connecting_to_tor = QtCore.Signal()
+ error_connecting_to_tor = QtCore.Signal(str)
def __init__(self, common, settings, dialog):
super(TorConnectionThread, self).__init__()
diff --git a/desktop/src/onionshare/update_checker.py b/desktop/src/onionshare/update_checker.py
index 982c4cb8..be7a5e01 100644
--- a/desktop/src/onionshare/update_checker.py
+++ b/desktop/src/onionshare/update_checker.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore
+from PySide2 import QtCore
import datetime, time, socket, re, platform
import socks
from distutils.version import LooseVersion as Version
@@ -57,10 +57,10 @@ class UpdateChecker(QtCore.QObject):
Only check at most once per day, unless force is True.
"""
- update_available = QtCore.pyqtSignal(str, str, str)
- update_not_available = QtCore.pyqtSignal()
- update_error = QtCore.pyqtSignal()
- update_invalid_version = QtCore.pyqtSignal(str)
+ update_available = QtCore.Signal(str, str, str)
+ update_not_available = QtCore.Signal()
+ update_error = QtCore.Signal()
+ update_invalid_version = QtCore.Signal(str)
def __init__(self, common, onion):
super(UpdateChecker, self).__init__()
@@ -183,10 +183,10 @@ class UpdateChecker(QtCore.QObject):
class UpdateThread(QtCore.QThread):
- update_available = QtCore.pyqtSignal(str, str, str)
- update_not_available = QtCore.pyqtSignal()
- update_error = QtCore.pyqtSignal()
- update_invalid_version = QtCore.pyqtSignal(str)
+ update_available = QtCore.Signal(str, str, str)
+ update_not_available = QtCore.Signal()
+ update_error = QtCore.Signal()
+ update_invalid_version = QtCore.Signal(str)
def __init__(self, common, onion, force=False):
super(UpdateThread, self).__init__()
diff --git a/desktop/src/onionshare/widgets.py b/desktop/src/onionshare/widgets.py
index 8ed84c96..6fffd77f 100644
--- a/desktop/src/onionshare/widgets.py
+++ b/desktop/src/onionshare/widgets.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PySide2 import QtCore, QtWidgets, QtGui
import qrcode
from . import strings
diff --git a/desktop/tests/gui_base_test.py b/desktop/tests/gui_base_test.py
index d70791cb..b1bb7e21 100644
--- a/desktop/tests/gui_base_test.py
+++ b/desktop/tests/gui_base_test.py
@@ -10,7 +10,7 @@ import tempfile
import secrets
import platform
-from PyQt5 import QtCore, QtTest, QtWidgets
+from PySide2 import QtCore, QtTest, QtWidgets
from onionshare_cli.common import Common
from onionshare_cli.settings import Settings
diff --git a/desktop/tests/test_gui_receive.py b/desktop/tests/test_gui_receive.py
index f89b69f8..bc50fb4d 100644
--- a/desktop/tests/test_gui_receive.py
+++ b/desktop/tests/test_gui_receive.py
@@ -5,7 +5,7 @@ import shutil
import sys
from datetime import datetime, timedelta
-from PyQt5 import QtCore, QtTest
+from PySide2 import QtCore, QtTest
from .gui_base_test import GuiBaseTest
diff --git a/desktop/tests/test_gui_share.py b/desktop/tests/test_gui_share.py
index 3da6f572..971b97b8 100644
--- a/desktop/tests/test_gui_share.py
+++ b/desktop/tests/test_gui_share.py
@@ -4,7 +4,7 @@ import requests
import tempfile
import zipfile
-from PyQt5 import QtCore, QtTest
+from PySide2 import QtCore, QtTest
from .gui_base_test import GuiBaseTest
diff --git a/desktop/tests/test_gui_tabs.py b/desktop/tests/test_gui_tabs.py
index 5644ea60..4534becf 100644
--- a/desktop/tests/test_gui_tabs.py
+++ b/desktop/tests/test_gui_tabs.py
@@ -1,7 +1,7 @@
import pytest
import os
-from PyQt5 import QtCore, QtTest, QtWidgets
+from PySide2 import QtCore, QtTest, QtWidgets
from .gui_base_test import GuiBaseTest
diff --git a/desktop/tests/test_gui_website.py b/desktop/tests/test_gui_website.py
index 6466b2a4..c3e56390 100644
--- a/desktop/tests/test_gui_website.py
+++ b/desktop/tests/test_gui_website.py
@@ -4,7 +4,7 @@ import requests
import shutil
from datetime import datetime, timedelta
-from PyQt5 import QtCore, QtTest
+from PySide2 import QtCore, QtTest
from .gui_base_test import GuiBaseTest