From 0a1c5275a76a04bff4d2f132095fa3d007606a3e Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 16 Sep 2024 10:53:31 -0300 Subject: [PATCH] We have to list commands in Keyboard Shortcuts regardless of context Removed KeyContext param from Command::isListed(). --- src/app/commands/cmd_flip.h | 2 +- src/app/commands/cmd_goto_frame.cpp | 6 ------ src/app/commands/cmd_launch.cpp | 4 ++-- src/app/commands/cmd_layer_properties.cpp | 3 --- src/app/commands/cmd_modify_selection.cpp | 4 +--- src/app/commands/cmd_open_browser.cpp | 4 +--- src/app/commands/cmd_run_script.cpp | 5 +---- src/app/commands/cmd_select_palette.cpp | 5 +---- src/app/commands/cmd_set_loop_section.cpp | 3 --- src/app/commands/cmd_set_palette_entry_size.cpp | 5 +---- src/app/commands/cmd_tiled_mode.cpp | 5 +---- src/app/commands/command.h | 11 ++++------- src/app/commands/screenshot.cpp | 4 +--- src/app/commands/set_playback_speed.cpp | 5 +---- src/app/commands/tileset_mode.cpp | 4 +--- src/app/ui/keyboard_shortcuts.cpp | 2 +- 16 files changed, 17 insertions(+), 55 deletions(-) diff --git a/src/app/commands/cmd_flip.h b/src/app/commands/cmd_flip.h index 710f9f02f..e52be639d 100644 --- a/src/app/commands/cmd_flip.h +++ b/src/app/commands/cmd_flip.h @@ -26,7 +26,7 @@ namespace app { bool onEnabled(Context* context) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override { + bool isListed(const Params& params) const override { return !params.empty(); } diff --git a/src/app/commands/cmd_goto_frame.cpp b/src/app/commands/cmd_goto_frame.cpp index e7e4a8a1a..cd57e506c 100644 --- a/src/app/commands/cmd_goto_frame.cpp +++ b/src/app/commands/cmd_goto_frame.cpp @@ -87,9 +87,6 @@ protected: return (frame > 0 ? frame-1: last); } - bool isListed(const Params& params, const KeyContext& context) const override { - return context == KeyContext::Normal; - } }; class GotoNextFrameCommand : public GotoCommand { @@ -103,9 +100,6 @@ protected: return (frame < last ? frame+1: 0); } - bool isListed(const Params& params, const KeyContext& context) const override { - return context == KeyContext::Normal; - } }; class GotoNextFrameWithSameTagCommand : public GotoCommand { diff --git a/src/app/commands/cmd_launch.cpp b/src/app/commands/cmd_launch.cpp index 3217ef815..42815b70d 100644 --- a/src/app/commands/cmd_launch.cpp +++ b/src/app/commands/cmd_launch.cpp @@ -25,8 +25,8 @@ protected: void onLoadParams(const Params& params) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override { - return params.get("path") != ""; + bool isListed(const Params& params) const override { + return !params.get("path").empty(); } private: diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp index 20a43485d..631e0f01e 100644 --- a/src/app/commands/cmd_layer_properties.cpp +++ b/src/app/commands/cmd_layer_properties.cpp @@ -56,9 +56,6 @@ public: protected: bool onEnabled(Context* context) override; void onExecute(Context* context) override; - bool isListed(const Params& params, const KeyContext& context) const override { - return context == KeyContext::Normal; - } }; class LayerPropertiesWindow; diff --git a/src/app/commands/cmd_modify_selection.cpp b/src/app/commands/cmd_modify_selection.cpp index ec94a4e92..3467222af 100644 --- a/src/app/commands/cmd_modify_selection.cpp +++ b/src/app/commands/cmd_modify_selection.cpp @@ -45,9 +45,7 @@ protected: bool onEnabled(Context* context) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: std::string getActionName() const; diff --git a/src/app/commands/cmd_open_browser.cpp b/src/app/commands/cmd_open_browser.cpp index 5e5bc4d74..1ec904440 100644 --- a/src/app/commands/cmd_open_browser.cpp +++ b/src/app/commands/cmd_open_browser.cpp @@ -25,9 +25,7 @@ protected: void onLoadParams(const Params& params) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: std::string m_filename; diff --git a/src/app/commands/cmd_run_script.cpp b/src/app/commands/cmd_run_script.cpp index ce21620f6..a16f0c750 100644 --- a/src/app/commands/cmd_run_script.cpp +++ b/src/app/commands/cmd_run_script.cpp @@ -39,10 +39,7 @@ protected: void onLoadParams(const Params& params) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override - { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: std::string m_filename; diff --git a/src/app/commands/cmd_select_palette.cpp b/src/app/commands/cmd_select_palette.cpp index 398dc6db4..2f3a1e2a3 100644 --- a/src/app/commands/cmd_select_palette.cpp +++ b/src/app/commands/cmd_select_palette.cpp @@ -45,10 +45,7 @@ protected: void onLoadParams(const Params& params) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override - { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: void selectTiles(const Layer* layer, diff --git a/src/app/commands/cmd_set_loop_section.cpp b/src/app/commands/cmd_set_loop_section.cpp index 5d84fced7..5baa325d8 100644 --- a/src/app/commands/cmd_set_loop_section.cpp +++ b/src/app/commands/cmd_set_loop_section.cpp @@ -34,9 +34,6 @@ protected: void onLoadParams(const Params& params) override; bool onEnabled(Context* context) override; void onExecute(Context* context) override; - bool isListed(const Params& params, const KeyContext& context) const override { - return context == KeyContext::FramesSelection; - } Action m_action; doc::frame_t m_begin, m_end; diff --git a/src/app/commands/cmd_set_palette_entry_size.cpp b/src/app/commands/cmd_set_palette_entry_size.cpp index 2d18865f2..0979d53d2 100644 --- a/src/app/commands/cmd_set_palette_entry_size.cpp +++ b/src/app/commands/cmd_set_palette_entry_size.cpp @@ -25,10 +25,7 @@ protected: bool onChecked(Context* context) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override - { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: int m_size; diff --git a/src/app/commands/cmd_tiled_mode.cpp b/src/app/commands/cmd_tiled_mode.cpp index 96dd856d0..c34372162 100644 --- a/src/app/commands/cmd_tiled_mode.cpp +++ b/src/app/commands/cmd_tiled_mode.cpp @@ -29,10 +29,7 @@ protected: bool onChecked(Context* context) override; void onExecute(Context* context) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override - { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } filters::TiledMode m_mode; }; diff --git a/src/app/commands/command.h b/src/app/commands/command.h index 180df6d95..54750ef92 100644 --- a/src/app/commands/command.h +++ b/src/app/commands/command.h @@ -37,13 +37,10 @@ namespace app { void loadParams(const Params& params); bool isEnabled(Context* context); bool isChecked(Context* context); - // Not all Commands must be listed on KeyBoard Shortcut list, so - // this function returns if a key command should be listed or not. - // Used on 'cmd_keyboard_shorcuts.cpp'. - virtual bool isListed(const Params& params, const KeyContext& context) const - { - return true; - } + + // Returns true if the command must be displayed in the Keyboard + // Shortcuts list. + virtual bool isListed(const Params& params) const { return true; } protected: virtual bool onNeedsParams() const; diff --git a/src/app/commands/screenshot.cpp b/src/app/commands/screenshot.cpp index ff143501e..7cb64ea78 100644 --- a/src/app/commands/screenshot.cpp +++ b/src/app/commands/screenshot.cpp @@ -54,9 +54,7 @@ public: protected: void onExecute(Context* ctx) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } }; ScreenshotCommand::ScreenshotCommand() diff --git a/src/app/commands/set_playback_speed.cpp b/src/app/commands/set_playback_speed.cpp index e112bc1f0..1eb1c1049 100644 --- a/src/app/commands/set_playback_speed.cpp +++ b/src/app/commands/set_playback_speed.cpp @@ -26,10 +26,7 @@ protected: bool onChecked(Context* ctx) override; void onExecute(Context* ctx) override; std::string onGetFriendlyName() const override; - bool isListed(const Params& params, const KeyContext& context) const override - { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } }; SetPlaybackSpeedCommand::SetPlaybackSpeedCommand() diff --git a/src/app/commands/tileset_mode.cpp b/src/app/commands/tileset_mode.cpp index 1b383ba6f..c86b8d51e 100644 --- a/src/app/commands/tileset_mode.cpp +++ b/src/app/commands/tileset_mode.cpp @@ -54,9 +54,7 @@ protected: return Strings::commands_TilesetMode(mode); } - bool isListed(const Params& params, const KeyContext& context) const override { - return !params.empty(); - } + bool isListed(const Params& params) const override { return !params.empty(); } private: TilesetMode m_mode; diff --git a/src/app/ui/keyboard_shortcuts.cpp b/src/app/ui/keyboard_shortcuts.cpp index f80fa95ef..2c04a851a 100644 --- a/src/app/ui/keyboard_shortcuts.cpp +++ b/src/app/ui/keyboard_shortcuts.cpp @@ -496,7 +496,7 @@ bool Key::isLooselyPressed() const bool Key::isListed() const { - return type() != KeyType::Command || !command()->isListed(params(), keycontext()); + return type() != KeyType::Command || !command()->isListed(params()); } bool Key::hasAccel(const ui::Accelerator& accel) const