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

pygpt_net/tools/html_canvas/ui/dialogs.py

@@ -6,29 +6,32 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.11 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 import re
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon
-from PySide6.QtWidgets import QHBoxLayout, QVBoxLayout, QCheckBox, QMenuBar
+from PySide6.QtWidgets import QMenuBar, QVBoxLayout
 
-from pygpt_net.tools.html_canvas.ui.widgets import CanvasOutput, CanvasEdit
 from pygpt_net.ui.widget.dialog.base import BaseDialog
-from pygpt_net.ui.widget.element.labels import HelpLabel
-from pygpt_net.ui.widget.textarea.html import CustomWebEnginePage
 from pygpt_net.utils import trans
 
-class Canvas:
-    def __init__(self, window=None):
+from .widgets import ToolWidget
+
+class Tool:
+    def __init__(self, window=None, tool=None):
         """
         HTML/JS canvas dialog
 
         :param window: Window instance
+        :param tool: Tool instance
         """
         self.window = window
+        self.tool = tool  # tool instance
+        self.widget = ToolWidget(window, tool)
+        self.layout = None
         self.menu_bar = None
         self.menu = {}
         self.actions = {}  # menu actions
@@ -45,20 +48,20 @@ class Canvas:
 
         self.actions["file.open"] = QAction(QIcon(":/icons/folder.svg"), trans("tool.html_canvas.menu.file.open"))
         self.actions["file.open"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").open_file()
+            lambda: self.tool.open_file()
         )
         self.actions["file.save_as"] = QAction(QIcon(":/icons/save.svg"), trans("tool.html_canvas.menu.file.save_as"))
         self.actions["file.save_as"].triggered.connect(
-            lambda: self.window.ui.nodes['html_canvas.output'].signals.save_as.emit(
-                re.sub(r'\n{2,}', '\n\n', self.window.ui.nodes['html_canvas.output'].html_content), 'html')
+            lambda: self.widget.output.signals.save_as.emit(
+                re.sub(r'\n{2,}', '\n\n', self.widget.output.html_content), 'html')
         )
         self.actions["file.reload"] = QAction(QIcon(":/icons/reload.svg"), trans("tool.html_canvas.menu.file.reload"))
         self.actions["file.reload"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").reload_output()
+            lambda: self.tool.reload_output()
         )
         self.actions["file.clear"] = QAction(QIcon(":/icons/close.svg"), trans("tool.html_canvas.menu.file.clear"))
         self.actions["file.clear"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").clear()
+            lambda: self.tool.clear()
         )
 
         # add actions
@@ -70,61 +73,44 @@ class Canvas:
 
     def setup(self):
         """Setup canvas dialog"""
-        self.window.ui.nodes['html_canvas.output'] = CanvasOutput(self.window)
-        self.window.ui.nodes['html_canvas.output'].setPage(
-            CustomWebEnginePage(self.window, self.window.ui.nodes['html_canvas.output'])
-        )
-        self.window.ui.nodes['html_canvas.edit'] = CanvasEdit(self.window)
-        self.window.ui.nodes['html_canvas.edit'].setVisible(False)
-        self.window.ui.nodes['html_canvas.edit'].textChanged.connect(
-            lambda: self.window.tools.get("html_canvas").save_output()
-        )
-
-        # edit checkbox
-        self.window.ui.nodes['html_canvas.btn.edit'] = QCheckBox(trans("html_canvas.btn.edit"))
-        self.window.ui.nodes['html_canvas.btn.edit'].stateChanged.connect(
-            lambda: self.window.tools.get("html_canvas").toggle_edit()
-        )
-
-        path = self.window.tools.get("html_canvas").get_current_path()
-        path_label = HelpLabel(path)
-        path_label.setMaximumHeight(30)
-        path_label.setAlignment(Qt.AlignRight)
+        self.layout = self.widget.setup()
+        self.layout.setMenuBar(self.setup_menu())  # add menu bar
 
-        bottom_layout = QHBoxLayout()
-        bottom_layout.addWidget(self.window.ui.nodes['html_canvas.btn.edit'])
-        bottom_layout.addWidget(path_label)
+        id = self.tool.get_dialog_id()
+        dialog = ToolDialog(window=self.window, tool=self.tool)
+        dialog.setLayout(self.layout)
+        dialog.setWindowTitle(trans("dialog.html_canvas.title"))
+        dialog.resize(800, 500)
+        self.window.ui.dialog[id] = dialog
 
-        output_layout = QVBoxLayout()
-        output_layout.addWidget(self.window.ui.nodes['html_canvas.output'])
-        output_layout.addWidget(self.window.ui.nodes['html_canvas.edit'])
-        output_layout.setContentsMargins(0, 0, 0, 0)
+    def get_widget(self) -> ToolWidget:
+        """
+        Get widget
 
-        # connect signals
-        self.window.ui.nodes['html_canvas.output'].signals.save_as.connect(self.window.tools.get("html_canvas").handle_save_as)
-        self.window.ui.nodes['html_canvas.output'].signals.audio_read.connect(self.window.controller.chat.render.handle_audio_read)
+        :return: ToolWidget
+        """
+        return self.widget
 
-        layout = QVBoxLayout()
-        layout.setMenuBar(self.setup_menu())  # add menu bar
-        layout.addLayout(output_layout)
-        layout.addLayout(bottom_layout)
+    def get_tab(self) -> QVBoxLayout:
+        """
+        Get layout
 
-        self.window.ui.dialog['html_canvas'] = CanvasDialog(self.window)
-        self.window.ui.dialog['html_canvas'].setLayout(layout)
-        self.window.ui.dialog['html_canvas'].setWindowTitle(trans("dialog.html_canvas.title"))
-        self.window.ui.dialog['html_canvas'].resize(800, 500)
+        :return: QVBoxLayout
+        """
+        return self.layout
 
 
-class CanvasDialog(BaseDialog):
-    def __init__(self, window=None, id="html_canvas"):
+class ToolDialog(BaseDialog):
+    def __init__(self, window=None, id="html_canvas", tool=None):
         """
         HTML canvas dialog
 
         :param window: main window
         :param id: logger id
         """
-        super(CanvasDialog, self).__init__(window, id)
+        super(ToolDialog, self).__init__(window, id)
         self.window = window
+        self.tool = tool
 
     def closeEvent(self, event):
         """
@@ -133,7 +119,7 @@ class CanvasDialog(BaseDialog):
         :param event: close event
         """
         self.cleanup()
-        super(CanvasDialog, self).closeEvent(event)
+        super(ToolDialog, self).closeEvent(event)
 
     def keyPressEvent(self, event):
         """
@@ -145,14 +131,12 @@ class CanvasDialog(BaseDialog):
             self.cleanup()
             self.close()  # close dialog when the Esc key is pressed.
         else:
-            super(CanvasDialog, self).keyPressEvent(event)
+            super(ToolDialog, self).keyPressEvent(event)
 
     def cleanup(self):
-        """
-        Cleanup on close
-        """
-        if self.window is None:
+        """Cleanup on close"""
+        if self.window is None or self.tool is None:
             return
-        self.window.tools.get("html_canvas").opened = False
-        self.window.tools.get("html_canvas").close()
-        self.window.tools.get("html_canvas").update()
+        self.tool.opened = False
+        self.tool.close()
+        self.tool.update()

pygpt_net/tools/html_canvas/ui/widgets.py

@@ -6,13 +6,101 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.11 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
+from PySide6.QtCore import Qt, Slot, QUrl, QObject, Signal
+from PySide6.QtWidgets import QVBoxLayout, QCheckBox, QHBoxLayout
+
+from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.textarea.editor import BaseCodeEditor
-from pygpt_net.ui.widget.textarea.html import HtmlOutput
+from pygpt_net.ui.widget.textarea.html import HtmlOutput, CustomWebEnginePage
 
 import pygpt_net.icons_rc
+from pygpt_net.utils import trans
+
+
+class ToolWidget:
+    def __init__(self, window=None, tool=None):
+        """
+        HTML/JS canvas widget
+
+        :param window: Window instance
+        :param tool: Tool instance
+        """
+        self.window = window
+        self.tool = tool  # tool instance
+        self.output = None  # canvas output
+        self.edit = None  # canvas edit
+        self.btn_edit = None  # edit checkbox
+
+    def setup(self) -> QVBoxLayout:
+        """
+        Setup widget body
+
+        :return: QVBoxLayout
+        """
+        self.output = CanvasOutput(self.window)
+        self.output.setPage(
+            CustomWebEnginePage(self.window, self.output)
+        )
+        self.edit = CanvasEdit(self.window)
+        self.edit.setVisible(False)
+        self.edit.textChanged.connect(
+            lambda: self.tool.save_output()
+        )
+
+        # edit checkbox
+        self.btn_edit = QCheckBox(trans("html_canvas.btn.edit"))
+        self.btn_edit.stateChanged.connect(
+            lambda: self.tool.toggle_edit(self)
+        )
+
+        path = self.tool.get_current_path()
+        path_label = HelpLabel(path)
+        path_label.setMaximumHeight(30)
+        path_label.setAlignment(Qt.AlignRight)
+
+        bottom_layout = QHBoxLayout()
+        bottom_layout.addWidget(self.btn_edit)
+        bottom_layout.addWidget(path_label)
+
+        output_layout = QVBoxLayout()
+        output_layout.addWidget(self.output)
+        output_layout.addWidget(self.edit)
+        output_layout.setContentsMargins(0, 0, 0, 0)
+
+        # connect signals
+        self.output.signals.save_as.connect(
+            self.tool.handle_save_as)
+        self.output.signals.audio_read.connect(
+            self.window.controller.chat.render.handle_audio_read)
+
+        self.tool.signals.update.connect(self.set_output)
+        self.tool.signals.reload.connect(self.load_output)
+
+        layout = QVBoxLayout()
+        layout.addLayout(output_layout)
+        layout.addLayout(bottom_layout)
+        return layout
+
+    @Slot(str)
+    def set_output(self, content: str):
+        """
+        Set output content
+
+        :param content: Content
+        """
+        self.edit.setPlainText(content)
+
+    @Slot(str)
+    def load_output(self, path: str):
+        """
+        Load output content
+
+        :param path: Content
+        """
+        self.output.setUrl(QUrl().fromLocalFile(path))
 
 class CanvasOutput(HtmlOutput):
     def __init__(self, window=None):
@@ -39,4 +127,9 @@ class CanvasEdit(BaseCodeEditor):
         self.min_font_size = 8
         self.setProperty('class', 'interpreter-output')
         self.default_stylesheet = ""
-        self.setStyleSheet(self.default_stylesheet)
+        self.setStyleSheet(self.default_stylesheet)
+
+
+class ToolSignals(QObject):
+    update = Signal(str)  # data
+    reload = Signal(str)  # path

pygpt_net/ui/base/context_menu.py

@@ -6,13 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.25 10:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QMenu
 from PySide6.QtGui import QAction, QIcon
 
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 

pygpt_net/ui/layout/chat/input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -153,14 +153,6 @@ class Input:
         """
         # header (input label + input counter)
         self.window.ui.nodes['input.label'] = HelpLabel(trans("input.label"))
-        self.window.ui.nodes['input.counter'] = QLabel("")
-        self.window.ui.nodes['input.counter'].setToolTip(trans('tip.tokens.input'))
-
-        # inline vision
-        self.window.ui.nodes['inline.vision'] = HelpLabel(trans('inline.vision'))
-        self.window.ui.nodes['inline.vision'].setVisible(False)
-        self.window.ui.nodes['inline.vision'].setContentsMargins(0, 0, 0, 0)
-        self.window.ui.nodes['inline.vision'].setToolTip(trans('vision.checkbox.tooltip'))
 
         # plugin audio input addon
         self.window.ui.plugin_addon['audio.input'] = AudioInput(self.window)
@@ -168,10 +160,10 @@ class Input:
 
         grid = QGridLayout()
 
-        left_layout = QHBoxLayout()
-        left_layout.addWidget(self.window.ui.nodes['input.label'])
-        left_layout.addWidget(self.window.ui.nodes['inline.vision'])
-        left_layout.addStretch(1)
+        #left_layout = QHBoxLayout()
+        #left_layout.addWidget(self.window.ui.nodes['input.label'])
+        #left_layout.addWidget(self.window.ui.nodes['inline.vision'])
+        #left_layout.addStretch(1)
 
         center_layout = QHBoxLayout()
         center_layout.addStretch()
@@ -179,13 +171,13 @@ class Input:
         center_layout.addWidget(self.window.ui.plugin_addon['audio.input.btn'])
         center_layout.addStretch()
 
-        right_layout = QHBoxLayout()
-        right_layout.addStretch(1)
-        right_layout.addWidget(self.window.ui.nodes['input.counter'])
+        #right_layout = QHBoxLayout()
+        #right_layout.addStretch(1)
+        #right_layout.addWidget(self.window.ui.nodes['input.counter'])
 
-        grid.addLayout(left_layout, 0, 0)
+        #grid.addLayout(left_layout, 0, 0)
         grid.addLayout(center_layout, 0, 1, alignment=Qt.AlignCenter)
-        grid.addLayout(right_layout, 0, 2, alignment=Qt.AlignRight)
+        #grid.addLayout(right_layout, 0, 2, alignment=Qt.AlignRight)
 
         grid.setContentsMargins(0, 0, 0, 0)
         return grid

pygpt_net/ui/layout/chat/output.py

@@ -6,18 +6,17 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.18 00:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
-from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QVBoxLayout, QLabel, QHBoxLayout, QCheckBox, QWidget, QSizePolicy, QPushButton, \
-    QGridLayout, QSpacerItem, QWidgetItem, QLayout
+    QGridLayout, QWidgetItem, QLayout
 
 from pygpt_net.ui.widget.audio.output import AudioOutput
 from pygpt_net.ui.widget.element.labels import ChatStatusLabel, IconLabel, HelpLabel
-from pygpt_net.ui.widget.tabs.output import OutputTabs
-from pygpt_net.ui.widget.anims.loader import Loader, Loading
+from pygpt_net.ui.widget.anims.loader import Loading
+from pygpt_net.ui.widget.tabs.layout import OutputLayout
 
 from .explorer import Explorer
 from .input import Input
@@ -28,6 +27,7 @@ from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
 
+
 class Output:
     def __init__(self, window=None):
         """
@@ -47,46 +47,15 @@ class Output:
 
         :return: QWidget
         """
-        # tabs
-        self.window.ui.tabs['output'] = OutputTabs(self.window)
-
-        # Create the [+] button
-        plus_button = QPushButton(QIcon(":/icons/add.svg"), "")
-        plus_button.setFixedSize(30, 25)
-        plus_button.setFlat(True)
-        plus_button.clicked.connect(self.window.controller.ui.tabs.new_tab)
-        plus_button.setObjectName('tab-add')
-        plus_button.setProperty('tabAdd', True)
-        plus_button.setToolTip(trans('action.tab.add.chat'))
-
-        # Add the button to the top right corner of the tab bar
-        self.window.ui.tabs['output'].setCornerWidget(plus_button, corner=Qt.TopRightCorner)
-
-        # create empty tabs
+        # prepare columns
+        self.window.ui.layout = OutputLayout(self.window)
+
+        # create empty containers for chat output
         self.window.ui.nodes['output'] = {}
         self.window.ui.nodes['output_plain'] = {}
 
-        # connect signals
-        self.window.ui.tabs['output'].currentChanged.connect(
-            self.window.controller.ui.tabs.on_tab_changed
-        )
-        self.window.ui.tabs['output'].tabBarClicked.connect(
-            self.window.controller.ui.tabs.on_tab_clicked
-        )
-        self.window.ui.tabs['output'].tabBarDoubleClicked.connect(
-            self.window.controller.ui.tabs.on_tab_dbl_clicked
-        )
-        self.window.ui.tabs['output'].tabCloseRequested.connect(
-            self.window.controller.ui.tabs.on_tab_closed
-        )
-
-        # tab bar signals
-        self.window.ui.tabs['output'].tabBar().tabMoved.connect(
-            self.window.controller.ui.tabs.on_tab_moved
-        )
-
         layout = QVBoxLayout()
-        layout.addWidget(self.window.ui.tabs['output'])
+        layout.addWidget(self.window.ui.layout)
         layout.addLayout(self.setup_bottom())
         layout.setContentsMargins(0, 5, 0, 0)
 
@@ -177,18 +146,29 @@ class Output:
         self.window.ui.nodes['prompt.context'].setToolTip(trans('tip.tokens.ctx'))
         self.window.ui.nodes['prompt.context'].setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
 
+        self.window.ui.nodes['input.counter'] = ChatStatusLabel("")
+        self.window.ui.nodes['input.counter'].setToolTip(trans('tip.tokens.input'))
+        self.window.ui.nodes['input.counter'].setWordWrap(False)
+
         # plugin audio output addon
         self.window.ui.plugin_addon['audio.output'] = AudioOutput(self.window)
 
         # schedule
         self.window.ui.plugin_addon['schedule'] = ChatStatusLabel("")
 
+        # inline vision
+        self.window.ui.nodes['inline.vision'] = HelpLabel(trans('inline.vision'))
+        self.window.ui.nodes['inline.vision'].setVisible(False)
+        self.window.ui.nodes['inline.vision'].setContentsMargins(0, 0, 0, 0)
+        self.window.ui.nodes['inline.vision'].setToolTip(trans('vision.checkbox.tooltip'))
+
         opts_layout = QHBoxLayout()
         # opts_layout.setSpacing(2)  #
         opts_layout.setContentsMargins(0, 0, 0, 0)
         opts_layout.addWidget(self.window.ui.nodes['output.timestamp'])
         # opts_layout.addWidget(self.window.ui.nodes['output.edit'])
         opts_layout.addWidget(self.window.ui.nodes['output.raw'])
+        opts_layout.addWidget(self.window.ui.nodes['inline.vision'])
         opts_layout.setAlignment(Qt.AlignLeft)
 
         left_layout = QHBoxLayout()
@@ -210,6 +190,8 @@ class Output:
         right_layout.addWidget(self.window.ui.nodes['chat.model'])
         right_layout.addWidget(QLabel("  "))
         right_layout.addWidget(self.window.ui.nodes['prompt.context'])
+        right_layout.addWidget(QLabel("  "))
+        right_layout.addWidget(self.window.ui.nodes['input.counter'])
         right_layout.setContentsMargins(0, 0, 0, 0)
 
         left_widget = QWidget()
@@ -224,14 +206,14 @@ class Output:
 
         left_layout = QHBoxLayout()
         left_layout.addWidget(left_widget)
-        left_layout.addStretch(1)
+        #left_layout.addStretch(1)
         left_layout.setContentsMargins(0, 0, 0, 0)
 
         center_layout = QHBoxLayout()
-        center_layout.addStretch()
+        #center_layout.addStretch()
         center_layout.addWidget(self.window.ui.nodes['anim.loading'])
         center_layout.addStretch()
-        center_layout.setContentsMargins(0, 0, 0, 0)
+        center_layout.setContentsMargins(20, 0, 0, 0)
 
         right_layout = QHBoxLayout()
         right_layout.addStretch(1)

pygpt_net/ui/layout/ctx/ctx_list.py

@@ -6,7 +6,7 @@
 # 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.12 04:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -211,10 +211,19 @@ class CtxList:
         item.dt = dt
         item.isPinned = data.important
         item.setData(tooltip_text, QtCore.Qt.ToolTipRole)
+        is_important = False
+        is_attachment = False
+        label = data.label
         if data.important:
-            item.setData(data.label + 10, QtCore.Qt.ItemDataRole.UserRole)
-        else:
-            item.setData(data.label, QtCore.Qt.ItemDataRole.UserRole)
+            is_important = True
+        if data.additional_ctx and len(data.additional_ctx) > 0:
+            is_attachment = True
+        custom_data = {
+            "label": label,
+            "is_important": is_important,
+            "is_attachment": is_attachment,
+        }
+        item.setData(custom_data, QtCore.Qt.ItemDataRole.UserRole)
         item.setData(name)
         return item
 

pygpt_net/ui/layout/toolbox/footer.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 03:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import os
 
 from PySide6.QtCore import QSize
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QVBoxLayout, QLabel, QPushButton, QWidget, QSizePolicy
+from PySide6.QtWidgets import QVBoxLayout, QLabel, QPushButton, QWidget, QSizePolicy, QHBoxLayout
 
 from pygpt_net.ui.widget.textarea.name import NameInput
 from pygpt_net.ui.widget.option.slider import OptionSlider
@@ -25,6 +25,7 @@ from .agent_llama import AgentLlama
 from .image import Image
 from .indexes import Indexes
 from .vision import Vision
+from ...widget.option.toggle_label import ToggleLabel
 
 
 class Footer:
@@ -75,6 +76,21 @@ class Footer:
         rows.addWidget(self.window.ui.nodes['voice.control.btn'])
         rows.setContentsMargins(2, 0, 0, 0)
 
+        self.window.ui.nodes['layout.split'] = ToggleLabel(trans('layout.split'), label_position="left",
+                                                          icon=":/icons/split_screen.svg")
+        self.window.ui.nodes['layout.split'].box.stateChanged.connect(
+            lambda: self.window.controller.ui.tabs.toggle_split_screen(self.window.ui.nodes['layout.split'].box.isChecked())
+        )
+        split_layout = QHBoxLayout()
+
+        split_layout.addWidget(QLabel(""))
+        split_layout.addStretch(1)
+        split_layout.addWidget(self.window.ui.nodes['layout.split'])
+        split_layout.setContentsMargins(5, 0, 15, 0)
+        split_widget = QWidget()
+        split_widget.setLayout(split_layout)
+        rows.addWidget(split_widget)
+
         # logo
         logo_button = self.setup_logo()
 

pygpt_net/ui/main.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 17:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 import os
@@ -192,8 +192,8 @@ class MainWindow(QMainWindow, QtStyleTools):
 
     def setup(self):
         """Setup app"""
-        self.controller.setup()
         self.tools.setup()
+        self.controller.setup()
         self.controller.plugins.setup()
         self.controller.post_setup()
 

pygpt_net/ui/menu/config.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.05.02 19:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
+import os
+
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QMenu
 
@@ -42,16 +44,10 @@ class Config:
         self.window.ui.menu['config.access'] = QAction(QIcon(":/icons/accessibility.svg"),
                                                        trans("menu.config.access"), self.window)
 
-        css_files = []
-        css_files.append("style.css")
-        css_files.append("style.dark.css")
-        css_files.append("style.light.css")
-        css_files.append("markdown.css")
-        css_files.append("markdown.dark.css")
-        css_files.append("markdown.light.css")
-        css_files.append("web.css")
-        css_files.append("web.dark.css")
-        css_files.append("web.light.css")
+        css_dir = os.path.join(self.window.core.config.path, 'css')
+        css_files = os.listdir(css_dir)
+        css_files = [f for f in css_files if not f.endswith('.backup')]  # remove .backup files
+        css_files = sorted(css_files)  # sort by name
 
         json_files = []
         json_files.append("attachments.json")