Skip to content

Commit

Permalink
Changed icons
Browse files Browse the repository at this point in the history
Changed icons as per request, renamed the file references and files to be based around 'zoom' rather than 'magifying' as that has extra connotations.
  • Loading branch information
Tiomat85 committed Jun 20, 2024
1 parent 8058d57 commit b7c3cd3
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 2 deletions.
15 changes: 15 additions & 0 deletions artwork/zoom_in.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions artwork/zoom_out.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions nion/swift/DocumentController.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file added nion/swift/resources/zoom_in.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nion/swift/resources/zoom_out.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions nion/swift/test/ImageCanvasItem_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b7c3cd3

Please sign in to comment.