[widget Audit] toga.App

core/src/toga/app.py

@@ -275,13 +275,15 @@ def __init__(
                 warn(
                     "App.app_name has been renamed to distribution_name",
                     DeprecationWarning,
+                    stacklevel=2,
                 )
                 distribution_name = app_name
 
         if id is not None:
             warn(
                 "App.id is deprecated and will be ignored. Use app_id instead",
                 DeprecationWarning,
+                stacklevel=2,
             )
 
         if windows is not None:
@@ -419,7 +421,11 @@ def paths(self) -> Paths:
     @property
     def name(self) -> str:
         """**DEPRECATED** – Use :any:`formal_name`."""
-        warn("App.name is deprecated. Use formal_name instead", DeprecationWarning)
+        warn(
+            "App.name is deprecated. Use formal_name instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         return self._formal_name
 
     @property
@@ -436,7 +442,11 @@ def distribution_name(self) -> str:
     @property
     def app_name(self) -> str:
         """**DEPRECATED** – Renamed to ``distribution_name``."""
-        warn("App.app_name has been renamed to distribution_name", DeprecationWarning)
+        warn(
+            "App.app_name has been renamed to distribution_name",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         return self._distribution_name
 
     @property
@@ -471,7 +481,9 @@ def description(self) -> str | None:
     @property
     def id(self) -> str:
         """**DEPRECATED** – Use :any:`app_id`."""
-        warn("App.id is deprecated. Use app_id instead", DeprecationWarning)
+        warn(
+            "App.id is deprecated. Use app_id instead", DeprecationWarning, stacklevel=2
+        )
         return self._app_id
 
     @property

core/src/toga/command.py

@@ -177,7 +177,8 @@ def __init__(
         Commands may not use all the arguments - for example, on some platforms, menus
         will contain icons; on other platforms they won't.
 
-        :param action: A handler that will be invoked when the command is activated.
+        :param action: A handler to invoke when the command is activated. If this is
+            ``None``, the command will be disabled.
         :param text: A label for the command.
         :param shortcut: A key combination that can be used to invoke the command.
         :param tooltip: A short description of what the command will do.

docs/reference/api/resources/command.rst

@@ -68,11 +68,6 @@ a similar pattern.
 It doesn't matter what order you add commands to the app - the group, section and order
 will be used to display the commands in the right order.
 
-If a command is added to a toolbar, it will automatically be added to the app
-as well. It isn't possible to have functionality exposed on a toolbar that
-isn't also exposed by the app. So, ``cmd2`` will be added to the app, even though
-it wasn't explicitly added to the app commands.
-
 
 Reference
 ---------

examples/command/command/app.py

@@ -45,10 +45,9 @@ def startup(self):
         tiberius_icon_256 = "resources/tiberius-256"
 
         # Set up main window
-        self.main_window = toga.MainWindow(title=self.name)
+        self.main_window = toga.MainWindow(title=self.formal_name)
 
         # Add commands
-        print("adding commands")
         # Create a "Things" menu group to contain some of the commands.
         # No explicit ordering is provided on the group, so it will appear
         # after application-level menus, but *before* the Command group.
@@ -113,16 +112,18 @@ def startup(self):
         )
         cmd7 = toga.Command(
             self.action7,
-            text="TB action 7",
+            text="TB Action 7",
             tooltip="Perform toolbar action 7",
+            shortcut=toga.Key.MOD_1 + "p",
             order=30,
             icon=tiberius_icon_256,
             group=sub_menu,
+            enabled=False,
         )
 
         def action4(widget):
             print("action 4")
-            cmd3.enabled = not cmd3.enabled
+            cmd7.enabled = not cmd7.enabled
             self.textpanel.value += "action 4\n"
 
         cmd4 = toga.Command(
@@ -135,7 +136,7 @@ def action4(widget):
 
         # The order in which commands are added to the app or the toolbar won't
         # alter anything. Ordering is defined by the command definitions.
-        self.app.commands.add(cmd1, cmd0, cmd6, cmd4, cmd3)
+        self.app.commands.add(cmd1, cmd0, cmd6, cmd4, cmd3, cmd7)
         self.app.main_window.toolbar.add(cmd2, cmd5, cmd7)
 
         # Buttons
@@ -164,7 +165,6 @@ def action4(widget):
 
 
 def main():
-    print("app.main")
     return ExampleTestCommandApp("Test Command", "org.beeware.widgets.command")
 
 

winforms/src/toga_winforms/app.py

@@ -110,16 +110,27 @@ def create(self):
 
         # Call user code to populate the main window
         self.interface._startup()
-        self.create_menus()
         self._create_app_commands()
+        self.create_menus()
         self.interface.main_window._impl.set_app(self)
 
     def create_menus(self):
+        window = self.interface.main_window._impl
+        menubar = window.native.MainMenuStrip
+        if menubar:
+            menubar.Items.Clear()
+        else:
+            # The menu bar doesn't need to be positioned, because its `Dock` property
+            # defaults to `Top`.
+            menubar = WinForms.MenuStrip()
+            window.native.Controls.Add(menubar)
+            window.native.MainMenuStrip = menubar
+            menubar.SendToBack()  # In a dock, "back" means "top".
+
         self._menu_items = {}
         self._menu_groups = {}
 
         toga.Group.FILE.order = 0
-        menubar = WinForms.MenuStrip()
         submenu = None
         for cmd in self.interface.commands:
             if cmd == GROUP_BREAK:
@@ -145,11 +156,7 @@ def create_menus(self):
                 self._menu_items[item] = cmd
                 submenu.DropDownItems.Add(item)
 
-        # The menu bar doesn't need to be positioned, because its `Dock` property
-        # defaults to `Top`.
-        self.interface.main_window._impl.native.Controls.Add(menubar)
-        self.interface.main_window._impl.native.MainMenuStrip = menubar
-        self.interface.main_window._impl.resize_content()
+        window.resize_content()
 
     def _submenu(self, group, menubar):
         try:

winforms/src/toga_winforms/container.py

@@ -52,7 +52,7 @@ def apply_layout(self, layout_width, layout_height):
         )
 
     def add_content(self, widget):
-        # The default appears to be to add new controls to the back of the Z-order.
+        # The default is to add new controls to the back of the Z-order.
         self.native_content.Controls.Add(widget.native)
         widget.native.BringToFront()
 

winforms/src/toga_winforms/window.py

@@ -47,20 +47,20 @@ def create_toolbar(self):
                 # defaults to `Top`.
                 self.toolbar_native = WinForms.ToolStrip()
                 self.native.Controls.Add(self.toolbar_native)
+                self.toolbar_native.BringToFront()  # In a dock, "front" means "bottom".
 
             for cmd in self.interface.toolbar:
                 if cmd == GROUP_BREAK:
                     item = WinForms.ToolStripSeparator()
                 elif cmd == SECTION_BREAK:
                     item = WinForms.ToolStripSeparator()
                 else:
+                    item = WinForms.ToolStripMenuItem(cmd.text)
+                    if cmd.tooltip is not None:
+                        item.ToolTipText = cmd.tooltip
                     if cmd.icon is not None:
-                        native_icon = cmd.icon._impl.native
-                        item = WinForms.ToolStripMenuItem(
-                            cmd.text, native_icon.ToBitmap()
-                        )
-                    else:
-                        item = WinForms.ToolStripMenuItem(cmd.text)
+                        item.Image = cmd.icon._impl.native.ToBitmap()
+                    item.Enabled = cmd.enabled
                     item.Click += WeakrefCallable(cmd._impl.winforms_handler)
                     cmd._impl.native.append(item)
                 self.toolbar_native.Items.Add(item)