Move handleMenuHovered and connect to tab context menus

Author: macevhicz

preditor/gui/__init__.py

@@ -1,9 +1,11 @@
 from __future__ import absolute_import
 
+import re
 from functools import partial
 
 from Qt.QtCore import Property
-from Qt.QtWidgets import QStackedWidget
+from Qt.QtGui import QCursor
+from Qt.QtWidgets import QStackedWidget, QToolTip
 
 from .dialog import Dialog  # noqa: F401
 from .window import Window  # noqa: F401
@@ -61,6 +63,23 @@ def _setattrCallback(callback, attrName, self, value):
     return Property(typ, fget=(lambda s: ga(s, name)), fset=(lambda s, v: sa(s, v)))
 
 
+def handleMenuHovered(action):
+    """Actions in QMenus which are not descendants of a QToolBar will not show
+    their toolTips, because... Reasons?
+    """
+    # Don't show if it's just the text of the action
+    text = re.sub(r"(?<!&)&(?!&)", "", action.text())
+    text = text.replace('...', '')
+
+    if text == action.toolTip():
+        text = ''
+    else:
+        text = action.toolTip()
+
+    menu = action.parent()
+    QToolTip.showText(QCursor.pos(), text, menu)
+
+
 def loadUi(filename, widget, uiname=''):
     """use's Qt's uic loader to load dynamic interafces onto the inputed widget
 

preditor/gui/drag_tab_bar.py

@@ -18,6 +18,7 @@
 
 from preditor import osystem
 
+from ..gui import handleMenuHovered
 from . import QtPropertyInit
 
 
@@ -364,6 +365,7 @@ def tab_menu(self, pos, popup=True):
             return
         menu = QMenu(self)
         menu.setFont(self.window().font())
+        menu.hovered.connect(handleMenuHovered)
 
         grouped_tab = self.parentWidget()
         workbox = grouped_tab.widget(self._context_menu_tab)

preditor/gui/loggerwindow.py

@@ -16,10 +16,9 @@
 from pathlib import Path
 
 import __main__
-import Qt as Qt_py
 from Qt import QtCompat, QtCore, QtWidgets
 from Qt.QtCore import QByteArray, QFileSystemWatcher, QObject, Qt, QTimer, Signal, Slot
-from Qt.QtGui import QCursor, QFont, QIcon, QKeySequence, QTextCursor
+from Qt.QtGui import QFont, QIcon, QKeySequence, QTextCursor
 from Qt.QtWidgets import (
     QApplication,
     QFontDialog,
@@ -45,7 +44,7 @@
     resourcePath,
 )
 from ..delayable_engine import DelayableEngine
-from ..gui import Dialog, Window, loadUi, tab_widget_for_tab
+from ..gui import Dialog, Window, handleMenuHovered, loadUi, tab_widget_for_tab
 from ..gui.fuzzy_search.fuzzy_search import FuzzySearch
 from ..gui.group_tab_widget.grouped_tab_models import GroupTabListItemModel
 from ..logging_config import LoggingConfig
@@ -210,7 +209,7 @@ def __init__(self, parent, name=None, run_workbox=False, standalone=False):
         action.setObjectName('uiCycleModeACT')
         action.setShortcut(QKeySequence(Qt.Modifier.CTRL | Qt.Key.Key_M))
         action.triggered.connect(self.cycleCompleterMode)
-        self.uiCompleterModeMENU.hovered.connect(self.handleMenuHovered)
+        self.uiCompleterModeMENU.hovered.connect(handleMenuHovered)
 
         # Workbox add/remove
         self.uiNewWorkboxACT.triggered.connect(
@@ -293,7 +292,7 @@ def __init__(self, parent, name=None, run_workbox=False, standalone=False):
         regEx = ".*"
         menus = self.findChildren(QtWidgets.QMenu, QtCore.QRegExp(regEx))
         for menu in menus:
-            menu.hovered.connect(self.handleMenuHovered)
+            menu.hovered.connect(handleMenuHovered)
 
         # Preferences window
         self.uiClosePreferencesBTN.clicked.connect(self.update_workbox_stack)
@@ -809,23 +808,6 @@ def adjustFontSize(self, kind, delta):
             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
-        text = re.sub(r"(?<!&)&(?!&)", "", action.text())
-        text = text.replace('...', '')
-
-        if text == action.toolTip():
-            text = ''
-        else:
-            text = action.toolTip()
-
-        if Qt_py.IsPyQt4:
-            menu = action.parentWidget()
-        else:
-            menu = action.parent()
-        QToolTip.showText(QCursor.pos(), text, menu)
-
     def selectFont(
         self, origFont=None, monospace=False, proportional=False, doGui=False
     ):