Support resizing gui font

Author: macevhicz

preditor/gui/console.py

@@ -165,6 +165,11 @@ def codeHighlighter(self):
         """
         return self._uiCodeHighlighter
 
+    def contextMenuEvent(self, event):
+        menu = self.createStandardContextMenu()
+        menu.setFont(self.window().font())
+        menu.exec(self.mapToGlobal(event.pos()))
+
     def doubleSingleShotSetScrollValue(self, origPercent):
         """This double QTimer.singleShot monkey business seems to be the only way
         to get scroll.maximum() to update properly so that we calc newValue

preditor/gui/drag_tab_bar.py

@@ -11,6 +11,7 @@
     QFileDialog,
     QInputDialog,
     QMenu,
+    QSizePolicy,
     QStyle,
     QStyleOptionTab,
     QTabBar,
@@ -353,6 +354,7 @@ def tab_menu(self, pos, popup=True):
         if self._context_menu_tab == -1:
             return
         menu = QMenu(self)
+        menu.setFont(self.window().font())
 
         grouped_tab = self.parentWidget()
         workbox = grouped_tab.widget(self._context_menu_tab)
@@ -520,6 +522,10 @@ def install_tab_widget(cls, tab_widget, mime_type='DragTabBar', menu=True):
         tab_widget.setMovable(True)
         tab_widget.setDocumentMode(True)
 
+        sizePolicy = tab_widget.sizePolicy()
+        sizePolicy.setVerticalPolicy(QSizePolicy.Policy.Preferred)
+        tab_widget.setSizePolicy(sizePolicy)
+
         if menu:
             bar.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
             bar.customContextMenuRequested.connect(bar.tab_menu)

preditor/gui/group_tab_widget/__init__.py

@@ -3,10 +3,8 @@
 from pathlib import Path
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QIcon
-from Qt.QtWidgets import QHBoxLayout, QMessageBox, QToolButton, QWidget
+from Qt.QtWidgets import QHBoxLayout, QMessageBox, QSizePolicy, QToolButton, QWidget
 
-from ... import resourcePath
 from ...prefs import VersionTypes, get_backup_version_info
 from ..drag_tab_bar import DragTabBar
 from ..workbox_text_edit import WorkboxTextEdit
@@ -16,10 +14,10 @@
 
 DEFAULT_STYLE_SHEET = """
 /* Make the two buttons in the GroupTabWidget take up the
-   same horizontal space as the GroupedTabWidget's buttons. */
+   same horizontal space as the GroupedTabWidget's buttons.
 GroupTabWidget>QTabBar::tab{
     max-height: 1.5em;
-}
+}*/
 /* We have an icon, no need to show the menu indicator */
 #group_tab_widget_menu_btn::menu-indicator{
     width: 0px;
@@ -51,26 +49,37 @@ def __init__(self, editor_kwargs=None, core_name=None, *args, **kwargs):
         corner = QWidget(self)
         lyt = QHBoxLayout(corner)
         lyt.setSpacing(0)
-        lyt.setContentsMargins(0, 0, 0, 0)
+        lyt.setContentsMargins(0, 5, 0, 0)
 
         corner.uiNewTabBTN = QToolButton(corner)
         corner.uiNewTabBTN.setObjectName('group_tab_widget_new_btn')
         corner.uiNewTabBTN.setText('+')
-        corner.uiNewTabBTN.setIcon(QIcon(resourcePath('img/file-plus.png')))
         corner.uiNewTabBTN.released.connect(lambda: self.add_new_tab(None))
+
         lyt.addWidget(corner.uiNewTabBTN)
 
         corner.uiMenuBTN = QToolButton(corner)
-        corner.uiMenuBTN.setIcon(QIcon(resourcePath('img/chevron-down.png')))
+        corner.uiMenuBTN.setText('\u2630')
         corner.uiMenuBTN.setObjectName('group_tab_widget_menu_btn')
         corner.uiMenuBTN.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
         corner.uiCornerMENU = GroupTabMenu(self, parent=corner.uiMenuBTN)
         corner.uiMenuBTN.setMenu(corner.uiCornerMENU)
+
+        self.adjustSizePolicy(corner)
+        self.adjustSizePolicy(corner.uiNewTabBTN)
+        self.adjustSizePolicy(corner.uiMenuBTN)
+        self.adjustSizePolicy(corner.uiCornerMENU)
+
         lyt.addWidget(corner.uiMenuBTN)
 
         self.uiCornerBTN = corner
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
+    def adjustSizePolicy(self, button):
+        sp = button.sizePolicy()
+        sp.setVerticalPolicy(QSizePolicy.Policy.Preferred)
+        button.setSizePolicy(sp)
+
     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.
@@ -110,6 +119,7 @@ def add_new_tab(self, group, title=None, prefs=None):
         editor = parent.add_new_editor(title, prefs)
         self.setCurrentIndex(self.indexOf(parent))
         self.window().focusToWorkbox()
+        self.tabBar().setFont(self.window().font())
         return parent, editor
 
     def all_widgets(self):

preditor/gui/group_tab_widget/grouped_tab_widget.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QIcon
 from Qt.QtWidgets import QMessageBox, QToolButton
 
-from ... import resourcePath
 from ...prefs import VersionTypes
 from ..drag_tab_bar import DragTabBar
 from ..workbox_text_edit import WorkboxTextEdit
@@ -24,7 +22,6 @@ def __init__(self, editor_kwargs, editor_cls=None, core_name=None, *args, **kwar
 
         self.uiCornerBTN = QToolButton(self)
         self.uiCornerBTN.setText('+')
-        self.uiCornerBTN.setIcon(QIcon(resourcePath('img/file-plus.png')))
         self.uiCornerBTN.released.connect(lambda: self.add_new_editor())
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 

preditor/gui/group_tab_widget/one_tab_widget.py

@@ -60,6 +60,7 @@ def get_next_available_tab_name(self, name):
     def addTab(self, *args, **kwargs):  # noqa: N802
         ret = super(OneTabWidget, self).addTab(*args, **kwargs)
         self.update_closable_tabs()
+        self.tabBar().setFont(self.window().font())
         return ret
 
     def close_tab(self, index):

preditor/gui/loggerwindow.py

@@ -23,9 +23,11 @@
     QApplication,
     QFontDialog,
     QInputDialog,
+    QMenu,
     QMessageBox,
     QTextBrowser,
     QTextEdit,
+    QToolButton,
     QToolTip,
     QVBoxLayout,
 )
@@ -156,13 +158,29 @@ def __init__(self, parent, name=None, run_workbox=False, standalone=False):
         self.uiAutoCompleteCaseSensitiveACT.toggled.connect(self.setCaseSensitive)
 
         self.uiSelectMonospaceFontACT.triggered.connect(
-            partial(self.selectFont, monospace=True)
+            partial(self.selectFont, origFont=None, monospace=True)
         )
         self.uiSelectProportionalFontACT.triggered.connect(
-            partial(self.selectFont, proportional=True)
+            partial(self.selectFont, origFont=None, proportional=True)
         )
         self.uiSelectAllFontACT.triggered.connect(
-            partial(self.selectFont, monospace=True, proportional=True)
+            partial(self.selectFont, origFont=None, monospace=True, proportional=True)
+        )
+        self.uiSelectGuiFontsMENU.triggered.connect(
+            partial(self.selectGuiFont, monospace=True, proportional=True)
+        )
+
+        self.uiDecreaseCodeFontSizeACT.triggered.connect(
+            partial(self.adjustFontSize, "Code", -1)
+        )
+        self.uiIncreaseCodeFontSizeACT.triggered.connect(
+            partial(self.adjustFontSize, "Code", 1)
+        )
+        self.uiDecreaseGuiFontSizeACT.triggered.connect(
+            partial(self.adjustFontSize, "Gui", -1)
+        )
+        self.uiIncreaseGuiFontSizeACT.triggered.connect(
+            partial(self.adjustFontSize, "Gui", 1)
         )
 
         # Setup ability to cycle completer mode, and create action for each mode
@@ -675,7 +693,17 @@ def getPrevCommand(self):
 
     def wheelEvent(self, event):
         """adjust font size on ctrl+scrollWheel"""
-        if event.modifiers() == Qt.KeyboardModifier.ControlModifier:
+        mods = event.modifiers()
+        ctrl = Qt.KeyboardModifier.ControlModifier
+        shift = Qt.KeyboardModifier.ShiftModifier
+        alt = Qt.KeyboardModifier.AltModifier
+
+        # Assign mods by functionality. Using shift | alt for gui, because just shift or
+        # just alt has existing functionality which also processes.
+        code_font_mod = ctrl
+        gui_font_mod = shift | alt
+
+        if mods == code_font_mod or mods == gui_font_mod:
             # WheelEvents can be emitted in a cluster, but we only want one at a time
             # (ie to change font size by 1, rather than 2 or 3). Let's bail if previous
             # font-resize wheel event was within a certain threshhold.
@@ -690,20 +718,43 @@ def wheelEvent(self, event):
             if hasattr(event, 'delta'):  # Qt4
                 delta = event.delta()
             else:  # QT5
-                delta = event.angleDelta().y()
+                # Also holding alt reverses the data in angleDelta (!?), so transpose to
+                # get correct value
+                angleDelta = event.angleDelta()
+                if mods == gui_font_mod:
+                    angleDelta = angleDelta.transposed()
+                delta = angleDelta.y()
 
             # convert delta to +1 or -1, depending
             delta = delta // abs(delta)
             minSize = 5
             maxSize = 50
-            font = self.console().font()
+            if mods == code_font_mod:
+                font = self.console().font()
+            elif mods == gui_font_mod:
+                font = self.font()
             newSize = font.pointSize() + delta
             newSize = max(min(newSize, maxSize), minSize)
 
-            self.setFontSize(newSize)
+            # If only ctrl was pressed, adjust code font size, otherwise adjust gui font
+            # size
+            if mods == code_font_mod:
+                self.setFontSize(newSize)
+            elif mods == gui_font_mod:
+                self.setGuiFont(newSize=newSize)
         else:
             Window.wheelEvent(self, event)
 
+    def adjustFontSize(self, kind, delta):
+        if kind == "Code":
+            size = self.console().font().pointSize()
+            size += delta
+            self.setFontSize(size)
+        else:
+            size = self.font().pointSize()
+            size += delta
+            self.setGuiFont(newSize=size)
+
     def handleMenuHovered(self, action):
         """Qt4 doesn't have a ToolTipsVisible method, so we fake it"""
         # Don't show if it's just the text of the action
@@ -721,15 +772,18 @@ def handleMenuHovered(self, action):
             menu = action.parent()
         QToolTip.showText(QCursor.pos(), text, menu)
 
-    def selectFont(self, monospace=False, proportional=False):
+    def selectFont(
+        self, origFont=None, monospace=False, proportional=False, doGui=False
+    ):
         """Present a QFontChooser dialog, offering, monospace, proportional, or all
         fonts, based on user choice. If a font is chosen, set it on the console and
         workboxes.
 
         Args:
             action (QAction): menu action associated with chosen font
         """
-        origFont = self.console().font()
+        if origFont is None:
+            origFont = self.console().font()
         curFontFamily = origFont.family()
 
         if monospace and proportional:
@@ -750,9 +804,45 @@ def selectFont(self, monospace=False, proportional=False):
         newFont, okClicked = QFontDialog.getFont(origFont, self, title, options=options)
 
         if okClicked:
-            self.console().setConsoleFont(newFont)
-            self.setWorkboxFontBasedOnConsole()
-            self.setEditorChooserFontBasedOnConsole()
+            if doGui:
+                self.setGuiFont(newFont=newFont)
+            else:
+                self.console().setConsoleFont(newFont)
+                self.setWorkboxFontBasedOnConsole()
+                self.setEditorChooserFontBasedOnConsole()
+
+    def selectGuiFont(self, monospace=True, proportional=True):
+        font = self.font()
+        self.selectFont(
+            origFont=font, monospace=monospace, proportional=proportional, doGui=True
+        )
+
+    def setGuiFont(self, newSize=None, newFont=None):
+        current = self.uiWorkboxTAB.currentWidget()
+        if not current:
+            return
+
+        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(".*")))
+
+        for child in children:
+            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.
@@ -1037,7 +1127,22 @@ def keyPressEvent(self, event):
             | Qt.KeyboardModifier.ControlModifier
             | Qt.KeyboardModifier.ShiftModifier
         ):
-            pass
+
+            kind = None
+            if event.modifiers() & Qt.KeyboardModifier.ControlModifier:
+                kind = "Code"
+            elif event.modifiers() & Qt.KeyboardModifier.AltModifier:
+                kind = "Gui"
+
+            delta = None
+            if event.key() == Qt.Key.Key_Plus:
+                delta = 1
+            elif event.key() == Qt.Key.Key_Minus:
+                delta = -1
+
+            if kind and delta:
+                self.adjustFontSize(kind, delta)
+
         else:
             super(LoggerWindow, self).keyPressEvent(event)
 
@@ -1074,6 +1179,7 @@ def recordPrefs(self, manual=False):
                 'wordWrap': self.uiWordWrapACT.isChecked(),
                 'clearBeforeRunning': self.uiClearBeforeRunningACT.isChecked(),
                 'toolbarStates': str(self.saveState().toHex(), 'utf-8'),
+                'guiFont': self.font().toString(),
                 'consoleFont': self.console().font().toString(),
                 'uiAutoSaveSettingssACT': self.uiAutoSaveSettingssACT.isChecked(),
                 'uiAutoPromptACT': self.uiAutoPromptACT.isChecked(),
@@ -1356,12 +1462,18 @@ def restorePrefs(self, skip_geom=False):
         # Ensure the correct workbox stack page is shown
         self.update_workbox_stack()
 
-        _font = pref.get('consoleFont', None)
-        if _font:
+        fontStr = pref.get('consoleFont', None)
+        if fontStr:
             font = QFont()
-            if QtCompat.QFont.fromString(font, _font):
+            if QtCompat.QFont.fromString(font, fontStr):
                 self.console().setConsoleFont(font)
 
+        guiFontStr = pref.get('guiFont', None)
+        if guiFontStr:
+            guiFont = QFont()
+            if guiFont.fromString(guiFontStr):
+                self.setGuiFont(newFont=guiFont)
+
         self.dont_ask_again = pref.get('dont_ask_again', [])
 
         # Allow any plugins to restore their own preferences