PR Notes

- Uniform font / gui font keyboard modifiers
- Remove QRegExp (deprecated, QRegularExpression not supported byQt.py)
- Identifier classes now subclass py3 enums
- update attr check name
- Add copy filename context menu item
- Better linked file comparisons by with `pathlib.Path` instances (ie
  remove `as_posix()`
- Cleanup doc strings

Author: macevhicz

preditor/gui/drag_tab_bar.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from enum import IntEnum
 from functools import partial
 from pathlib import Path
 
@@ -22,7 +23,7 @@
 from . import QtPropertyInit
 
 
-class TabStates:
+class TabStates(IntEnum):
     """Nice names for the Tab states for coloring"""
 
     Normal = 0
@@ -366,6 +367,9 @@ def tab_menu(self, pos, popup=True):
 
                     act = menu.addAction('Save As')
                     act.triggered.connect(partial(self.save_and_link_file, workbox))
+
+                    act = menu.addAction('Copy Filename')
+                    act.triggered.connect(partial(self.copyFilename, workbox))
                 else:
                     act = menu.addAction('Explore File')
                     act.triggered.connect(partial(self.explore_file, workbox))
@@ -465,6 +469,15 @@ def unlink_file(self, workbox):
         name = self.parent().default_title
         self.setTabText(self._context_menu_tab, name)
 
+    def copyFilename(self, workbox):
+        """Copy the given workbox's filename to the clipboard
+
+        Args:
+            workbox (WorkboxMixin): The workbox for which to provide the filename
+        """
+        filename = workbox.__filename__()
+        QApplication.clipboard().setText(filename)
+
     def copy_workbox_name(self, workbox, index):
         """Copy the workbox name to clipboard.
 

preditor/gui/loggerwindow.py

@@ -11,6 +11,7 @@
 import warnings
 from builtins import bytes
 from datetime import datetime, timedelta
+from enum import IntEnum
 from functools import partial
 from pathlib import Path
 
@@ -61,7 +62,7 @@
 PRUNE_PATTERN = re.compile(PRUNE_PATTERN)
 
 
-class WorkboxPages:
+class WorkboxPages(IntEnum):
     """Nice names for the uiWorkboxSTACK indexes."""
 
     Options = 0
@@ -522,7 +523,6 @@ def workbox_for_id(self, workbox_id, show=False, visible=False):
                 to ensure that it is initialized and its text is loaded.
             visible (bool, optional): Make the this workbox visible if found.
         """
-        # pred = self.instance()
         workbox = None
         for box_info in self.uiWorkboxTAB.all_widgets():
             temp_box = box_info[0]
@@ -850,24 +850,24 @@ def setGuiFont(self, newSize=None, newFont=None):
         tabbar_class = current.tabBar().__class__
         menubar_class = self.menuBar().__class__
         label_class = self.uiStatusLBL.__class__
-        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(".*")))
+        children = self.findChildren(tabbar_class, None)
+        children.extend(self.findChildren(menubar_class, None))
+        children.extend(self.findChildren(label_class, None))
+        children.extend(self.findChildren(QToolButton, None))
+        children.extend(self.findChildren(QMenu, None))
+        children.extend(self.findChildren(QToolTip, None))
 
         for child in children:
+            if not hasattr(child, "setFont"):
+                continue
             if newFont is None:
                 newFont = child.font()
             if newSize is None:
                 newSize = newFont.pointSize()
             newFont.setPointSize(newSize)
             child.setFont(newFont)
-            # child.resize()
         self.setFont(newFont)
         QToolTip.setFont(newFont)
-        # self.resize()
 
     def setFontSize(self, newSize):
         """Update the font size in the console and current workbox.
@@ -1046,8 +1046,6 @@ def setFileMonitoringEnabled(self, filename, state):
         if not filename:
             return
 
-        filename = Path(filename).as_posix()
-
         if state:
             self.openFileMonitor.addPath(filename)
         else:
@@ -1066,9 +1064,8 @@ def fileMonitoringEnabled(self, filename):
         if not filename:
             return False
 
-        filename = Path(filename).as_posix()
-        watched_files = self.openFileMonitor.files()
-        return filename in watched_files
+        watched_files = [Path(file) for file in self.openFileMonitor.files()]
+        return Path(filename) in watched_files
 
     def prefsPath(self, name='preditor_pref.json'):
         """Get the path to this core's prefs, for the given name
@@ -1090,10 +1087,9 @@ def linkedFileChanged(self, filename):
         Args:
             filename (str): The file which triggered the file changed signal
         """
-        prefs_path = Path(self.prefsPath()).as_posix()
 
         # Either handle prefs or workbox
-        if filename == prefs_path:
+        if Path(filename) == Path(self.prefsPath()):
             # First, save workbox prefs. Don't save preditor.prefs because that
             # would just overwrite whatever changes we are responding to.
             self.getBoxesChangedByInstance()
@@ -1172,6 +1168,10 @@ def recordPrefs(self, manual=False, disableFileMonitoring=False):
         if not manual and not self.autoSaveEnabled():
             return
 
+        # When applying a change to editor class, we may essentially auto-save
+        # prefs, in order to reload on the next class. In doing so, we may be
+        # changing workbox filename(s), if any, so let's remove them from file
+        # monitoring. They will be re-added during restorePrefs.
         if disableFileMonitoring:
             for editor_info in self.uiWorkboxTAB.all_widgets():
                 editor = editor_info[0]

preditor/gui/ui/loggerwindow.ui

@@ -1063,7 +1063,7 @@ at the indicated line in the specified text editor.
     <string>Increase Gui Font Size</string>
    </property>
    <property name="toolTip">
-    <string>..or Alt+Scroll Up</string>
+    <string>..or Ctrl+Alt+Scroll Up</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Alt++</string>
@@ -1085,7 +1085,7 @@ at the indicated line in the specified text editor.
     <string>Decrease Gui Font Size</string>
    </property>
    <property name="toolTip">
-    <string>..or Alt+Scroll Down</string>
+    <string>..or Ctrl+Alt+Scroll Down</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Alt+-</string>

preditor/prefs.py

@@ -203,7 +203,7 @@ def get_file_group(core_name, workbox_id):
         workbox_id (str): The current workbox_id
 
     Returns:
-        TYPE: Description
+        files (list): The list of files found for the given workbox_id
     """
     directory = Path(get_prefs_dir(core_name=core_name, sub_dir='workboxes'))
     workbox_dir = directory / workbox_id
@@ -252,7 +252,7 @@ def get_backup_version_info(core_name, workbox_id, versionType, backup_file=None
     Args:
         core_name (str): The current core_name
         workbox_id (str): The current workbox_id
-        versionType (TYPE): The VersionType (ie First, Previous, Next, Last)
+        versionType (VersionType): The VersionType (ie First, Previous, Next, Last)
         backup_file (None, optional): The currently loaded backup file.
 
     Returns:
@@ -312,9 +312,9 @@ def update_pref_args(core_name, pref_dict, old_name, update_data):
 
     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
-        update_data (TYPE): Dict to define ways to update the values, which
+        pref_dict (dict): The pref to update
+        old_name (str): Original pref name, which may be updated
+        update_data (str): Dict to define ways to update the values, which
         currently only supports str.replace.
     """
     workbox_dir = Path(get_prefs_dir(core_name=core_name, create=True))
@@ -352,8 +352,8 @@ def update_prefs_args(core_name, prefs_dict, prefs_updates):
 
     Args:
         core_name (str): The current core_name
-        prefs_dict (TYPE): The PrEditor prefs to update
-        prefs_updates (TYPE): The update definition dict
+        prefs_dict (dict): The PrEditor prefs to update
+        prefs_updates (dict): The update definition dict
 
     Returns:
         prefs_dict (dict): The updated dict