From 0b1eaa13918e9edbe3d8139e95d66b762f1e223d Mon Sep 17 00:00:00 2001 From: emdee Date: Sun, 20 Nov 2022 18:44:17 +0000 Subject: [PATCH] Added toxygen/third_party/qweechat --- README.md | 24 +++++++++++++++++++----- requirements.txt | 6 +++++- toxygen/third_party/__init__.py | 0 toxygen/ui/main_screen.py | 11 +++++++++-- 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 toxygen/third_party/__init__.py diff --git a/README.md b/README.md index cf8bc46..7985dc0 100644 --- a/README.md +++ b/README.md @@ -55,12 +55,26 @@ is making a dependency. Just download it and copy the two directories See ToDo.md to the current ToDo list. -If you install https://github.com/weechat/qweechat -you can have IRC and jabber in a window too. Start -[weechat](https://github.com/weechat/weechat) and +You can have a [weechat](https://github.com/weechat/qweechat) +console so that you can have IRC and jabber in a window as well as Tox. +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 weechat 9000 password +/relay add ipv4.ssl.weechat 9001 +/relay start ipv4.ssl.weechat +``` +or +``` +/relay add weechat 9000 +/relay start weechat +``` +and use the File/Connect menu item to connect to weechat. Weechat +has a Jabber plugin to enable XMPP: +``` +/python load jabber.el +/help jabber ``` -Work on this project is suspended until the +Work on Tox on this project is suspended until the [MultiDevice](https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC) problem is solved. Fork me! diff --git a/requirements.txt b/requirements.txt index c698f7e..b38e8ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,6 @@ PyQt5 - +PyAudio +numpy +opencv-python +pydenticon +cv2 diff --git a/toxygen/third_party/__init__.py b/toxygen/third_party/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/toxygen/ui/main_screen.py b/toxygen/ui/main_screen.py index 045f2c5..a7e6f99 100644 --- a/toxygen/ui/main_screen.py +++ b/toxygen/ui/main_screen.py @@ -700,10 +700,12 @@ class MainWindow(QtWidgets.QMainWindow): def weechat_console(self): try: - from qweechat.qweechat import MainWindow as MainWindow + # WeeChat backported from PySide6 to PyQt5 + from third_party.qweechat import MainWindow as MainWindow + from third_party.qweechat import config LOG.info("Adding WeechatConsole") except Exception as e: - LOG.exception(f"ERROR WeechatConsole {e} {sys.path}") + LOG.exception(f"ERROR WeechatConsole {e}") MainWindow = None return LOG.debug(f"calling {MainWindow}") @@ -752,6 +754,11 @@ class MainWindow(QtWidgets.QMainWindow): self._we.setGeometry(geometry) self._we.resize(font_width*80+20, font_width*40) + self._we.list_buffers.setSizePolicy(QtWidgets.QSizePolicy.Preferred, + QtWidgets.QSizePolicy.Preferred) + self._we.stacked_buffers.setSizePolicy(QtWidgets.QSizePolicy.Expanding, + QtWidgets.QSizePolicy.Expanding) + self._we.show() # or self._we.eval_in_thread() return