Fix Missing About Menu on OSX (#52)

* Fix missing About... menu item

* Update info in about.py

* Update CHANGELOG

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Don't switch to deck browser after import (#38)
 - Properly handle importing a page when title is missing (#34)
+- Missing About menu on OSX (#47)
 
 ### Changed
 - Use `poetry` to manage the project (#43)

ir/about.py

@@ -17,32 +17,27 @@
 
 from ._version import __version__
 
-IR_GITHUB_URL = "https://github.com/luoliyan/incremental-reading"
+IR_GITHUB_URL = "https://github.com/tvhong/incremental-reading"
 
 
 def showAbout():
     dialog = QDialog(mw)
 
     label = QLabel()
     label.setStyleSheet("QLabel { font-size: 14px; }")
-    names = [
-        "Tiago Barroso",
-        "Frank Kmiec",
-        "Aleksej",
+    contributors = [
+        "Joseph Lorimer <[email protected]>" "Timothée Chauvin",
         "Christian Weiß",
-        "Timothée Chauvin",
+        "Aleksej",
+        "Frank Kmiec",
+        "Tiago Barroso",
     ]
-    text = """
-<div style="font-weight: bold">Incremental Reading v%s</div>
-<div>Joseph Lorimer &lt;[email protected]&gt;</div>
-<div>Contributors: %s</div>
-<div>Website: <a href="%s">%s</a></div>
-""" % (
-        __version__,
-        ", ".join(names),
-        IR_GITHUB_URL,
-        IR_GITHUB_URL,
-    )
+    text = f"""
+<div style="font-weight: bold">Incremental Reading v{__version__}</div>
+<div>Vy Hong &lt;[email protected]&gt;</div>
+<div>Contributors: {", ".join(contributors)}</div>
+<div>Website: <a href="{IR_GITHUB_URL}">{IR_GITHUB_URL}</a></div>
+"""
     label.setText(text)
 
     buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok)

ir/util.py

@@ -13,6 +13,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 import os
+import re
 import stat
 import time
 from urllib.parse import unquote
@@ -83,19 +84,39 @@ def addMenuItem(path, text, function, keys=None):
     if keys:
         action.setShortcut(QKeySequence(keys))
 
+    # Override surprising behavior in OSX
+    # https://doc.qt.io/qt-6/qmenubar.html#qmenubar-as-a-global-menu-bar
+    if _hasSpecialOsxMenuKeywords(text):
+        action.setMenuRole(QAction.MenuRole.NoRole)
+
     action.triggered.connect(function)
 
+    menu = None
     if path == "File":
-        mw.form.menuCol.addAction(action)
+        menu = mw.form.menuCol
     elif path == "Edit":
-        mw.form.menuEdit.addAction(action)
+        menu = mw.form.menuEdit
     elif path == "Tools":
-        mw.form.menuTools.addAction(action)
+        menu = mw.form.menuTools
     elif path == "Help":
-        mw.form.menuHelp.addAction(action)
+        menu = mw.form.menuHelp
     else:
         addMenu(path)
-        mw.customMenus[path].addAction(action)
+        menu = mw.customMenus[path]
+
+    menu.addAction(action)
+
+
+def _hasSpecialOsxMenuKeywords(text: str):
+    """Checks if a string contains any of the specified keywords.
+    Args:
+        text: The string to check.
+
+    Returns:
+        True if any keyword is found, False otherwise.
+    """
+    keywords = r"about|config|options|setup|settings|preferences|quit|exit"
+    return bool(re.search(keywords, text, re.IGNORECASE))
 
 
 def getField(note, fieldName):