Overhaul workbox tabs and font improvements #40

macevhicz · 2025-10-22T01:55:13Z

Checklist

I have read the CONTRIBUTING.md document
I formatted my changes with black
I linted my changes with flake8
I have added documentation regarding my changes where necessary
Any pre-existing tests continue to pass
Additional tests were made covering my changes

Types of Changes

Bugfix (change that fixes an issue)
New Feature (change that adds functionality)
Documentation Update (if none of the other choices apply)

Proposed Changes

Overhaul workbox tabs

Supporting linking files
Support backing up workbox files, with ability to scroll forward and
backward thru previous versions. Only workboxes / prefs with changes
are saved
Colorize tabs indicating state (with toolTips)
Support auto-sync between multiple instances of PrEditor in same core
Support updating prefs args / values based on json file
Enforce unique tab names

Fonts

Support resizing gui font
Support dialogs opening with same font as PrEditor

MHendricks · 2025-10-25T00:22:32Z

Note: This pull request will migrate prefs to a new format that is not backwards compatible with old prefs. Moving forward to new prefs just works but if you wanted to revert to an older version of PrEditor you can loose new code changes. Do we want to do anything special with when this code is released? Major version upgrade or skip a few minor versions, something else?

@macevhicz @tbttfox

MHendricks

Updated: I've finished this pass of review.

I haven't finished looking at all of this. I have these files remaining to look at.

preditor/gui/workbox_mixin.py
preditor/gui/workboxwidget.py
preditor/prefs.py

MHendricks · 2025-10-24T23:34:46Z

preditor/gui/ui/loggerwindow.ui

+    <string>Ctrl+Alt+Shift+]</string>
+   </property>
+  </action>
+  <action name="uiSelectGuiFontsMENU">


Would it make sense to put all of the font settings inside of a font sub-menu?

MHendricks · 2025-10-24T23:39:39Z

preditor/gui/ui/loggerwindow.ui

+    <string>Increase Gui Font Size</string>
+   </property>
+   <property name="toolTip">
+    <string>..or Alt+Scroll Up</string>


Tool tip should be updated to match the current scroll shortcut. shift + alt + scroll.

Out of curiosity, why did you choose to not use Ctrl for GUI scroll? The workbox/console resize key is Ctrl + scroll. Would ctrl + Shift + scroll or ctrl + alt + scroll work and keep the scaling shortcuts similar? If shift + alt + scroll is a common shortcut then I'm ok with it, just curious about the choice.

MHendricks · 2025-10-25T00:08:12Z

preditor/gui/loggerwindow.py

+        children = self.findChildren(tabbar_class, QtCore.QRegExp(".*"))
+        children.extend(self.findChildren(menubar_class, QtCore.QRegExp(".*")))
+        children.extend(self.findChildren(label_class, QtCore.QRegExp(".*")))
+        children.extend(self.findChildren(QToolButton, QtCore.QRegExp(".*")))
+        children.extend(self.findChildren(QMenu, QtCore.QRegExp(".*")))
+        children.extend(self.findChildren(QToolTip, QtCore.QRegExp(".*")))


QRegExp is deprecated in Qt5 and removed in Qt6. We are no longer supporting Qt4 so you should switch to QRegularExpression. I would only use QRegularExpression if you need to pass it to Qt like you do in this case, if its just python code then stick with the re module.

However its not supported by Qt.py so we will need to work around this until that is updated. Could just do if Qt.IsPyQt5 style if checks to handle the import.

MHendricks · 2025-10-25T00:12:53Z

preditor/gui/drag_tab_bar.py

+class TabStates:
+    """Nice names for the Tab states for coloring"""
+
+    Normal = 0
+    Linked = 1
+    Changed = 2
+    ChangedLinked = 3
+    Orphaned = 4
+    OrphanedLinked = 5
+    Dirty = 6
+    DirtyLinked = 7
+    MissingLinked = 8


I would make this into an enum class like EnumInt if you need int values, or one of the other enum classes.

MHendricks · 2025-10-25T00:18:01Z

preditor/gui/drag_tab_bar.py

+            if hasattr(widget, "text"):
+                filename = widget.__filename__() or widget._filename_pref


Should this be checking for a mixin property not text? Ie __text__ or __filename__ etc.

MHendricks · 2025-10-25T00:33:04Z

preditor/gui/drag_tab_bar.py

+        color = self.bg_color_map.get(state)
+        return color, toolTip
+
+    def paintEvent(self, event):


I tend to avoid messing with paintEvent. This is mostly from past experience where doing it in python might be slower and cause crashes(likely due to me not doing it correctly).

Instead of overriding paintEvent you can use a Property Selector in style sheets. https://doc.qt.io/qt-6/stylesheet-syntax.html#selector-types This may require updating the QStyleSheet per the warning in the link.

QPushButton[flat="false"]{color: blue;} would make any QPushButton's with the flat property set to False blue. You don't need to update the stylesheet's contents to apply this change, just updating the qproperty and making sure the style sheet engine is updated will apply the change.

MHendricks · 2025-10-25T00:35:44Z

preditor/gui/drag_tab_bar.py

+                act = menu.addAction('Save and Link File')
+                act.triggered.connect(partial(self.save_and_link_file, workbox))
+            else:
+                if Path(workbox.filename()).is_file():


Might be nice to have a copy filename option in this case. I would put it next to the other copy menu items.

MHendricks · 2025-10-25T00:47:29Z

preditor/gui/loggerwindow.py

+                to ensure that it is initialized and its text is loaded.
+            visible (bool, optional): Make the this workbox visible if found.
+        """
+        # pred = self.instance()


I've seen a couple of these in this code, are they for a reason or leftover from development?

MHendricks · 2025-10-25T01:22:33Z

preditor/gui/loggerwindow.py

+                editor, _, _, group_idx, editor_idx = info
+                if not editor.filename():
+                    continue
+                if Path(editor.filename()).as_posix() == Path(filename).as_posix():


You should be able to omit the .as_posix() calls here. That has the benefit of making this check case insensitive on windows.

MHendricks · 2025-10-25T01:24:51Z

preditor/gui/loggerwindow.py

+        Returns:
+            TYPE: Description


This return docstring can probably be removed as it doesn't really provide any useful information.

MHendricks · 2025-10-28T01:27:01Z

preditor/gui/workboxwidget.py

    def __init__(
-        self, parent=None, console=None, delayable_engine='default', core_name=None
+        self,
+        parent=None,
+        console=None,
+        workbox_id=None,
+        filename=None,
+        backup_file=None,
+        tempfile=None,
+        delayable_engine='default',
+        core_name=None,


Please make sure your changes are compatible with the WorkboxTextEdit widget when using the editor class TextEdit. Currently switching to that can soft lock PrEditor and has caused me to loose my workbox tabs(Luckily,I had a paranoid manual backup for just this event so I didn't loose things.)

I'm getting errors like this and attempting to fix that caused others.

Traceback (most recent call last): File "C:\blur\dev\preditor\preditor\gui\drag_tab_bar.py", line 202, in paintEvent color, toolTip = self.get_color_and_tooltip(index) File "C:\blur\dev\preditor\preditor\gui\drag_tab_bar.py", line 171, in get_color_and_tooltip workbox_id = widget.__workbox_id__() File "C:\blur\dev\preditor\preditor\gui\workbox_mixin.py", line 538, in __workbox_id__ return self._workbox_id AttributeError: 'WorkboxTextEdit' object has no attribute '_workbox_id' QBackingStore::endPaint() called with active painter; did you forget to destroy it or call QPainter::end() on it?

MHendricks · 2025-10-28T02:06:36Z

preditor/prefs.py

+    Args:
+        core_name (str): The current core_name
+        pref_dict (TYPE): The pref to update
+        old_name (TYPE): Original pref name, which may be updated


Please clean up the various default TYPE docstrings found in this file.

- Supporting linking files - Support backing up workbox files, with ability to scroll forward and backward thru previous versions. Only workboxes / prefs with changes are saved - Colorize tabs indicating state (with toolTips) - Support auto-sync between multiple instances of PrEditor in same core - Support updating prefs args / values based on json file - Enforce unique tab names

macevhicz marked this pull request as draft October 22, 2025 01:56

macevhicz force-pushed the markm/general_updates5 branch 4 times, most recently from be49d6f to 5d8c2f2 Compare October 23, 2025 00:28

MHendricks reviewed Oct 25, 2025

View reviewed changes

macevhicz force-pushed the markm/general_updates5 branch from 5d8c2f2 to 8781a28 Compare October 27, 2025 19:09

MHendricks reviewed Oct 28, 2025

View reviewed changes

macevhicz force-pushed the markm/general_updates5 branch 4 times, most recently from 308914d to fed598b Compare October 28, 2025 18:04

macevhicz added 4 commits October 29, 2025 11:10

Update Find in Files to anchor workbox_name

d289937

Support resizing gui font

9a4df96

Generalize launching dialogs with matching font

f394369

macevhicz force-pushed the markm/general_updates5 branch from fed598b to f394369 Compare October 29, 2025 18:14

		if hasattr(widget, "text"):
		filename = widget.__filename__() or widget._filename_pref

Overhaul workbox tabs and font improvements #40

Are you sure you want to change the base?

Overhaul workbox tabs and font improvements #40

Uh oh!

Conversation

macevhicz commented Oct 22, 2025

Checklist

Types of Changes

Proposed Changes

Uh oh!

MHendricks commented Oct 25, 2025

Uh oh!

MHendricks left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MHendricks left a comment •

edited

Loading