napari · DragaDoncila · Sep 13, 2023 · Jul 3, 2022 · Jul 3, 2022 · Jul 3, 2022
@@ -25,6 +25,24 @@
             enablement=LLSCK.active_layer_is_image_3d,
         ),
     ),
+    (
+        MenuId.MENUBAR_FILE,
+        SubmenuItem(
+            submenu=MenuId.FILE_OPEN_WITH_PLUGIN,
+            title=trans._('Open with Plugin'),
+            group=MenuGroup.NAVIGATION,
+            order=99,
+        ),
+    ),
+    (
+        MenuId.MENUBAR_FILE,
+        SubmenuItem(
+            submenu=MenuId.FILE_SAMPLES,
+            title=trans._('Open Sample'),
+            group=MenuGroup.NAVIGATION,
+            order=100,
+        ),
+    ),
     (
         MenuId.MENUBAR_VIEW,
         SubmenuItem(submenu=MenuId.VIEW_AXES, title=trans._('Axes')),

@@ -9,7 +9,7 @@
 from app_model.types import Action, ToggleRule
 
 from napari._app_model.actions._toggle_action import ViewerToggleAction
-from napari._app_model.constants import CommandId, MenuId
+from napari._app_model.constants import CommandId, MenuGroup, MenuId
 from napari.settings import get_settings
 
 VIEW_ACTIONS: List[Action] = []
@@ -53,7 +53,11 @@ def _get_current_tooltip_visibility():
             id=CommandId.TOGGLE_LAYER_TOOLTIPS,
             title=CommandId.TOGGLE_LAYER_TOOLTIPS.title,
             menus=[
-                {'id': MenuId.MENUBAR_VIEW, 'group': '1_render', 'order': 10}
+                {
+                    'id': MenuId.MENUBAR_VIEW,
+                    'group': MenuGroup.RENDER,
+                    'order': 10,
+                }
             ],
             callback=_tooltip_visibility_toggle,
             toggled=ToggleRule(get_current=_get_current_tooltip_visibility),

@@ -17,6 +17,25 @@
 # fmt: off
 class CommandId(str, Enum):
     """Id representing a napari command."""
+    # File menubar
+    DLG_OPEN_FILES = 'napari:window:file:open_files_dialog'
+    DLG_OPEN_FILES_AS_STACK = 'napari:window:file:open_files_as_stack_dialog'
+    DLG_OPEN_FOLDER = 'napari:window:file:open_folder_dialog'
+    DLG_OPEN_FILES_WITH_PLUGIN = 'napari:window:file:_open_files_with_plugin'
+    DLG_OPEN_FILES_AS_STACK_WITH_PLUGIN = 'napari:window:file:_open_files_as_stack_with_plugin'
+    DLG_OPEN_FOLDER_WITH_PLUGIN = 'napari:window:file:_open_folder_with_plugin'
+    DLG_SHOW_PREFERENCES = 'napari:window:file:show_preferences_dialog'
+    DLG_SAVE_LAYERS = 'napari:window:file:save_layers_dialog'
+    # `DLG_SAVE_SELECTED_LAYERS` uses the same callback as `DLG_SAVE_LAYERS`,
+    # just with different kwarg
+    DLG_SAVE_SELECTED_LAYERS = 'napari:window:file:save_layers_dialog:selected'
+    DLG_SAVE_CANVAS_SCREENSHOT = 'napari:window:file:save_canvas_screenshot_dialog'
+    DLG_SAVE_VIEWER_SCREENSHOT = 'napari:window:file:save_viewer_screenshot_dialog'
+    COPY_CANVAS_SCREENSHOT = 'napari:window:file:copy_canvas_screenshot'
+    COPY_VIEWER_SCREENSHOT = 'napari:window:file:copy_viewer_screenshot'
+    DLG_CLOSE = 'napari:window:file:close_dialog'
+    DLG_QUIT = 'napari:window:file:quit_dialog'
+    RESTART = 'napari:window:file:restart'
 
     # View menubar
     TOGGLE_FULLSCREEN = 'napari:window:view:toggle_fullscreen'
@@ -92,6 +111,24 @@ class _i(NamedTuple):
 
 
 _COMMAND_INFO = {
+    # File menubar
+    CommandId.DLG_OPEN_FILES: _i(trans._('Open File(s)...')),
+    CommandId.DLG_OPEN_FILES_AS_STACK: _i(trans._('Open Files as Stack...')),
+    CommandId.DLG_OPEN_FOLDER: _i(trans._('Open Folder...')),
+    CommandId.DLG_OPEN_FILES_WITH_PLUGIN: _i(trans._('Open File(s)...')),
+    CommandId.DLG_OPEN_FILES_AS_STACK_WITH_PLUGIN: _i(trans._('Open Files as Stack...')),
+    CommandId.DLG_OPEN_FOLDER_WITH_PLUGIN: _i(trans._('Open Folder...')),
+    CommandId.DLG_SHOW_PREFERENCES: _i(trans._('Preferences')),
+    CommandId.DLG_SAVE_LAYERS: _i(trans._('Save All Layers...')),
+    CommandId.DLG_SAVE_SELECTED_LAYERS: _i(trans._('Save Selected Layers...')),
+    CommandId.DLG_SAVE_CANVAS_SCREENSHOT: _i(trans._('Save Screenshot...')),
+    CommandId.DLG_SAVE_VIEWER_SCREENSHOT: _i(trans._('Save Screenshot with Viewer...')),
+    CommandId.COPY_CANVAS_SCREENSHOT: _i(trans._('Copy Screenshot to Clipboard')),
+    CommandId.COPY_VIEWER_SCREENSHOT: _i(trans._('Copy Screenshot with Viewer to Clipboard')),
+    CommandId.DLG_CLOSE: _i(trans._('Close Window')),
+    CommandId.DLG_QUIT: _i(trans._('Exit')),
+    CommandId.RESTART: _i(trans._('Restart')),
+
     # View menubar
     CommandId.TOGGLE_FULLSCREEN: _i(trans._('Toggle Full Screen')),
     CommandId.TOGGLE_MENUBAR: _i(trans._('Toggle Menubar Visibility')),

@@ -17,6 +17,10 @@
 class MenuId(str, Enum):
     """Id representing a menu somewhere in napari."""
 
+    MENUBAR_FILE = 'napari/file'
+    FILE_OPEN_WITH_PLUGIN = 'napari/file/open_with_plugin'
+    FILE_SAMPLES = 'napari/file/samples'
+
     MENUBAR_VIEW = 'napari/view'
     VIEW_AXES = 'napari/view/axes'
     VIEW_SCALEBAR = 'napari/view/scalebar'
@@ -35,6 +39,9 @@ def __str__(self) -> str:
 class MenuGroup:
     NAVIGATION = 'navigation'  # always the first group in any menu
     RENDER = '1_render'
+    PREFERENCES = '2_preferences'
+    SAVE = '3_save'
+    CLOSE = '4_close'
 
     class LAYERLIST_CONTEXT:
         CONVERSION = '1_conversion'

@@ -1,28 +1,65 @@
-from unittest.mock import MagicMock
-
+import numpy as np
 import pytest
+from app_model.types import Action
 
-from napari import viewer
-from napari._app_model import constants, get_app
+from napari._app_model import get_app
+from napari._app_model.constants import MenuId
+from napari._app_model.context import LayerListContextKeys as LLCK
 from napari._qt._qapp_model import build_qmodel_menu
-from napari._qt._qapp_model.qactions import init_qactions
-from napari._qt.qt_main_window import Window
+from napari.layers import Image
 
 
-@pytest.mark.parametrize('menu_id', list(constants.MenuId))
-def test_build_qmodel_menu(qtbot, menu_id):
-    """Test that we can build qmenus for all registered menu IDs"""
+# `builtins` required so there are samples registered, so samples menu exists
+@pytest.mark.parametrize('menu_id', list(MenuId))
+def test_build_qmodel_menu(builtins, make_napari_viewer, qtbot, menu_id):
+    """Test that we can build qmenus for all registered menu IDs."""
     app = get_app()
 
-    mock = MagicMock()
-    with app.injection_store.register(
-        providers={viewer.Viewer: lambda: mock, Window: lambda: mock}
-    ):
-        init_qactions.cache_clear()
-        init_qactions()
+    # Configures `app`, registers actions and initializes plugins
+    make_napari_viewer()
+
+    menu = build_qmodel_menu(menu_id)
+    qtbot.addWidget(menu)
+
+    # `>=` because separator bars count as actions
+    assert len(menu.actions()) >= len(app.menus.get_menu(menu_id))
+
+
+def test_update_menu_state_context(make_napari_viewer):
+    """Test `_update_menu_state` correctly updates enabled/visible state."""
+    app = get_app()
+    viewer = make_napari_viewer()
+
+    action = Action(
+        id='dummy_id',
+        title='dummy title',
+        callback=lambda: None,
+        menus=[{'id': MenuId.MENUBAR_FILE, 'when': (LLCK.num_layers > 0)}],
+        enablement=(LLCK.num_layers == 2),
+    )
+    app.register_action(action)
+
+    dummy_action = viewer.window.file_menu.findAction('dummy_id')
+
+    assert 'dummy_id' in app.commands
+    assert len(viewer.layers) == 0
+    # `dummy_action` should be disabled & not visible as num layers == 0
+    viewer.window._update_menu_state('file_menu')
+    assert not dummy_action.isVisible()
+    assert not dummy_action.isEnabled()
 
-        menu = build_qmodel_menu(menu_id)
-        qtbot.addWidget(menu)
+    layer_a = Image(np.random.random((10, 10)))
+    viewer.layers.append(layer_a)
+    assert len(viewer.layers) == 1
+    viewer.window._update_menu_state('file_menu')
+    # `dummy_action` should be visible but not enabled after adding layer
+    assert dummy_action.isVisible()
+    assert not dummy_action.isEnabled()
 
-        # `>=` because separator bars count as actions
-        assert len(menu.actions()) >= len(app.menus.get_menu(menu_id))
+    layer_b = Image(np.random.random((10, 10)))
+    viewer.layers.append(layer_b)
+    assert len(viewer.layers) == 2
+    # `dummy_action` should be enabled and visible after adding second layer
+    viewer.window._update_menu_state('file_menu')
+    assert dummy_action.isVisible()
+    assert dummy_action.isEnabled()
@@ -23,6 +23,7 @@ def init_qactions() -> None:
     """
 
     from napari._app_model import get_app
+    from napari._qt._qapp_model.qactions._file import Q_FILE_ACTIONS
     from napari._qt._qapp_model.qactions._help import Q_HELP_ACTIONS
     from napari._qt._qapp_model.qactions._view import Q_VIEW_ACTIONS
     from napari._qt.qt_main_window import Window, _QtMainWindow
@@ -51,5 +52,4 @@ def _provide_qt_viewer() -> Optional[QtViewer]:
         return None
 
     # register actions
-    for action in chain(Q_VIEW_ACTIONS, Q_HELP_ACTIONS):
-        app.register_action(action)
+    app.register_actions(chain(Q_FILE_ACTIONS, Q_HELP_ACTIONS, Q_VIEW_ACTIONS))