pygpt-net 2.6.20__py3-none-any.whl → 2.6.22__py3-none-any.whl

pygpt_net/ui/widget/draw/painter.py

@@ -6,18 +6,18 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.19 02:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import datetime
+from collections import deque
 
 from PySide6.QtCore import Qt, QPoint
-from PySide6.QtGui import QImage, QPainter, QPen, QAction, QIcon, QKeySequence
+from PySide6.QtGui import QImage, QPainter, QPen, QAction, QIcon
 from PySide6.QtWidgets import QMenu, QWidget, QFileDialog, QMessageBox, QApplication
 
 from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 
 class PainterWidget(QWidget):
@@ -31,13 +31,50 @@ class PainterWidget(QWidget):
         self.brushColor = Qt.black
         self.lastPoint = QPoint()
         self.originalImage = None
-        self.undoStack = []
-        self.redoStack = []
         self.undoLimit = 10
+        self.undoStack = deque(maxlen=self.undoLimit)
+        self.redoStack = deque()
         self.setFocusPolicy(Qt.StrongFocus)
         self.setFocus()
         self.installEventFilter(self)
         self.tab = None
+        self._pen = QPen(self.brushColor, self.brushSize, Qt.SolidLine, Qt.RoundCap, Qt.RoundJoin)
+        self.setAttribute(Qt.WA_OpaquePaintEvent, True)
+        self.setAttribute(Qt.WA_StaticContents, True)
+
+        self._act_undo = QAction(QIcon(":/icons/undo.svg"), trans('action.undo'), self)
+        self._act_undo.triggered.connect(self.undo)
+
+        self._act_redo = QAction(QIcon(":/icons/redo.svg"), trans('action.redo'), self)
+        self._act_redo.triggered.connect(self.redo)
+
+        self._act_copy = QAction(QIcon(":/icons/copy.svg"), trans('action.copy'), self)
+        self._act_copy.triggered.connect(self.handle_copy)
+
+        self._act_paste = QAction(QIcon(":/icons/paste.svg"), trans('action.paste'), self)
+        self._act_paste.triggered.connect(self.handle_paste)
+
+        self._act_open = QAction(QIcon(":/icons/folder_filled.svg"), trans('action.open'), self)
+        self._act_open.triggered.connect(self.action_open)
+
+        self._act_capture = QAction(QIcon(":/icons/fullscreen.svg"), trans('painter.btn.capture'), self)
+        self._act_capture.triggered.connect(self.action_capture)
+
+        self._act_save = QAction(QIcon(":/icons/save.svg"), trans('img.action.save'), self)
+        self._act_save.triggered.connect(self.action_save)
+
+        self._act_clear = QAction(QIcon(":/icons/close.svg"), trans('painter.btn.clear'), self)
+        self._act_clear.triggered.connect(self.action_clear)
+
+        self._ctx_menu = QMenu(self)
+        self._ctx_menu.addAction(self._act_undo)
+        self._ctx_menu.addAction(self._act_redo)
+        self._ctx_menu.addAction(self._act_open)
+        self._ctx_menu.addAction(self._act_capture)
+        self._ctx_menu.addAction(self._act_copy)
+        self._ctx_menu.addAction(self._act_paste)
+        self._ctx_menu.addAction(self._act_save)
+        self._ctx_menu.addAction(self._act_clear)
 
     def set_tab(self, tab: Tab):
         """
@@ -67,66 +104,14 @@ class PainterWidget(QWidget):
 
         :param event: Event
         """
-        actions = {}
-        actions['undo'] = QAction(QIcon(":/icons/undo.svg"), trans('action.undo'), self)
-        actions['undo'].triggered.connect(
-            lambda: self.undo())
-        if self.has_undo():
-            actions['undo'].setEnabled(True)
-        else:
-            actions['undo'].setEnabled(False)
-
-        actions['redo'] = QAction(QIcon(":/icons/redo.svg"), trans('action.redo'), self)
-        actions['redo'].triggered.connect(
-            lambda: self.redo())
-        if self.has_redo():
-            actions['redo'].setEnabled(True)
-        else:
-            actions['redo'].setEnabled(False)
-
-        actions['copy'] = QAction(QIcon(":/icons/copy.svg"),  trans('action.copy'), self)
-        actions['copy'].triggered.connect(
-            lambda: self.handle_copy()
-        )
+        self._act_undo.setEnabled(self.has_undo())
+        self._act_redo.setEnabled(self.has_redo())
 
-        is_paste = False
         clipboard = QApplication.clipboard()
         mime_data = clipboard.mimeData()
-        if mime_data.hasImage():
-            is_paste = True
+        self._act_paste.setEnabled(bool(mime_data.hasImage()))
 
-        actions['paste'] = QAction(QIcon(":/icons/paste.svg"), trans('action.paste'), self)
-        actions['paste'].triggered.connect(
-            lambda: self.handle_paste()
-        )
-        if is_paste:
-            actions['paste'].setEnabled(True)
-        else:
-            actions['paste'].setEnabled(False)
-
-        actions['open'] = QAction(QIcon(":/icons/folder_filled.svg"), trans('action.open'), self)
-        actions['open'].triggered.connect(
-            lambda: self.action_open())
-        actions['capture'] = QAction(QIcon(":/icons/fullscreen.svg"), trans('painter.btn.capture'), self)
-        actions['capture'].triggered.connect(
-            lambda: self.action_capture())
-        actions['save'] = QAction(QIcon(":/icons/save.svg"), trans('img.action.save'), self)
-        actions['save'].triggered.connect(
-            lambda: self.action_save())
-        actions['clear'] = QAction(QIcon(":/icons/close.svg"), trans('painter.btn.clear'), self)
-        actions['clear'].triggered.connect(
-            lambda: self.action_clear())
-
-        menu = QMenu(self)
-        menu.addAction(actions['undo'])
-        menu.addAction(actions['redo'])
-        menu.addAction(actions['open'])
-        menu.addAction(actions['capture'])
-        menu.addAction(actions['copy'])
-        menu.addAction(actions['paste'])
-        menu.addAction(actions['save'])
-        menu.addAction(actions['clear'])
-        menu.exec_(event.globalPos())
+        self._ctx_menu.exec(event.globalPos())
 
     def action_open(self):
         """Open the image"""
@@ -195,7 +180,6 @@ class PainterWidget(QWidget):
         if image.width() == self.width():
             new = image
         else:
-            # to fit the width
             if image.width() > image.height():
                 width = self.width()
                 height = (image.height() * self.width()) / image.width()
@@ -215,11 +199,8 @@ class PainterWidget(QWidget):
                     Qt.SmoothTransformation,
                 )
 
-        self.image = QImage(
-            self.width(),
-            self.height(),
-            QImage.Format_RGB32,
-        )
+        if self.image.size() != self.size():
+            self.image = QImage(self.size(), QImage.Format_RGB32)
         self.image.fill(Qt.white)
         painter = QPainter(self.image)
         painter.drawImage(0, 0, new)
@@ -229,22 +210,20 @@ class PainterWidget(QWidget):
 
     def saveForUndo(self):
         """Save current state for undo"""
-        if len(self.undoStack) >= self.undoLimit:
-            self.undoStack.pop(0)
-        self.undoStack.append(self.image.copy())
-        self.redoStack.clear()  # clear redo on new action
+        self.undoStack.append(QImage(self.image))
+        self.redoStack.clear()
 
     def undo(self):
         """Undo the last action"""
         if self.undoStack:
-            self.redoStack.append(self.image.copy())
+            self.redoStack.append(QImage(self.image))
             self.image = self.undoStack.pop()
             self.update()
 
     def redo(self):
         """Redo the last undo action"""
         if self.redoStack:
-            self.undoStack.append(self.image.copy())
+            self.undoStack.append(QImage(self.image))
             self.image = self.redoStack.pop()
             self.update()
 
@@ -263,6 +242,7 @@ class PainterWidget(QWidget):
         :param color: Color
         """
         self.brushColor = color
+        self._pen.setColor(color)
 
     def set_brush_size(self, size):
         """
@@ -271,6 +251,7 @@ class PainterWidget(QWidget):
         :param size: Brush size
         """
         self.brushSize = size
+        self._pen.setWidth(size)
 
     def clear_image(self):
         """Clear the image"""
@@ -289,16 +270,9 @@ class PainterWidget(QWidget):
             self.lastPoint = event.pos()
             self.saveForUndo()
             painter = QPainter(self.image)
-            painter.setPen(
-                QPen(
-                    self.brushColor,
-                    self.brushSize,
-                    Qt.SolidLine,
-                    Qt.RoundCap,
-                    Qt.RoundJoin,
-                )
-            )
+            painter.setPen(self._pen)
             painter.drawPoint(self.lastPoint)
+            painter.end()
             self.update()
 
     def mouseMoveEvent(self, event):
@@ -309,16 +283,9 @@ class PainterWidget(QWidget):
         """
         if (event.buttons() & Qt.LeftButton) and self.drawing:
             painter = QPainter(self.image)
-            painter.setPen(
-                QPen(
-                    self.brushColor,
-                    self.brushSize,
-                    Qt.SolidLine,
-                    Qt.RoundCap,
-                    Qt.RoundJoin,
-                )
-            )
+            painter.setPen(self._pen)
             painter.drawLine(self.lastPoint, event.pos())
+            painter.end()
             self.lastPoint = event.pos()
             self.update()
 
@@ -350,12 +317,13 @@ class PainterWidget(QWidget):
         """
         painter = QPainter(self)
         painter.drawImage(self.rect(), self.image, self.image.rect())
+        painter.end()
         self.originalImage = self.image
 
     def resizeEvent(self, event):
         """
         Update coords on resize
-        
+
         :param event: Event
         """
         if self.image.size() != self.size():
@@ -363,6 +331,7 @@ class PainterWidget(QWidget):
             new.fill(Qt.white)
             painter = QPainter(new)
             painter.drawImage(QPoint(0, 0), self.image)
+            painter.end()
             self.image = new
 
     def eventFilter(self, source, event):
@@ -376,4 +345,4 @@ class PainterWidget(QWidget):
             if self.tab is not None:
                 col_idx = self.tab.column_idx
                 self.window.controller.ui.tabs.on_column_focus(col_idx)
-        return super().eventFilter(source, event)
+        return super().eventFilter(source, event)

pygpt_net/ui/widget/element/button.py

@@ -6,11 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.29 16:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
-from PySide6.QtGui import QAction, QIcon
+from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QPushButton, QMenu
 
 from pygpt_net.utils import trans
@@ -22,13 +22,17 @@ class ContextMenuButton(QPushButton):
         self.action = action
 
     def mousePressEvent(self, event):
-        if event.button() == Qt.LeftButton or event.button() == Qt.RightButton:
+        btn = event.button()
+        if btn == Qt.LeftButton or btn == Qt.RightButton:
             self.action(self, event.pos())
         else:
             super().mousePressEvent(event)
 
 
 class NewCtxButton(QPushButton):
+    _icon_add = None
+    _icon_folder_filled = None
+
     def __init__(self, title: str = None, window=None):
         super().__init__(title)
         self.window = window
@@ -36,6 +40,12 @@ class NewCtxButton(QPushButton):
             lambda: self.window.controller.ctx.new()
         )
 
+    @classmethod
+    def _ensure_icons(cls):
+        if cls._icon_add is None:
+            cls._icon_add = QIcon(":/icons/add.svg")
+            cls._icon_folder_filled = QIcon(":/icons/folder_filled.svg")
+
     def mousePressEvent(self, event):
         if event.button() == Qt.RightButton:
             self.new_context_menu(self, event.pos())
@@ -49,32 +59,30 @@ class NewCtxButton(QPushButton):
         :param parent: parent widget
         :param pos: mouse  position
         """
+        type(self)._ensure_icons()
         group_id = self.window.controller.ctx.group_id
-        menu = QMenu(self)
-        actions = {}
-        actions['new'] = QAction(QIcon(":/icons/add.svg"), trans('action.ctx.new'), self)
-        actions['new'].triggered.connect(
-            lambda: self.window.controller.ctx.new_ungrouped()
-        )
+        menu = QMenu(parent)
         if group_id is not None and group_id > 0:
             group_name = self.window.controller.ctx.get_group_name(group_id)
-            actions['new_in_group'] = QAction(QIcon(":/icons/add.svg"), trans('action.ctx.new.in_group').format(group=group_name), self)
-            actions['new_in_group'].triggered.connect(
+            act_new_in_group = menu.addAction(type(self)._icon_add, trans('action.ctx.new.in_group').format(group=group_name))
+            act_new_in_group.triggered.connect(
                 lambda checked=False, id=group_id: self.window.controller.ctx.new(force=False, group_id=id)
             )
-        actions['new_group'] = QAction(QIcon(":/icons/folder_filled.svg"), trans('menu.file.group.new'), self)
-        actions['new_group'].triggered.connect(
-            lambda: self.window.controller.ctx.new_group()
+        act_new = menu.addAction(type(self)._icon_add, trans('action.ctx.new'))
+        act_new.triggered.connect(
+            lambda checked=False: self.window.controller.ctx.new_ungrouped()
+        )
+        act_new_group = menu.addAction(type(self)._icon_folder_filled, trans('menu.file.group.new'))
+        act_new_group.triggered.connect(
+            lambda checked=False: self.window.controller.ctx.new_group()
         )
-
-        if group_id is not None and group_id > 0:
-            menu.addAction(actions['new_in_group'])
-        menu.addAction(actions['new'])
-        menu.addAction(actions['new_group'])
         menu.exec_(parent.mapToGlobal(pos))
+        menu.deleteLater()
 
 
 class SyncButton(QPushButton):
+    _icon_download = None
+
     def __init__(self, title: str = None, window=None):
         super().__init__(title)
         self.window = window
@@ -82,6 +90,11 @@ class SyncButton(QPushButton):
             lambda: self.window.controller.assistant.batch.import_files_current()
         )
 
+    @classmethod
+    def _ensure_icons(cls):
+        if cls._icon_download is None:
+            cls._icon_download = QIcon(":/icons/download.svg")
+
     def mousePressEvent(self, event):
         if event.button() == Qt.RightButton:
             self.new_context_menu(self, event.pos())
@@ -95,16 +108,15 @@ class SyncButton(QPushButton):
         :param parent: parent widget
         :param pos: mouse  position
         """
-        menu = QMenu(self)
-        actions = {}
-        actions['current'] = QAction(QIcon(":/icons/download.svg"), trans('attachments_uploaded.btn.sync.current'), self)
-        actions['current'].triggered.connect(
-            lambda: self.window.controller.assistant.batch.import_files_current()
+        type(self)._ensure_icons()
+        menu = QMenu(parent)
+        act_current = menu.addAction(type(self)._icon_download, trans('attachments_uploaded.btn.sync.current'))
+        act_current.triggered.connect(
+            lambda checked=False: self.window.controller.assistant.batch.import_files_current()
         )
-        actions['all'] = QAction(QIcon(":/icons/download.svg"), trans('attachments_uploaded.btn.sync.all'), self)
-        actions['all'].triggered.connect(
-            lambda: self.window.controller.assistant.batch.import_files()
+        act_all = menu.addAction(type(self)._icon_download, trans('attachments_uploaded.btn.sync.all'))
+        act_all.triggered.connect(
+            lambda checked=False: self.window.controller.assistant.batch.import_files()
         )
-        menu.addAction(actions['current'])
-        menu.addAction(actions['all'])
-        menu.exec_(parent.mapToGlobal(pos))
+        menu.exec_(parent.mapToGlobal(pos))
+        menu.deleteLater()

pygpt_net/ui/widget/element/checkbox.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.06 02:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QWidget, QCheckBox, QHBoxLayout, QLabel
-from PySide6.QtGui import QPainter, QPixmap
-from PySide6.QtCore import Qt
+from PySide6.QtGui import QPainter, QPixmap, QIcon
+from PySide6.QtCore import Qt, QSize
 
 from pygpt_net.utils import trans
 
@@ -31,33 +31,36 @@ class ColorCheckbox(QWidget):
         layout.addWidget(self.window.ui.nodes['filter.ctx.label.colors'])
         layout.setContentsMargins(0, 0, 0, 0)
         labels = self.window.controller.ui.get_colors()
+        icon_size = 20
+        icon_qsize = QSize(icon_size, icon_size)
 
-        for id, status in labels.items():
-            self.boxes[id] = QCheckBox()
-            self.boxes[id].stateChanged.connect(
-                lambda state, idx=id: self.update_colors(state, idx)
-            )
-            pixmap = QPixmap(20, 20)
+        for color_id, status in labels.items():
+            cb = QCheckBox(self)
+            pixmap = QPixmap(icon_size, icon_size)
             pixmap.fill(Qt.transparent)
             painter = QPainter(pixmap)
             painter.setBrush(status['color'])
-            painter.drawRect(0, 0, 20, 20)
+            painter.drawRect(0, 0, icon_size, icon_size)
             painter.end()
 
-            self.boxes[id].setIcon(pixmap)
-            layout.addWidget(self.boxes[id])
+            cb.setIcon(QIcon(pixmap))
+            cb.setIconSize(icon_qsize)
+            cb.toggled.connect(lambda checked, idx=color_id: self.update_colors(checked, idx))
+            self.boxes[color_id] = cb
+            layout.addWidget(cb)
 
         layout.addStretch()
         self.setLayout(layout)
 
-    def update_colors(self, state: int, idx: int):
+    def update_colors(self, state, idx: int):
         """
         Update selected colors list
 
         :param state: checkbox state
         :param idx: color index
         """
-        if state == 2:
+        checked = state if isinstance(state, bool) else state == Qt.Checked
+        if checked:
             if idx not in self.selected:
                 self.selected.append(idx)
         else:
@@ -74,4 +77,9 @@ class ColorCheckbox(QWidget):
         """
         self.selected = selected
         for idx in selected:
-            self.boxes[idx].setChecked(True)
+            cb = self.boxes.get(idx)
+            if cb is not None:
+                prev = cb.blockSignals(True)
+                cb.setChecked(True)
+                cb.blockSignals(prev)
+        self.window.controller.ctx.label_filters_changed(self.selected)

pygpt_net/ui/widget/element/group.py

@@ -6,15 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.16 01:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QCheckBox, QWidget, QVBoxLayout, QFrame
 
-import pygpt_net.icons_rc
-
 
 class CollapsedGroup(QWidget):
     def __init__(self, window=None, id=None, title=None, value=False, section=None):
@@ -54,6 +52,9 @@ class CollapsedGroup(QWidget):
                 height: 0px;
             }
         """)
+
+        self._icon_collapse = QIcon(":/icons/collapse.svg")
+        self._icon_expand = QIcon(":/icons/expand.svg")
         self.update_icon(self.box.checkState())
 
         # options layout
@@ -78,9 +79,9 @@ class CollapsedGroup(QWidget):
         :param state:checkbox state
         """
         if state == Qt.Checked:
-            self.box.setIcon(QIcon(":/icons/collapse.svg"))
+            self.box.setIcon(self._icon_collapse)
         else:
-            self.box.setIcon(QIcon(":/icons/expand.svg"))
+            self.box.setIcon(self._icon_expand)
 
     def collapse(self, value):
         """

pygpt_net/ui/widget/element/labels.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.07 19:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, QTimer, QRect, Signal, QUrl, QEvent
@@ -14,7 +14,6 @@ from PySide6.QtGui import QCursor, QAction, QIcon, QDesktopServices, QPainter, Q
 from PySide6.QtWidgets import QLabel, QLineEdit, QToolTip
 
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 
 class HelpLabel(QLabel):