PrEditor 1.3.0__tar.gz → 1.4.0__tar.gz

{preditor-1.3.0 → preditor-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.3.0
+Version: 1.4.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-1.3.0 → preditor-1.4.0}/PrEditor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.3.0
+Version: 1.4.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/drag_tab_bar.py

@@ -139,8 +139,11 @@ class DragTabBar(QTabBar):
         """Used by the tab_menu to rename the tab at index `_context_menu_tab`."""
         if self._context_menu_tab != -1:
             current = self.tabText(self._context_menu_tab)
-            msg = 'Rename the {} tab to:'.format(current)
+            msg = 'Rename the {} tab to (new name must be unique):'.format(current)
+
             name, success = QInputDialog.getText(self, 'Rename Tab', msg, text=current)
+            name = self.parent().get_next_available_tab_name(name)
+
             if success:
                 self.setTabText(self._context_menu_tab, name)
 

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/group_tab_widget/__init__.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import os
-import re
 
 from Qt.QtCore import Qt
 from Qt.QtGui import QIcon
@@ -46,6 +45,9 @@ class GroupTabWidget(OneTabWidget):
         self.editor_cls = WorkboxTextEdit
         self.core_name = core_name
         self.setStyleSheet(DEFAULT_STYLE_SHEET)
+
+        self.default_title = 'Group01'
+
         corner = QWidget(self)
         lyt = QHBoxLayout(corner)
         lyt.setSpacing(0)
@@ -69,7 +71,7 @@ class GroupTabWidget(OneTabWidget):
         self.uiCornerBTN = corner
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
-    def add_new_tab(self, group, title="Workbox", group_fmt=None):
+    def add_new_tab(self, group, title=None, prefs=None):
         """Adds a new tab to the requested group, creating the group if the group
         doesn't exist.
 
@@ -80,9 +82,6 @@ class GroupTabWidget(OneTabWidget):
                 If True is passed, then the current group tab is used.
             title (str, optional): The name to give the newly created tab inside
                 the group.
-            group_fmt(str, optional): If None is passed to group, this string is
-                used to search for existing tabs to calculate the last number
-                and generate the new group tab name.
 
         Returns:
             GroupedTabWidget: The tab group for this group.
@@ -90,21 +89,14 @@ class GroupTabWidget(OneTabWidget):
         """
         parent = None
         if not group:
-            if group_fmt is None:
-                group_fmt = r'Group {}'
-            last = 0
-            for i in range(self.count()):
-                match = re.match(group_fmt.format(r'(\d+)'), self.tabText(i))
-                if match:
-                    last = max(last, int(match.group(1)))
-            group = group_fmt.format(last + 1)
+            group = self.get_next_available_tab_name(self.default_title)
         elif group is True:
             group = self.currentIndex()
         if isinstance(group, int):
             group_title = self.tabText(group)
             parent = self.widget(group)
         elif isinstance(group, str):
-            group_title = group
+            group_title = group.replace(" ", "_")
             index = self.index_for_text(group)
             if index != -1:
                 parent = self.widget(index)
@@ -146,7 +138,7 @@ class GroupTabWidget(OneTabWidget):
             self,
             'Close all editors under this tab?',
             'Are you sure you want to close all tabs under the "{}" tab?'.format(
-                self.tabText(self.currentIndex())
+                self.tabText(index)
             ),
             QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
@@ -154,11 +146,11 @@ class GroupTabWidget(OneTabWidget):
             # Clean up all temp files created by this group's editors if they
             # are not using actual saved files.
             tab_widget = self.widget(self.currentIndex())
-            for index in range(tab_widget.count()):
-                editor = tab_widget.widget(index)
+            for editor_index in range(tab_widget.count()):
+                editor = tab_widget.widget(editor_index)
                 editor.__remove_tempfile__()
 
-            super(GroupTabWidget, self).close_tab(self.currentIndex())
+            super(GroupTabWidget, self).close_tab(index)
 
     def current_groups_widget(self):
         """Returns the current widget of the currently selected group or None."""
@@ -166,7 +158,8 @@ class GroupTabWidget(OneTabWidget):
         if editor_tab:
             return editor_tab.currentWidget()
 
-    def default_tab(self, title='Group 1'):
+    def default_tab(self, title=None, prefs=None):
+        title = title or self.default_title
         widget = GroupedTabWidget(
             parent=self,
             editor_kwargs=self.editor_kwargs,
@@ -223,6 +216,8 @@ class GroupTabWidget(OneTabWidget):
             group_name = group['name']
             tab_widget = None
 
+            group_name = self.get_next_available_tab_name(group_name)
+
             for tab in group.get('tabs', []):
                 # Only add this tab if, there is data on disk to load. The user can
                 # open multiple instances of PrEditor using the same prefs. The

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/group_tab_widget/grouped_tab_widget.py

@@ -27,7 +27,12 @@ class GroupedTabWidget(OneTabWidget):
         self.uiCornerBTN.released.connect(lambda: self.add_new_editor())
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
-    def add_new_editor(self, title="Workbox"):
+        self.default_title = "Workbox01"
+
+    def add_new_editor(self, title=None, prefs=None):
+        title = title or self.default_title
+
+        title = self.get_next_available_tab_name(title)
         editor, title = self.default_tab(title)
         index = self.addTab(editor, title)
         self.setCurrentIndex(index)
@@ -45,11 +50,18 @@ class GroupedTabWidget(OneTabWidget):
                 self, 'Tab can not be closed.', msg, QMessageBox.StandardButton.Ok
             )
             return
+
+        workbox = self.widget(index)
+        name = workbox.__workbox_name__()
+        msg = (
+            f"Would you like to donate the contents of tab\n{name}\nto the "
+            "/dev/null fund for wayward code?"
+        )
+
         ret = QMessageBox.question(
             self,
             'Donate to the cause?',
-            "Would you like to donate this tabs contents to the /dev/null fund "
-            "for wayward code?",
+            msg,
             QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
         if ret == QMessageBox.StandardButton.Yes:
@@ -59,7 +71,8 @@ class GroupedTabWidget(OneTabWidget):
 
             super(GroupedTabWidget, self).close_tab(index)
 
-    def default_tab(self, title='Workbox'):
+    def default_tab(self, title=None, prefs=None):
+        title = title or self.default_title
         kwargs = self.editor_kwargs if self.editor_kwargs else {}
         editor = self.editor_cls(parent=self, core_name=self.core_name, **kwargs)
         return editor, title
@@ -76,5 +89,14 @@ class GroupedTabWidget(OneTabWidget):
         if hasattr(self.window(), "setWorkboxFontBasedOnConsole"):
             self.window().setWorkboxFontBasedOnConsole()
 
+    def tab_widget(self):
+        """Return the tab widget which contains this group tab
+
+        Returns:
+            self._tab_widget (GroupTabWidget): The tab widget which contains
+                this workbox
+        """
+        return self.parent().parent()
+
     def update_closable_tabs(self):
         self.setTabsClosable(self.count() != 1)

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/group_tab_widget/one_tab_widget.py

@@ -1,7 +1,11 @@
 from __future__ import absolute_import
 
+import re
+
 from Qt.QtWidgets import QTabWidget
 
+TAB_ITERATION_PATTERN = re.compile(r"(\d+)(?!.*\d)")
+
 
 class OneTabWidget(QTabWidget):
     """A QTabWidget that shows the close button only if there is more than one
@@ -17,6 +21,44 @@ class OneTabWidget(QTabWidget):
         super(OneTabWidget, self).__init__(*args, **kwargs)
         self.tabCloseRequested.connect(self.close_tab)
 
+    def get_next_available_tab_name(self, name):
+        """Get the next available tab name, incrementing an iteration if needed.
+
+        Args:
+            name (str): The desired name
+
+        Returns:
+            name (str): The name, or updated name if needed
+        """
+        name = name.replace(" ", "_")
+
+        existing_names = [self.tabText(i) for i in range(self.count())]
+
+        # Use regex to find the last set of digits. If found, the base name is
+        # a slice of name minus the digits string. Otherwise, the base name is
+        # the full name and iteration is zero.
+        match = TAB_ITERATION_PATTERN.search(name)
+        if match:
+            # We found trailing digits, so slice to get base name, and convert
+            # iteration to int
+            iter_str = match.group()
+            base = name[: -len(iter_str)]
+            iteration = int(iter_str)
+        else:
+            # No trailing digits found, so base name is full name and iteration
+            # is zero.
+            base = name
+            iteration = 0
+
+        if name in existing_names:
+            for _ in range(99):
+                iteration += 1
+                new_iter_str = str(iteration).zfill(2)
+                name = base + new_iter_str
+                if name not in existing_names:
+                    break
+        return name
+
     def addTab(self, *args, **kwargs):  # noqa: N802
         ret = super(OneTabWidget, self).addTab(*args, **kwargs)
         self.update_closable_tabs()

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/logger_window_plugin.py

@@ -13,6 +13,9 @@ class LoggerWindowPlugin:
     def __init__(self, parent):
         self.parent = parent
 
+    def updateWindowTitle(self, title):
+        return title
+
     def record_prefs(self, name):
         """Returns any prefs to save with the PrEditor's preferences.
 

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/loggerwindow.py

@@ -48,6 +48,7 @@ from .completer import CompleterMode
 from .level_buttons import LoggingLevelButton
 from .set_text_editor_path_dialog import SetTextEditorPathDialog
 from .status_label import StatusLabel
+from .workbox_mixin import WorkboxName
 
 logger = logging.getLogger(__name__)
 
@@ -59,31 +60,6 @@ class WorkboxPages:
     Workboxes = 1
 
 
-class WorkboxName(str):
-    """The joined name of a workbox `group/workbox` with access to its parts.
-
-    This subclass provides properties for the group and workbox values separately.
-    """
-
-    def __new__(cls, group, workbox):
-        txt = "/".join((group, workbox))
-        ret = super().__new__(cls, txt)
-        # Preserve the imitable nature of str's by using properties without setters.
-        ret._group = group
-        ret._workbox = workbox
-        return ret
-
-    @property
-    def group(self):
-        """The tab name of the group tab that contains the workbox."""
-        return self._group
-
-    @property
-    def workbox(self):
-        """The workbox of the tab for this workbox inside of the group."""
-        return self._workbox
-
-
 class LoggerWindow(Window):
     _instance = None
     styleSheetChanged = Signal(str)
@@ -290,10 +266,9 @@ class LoggerWindow(Window):
 
         self.dont_ask_again = []
 
-        # Load any plugins that modify the LoggerWindow
-        self.plugins = {}
-        for name, plugin in plugins.loggerwindow():
-            self.plugins[name] = plugin(self)
+        # Load any plugins, and set window title
+        self.loadPlugins()
+        self.setWindowTitle(self.defineWindowTitle())
 
         self.restorePrefs()
 
@@ -306,17 +281,6 @@ class LoggerWindow(Window):
             action.triggered.connect(partial(self.setStyleSheet, style_name))
 
         self.uiConsoleTOOLBAR.show()
-        loggerName = QApplication.instance().translate(
-            'PrEditorWindow', DEFAULT_CORE_NAME
-        )
-        self.setWindowTitle(
-            '{} - {} - {} {}-bit'.format(
-                loggerName,
-                self.name,
-                '{}.{}.{}'.format(*sys.version_info[:3]),
-                osystem.getPointerSize(),
-            )
-        )
 
         self.setWorkboxFontBasedOnConsole()
         self.setEditorChooserFontBasedOnConsole()
@@ -357,6 +321,29 @@ class LoggerWindow(Window):
 
         self.update_workbox_stack()
 
+    def loadPlugins(self):
+        """Load any plugins that modify the LoggerWindow."""
+        self.plugins = {}
+        for name, plugin in plugins.loggerwindow():
+            if name not in self.plugins:
+                self.plugins[name] = plugin(self)
+
+    def defineWindowTitle(self):
+        """Define the window title, including and info plugins may add."""
+
+        # Define the title
+        loggerName = QApplication.instance().translate(
+            'PrEditorWindow', DEFAULT_CORE_NAME
+        )
+        pyVersion = '{}.{}.{}'.format(*sys.version_info[:3])
+        size = osystem.getPointerSize()
+        title = f"{loggerName} - {self.name} - {pyVersion} {size}-bit"
+
+        # Add any info plugins may add to title
+        for _name, plugin in self.plugins.items():
+            title = plugin.updateWindowTitle(title)
+        return title
+
     def comment_toggle(self):
         self.current_workbox().__comment_toggle__()
 

{preditor-1.3.0 → preditor-1.4.0}/preditor/gui/workbox_mixin.py

@@ -12,6 +12,44 @@ from Qt.QtWidgets import QStackedWidget
 from ..prefs import prefs_path
 
 
+class WorkboxName(str):
+    """The joined name of a workbox `group/workbox` with access to its parts.
+
+    You may pass the group, workbox, or the fully formed workbox name:
+        examples:
+            workboxName = WorkboxName("Group01", "Workbox05")
+            workboxName = WorkboxName("Group01/Workbox05")
+    This subclass provides properties for the group and workbox values separately.
+    """
+
+    def __new__(cls, name, sub_name=None):
+        if sub_name is not None:
+            txt = "/".join((name, sub_name))
+        else:
+            txt = name
+            try:
+                name, sub_name = txt.split("/")
+            except ValueError:
+                msg = "A fully formed name, or a group and name, must be passed in."
+                raise ValueError(msg) from None
+
+        ret = super().__new__(cls, txt)
+        # Preserve the imitable nature of str's by using properties without setters.
+        ret._group = name
+        ret._workbox = sub_name
+        return ret
+
+    @property
+    def group(self):
+        """The tab name of the group tab that contains the workbox."""
+        return self._group
+
+    @property
+    def workbox(self):
+        """The workbox of the tab for this workbox inside of the group."""
+        return self._workbox
+
+
 class WorkboxMixin(object):
     _warning_text = None
     """When a user is picking this Workbox class, show a warning with this text."""
@@ -26,6 +64,16 @@ class WorkboxMixin(object):
         self._tempfile = tempfile
         self.core_name = core_name
 
+        self._tab_widget = parent
+
+    def __tab_widget__(self):
+        """Return the tab widget which contains this workbox
+
+        Returns:
+            GroupedTabWidget: The tab widget which contains this workbox
+        """
+        return self._tab_widget
+
     def __auto_complete_enabled__(self):
         raise NotImplementedError("Mixin method not overridden.")
 
@@ -151,7 +199,57 @@ class WorkboxMixin(object):
         if group == -1 or editor == -1:
             return '<{}>'.format(title)
         else:
-            return '<{}>:{},{}'.format(title, group, editor)
+            name = self.__workbox_name__()
+            return '<{}>:{}'.format(title, name)
+
+    def __workbox_name__(self, workbox=None):
+        """Returns the name for this workbox or a given workbox.
+        The name is the group tab text and the workbox tab text joined by a `/`"""
+        workboxTAB = self.window().uiWorkboxTAB
+        group_name = None
+        workbox_name = None
+
+        if workbox:
+            grouped_tab_widget = workbox.__tab_widget__()
+            for group_idx in range(workboxTAB.count()):
+                # If a previous iteration determine workbox_name, bust out
+                if workbox_name:
+                    break
+                # Check if current group is the workboxes parent group
+                cur_group_widget = workboxTAB.widget(group_idx)
+                if cur_group_widget == grouped_tab_widget:
+                    group_name = workboxTAB.tabText(group_idx)
+
+                    # Found the group, now find workbox
+                    for workbox_idx in range(cur_group_widget.count()):
+                        cur_workbox_widget = cur_group_widget.widget(workbox_idx)
+                        if cur_workbox_widget == workbox:
+                            workbox_name = cur_group_widget.tabText(workbox_idx)
+                            break
+        else:
+            grouped = self.__tab_widget__()
+            groupedTabBar = grouped.tabBar()
+
+            idx = -1
+            for idx in range(grouped.count()):
+                if grouped.widget(idx) == self:
+                    break
+            workbox_name = groupedTabBar.tabText(idx)
+
+            group = grouped.tab_widget()
+            groupTabBar = group.tabBar()
+            idx = -1
+            for idx in range(group.count()):
+                if group.widget(idx) == grouped:
+                    break
+            group_name = groupTabBar.tabText(idx)
+
+        # If both found, construct workbox name
+        if group_name and workbox_name:
+            name = WorkboxName(group_name, workbox_name)
+        else:
+            name = WorkboxName("", "")
+        return name
 
     def __goto_line__(self, line):
         raise NotImplementedError("Mixin method not overridden.")

{preditor-1.3.0 → preditor-1.4.0}/preditor/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)
 
-__commit_id__ = commit_id = 'gaa3ec1d05'
+__commit_id__ = commit_id = 'g79cb36c80'