Fix duplicate shortcut key configuration items in Keyboard shortcuts …

…Window (fix aseprite#4387) Introduced Key::isSkipListing() and Command::isSkipListing() to skip keyItem creation on Keyboard shortcut List Box. Removed commands: 'Launch' 'OpenBrowser' And removed unnecessary commands: 'Change Color Mode: Indexed' 'Contract Selection' 'Export Sprite Sheet' 'Flip Canvas Horizontally' 'Frame Properties' 'Load Palette' 'Open Sprite' 'Playback Speed 1x' 'Run Script' 'Save Palette' 'Select Used Colors' 'Set Palette Entry Size' 'Tileset Mode: Auto'
Gasparoken · Jul 2, 2024 · 84fc105 · 84fc105
1 parent 064ddef
commit 84fc105
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 3 deletions.
diff --git a/src/app/commands/cmd_change_pixel_format.cpp b/src/app/commands/cmd_change_pixel_format.cpp
@@ -482,6 +482,9 @@ class ChangePixelFormatCommand : public Command {
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
+  const bool isSkipListing(const Params& params) const override {
+    return m_format == IMAGE_INDEXED && params.size() > 1;
+  }
 
 private:
   bool m_showDlg;

diff --git a/src/app/commands/cmd_export_sprite_sheet.h b/src/app/commands/cmd_export_sprite_sheet.h
@@ -64,6 +64,9 @@ class ExportSpriteSheetCommand : public CommandWithNewParams<ExportSpriteSheetPa
 protected:
   bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(const Params& params) const override {
+    return !params.empty();
+  }
 };
 
 } // namespace app

diff --git a/src/app/commands/cmd_flip.h b/src/app/commands/cmd_flip.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2024  Igara Studio S.A.
 // Copyright (C) 2001-2015  David Capello
 //
 // This program is distributed under the terms of
@@ -9,6 +10,7 @@
 #pragma once
 
 #include "app/commands/command.h"
+#include "app/commands/params.h"
 #include "doc/algorithm/flip_type.h"
 
 namespace app {
@@ -24,6 +26,9 @@ namespace app {
     bool onEnabled(Context* context) override;
     void onExecute(Context* context) override;
     std::string onGetFriendlyName() const override;
+    const bool isSkipListing(const Params& params) const override {
+      return !params.empty();
+    }
 
   private:
     bool m_flipMask;

diff --git a/src/app/commands/cmd_frame_properties.cpp b/src/app/commands/cmd_frame_properties.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2024  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -14,6 +15,7 @@
 #include "app/context.h"
 #include "app/context_access.h"
 #include "app/doc_api.h"
+#include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
 #include "app/tx.h"
 #include "base/convert_to.h"
@@ -35,6 +37,10 @@ class FramePropertiesCommand : public Command {
   void onLoadParams(const Params& params) override;
   bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(const Params& params) const override {
+    return !params.empty() &&
+      strcmp(params.begin()->second.c_str(), "all") == 0;
+  }
 
 private:
   enum Target {

diff --git a/src/app/commands/cmd_goto_frame.cpp b/src/app/commands/cmd_goto_frame.cpp
@@ -100,6 +100,10 @@ class GotoNextFrameCommand : public GotoCommand {
 
     return (frame < last ? frame+1: 0);
   }
+
+  const bool isSkipListing(const Params& params) const override {
+    return params.empty();
+  }
 };
 
 class GotoNextFrameWithSameTagCommand : public GotoCommand {

diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -606,7 +606,8 @@ class KeyboardShortcutsWindow : public app::gen::KeyboardShortcuts {
       if (key->type() == KeyType::Tool ||
           key->type() == KeyType::Quicktool ||
           key->type() == KeyType::WheelAction ||
-          key->type() == KeyType::DragAction) {
+          key->type() == KeyType::DragAction ||
+          key->isSkipListing()) {
         continue;
       }
 

diff --git a/src/app/commands/cmd_launch.cpp b/src/app/commands/cmd_launch.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2020  Igara Studio S.A.
+// Copyright (C) 2020-2024  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -20,6 +20,7 @@ namespace app {
 class LaunchCommand : public Command {
 public:
   LaunchCommand();
+  const bool isSkipListing(const Params& params) const override { return true; }
 
 protected:
   void onLoadParams(const Params& params) override;

diff --git a/src/app/commands/cmd_load_palette.cpp b/src/app/commands/cmd_load_palette.cpp
@@ -32,6 +32,9 @@ class LoadPaletteCommand : public Command {
 protected:
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(const Params& params) const override {
+    return !params.empty();
+  }
 
 private:
   std::string m_preset;

diff --git a/src/app/commands/cmd_modify_selection.cpp b/src/app/commands/cmd_modify_selection.cpp
@@ -45,6 +45,9 @@ class ModifySelectionCommand : public Command {
   bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
+  const bool isSkipListing(const Params& params) const override {
+    return m_modifier == doc::algorithm::SelectionModifier::Contract;
+  }
 
 private:
   std::string getActionName() const;

diff --git a/src/app/commands/cmd_open_browser.cpp b/src/app/commands/cmd_open_browser.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2024  Igara Studio S.A.
 // Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -23,6 +24,7 @@ class OpenBrowserCommand : public Command {
 protected:
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(const Params& params) const override { return true; }
 
 private:
   std::string m_filename;

diff --git a/src/app/commands/cmd_open_file.h b/src/app/commands/cmd_open_file.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "app/commands/command.h"
+#include "app/commands/params.h"
 #include "app/pref/preferences.h"
 #include "base/paths.h"
 
@@ -32,6 +33,9 @@ namespace app {
   protected:
     void onLoadParams(const Params& params) override;
     void onExecute(Context* context) override;
+    const bool isSkipListing(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
@@ -39,6 +39,7 @@ class RunScriptCommand : public Command {
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
+  const bool isSkipListing(const Params& params) const override { return params.empty(); }
 
 private:
   std::string m_filename;

diff --git a/src/app/commands/cmd_save_palette.cpp b/src/app/commands/cmd_save_palette.cpp
@@ -34,6 +34,7 @@ class SavePaletteCommand : public Command {
 protected:
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(const Params& params) const override { return !params.empty(); }
 
 private:
   std::string m_preset;

diff --git a/src/app/commands/cmd_select_palette.cpp b/src/app/commands/cmd_select_palette.cpp
@@ -45,6 +45,9 @@ class SelectPaletteColorsCommand : public Command {
   void onLoadParams(const Params& params) override;
   void onExecute(Context* context) override;
   std::string onGetFriendlyName() const override;
+  const bool isSkipListing(const Params& params) const override {
+    return params.empty();
+  }
 
 private:
   void selectTiles(const Layer* layer,

diff --git a/src/app/commands/cmd_set_palette_entry_size.cpp b/src/app/commands/cmd_set_palette_entry_size.cpp
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (c) 2024  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
@@ -23,6 +24,9 @@ class SetPaletteEntrySizeCommand : public Command {
   void onLoadParams(const Params& params) override;
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(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
@@ -26,6 +26,9 @@ class TiledModeCommand : public Command {
   bool onEnabled(Context* context) override;
   bool onChecked(Context* context) override;
   void onExecute(Context* context) override;
+  const bool isSkipListing(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
@@ -37,6 +37,13 @@ namespace app {
     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 const bool isSkipListing(const Params& params) const {
+      return false;
+    }
+
   protected:
     virtual bool onNeedsParams() const;
     virtual void onLoadParams(const Params& params);

diff --git a/src/app/commands/set_playback_speed.cpp b/src/app/commands/set_playback_speed.cpp
@@ -26,6 +26,9 @@ class SetPlaybackSpeedCommand : public CommandWithNewParams<SetPlaybackSpeedPara
   bool onChecked(Context* ctx) override;
   void onExecute(Context* ctx) override;
   std::string onGetFriendlyName() const override;
+  const bool isSkipListing(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
@@ -54,6 +54,10 @@ class TilesetModeCommand : public Command {
     return Strings::commands_TilesetMode(mode);
   }
 
+  const bool isSkipListing(const Params& params) const override {
+    return params.empty();
+  }
+
 private:
   TilesetMode m_mode;
 };

diff --git a/src/app/ui/key.h b/src/app/ui/key.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2024  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -138,6 +138,7 @@ namespace app {
                                      const KeyboardShortcuts& globalKeys) const;
     bool isPressed() const;
     bool isLooselyPressed() const;
+    bool isSkipListing() const;
 
     bool hasAccel(const ui::Accelerator& accel) const;
     bool hasUserDefinedAccels() const;

diff --git a/src/app/ui/keyboard_shortcuts.cpp b/src/app/ui/keyboard_shortcuts.cpp
@@ -494,6 +494,11 @@ bool Key::isLooselyPressed() const
   return false;
 }
 
+bool Key::isSkipListing() const
+{
+  return type() == KeyType::Command && command()->isSkipListing(params());
+}
+
 bool Key::hasAccel(const ui::Accelerator& accel) const
 {
   return accels().has(accel);