From 90d404c354722ad91e7ca42ffc23efb8b3e23adf Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:32:11 -0600 Subject: [PATCH 1/3] change naming from pan/zoom to move camera --- napari/_qt/layer_controls/qt_image_controls.py | 4 ++-- napari/_qt/layer_controls/qt_image_controls_base.py | 4 ++-- napari/_qt/layer_controls/qt_layer_controls_base.py | 8 +++++--- napari/_qt/layer_controls/qt_points_controls.py | 2 +- napari/_qt/layer_controls/qt_shapes_controls.py | 2 +- napari/_qt/layer_controls/qt_surface_controls.py | 2 +- napari/_qt/layer_controls/qt_tracks_controls.py | 2 +- napari/_qt/layer_controls/qt_vectors_controls.py | 2 +- napari/components/_viewer_key_bindings.py | 2 +- napari/layers/base/base.py | 2 +- napari/layers/image/_image_key_bindings.py | 2 +- napari/layers/labels/_labels_key_bindings.py | 2 +- napari/layers/points/_points_key_bindings.py | 2 +- napari/layers/shapes/_shapes_key_bindings.py | 2 +- napari/layers/surface/_surface_key_bindings.py | 2 +- napari/layers/tracks/_tracks_key_bindings.py | 2 +- napari/layers/vectors/_vectors_key_bindings.py | 2 +- 17 files changed, 23 insertions(+), 21 deletions(-) diff --git a/napari/_qt/layer_controls/qt_image_controls.py b/napari/_qt/layer_controls/qt_image_controls.py index d13ac272e8a..776ba7a2da1 100644 --- a/napari/_qt/layer_controls/qt_image_controls.py +++ b/napari/_qt/layer_controls/qt_image_controls.py @@ -49,9 +49,9 @@ class QtImageControls(QtBaseImageControls): button_grid : qtpy.QtWidgets.QGridLayout GridLayout for the layer mode buttons panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to pan/zoom shapes layer. + Button to activate move camera mode. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to transform shapes layer. + Button to transform layer. attenuationSlider : qtpy.QtWidgets.QSlider Slider controlling attenuation rate for `attenuated_mip` mode. attenuationLabel : qtpy.QtWidgets.QLabel diff --git a/napari/_qt/layer_controls/qt_image_controls_base.py b/napari/_qt/layer_controls/qt_image_controls_base.py index 38bd6d101c8..509e112ce15 100644 --- a/napari/_qt/layer_controls/qt_image_controls_base.py +++ b/napari/_qt/layer_controls/qt_image_controls_base.py @@ -70,9 +70,9 @@ class QtBaseImageControls(QtLayerControls): button_grid : qtpy.QtWidgets.QGridLayout GridLayout for the layer mode buttons panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to pan/zoom shapes layer. + Button to activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to transform shapes layer. + Button to transform image layer. clim_popup : napari._qt.qt_range_slider_popup.QRangeSliderPopup Popup widget launching the contrast range slider. colorbarLabel : qtpy.QtWidgets.QLabel diff --git a/napari/_qt/layer_controls/qt_layer_controls_base.py b/napari/_qt/layer_controls/qt_layer_controls_base.py index e3f2a053f9f..15fd4ef1b12 100644 --- a/napari/_qt/layer_controls/qt_layer_controls_base.py +++ b/napari/_qt/layer_controls/qt_layer_controls_base.py @@ -62,9 +62,9 @@ class QtLayerControls(QFrame): button_grid : qtpy.QtWidgets.QGridLayout GridLayout for the layer mode buttons panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to pan/zoom shapes layer. + Button to activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to transform shapes layer. + Button to transform layer. blendComboBox : qtpy.QtWidgets.QComboBox Dropdown widget to select blending mode of layer. layer : napari.layers.Layer @@ -106,7 +106,9 @@ def __init__(self, layer: Layer) -> None: self.MODE.PAN_ZOOM, False, self.PAN_ZOOM_ACTION_NAME, - extra_tooltip_text=trans._('(or hold Space)'), + extra_tooltip_text=trans._( + '\n(or hold Space [2D]\nor Shift+Space [3D])' + ), checked=True, ) self.transform_button = self._radio_button( diff --git a/napari/_qt/layer_controls/qt_points_controls.py b/napari/_qt/layer_controls/qt_points_controls.py index eacdd8acf52..b1828fb4067 100644 --- a/napari/_qt/layer_controls/qt_points_controls.py +++ b/napari/_qt/layer_controls/qt_points_controls.py @@ -57,7 +57,7 @@ class QtPointsControls(QtLayerControls): outOfSliceCheckBox : qtpy.QtWidgets.QCheckBox Checkbox to indicate whether to render out of slice. panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button for pan/zoom mode. + Button to activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton Button to select transform mode. select_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton diff --git a/napari/_qt/layer_controls/qt_shapes_controls.py b/napari/_qt/layer_controls/qt_shapes_controls.py index 974597cdb25..ca66cd13f2a 100644 --- a/napari/_qt/layer_controls/qt_shapes_controls.py +++ b/napari/_qt/layer_controls/qt_shapes_controls.py @@ -62,7 +62,7 @@ class QtShapesControls(QtLayerControls): move_front_button : qtpy.QtWidgets.QtModePushButton Button to move shape(s) to the front. panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to pan/zoom shapes layer. + Button to activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton Button to transform shapes layer. path_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton diff --git a/napari/_qt/layer_controls/qt_surface_controls.py b/napari/_qt/layer_controls/qt_surface_controls.py index 279d831c6b5..22defd6e2d1 100644 --- a/napari/_qt/layer_controls/qt_surface_controls.py +++ b/napari/_qt/layer_controls/qt_surface_controls.py @@ -35,7 +35,7 @@ class QtSurfaceControls(QtBaseImageControls): button_grid : qtpy.QtWidgets.QGridLayout GridLayout for the layer mode buttons panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button to pan/zoom shapes layer. + Button to activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton Button to transform shapes layer. diff --git a/napari/_qt/layer_controls/qt_tracks_controls.py b/napari/_qt/layer_controls/qt_tracks_controls.py index fcb8b1701fd..efd79a33cc1 100644 --- a/napari/_qt/layer_controls/qt_tracks_controls.py +++ b/napari/_qt/layer_controls/qt_tracks_controls.py @@ -32,7 +32,7 @@ class QtTracksControls(QtLayerControls): button_group : qtpy.QtWidgets.QButtonGroup Button group of points layer modes (ADD, PAN_ZOOM, SELECT). panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button for pan/zoom mode. + Button for activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton Button to select transform mode. diff --git a/napari/_qt/layer_controls/qt_vectors_controls.py b/napari/_qt/layer_controls/qt_vectors_controls.py index 83430ee7e0a..b08dec24d4b 100644 --- a/napari/_qt/layer_controls/qt_vectors_controls.py +++ b/napari/_qt/layer_controls/qt_vectors_controls.py @@ -42,7 +42,7 @@ class QtVectorsControls(QtLayerControls): button_group : qtpy.QtWidgets.QButtonGroup Button group of points layer modes (ADD, PAN_ZOOM, SELECT). panzoom_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton - Button for pan/zoom mode. + Button for activate move camera mode for layer. transform_button : napari._qt.widgets.qt_mode_button.QtModeRadioButton Button to select transform mode. edge_color_label : qtpy.QtWidgets.QLabel diff --git a/napari/components/_viewer_key_bindings.py b/napari/components/_viewer_key_bindings.py index 62ef0efb398..9ea513a2130 100644 --- a/napari/components/_viewer_key_bindings.py +++ b/napari/components/_viewer_key_bindings.py @@ -218,7 +218,7 @@ def toggle_console_visibility(viewer: Viewer): viewer.window._qt_viewer.toggle_console_visibility() -@register_viewer_action(trans._('Press and hold for pan/zoom mode')) +@register_viewer_action(trans._('Press and hold for move camera mode')) def hold_for_pan_zoom(viewer: ViewerModel): selected_layer = viewer.layers.selection.active if selected_layer is None: diff --git a/napari/layers/base/base.py b/napari/layers/base/base.py index 16cc5f674e7..a8945d5767b 100644 --- a/napari/layers/base/base.py +++ b/napari/layers/base/base.py @@ -578,7 +578,7 @@ def _mode_setter_helper(self, mode_in: Union[Mode, str]) -> StringEnum: if mode == TRANSFORM: self.help = trans._( - 'hold to pan/zoom, hold to preserve aspect ratio and rotate in 45° increments' + 'hold to move camera, hold to preserve aspect ratio and rotate in 45° increments' ) elif mode == PAN_ZOOM: self.help = '' diff --git a/napari/layers/image/_image_key_bindings.py b/napari/layers/image/_image_key_bindings.py index 2deec98516e..d24d429a633 100644 --- a/napari/layers/image/_image_key_bindings.py +++ b/napari/layers/image/_image_key_bindings.py @@ -102,7 +102,7 @@ def activate_image_transform_mode(layer: Image) -> None: layer.mode = str(Mode.TRANSFORM) -@register_image_mode_action(trans._('Pan/zoom')) +@register_image_mode_action(trans._('Move camera')) def activate_image_pan_zoom_mode(layer: Image) -> None: layer.mode = str(Mode.PAN_ZOOM) diff --git a/napari/layers/labels/_labels_key_bindings.py b/napari/layers/labels/_labels_key_bindings.py index 608f0eeacc0..ab042d52ca8 100644 --- a/napari/layers/labels/_labels_key_bindings.py +++ b/napari/layers/labels/_labels_key_bindings.py @@ -28,7 +28,7 @@ def activate_labels_transform_mode(layer: Labels): layer.mode = Mode.TRANSFORM -@register_label_mode_action(trans._('Pan/zoom')) +@register_label_mode_action(trans._('Move camera')) def activate_labels_pan_zoom_mode(layer: Labels): layer.mode = Mode.PAN_ZOOM diff --git a/napari/layers/points/_points_key_bindings.py b/napari/layers/points/_points_key_bindings.py index 62a98727fae..a0c7478138d 100644 --- a/napari/layers/points/_points_key_bindings.py +++ b/napari/layers/points/_points_key_bindings.py @@ -31,7 +31,7 @@ def activate_points_transform_mode(layer: Points) -> None: layer.mode = Mode.TRANSFORM -@register_points_mode_action(trans._('Pan/zoom')) +@register_points_mode_action(trans._('Move camera')) def activate_points_pan_zoom_mode(layer: Points) -> None: layer.mode = Mode.PAN_ZOOM diff --git a/napari/layers/shapes/_shapes_key_bindings.py b/napari/layers/shapes/_shapes_key_bindings.py index 88ded26ef33..06e02a7a488 100644 --- a/napari/layers/shapes/_shapes_key_bindings.py +++ b/napari/layers/shapes/_shapes_key_bindings.py @@ -57,7 +57,7 @@ def activate_shapes_transform_mode(layer: Shapes) -> None: layer.mode = Mode.TRANSFORM -@register_shapes_mode_action(trans._('Pan/zoom')) +@register_shapes_mode_action(trans._('Move camera')) def activate_shapes_pan_zoom_mode(layer: Shapes) -> None: layer.mode = Mode.PAN_ZOOM diff --git a/napari/layers/surface/_surface_key_bindings.py b/napari/layers/surface/_surface_key_bindings.py index fe79da61f22..2fe7d7c58cd 100644 --- a/napari/layers/surface/_surface_key_bindings.py +++ b/napari/layers/surface/_surface_key_bindings.py @@ -26,7 +26,7 @@ def activate_surface_transform_mode(layer: Surface) -> None: layer.mode = str(Mode.TRANSFORM) -@register_surface_mode_action(trans._('Pan/zoom')) +@register_surface_mode_action(trans._('Move camera')) def activate_surface_pan_zoom_mode(layer: Surface) -> None: layer.mode = str(Mode.PAN_ZOOM) diff --git a/napari/layers/tracks/_tracks_key_bindings.py b/napari/layers/tracks/_tracks_key_bindings.py index 7c971b46a63..5cad1b658d2 100644 --- a/napari/layers/tracks/_tracks_key_bindings.py +++ b/napari/layers/tracks/_tracks_key_bindings.py @@ -26,7 +26,7 @@ def activate_tracks_transform_mode(layer: Tracks) -> None: layer.mode = str(Mode.TRANSFORM) -@register_tracks_mode_action(trans._('Pan/zoom')) +@register_tracks_mode_action(trans._('Move camera')) def activate_tracks_pan_zoom_mode(layer: Tracks) -> None: layer.mode = str(Mode.PAN_ZOOM) diff --git a/napari/layers/vectors/_vectors_key_bindings.py b/napari/layers/vectors/_vectors_key_bindings.py index 9971b0edc05..30b22ecde76 100644 --- a/napari/layers/vectors/_vectors_key_bindings.py +++ b/napari/layers/vectors/_vectors_key_bindings.py @@ -26,7 +26,7 @@ def activate_vectors_transform_mode(layer: Vectors) -> None: layer.mode = str(Mode.TRANSFORM) -@register_vectors_mode_action(trans._('Pan/zoom')) +@register_vectors_mode_action(trans._('Move camera')) def activate_vectors_pan_zoom_mode(layer: Vectors) -> None: layer.mode = str(Mode.PAN_ZOOM) From 62f5dafd379c70071b59e0dc34fea6828b2df5bf Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:51:38 -0600 Subject: [PATCH 2/3] update temp mode tooltip --- napari/_qt/layer_controls/qt_layer_controls_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/napari/_qt/layer_controls/qt_layer_controls_base.py b/napari/_qt/layer_controls/qt_layer_controls_base.py index 15fd4ef1b12..2103a337b86 100644 --- a/napari/_qt/layer_controls/qt_layer_controls_base.py +++ b/napari/_qt/layer_controls/qt_layer_controls_base.py @@ -107,7 +107,7 @@ def __init__(self, layer: Layer) -> None: False, self.PAN_ZOOM_ACTION_NAME, extra_tooltip_text=trans._( - '\n(or hold Space [2D]\nor Shift+Space [3D])' + '\n(or hold Space\n[+Shift to pan in 3D])' ), checked=True, ) From 1df16dcf439ae6189fd7365f0510b8abe3c14682 Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 30 Jan 2025 21:43:58 -0600 Subject: [PATCH 3/3] update tooltip after @psobolewskiPhD suggestion --- napari/_qt/layer_controls/qt_layer_controls_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/napari/_qt/layer_controls/qt_layer_controls_base.py b/napari/_qt/layer_controls/qt_layer_controls_base.py index 2103a337b86..d536c516ad9 100644 --- a/napari/_qt/layer_controls/qt_layer_controls_base.py +++ b/napari/_qt/layer_controls/qt_layer_controls_base.py @@ -107,7 +107,7 @@ def __init__(self, layer: Layer) -> None: False, self.PAN_ZOOM_ACTION_NAME, extra_tooltip_text=trans._( - '\n(or hold Space\n[+Shift to pan in 3D])' + '\n(or hold Space)\n(hold Shift to pan in 3D)' ), checked=True, )