Move ConversationTabs initialization to own module

Author: Cubicpath

src/chatgpt_gui/gui/__init__.py

@@ -9,6 +9,7 @@
     'AppWindow',
     'CaptchaDialog',
     'ComboBox',
+    'ConversationTabs',
     'ConversationView',
     'ExceptionLogger',
     'ExceptionReporter',
@@ -35,6 +36,7 @@
 from .menus import HelpContextMenu
 from .menus import ToolsContextMenu
 from .widgets import ComboBox
+from .widgets import ConversationTabs
 from .widgets import ConversationView
 from .widgets import ExceptionLogger
 from .widgets import ExternalTextBrowser

src/chatgpt_gui/gui/widgets/__init__.py

@@ -5,6 +5,7 @@
 
 __all__ = (
     'ComboBox',
+    'ConversationTabs',
     'ConversationView',
     'ExceptionLogger',
     'ExternalTextBrowser',
@@ -16,6 +17,7 @@
 from .combo_box import ComboBox
 from .combo_box import HistoryComboBox
 from .combo_box import TranslatableComboBox
+from .conversation_tabs import ConversationTabs
 from .conversation_view import ConversationView
 from .exception_logger import ExceptionLogger
 from .external_text_browser import ExternalTextBrowser

src/chatgpt_gui/gui/widgets/conversation_tabs.py

@@ -0,0 +1,70 @@
+###################################################################################################
+#                              MIT Licence (C) 2022 Cubicpath@Github                              #
+###################################################################################################
+"""ConversationView implementation."""
+from __future__ import annotations
+
+__all__ = (
+    'ConversationTabs',
+)
+
+from PySide6.QtCore import *
+from PySide6.QtGui import *
+from PySide6.QtWidgets import *
+
+from ...network.client import Conversation
+from ...utils import init_objects
+from ..aliases import app
+from .conversation_view import ConversationView
+
+
+class ConversationTabs(QTabWidget):
+    """Viewer for a ChatGPT conversation."""
+
+    def __init__(self, parent: QWidget | None = None, conversation: Conversation | None = None) -> None:
+        """Initialize :py:class:`ConversationView` values."""
+        super().__init__(parent)
+        self.conversation_counter: int = 0
+        self.conversation: Conversation = conversation if conversation is not None else Conversation()
+        self.add_conversation_button: QPushButton = QPushButton(self)
+
+        init_objects({
+            self: {
+                'tabsClosable': True,
+                'tabCloseRequested': self.remove_conversation,
+                'contextMenuPolicy': Qt.ContextMenuPolicy.CustomContextMenu,
+                'customContextMenuRequested': self.on_custom_context_menu
+            },
+
+            self.add_conversation_button: {
+                'size': {'fixed': (None, 26)},
+                'icon': app().icon_store['add'],
+                'clicked': self.add_conversation
+            }
+        })
+
+        self.setCornerWidget(self.add_conversation_button, Qt.Corner.TopLeftCorner)
+
+    def add_conversation(self):
+        """Add a new conversation. Increments the conversation counter."""
+        self.conversation_counter += 1
+        self.addTab(ConversationView(), f'Conversation {self.conversation_counter}')
+
+    def remove_conversation(self, index: int):
+        """Remove the conversation at the given index.
+
+        :param index: Index of conversation to remove.
+        """
+        view: ConversationView = self.conversation_tabs.widget(index)  # type: ignore
+        view.deleteLater()
+
+        self.removeTab(index)
+        if not self.count():
+            self.conversation_counter = 0
+            self.add_conversation()
+
+    def on_custom_context_menu(self, point: QPoint) -> None:
+        """Ran when the customContextMenuRequested signal is emitted.
+
+        :param point: The point to place the context menu.
+        """

src/chatgpt_gui/gui/windows/application.py

@@ -26,7 +26,7 @@
 from ..menus import AccountContextMenu
 from ..menus import HelpContextMenu
 from ..menus import ToolsContextMenu
-from ..widgets import ConversationView
+from ..widgets import ConversationTabs
 from ..widgets import ExceptionLogger
 
 
@@ -55,7 +55,6 @@ def __init__(self, size: QSize) -> None:
         super().__init__()
 
         self.resize(size)
-        self.conversation_counter: int = 0
 
         app().client.authenticator.authenticationSuccessful.connect(DeferredCallable(self.update_user_icon))
         app().client.signedOut.connect(self.update_user_icon)
@@ -150,42 +149,13 @@ def context_menu_handler(menu_class: type[QMenu]) -> None:
     # noinspection PyTypeChecker
     def _init_ui(self) -> None:
         """Initialize the UI, including Layouts and widgets."""
-        def add_conversation():
-            self.conversation_counter += 1
-            self.conversation_tabs.addTab(ConversationView(), f'Conversation {self.conversation_counter}')
-
-        def remove_conversation(index: int):
-            view: ConversationView = self.conversation_tabs.widget(index)  # type: ignore
-            view.deleteLater()
-
-            self.conversation_tabs.removeTab(index)
-            if not self.conversation_tabs.count():
-                self.conversation_counter = 0
-                add_conversation()
-
         # Define widget attributes
         # Cannot be defined in init_objects() as walrus operators are not allowed for object attribute assignment.
         # This works in the standard AST, but is a seemingly arbitrary limitation set by the interpreter.
         # See:
         # https://stackoverflow.com/questions/64055314/why-cant-pythons-walrus-operator-be-used-to-set-instance-attributes#answer-66617839
-        self.conversation_tabs = QTabWidget(self)
-
-        init_objects({
-            self.conversation_tabs: {
-                'tabsClosable': True,
-                'tabCloseRequested': remove_conversation
-            },
-
-            (add_conversation_button := QPushButton(self.conversation_tabs)): {
-                'size': {'fixed': (None, 26)},
-                'icon': app().icon_store['add'],
-                'clicked': add_conversation
-            }
-
-        })
-
-        add_conversation()
-        self.conversation_tabs.setCornerWidget(add_conversation_button, Qt.Corner.TopLeftCorner)
+        self.conversation_tabs = ConversationTabs(self)
+        self.conversation_tabs.add_conversation()
 
         init_layouts({
             # Main layout