final qtpy

README.md

@@ -40,6 +40,7 @@ written in pure Python3.
 - Read receipts
 - uses gevent
 - NGC groups
+- PyQt5, PyQt6, PySide2, PySide6 via qtpy
 
 ### Screenshots
 *Toxygen on Ubuntu and Windows*
@@ -66,7 +67,7 @@ There's a copy of qweechat in ```thirdparty/qweechat``` backported to
 PyQt5 and integrated into toxygen. Follow the normal instructions for
 adding a ```relay``` to [weechat](https://github.com/weechat/weechat)
 ```
-/relay add ipv4.ssl.weechat 9001
+/relay add ipv4.ssl.weechat 9000
 /relay start ipv4.ssl.weechat
 ```
 or
@@ -107,6 +108,7 @@ make install
 You should set the PIP_EXE_MSYS and PYTHON_EXE_MSYS variables and it does
 ```
 	${PIP_EXE_MSYS} --python ${PYTHON_EXE_MSYS} install \
+		--no-deps \
 		--target ${PREFIX}/lib/python${PYTHON_MINOR}/site-packages/ \
 		--upgrade .
 ```

toxygen/app.py

@@ -542,6 +542,7 @@ class App:
             LOG.debug("creating _settings from: " +json_file)
             self._settings = Settings(self._toxes, json_file, self)
         else:
+             self._settings = Settings.get_default_settings()
 
         self._tox = self._create_tox(data, self._settings)
         LOG.debug("created _tox")

toxygen/third_party/qweechat/buffer.py

@@ -25,7 +25,8 @@
 from pkg_resources import resource_filename
 
 from  qtpy import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import pyqtSignal as Signal
+# from PyQt5.QtCore import pyqtSignal as Signal
+from  qtpy.QtCore import Signal
 
 from third_party.qweechat.chat import ChatTextEdit
 from third_party.qweechat.input import InputLineEdit

toxygen/third_party/qweechat/input.py

@@ -23,7 +23,8 @@
 """Input line for chat and debug window."""
 
 from  qtpy import QtCore, QtWidgets
-from PyQt5.QtCore import pyqtSignal as Signal
+# from PyQt5.QtCore import pyqtSignal as Signal
+from  qtpy.QtCore import Signal
 
 class InputLineEdit(QtWidgets.QLineEdit):
     """Input line."""

toxygen/third_party/qweechat/network.py

@@ -27,7 +27,8 @@ import secrets
 import struct
 
 from  qtpy import QtCore, QtNetwork
-from PyQt5.QtCore import pyqtSignal as Signal
+# from PyQt5.QtCore import pyqtSignal as Signal
+from  qtpy.QtCore import Signal
 
 from third_party.qweechat import config
 from third_party.qweechat.debug import DebugDialog

toxygen/ui/tray.py

@@ -1,5 +1,6 @@
 from  qtpy import QtWidgets, QtGui, QtCore
-from PyQt5.QtCore import pyqtSignal as Signal
+# from PyQt5.QtCore import pyqtSignal as Signal
+from  qtpy.QtCore import Signal
 
 from utils.ui import tr
 from utils.util import *

toxygen/ui/widgets.py

@@ -1,6 +1,7 @@
 # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*-
 from  qtpy import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import pyqtSignal as Signal
+# from PyQt5.QtCore import pyqtSignal as Signal
+from  qtpy.QtCore import Signal
 
 import utils.ui as util_ui
 import logging