quickmacapp 2025.4.15__py3-none-any.whl → 2025.6.24__py3-none-any.whl

quickmacapp/__init__.py

@@ -1,9 +1,10 @@
-from ._quickapp import Actionable, Status, mainpoint, menu, quit
+from ._quickapp import Actionable, ItemState, Status, mainpoint, menu, quit
 from ._interactions import ask, choose, answer, getpass
 from ._background import dockIconWhenVisible
 
 __all__ = [
     "Actionable",
+    "ItemState",
     "Status",
     "mainpoint",
     "menu",

quickmacapp/_quickapp.py

@@ -3,31 +3,48 @@ from __future__ import annotations
 import os
 import sys
 import traceback
-from typing import Callable, Protocol, Any
-
-from objc import ivar, IBAction, super
-
-from Foundation import (
-    NSObject,
-    NSException,
-)
+from dataclasses import dataclass
+from types import FunctionType
+from typing import Any, Callable, Iterable, Protocol, Sequence, Literal
 
 from AppKit import (
     NSApp,
     NSApplication,
     NSEvent,
-    NSResponder,
-    NSMenu,
     NSImage,
+    NSMenu,
     NSMenuItem,
+    NSResponder,
     NSStatusBar,
     NSVariableStatusItemLength,
+    NSControlStateValueOn,
+    NSControlStateValueOff,
 )
-
+from ExceptionHandling import NSStackTraceKey  # type:ignore
+from Foundation import NSException, NSObject
+from objc import IBAction, ivar, super
 from PyObjCTools.Debugging import _run_atos, isPythonException
-from ExceptionHandling import (  # type:ignore
-    NSStackTraceKey,
-)
+
+
+def asSelectorString(f: FunctionType) -> str:
+    """
+    Convert a method on a PyObjC class into a selector string.
+    """
+    return f.__name__.replace("_", ":")
+
+
+@dataclass(kw_only=True)
+class ItemState:
+    """
+    The state of a menu item.
+    """
+
+    enabled: bool = True
+    "Should the menu item be disabled? True if not, False if so."
+    checked: bool = False
+    "Should the menu item display a check-mark next to itself? True if so, False if not."
+    key: str | None = None
+    "Should the menu shortcut mnemonic key be set, blank, or derived from the item's title?"
 
 
 class Actionable(NSObject):
@@ -35,15 +52,20 @@ class Actionable(NSObject):
     Wrap a Python no-argument function call in an NSObject with a C{doIt:}
     method.
     """
-    _thunk: Callable[[], None]
 
-    def initWithFunction_(self, thunk: Callable[[], None]) -> Actionable:
+    _thunk: Callable[[], object]
+    _state: ItemState
+
+    def initWithFunction_andState_(
+        self, thunk: Callable[[], None], state: ItemState
+    ) -> Actionable:
         """
         Remember the given callable.
 
         @param thunk: the callable to run in L{doIt_}.
         """
         self._thunk = thunk
+        self._state = state
         return self
 
     @IBAction
@@ -52,10 +74,41 @@ class Actionable(NSObject):
         Call the given callable; exposed as an C{IBAction} in case you want IB
         to be able to see it.
         """
-        self._thunk()
+        result = self._thunk()
+        if isinstance(result, ItemState):
+            self._state = result
+
+    def validateMenuItem_(self, item: NSMenuItem) -> bool:
+        item.setState_(
+            NSControlStateValueOn if self._state.checked else NSControlStateValueOff
+        )
+        return self._state.enabled
+
+
+ACTION_METHOD = asSelectorString(Actionable.doIt_)
+
+
+def _adjust(
+    items: Iterable[
+        tuple[str, Callable[[], object]] | tuple[str, Callable[[], object], ItemState]
+    ],
+) -> Iterable[tuple[str, Callable[[], object], ItemState]]:
+    for item in items:
+        if len(item) == 3:
+            yield item
+        else:
+            yield (*item, ItemState())
+
 
+ItemSeq = Sequence[
+    tuple[str, Callable[[], object]] | tuple[str, Callable[[], object], ItemState]
+]
 
-def menu(title: str, items: list[tuple[str, Callable[[], object]]]) -> NSMenu:
+
+def menu(
+    title: str,
+    items: ItemSeq,
+) -> NSMenu:
     """
     Construct an NSMenu from a list of tuples describing it.
 
@@ -68,11 +121,16 @@ def menu(title: str, items: list[tuple[str, Callable[[], object]]]) -> NSMenu:
     @return: a new Menu tha is not attached to anything.
     """
     result = NSMenu.alloc().initWithTitle_(title)
-    for (subtitle, thunk) in items:
+    for subtitle, thunk, state in _adjust(items):
+        initialKeyEquivalent = subtitle[0].lower()
         item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
-            subtitle, "doIt:", subtitle[0].lower()
+            subtitle,
+            ACTION_METHOD,
+            initialKeyEquivalent if state.key is None else state.key,
+        )
+        item.setTarget_(
+            Actionable.alloc().initWithFunction_andState_(thunk, state).retain()
         )
-        item.setTarget_(Actionable.alloc().initWithFunction_(thunk).retain())
         result.addItem_(item)
     result.update()
     return result
@@ -97,11 +155,12 @@ class Status:
             self.item.button().setImage_(image)
         elif text is None:
             from __main__ import __file__ as default
+
             text = os.path.basename(default)
         if text is not None:
             self.item.button().setTitle_(text)
 
-    def menu(self, items: list[tuple[str, Callable[[], object]]]) -> None:
+    def menu(self, items: ItemSeq) -> None:
         """
         Set the status drop-down menu.
 
@@ -183,6 +242,7 @@ class QuickApplication(NSApplication):
         be more complicated in LSUIElement apps, but there might be a better
         way to do this.)
     """
+
     keyEquivalentHandler: NSResponder = ivar()
 
     def sendEvent_(self, event: NSEvent) -> None:
@@ -210,6 +270,7 @@ class MainRunner(Protocol):
     """
     A function which has been decorated with a runMain attribute.
     """
+
     def __call__(self, reactor: Any) -> None:
         """
         @param reactor: A Twisted reactor, which provides the usual suspects of
@@ -218,6 +279,7 @@ class MainRunner(Protocol):
 
     runMain: Callable[[], None]
 
+
 def mainpoint() -> Callable[[Callable[[Any], None]], MainRunner]:
     """
     Add a .runMain attribute to function
@@ -227,10 +289,11 @@ def mainpoint() -> Callable[[Callable[[Any], None]], MainRunner]:
         The runMain attribute starts a reactor and calls the original function
         with a running, initialized, reactor.
     """
+
     def wrapup(appmain: Callable[[Any], None]) -> MainRunner:
         def doIt() -> None:
-            from twisted.internet import cfreactor
             import PyObjCTools.AppHelper
+            from twisted.internet import cfreactor
 
             QuickApplication.sharedApplication()
 

{quickmacapp-2025.4.15.dist-info → quickmacapp-2025.6.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickmacapp
-Version: 2025.4.15
+Version: 2025.6.24
 Summary: Make it easier to write Mac apps in Python
 Description-Content-Type: text/x-rst
 License-File: LICENSE

quickmacapp-2025.6.24.dist-info/RECORD

@@ -0,0 +1,12 @@
+quickmacapp/__init__.py,sha256=WAfaenkgALceVKrSmVBoEOJER-SX65r4WjkaBGtmO24,363
+quickmacapp/_background.py,sha256=M_ob3EF8v-Z_gpKuFDl2N9XrQz0eBLFfUp2XErDB3DU,5943
+quickmacapp/_interactions.py,sha256=eLv_mVf5Jr-puNizlR8tDL_DlLy1Rc82XQ80o0GP5R4,3439
+quickmacapp/_notifications.py,sha256=DNm4-vOF0wQNUUTBHqp3-RKXVQK98ef53isxwsWqyj8,16965
+quickmacapp/_quickapp.py,sha256=cjMEzhofV8pq-rkcdjHTvUG1Omn2kQDKD4uzmAWLAAA,9273
+quickmacapp/notifications.py,sha256=UCigVIurf-zWAqVXUYjTtz_xMjcoI23dqyJ4OzZurQM,10275
+quickmacapp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+quickmacapp-2025.6.24.dist-info/licenses/LICENSE,sha256=7RIBNNvrnKHR3lw9z3KXv3Q6RRjhyxtNQoMnoUsf3_M,1091
+quickmacapp-2025.6.24.dist-info/METADATA,sha256=9vY7FxxnBVFNeZJIEvJi2bN4ZEiEhiHThFjAQJlwp2Y,1344
+quickmacapp-2025.6.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quickmacapp-2025.6.24.dist-info/top_level.txt,sha256=_iJkekUYnuWhCZbFSQyo2d5_6B7OoPwx7k527bokzeA,12
+quickmacapp-2025.6.24.dist-info/RECORD,,

{quickmacapp-2025.4.15.dist-info → quickmacapp-2025.6.24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

quickmacapp-2025.4.15.dist-info/RECORD

@@ -1,12 +0,0 @@
-quickmacapp/__init__.py,sha256=NsZW_cPvJTunDShN3RjOyK1gTwTKsghMb7wb6vRgTXI,335
-quickmacapp/_background.py,sha256=M_ob3EF8v-Z_gpKuFDl2N9XrQz0eBLFfUp2XErDB3DU,5943
-quickmacapp/_interactions.py,sha256=eLv_mVf5Jr-puNizlR8tDL_DlLy1Rc82XQ80o0GP5R4,3439
-quickmacapp/_notifications.py,sha256=DNm4-vOF0wQNUUTBHqp3-RKXVQK98ef53isxwsWqyj8,16965
-quickmacapp/_quickapp.py,sha256=Ed5n9rAw12nlHxyBMzyPc1Vt4K2OVIqCszWPqQyVElk,7571
-quickmacapp/notifications.py,sha256=UCigVIurf-zWAqVXUYjTtz_xMjcoI23dqyJ4OzZurQM,10275
-quickmacapp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quickmacapp-2025.4.15.dist-info/licenses/LICENSE,sha256=7RIBNNvrnKHR3lw9z3KXv3Q6RRjhyxtNQoMnoUsf3_M,1091
-quickmacapp-2025.4.15.dist-info/METADATA,sha256=KV6153Iy7rHC5Xrgs8RVtTtBauSRG9GNKzOk3btM-Rg,1344
-quickmacapp-2025.4.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-quickmacapp-2025.4.15.dist-info/top_level.txt,sha256=_iJkekUYnuWhCZbFSQyo2d5_6B7OoPwx7k527bokzeA,12
-quickmacapp-2025.4.15.dist-info/RECORD,,