pygpt-net 2.4.37__py3-none-any.whl → 2.4.39__py3-none-any.whl

pygpt_net/ui/menu/theme.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.24 02:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -28,10 +28,14 @@ class Theme:
     def setup(self):
         """Setup theme menu"""
         self.window.ui.menu['theme'] = {}
+        self.window.ui.menu['theme_style'] = {}
         self.window.ui.menu['theme_syntax'] = {}
         self.window.ui.menu['theme.layout.density'] = {}
         self.window.ui.menu['menu.theme'] = QMenu(trans("menu.theme"), self.window)
 
+        # styles
+        self.window.ui.menu['theme.style'] = QMenu(trans("menu.theme.style"), self.window)
+
         # color themes
         self.window.ui.menu['theme.dark'] = QMenu(trans("menu.theme.dark"), self.window)
         self.window.ui.menu['theme.light'] = QMenu(trans("menu.theme.light"), self.window)
@@ -40,12 +44,14 @@ class Theme:
         # layout density
         self.window.ui.menu['theme.density'] = QMenu(trans("menu.theme.density"), self.window)
 
+        """
         # blocks
         self.window.ui.menu['theme.blocks'] = QAction(trans("menu.theme.blocks"), self.window, checkable=True)
         self.window.ui.menu['theme.blocks'].triggered.connect(
             lambda: self.window.controller.theme.toggle_option('render.blocks'))
         self.window.ui.menu['theme.blocks'].setCheckable(True)
         self.window.ui.menu['theme.blocks'].setChecked(self.window.core.config.get('render.blocks'))
+        """
 
         # tooltips
         self.window.ui.menu['theme.tooltips'] = QAction(trans("menu.theme.tooltips"), self.window, checkable=True)
@@ -62,10 +68,11 @@ class Theme:
         self.window.ui.menu['theme.settings'].triggered.connect(
             lambda: self.window.controller.settings.open_section('layout'))
 
+        self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.style'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.dark'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.light'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.syntax'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.density'])
-        self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.blocks'])
+        # self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.blocks'])
         self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.tooltips'])
         self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.settings'])

pygpt_net/ui/widget/lists/context.py

@@ -494,3 +494,4 @@ class SectionItem(QStandardItem):
         self.setTextAlignment(QtCore.Qt.AlignRight)
         font = self.font()
         font.setBold(True)
+        self.setFont(font)

pygpt_net/ui/widget/tabs/layout.py

@@ -0,0 +1,195 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2024.12.09 03:00:00                  #
+# ================================================== #
+
+from PySide6.QtCore import Qt, QObject, QEvent
+from PySide6.QtWidgets import QTabWidget, QWidget, QVBoxLayout, QSplitter, QSizePolicy
+
+from pygpt_net.ui.widget.tabs.output import OutputTabs
+
+
+class OutputColumn(QWidget):
+    def __init__(self, window=None):
+        """
+        Output column
+
+        :param window: window instance
+        """
+        super(OutputColumn, self).__init__(window)
+        self.window = window
+        self.idx = -1
+        self.tabs = OutputTabs(self.window, column=self)
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.tabs)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+        self.filter = FocusEventFilter(self, self.on_focus)
+        self.installEventFilter(self.filter)
+        self.setFocusPolicy(Qt.StrongFocus)
+
+    def on_focus(self, widget):
+        """
+        On widget clicked
+
+        :param widget: widget
+        """
+        self.window.controller.ui.tabs.on_column_focus(self.idx)
+        widget.setFocus()
+
+    def set_idx(self, idx: int):
+        """
+        Set index
+
+        :param idx: int
+        """
+        self.idx = idx
+
+    def get_idx(self) -> int:
+        """
+        Get index
+
+        :return: int
+        """
+        return self.idx
+
+    def set_tabs(self, tabs: QTabWidget):
+        """
+        Set tabs widget
+
+        :param tabs: QTabWidget
+        """
+        self.tabs = tabs
+
+    def get_tabs(self) -> OutputTabs:
+        """
+        Get tabs
+
+        :return: OutputTabs
+        """
+        return self.tabs
+
+
+class OutputLayout(QWidget):
+    def __init__(self, window=None):
+        """
+        Output layout
+
+        :param window: window instance
+        """
+        super(OutputLayout, self).__init__(window)
+        self.window = window
+        self.columns = []
+
+        column1 = OutputColumn(self.window)
+        column2 = OutputColumn(self.window)
+        self.add_column(column1)
+        self.add_column(column2)
+
+        self.splitter = QSplitter(Qt.Horizontal)
+        self.splitter.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        for column in self.columns:
+            self.splitter.addWidget(column)
+
+        self.window.ui.splitters['columns'] = self.splitter
+
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.splitter, stretch=1)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+    def get_next_idx(self) -> int:
+        """
+        Get next index
+
+        :return: int
+        """
+        return len(self.columns)
+
+    def add_column(self, column: OutputColumn):
+        """
+        Add column
+
+        :param column: OutputColumn
+        """
+        idx = self.get_next_idx()
+        column.set_idx(idx)
+        self.columns.append(column)
+
+    def get_tabs_by_idx(self, idx: int) -> OutputTabs:
+        """
+        Get tabs by column index
+
+        :param idx: int
+        :return: OutputTabs
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column.tabs
+        return None
+
+    def get_active_tabs(self) -> OutputTabs:
+        """
+        Get active tabs
+
+        :return: OutputTabs
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column.tabs
+
+    def get_column_by_idx(self, idx: int) -> OutputColumn:
+        """
+        Get column by index
+
+        :param idx: int
+        :return: OutputColumn
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column
+        return None
+
+    def get_active_column(self) -> OutputColumn:
+        """
+        Get active column
+
+        :return: OutputColumn
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column
+
+class FocusEventFilter(QObject):
+    def __init__(self, column, callback):
+        """
+        Column event filter
+
+        :param column: parent column
+        :param callback: callback
+        """
+        super().__init__()
+        self.column = column
+        self.callback = callback
+
+    def eventFilter(self, obj, event):
+        """
+        Click event filter
+
+        :param obj: object
+        :param event: event
+        """
+        if event.type() == QEvent.MouseButtonPress or event.type() == QEvent.FocusIn:
+            widget = obj
+            if widget is not None:
+                self.callback(widget)
+            return False
+        return False

pygpt_net/ui/widget/tabs/output.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QTabWidget, QMenu
+from PySide6.QtWidgets import QTabWidget, QMenu, QPushButton
 from PySide6.QtCore import Qt, Slot
 from PySide6.QtGui import QAction, QIcon
 
@@ -19,16 +19,59 @@ import pygpt_net.icons_rc
 
 
 class OutputTabs(QTabWidget):
-    def __init__(self, window=None):
+    def __init__(self, window=None, column=None):
         super(OutputTabs, self).__init__(window)
         self.window = window
+        self.column = column
         self.setMinimumHeight(1)
         self.owner = None
         self.setMovable(True)
+        self.init()
+
+    def init(self):
+        """Initialize"""
+        # create the [+] button
+        add_button = QPushButton(QIcon(":/icons/add.svg"), "")
+        add_button.setFixedSize(30, 25)
+        add_button.setFlat(True)
+        add_button.clicked.connect(
+            lambda: self.window.controller.ui.tabs.new_tab(self.column.get_idx())
+        )
+        add_button.setObjectName('tab-add')
+        add_button.setProperty('tabAdd', True)
+        add_button.setToolTip(trans('action.tab.add.chat'))
+
+        # add the button to the top right corner of the tab bar
+        self.setCornerWidget(add_button, corner=Qt.TopRightCorner)
+
+        # connect signals
+        self.currentChanged.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_changed(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBarClicked.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_clicked(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBarDoubleClicked.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_dbl_clicked(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabCloseRequested.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_closed(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBar().tabMoved.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_moved(self.currentIndex(), self.column.get_idx())
+        )
+
+    def get_column(self):
+        """
+        Get column
+
+        :return: OutputColumn
+        """
+        return self.column
 
     def setOwner(self, owner: Tab):
         """
-        Set parent
+        Set internal tab instance
 
         :param owner: parent tab instance
         """
@@ -42,56 +85,67 @@ class OutputTabs(QTabWidget):
         """
         if event.button() == Qt.RightButton:
             idx = self.tabBar().tabAt(event.pos())
-            tab = self.window.core.tabs.get_tab_by_index(idx)
+            column_idx = self.column.get_idx()
+            tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
             if tab is not None:
                 if tab.type == Tab.TAB_NOTEPAD:
-                    self.show_notepad_menu(idx, event.globalPos())  # notepad
+                    self.show_notepad_menu(idx, column_idx, event.globalPos())  # notepad
                 elif tab.type == Tab.TAB_CHAT:
-                    self.show_chat_menu(idx, event.globalPos())  # chat
+                    self.show_chat_menu(idx, column_idx, event.globalPos())  # chat
                 elif tab.type == Tab.TAB_FILES:
-                    self.show_files_menu(idx, event.globalPos())  # files
+                    self.show_files_menu(idx, column_idx, event.globalPos())  # files
                 else:
-                    self.show_default_menu(idx, event.globalPos()) # default
+                    self.show_default_menu(idx, column_idx, event.globalPos()) # default
         super(OutputTabs, self).mousePressEvent(event)
 
-    def get_common_actions(self, index):
+    def get_common_actions(self, index: int, column_idx: int):
         """
         Get common actions
 
         :param index: index
+        :param column_idx: column index
         :return: dict
         """
         actions = {}
         actions['add_chat'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.chat'), self)
         actions['add_chat'].triggered.connect(
-            lambda: self.add_tab(index, Tab.TAB_CHAT)
+            lambda: self.add_tab(index, column_idx, Tab.TAB_CHAT)
         )
         actions['add_notepad'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.notepad'), self)
         actions['add_notepad'].triggered.connect(
-            lambda: self.add_tab(index, Tab.TAB_NOTEPAD)
+            lambda: self.add_tab(index, column_idx, Tab.TAB_NOTEPAD)
         )
         actions['edit'] = QAction(QIcon(":/icons/edit.svg"), trans('action.rename'), self)
         actions['edit'].triggered.connect(
-            lambda: self.rename_tab(index)
+            lambda: self.rename_tab(index, column_idx)
+        )
+        actions['move_right'] = QAction(QIcon(":/icons/forward"), trans('action.tab.move.right'), self)
+        actions['move_right'].triggered.connect(
+            lambda: self.window.controller.ui.tabs.move_tab(index, column_idx, 1)
+        )
+        actions['move_left'] = QAction(QIcon(":/icons/back"), trans('action.tab.move.left'), self)
+        actions['move_left'].triggered.connect(
+            lambda: self.window.controller.ui.tabs.move_tab(index, column_idx, 0)
         )
         return actions
 
-    def show_notepad_menu(self, index, global_pos):
+    def show_notepad_menu(self, index: int, column_idx: int, global_pos):
         """
         Show notepad menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
         context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        actions = self.get_common_actions(index, column_idx)
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
-            lambda: self.close_tab(index)
+            lambda: self.close_tab(index, column_idx)
         )
         actions['close_all'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close_all.notepad'), self)
         actions['close_all'].triggered.connect(
-            lambda: self.close_all(Tab.TAB_NOTEPAD)
+            lambda: self.close_all(Tab.TAB_NOTEPAD, column_idx)
         )
         context_menu.addAction(actions['add_chat'])
         context_menu.addAction(actions['add_notepad'])
@@ -100,24 +154,32 @@ class OutputTabs(QTabWidget):
 
         if self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) > 1:
             context_menu.addAction(actions['close_all'])
+
+        # move
+        if column_idx != 0:
+            context_menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            context_menu.addAction(actions['move_right'])
+
         context_menu.exec(global_pos)
 
-    def show_chat_menu(self, index, global_pos):
+    def show_chat_menu(self, index: int, column_idx: int, global_pos):
         """
         Show chat menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
         context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        actions = self.get_common_actions(index, column_idx)
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
-            lambda: self.close_tab(index)
+            lambda: self.close_tab(index, column_idx)
         )
         actions['close_all'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close_all.chat'), self)
         actions['close_all'].triggered.connect(
-            lambda: self.close_all(Tab.TAB_CHAT)
+            lambda: self.close_all(Tab.TAB_CHAT, column_idx)
         )
         context_menu.addAction(actions['add_chat'])
         context_menu.addAction(actions['add_notepad'])
@@ -126,21 +188,26 @@ class OutputTabs(QTabWidget):
         # at least one chat tab must be open
         if self.window.core.tabs.count_by_type(Tab.TAB_CHAT) > 1:
             context_menu.addAction(actions['close'])
-
-        if self.window.core.tabs.count_by_type(Tab.TAB_CHAT) > 1:
             context_menu.addAction(actions['close_all'])
 
+        # move
+        if column_idx != 0:
+            context_menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            context_menu.addAction(actions['move_right'])
+
         context_menu.exec(global_pos)
 
-    def show_files_menu(self, index, global_pos):
+    def show_files_menu(self, index: int, column_idx: int, global_pos):
         """
         Show files menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
         context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        actions = self.get_common_actions(index, column_idx)
         actions['refresh'] = QAction(QIcon(":/icons/reload.svg"), trans('action.refresh'), self)
         actions['refresh'].triggered.connect(
             lambda: self.window.controller.files.update_explorer()
@@ -149,51 +216,73 @@ class OutputTabs(QTabWidget):
         context_menu.addAction(actions['add_notepad'])
         context_menu.addAction(actions['refresh'])
         context_menu.addAction(actions['edit'])
+
+        # move
+        if column_idx != 0:
+            context_menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            context_menu.addAction(actions['move_right'])
+
         context_menu.exec(global_pos)
 
-    def show_default_menu(self, index, global_pos):
+    def show_default_menu(self, index: int, column_idx: int, global_pos):
         """
         Show default menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
         context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        actions = self.get_common_actions(index, column_idx)
         context_menu.addAction(actions['add_chat'])
         context_menu.addAction(actions['add_notepad'])
         context_menu.addAction(actions['edit'])
+
+        # move
+        if column_idx != 0:
+            context_menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            context_menu.addAction(actions['move_right'])
+
         context_menu.exec(global_pos)
 
     @Slot()
-    def rename_tab(self, index):
+    def rename_tab(self, index: int, column_idx: int):
         """
         Rename tab
+
         :param index: index
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.rename(index)
+        self.window.controller.ui.tabs.rename(index, column_idx)
 
     @Slot()
-    def close_tab(self, index):
+    def close_tab(self, index: int, column_idx: int):
         """
         Close tab
+
         :param index: index
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.close(index)
+        self.window.controller.ui.tabs.close(index, column_idx)
 
     @Slot()
-    def close_all(self, type):
+    def close_all(self, type, column_idx: int):
         """
         Close all tabs
+
         :param type: type
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.close_all(type)
+        self.window.controller.ui.tabs.close_all(type, column_idx)
 
     @Slot()
-    def add_tab(self, index, type):
+    def add_tab(self, index: int, column_idx: int, type):
         """
         Add tab
         :param index: index
+        :param column_idx: column index
         :param type: type
         """
-        self.window.controller.ui.tabs.append(type, index)
+        self.window.controller.ui.tabs.append(type, index, column_idx)

pygpt_net/ui/widget/textarea/html.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 import re
@@ -42,6 +42,15 @@ class HtmlOutput(QWebEngineView):
         self.plain = ""
         self.html_content = ""
         self.meta = None
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def set_meta(self, meta: CtxMeta):
         """
@@ -163,6 +172,7 @@ class HtmlOutput(QWebEngineView):
         if success:
             event = RenderEvent(RenderEvent.ON_PAGE_LOAD, {
                 "meta": self.meta,
+                "tab": self.tab,
             })
             self.window.dispatch(event)
 

pygpt_net/ui/widget/textarea/output.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.24 01:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -38,6 +38,15 @@ class ChatOutput(QTextBrowser):
         self.setOpenLinks(False)
         self.anchorClicked.connect(self.open_external_link)
         self.setWordWrapMode(QTextOption.WordWrap)
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def open_external_link(self, url):
         """

pygpt_net/ui/widget/textarea/search_input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.12 10:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -32,6 +32,9 @@ class CtxSearchInput(QLineEdit):
         self.clear_action.triggered.connect(self.clear_search_string)
         self.addAction(self.clear_action, QLineEdit.TrailingPosition)
         self.clear_action.setVisible(False)
+        action = QAction(self)
+        action.setIcon(QIcon(":/icons/search.svg"))
+        self.addAction(action, QLineEdit.LeadingPosition)
 
         self.textChanged.connect(self.on_text_changed)