diff --git a/artwork/zoom_in.svg b/artwork/zoom_in.svg new file mode 100644 index 000000000..f0c524e85 --- /dev/null +++ b/artwork/zoom_in.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/artwork/zoom_out.svg b/artwork/zoom_out.svg new file mode 100644 index 000000000..07ebf5389 --- /dev/null +++ b/artwork/zoom_out.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/nion/swift/DocumentController.py b/nion/swift/DocumentController.py index b90cdee82..e8b8a6239 100755 --- a/nion/swift/DocumentController.py +++ b/nion/swift/DocumentController.py @@ -3292,8 +3292,8 @@ def execute(self, context: Window.ActionContext) -> Window.ActionResult: Window.register_action(SetToolModeAction("wedge", _("Wedge"), "wedge_icon.png", _("Wedge tool for creating wedge masks"))) Window.register_action(SetToolModeAction("ring", _("Ring"), "annular_ring.png", _("Ring tool for creating ring masks"))) Window.register_action(SetToolModeAction("lattice", _("Lattice"), "lattice_icon.png", _("Lattice tool for creating periodic lattice masks"))) -Window.register_action(SetToolModeAction("zoom-in", _("Zoom In"), "mag_glass_in.png", _("Zoom in on image"))) -Window.register_action(SetToolModeAction("zoom-out", _("Zoom Out"), "mag_glass_out.png", _("Zoom out on image"))) +Window.register_action(SetToolModeAction("zoom-in", _("Zoom In"), "zoom_in.png", _("Zoom in on image"))) +Window.register_action(SetToolModeAction("zoom-out", _("Zoom Out"), "zoom_out.png", _("Zoom out on image"))) class WorkspaceChangeSplits(Window.Action): # this is for internal testing only. since it requires passing the splitter and splits, diff --git a/nion/swift/resources/zoom_in.png b/nion/swift/resources/zoom_in.png new file mode 100644 index 000000000..1b98066c7 Binary files /dev/null and b/nion/swift/resources/zoom_in.png differ diff --git a/nion/swift/resources/zoom_out.png b/nion/swift/resources/zoom_out.png new file mode 100644 index 000000000..7337e4299 Binary files /dev/null and b/nion/swift/resources/zoom_out.png differ diff --git a/nion/swift/test/ImageCanvasItem_test.py b/nion/swift/test/ImageCanvasItem_test.py index 855e98ced..5f5579fbb 100644 --- a/nion/swift/test/ImageCanvasItem_test.py +++ b/nion/swift/test/ImageCanvasItem_test.py @@ -307,9 +307,11 @@ def test_zoom_tool_on_one_image_of_multiple_displays(self): # run test document_controller.tool_mode = "zoom-in" display_panel.display_canvas_item.simulate_press((100, 125)) + display_panel.display_canvas_item.simulate_release((100, 125)) document_controller.tool_mode = "zoom-out" display_panel.display_canvas_item.simulate_press((125, 100)) + display_panel.display_canvas_item.simulate_release((125, 100)) if __name__ == '__main__': logging.getLogger().setLevel(logging.DEBUG)