diff options
author | Marcus Nilsson <brainbomb@gmail.com> | 2022-01-03 11:19:05 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-01-06 21:25:02 +0100 |
commit | cecbed467bf2f365c6c48eaea89f35a57e671b4b (patch) | |
tree | 0528de7b6d44f3bd332e2cffca9e0137e273e4b1 /Userland/Applications | |
parent | 56bec4968c958e86be4d7c00c38a1283f950c6c1 (diff) | |
download | serenity-cecbed467bf2f365c6c48eaea89f35a57e671b4b.zip |
LibGUI: Move rotate cw/ccw to CommonActions
The rotate clockwise/rotate counterclockwise actions can be added to
CommonActions since they are repeated in FontEditor, ImageViewer and
PixelPaint. This keeps the shortcuts and icons consistent across
applications.
Diffstat (limited to 'Userland/Applications')
-rw-r--r-- | Userland/Applications/FontEditor/FontEditor.cpp | 4 | ||||
-rw-r--r-- | Userland/Applications/ImageViewer/main.cpp | 22 | ||||
-rw-r--r-- | Userland/Applications/PixelPaint/MainWidget.cpp | 10 |
3 files changed, 18 insertions, 18 deletions
diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp index 03bcd8b6e9..4a0cb13071 100644 --- a/Userland/Applications/FontEditor/FontEditor.cpp +++ b/Userland/Applications/FontEditor/FontEditor.cpp @@ -335,11 +335,11 @@ FontEditorWidget::FontEditorWidget() glyph_mode_toolbar.add_action(*m_paint_glyph_action); glyph_mode_toolbar.add_action(*m_move_glyph_action); - m_rotate_counterclockwise_action = GUI::Action::create("Rotate Counterclockwise", { Mod_Ctrl | Mod_Shift, Key_Z }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-rotate-ccw.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { + m_rotate_counterclockwise_action = GUI::CommonActions::make_rotate_counterclockwise_action([&](auto&) { m_glyph_editor_widget->rotate_90(GlyphEditorWidget::Counterclockwise); }); - m_rotate_clockwise_action = GUI::Action::create("Rotate Clockwise", { Mod_Ctrl | Mod_Shift, Key_X }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-rotate-cw.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { + m_rotate_clockwise_action = GUI::CommonActions::make_rotate_clockwise_action([&](auto&) { m_glyph_editor_widget->rotate_90(GlyphEditorWidget::Clockwise); }); diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp index f77107f7c6..f1c44cbb8b 100644 --- a/Userland/Applications/ImageViewer/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -149,15 +149,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) app->quit(); }); - auto rotate_left_action = GUI::Action::create("Rotate &Left", { Mod_None, Key_L }, - [&](auto&) { - widget->rotate(Gfx::RotationDirection::CounterClockwise); - }); + auto rotate_counterclockwise_action = GUI::CommonActions::make_rotate_counterclockwise_action([&](auto&) { + widget->rotate(Gfx::RotationDirection::CounterClockwise); + }); - auto rotate_right_action = GUI::Action::create("Rotate &Right", { Mod_None, Key_R }, - [&](auto&) { - widget->rotate(Gfx::RotationDirection::Clockwise); - }); + auto rotate_clockwise_action = GUI::CommonActions::make_rotate_clockwise_action([&](auto&) { + widget->rotate(Gfx::RotationDirection::Clockwise); + }); auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, [&](auto&) { @@ -247,8 +245,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) bool should_enable_forward_actions = (widget->is_next_available() && should_enable_image_actions); bool should_enable_backward_actions = (widget->is_previous_available() && should_enable_image_actions); delete_action->set_enabled(should_enable_image_actions); - rotate_left_action->set_enabled(should_enable_image_actions); - rotate_right_action->set_enabled(should_enable_image_actions); + rotate_counterclockwise_action->set_enabled(should_enable_image_actions); + rotate_clockwise_action->set_enabled(should_enable_image_actions); vertical_flip_action->set_enabled(should_enable_image_actions); horizontal_flip_action->set_enabled(should_enable_image_actions); desktop_wallpaper_action->set_enabled(should_enable_image_actions); @@ -285,8 +283,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(file_menu->try_add_action(quit_action)); auto image_menu = TRY(window->try_add_menu("&Image")); - TRY(image_menu->try_add_action(rotate_left_action)); - TRY(image_menu->try_add_action(rotate_right_action)); + TRY(image_menu->try_add_action(rotate_counterclockwise_action)); + TRY(image_menu->try_add_action(rotate_clockwise_action)); TRY(image_menu->try_add_action(vertical_flip_action)); TRY(image_menu->try_add_action(horizontal_flip_action)); TRY(image_menu->try_add_separator()); diff --git a/Userland/Applications/PixelPaint/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index b43f283c6d..144d0deb20 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -455,15 +455,17 @@ void MainWidget::initialize_menubar(GUI::Window& window) editor->image().flip(Gfx::Orientation::Horizontal); })); image_menu.add_separator(); - image_menu.add_action(GUI::Action::create( - "Rotate &Left", [&](auto&) { + + image_menu.add_action(GUI::CommonActions::make_rotate_counterclockwise_action( + [&](auto&) { auto* editor = current_image_editor(); if (!editor) return; editor->image().rotate(Gfx::RotationDirection::CounterClockwise); })); - image_menu.add_action(GUI::Action::create( - "Rotate &Right", [&](auto&) { + + image_menu.add_action(GUI::CommonActions::make_rotate_clockwise_action( + [&](auto&) { auto* editor = current_image_editor(); if (!editor) return; |