fixed nav shorcuts (added compat map)

Author: igorkorsukov

framework/shortcuts/internal/shortcutscontroller.cpp

@@ -21,6 +21,10 @@
  */
 #include "shortcutscontroller.h"
 
+#include "global/containers.h"
+
+#include "actions/actiontypes.h"
+#include "ui/navigationcommands.h"
 #include "log.h"
 
 #define SHORTCUTS_DEBUG 1
@@ -34,6 +38,26 @@
 using namespace muse::shortcuts;
 using namespace muse::actions;
 using namespace muse::rcommand;
+using namespace muse::ui;
+
+static std::map<std::string, Command> compatActionToCommand = {
+    { "nav-next-section", NEXT_SECTION_COMMAND },
+    { "nav-prev-section", PREV_SECTION_COMMAND },
+    { "nav-next-panel", NEXT_PANEL_COMMAND },
+    { "nav-prev-panel", PREV_PANEL_COMMAND },
+    { "nav-next-tab", NEXT_PANEL_COMMAND },
+    { "nav-prev-tab", PREV_PANEL_COMMAND },
+    { "nav-trigger-control", TRIGGER_CONTROL_COMMAND },
+    { "nav-right", RIGHT_COMMAND },
+    { "nav-left", LEFT_COMMAND },
+    { "nav-up", UP_COMMAND },
+    { "nav-down", DOWN_COMMAND },
+    { "nav-escape", ESCAPE_COMMAND },
+    { "nav-first-control", FIRST_CONTROL_COMMAND },
+    { "nav-last-control", LAST_CONTROL_COMMAND },
+    { "nav-nextrow-control", NEXTROW_CONTROL_COMMAND },
+    { "nav-prevrow-control", PREVROW_CONTROL_COMMAND },
+};
 
 void ShortcutsController::init()
 {
@@ -81,7 +105,12 @@ void ShortcutsController::activate(const std::string& sequence)
     if (!commandShortcutsProcessed) {
         ActionCode actionCode = resolveAction(sequence);
         if (!actionCode.empty()) {
-            dispatcher()->dispatch(actionCode);
+            const Command& command = muse::value(compatActionToCommand, actionCode);
+            if (command.isValid()) {
+                commandDispatcher()->dispatch(command);
+            } else {
+                dispatcher()->dispatch(actionCode);
+            }
         }
     }
 }

framework/ui/api/navigationapi.cpp

@@ -21,6 +21,8 @@
  */
 #include "navigationapi.h"
 
+#include "navigationcommands.h"
+
 #include "log.h"
 
 using namespace muse::api;
@@ -37,37 +39,37 @@ NavigationApi::~NavigationApi()
 
 void NavigationApi::nextPanel()
 {
-    dispatcher()->dispatch("nav-next-panel");
+    dispatcher()->dispatch(NEXT_PANEL_COMMAND);
 }
 
 void NavigationApi::prevPanel()
 {
-    dispatcher()->dispatch("nav-prev-panel");
+    dispatcher()->dispatch(PREV_PANEL_COMMAND);
 }
 
 void NavigationApi::right()
 {
-    dispatcher()->dispatch("nav-right");
+    dispatcher()->dispatch(RIGHT_COMMAND);
 }
 
 void NavigationApi::left()
 {
-    dispatcher()->dispatch("nav-left");
+    dispatcher()->dispatch(LEFT_COMMAND);
 }
 
 void NavigationApi::up()
 {
-    dispatcher()->dispatch("nav-up");
+    dispatcher()->dispatch(UP_COMMAND);
 }
 
 void NavigationApi::down()
 {
-    dispatcher()->dispatch("nav-down");
+    dispatcher()->dispatch(DOWN_COMMAND);
 }
 
 void NavigationApi::escape()
 {
-    dispatcher()->dispatch("nav-escape");
+    dispatcher()->dispatch(ESCAPE_COMMAND);
 }
 
 bool NavigationApi::goToControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex)
@@ -95,7 +97,7 @@ bool NavigationApi::goToControl(const QString& section, const QString& panel, co
 
 void NavigationApi::trigger()
 {
-    dispatcher()->dispatch("nav-trigger-control");
+    dispatcher()->dispatch(TRIGGER_CONTROL_COMMAND);
 }
 
 bool NavigationApi::triggerControl(const QString& section, const QString& panel, const QJSValue& controlNameOrIndex)

framework/ui/api/navigationapi.h

@@ -27,15 +27,15 @@
 
 #include "api/apiobject.h"
 #include "modularity/ioc.h"
-#include "actions/iactionsdispatcher.h"
+#include "rcommand/icommanddispatcher.h"
 #include "ui/inavigationcontroller.h"
 
 namespace muse::api {
 class NavigationApi : public api::ApiObject
 {
     Q_OBJECT
 
-    ContextInject<actions::IActionsDispatcher> dispatcher = { this };
+    ContextInject<rcommand::ICommandDispatcher> dispatcher = { this };
     ContextInject<ui::INavigationController> navigation = { this };
 
 public: