Port from PyQt5 to PySide2

11 files changed, 40 insertions, 40 deletions

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,