Merge pull request #29414 from igorkorsukov/fix/29147_4.7

fixed update state of NotationContextMenuModel

Author: RomanPudashkin

src/framework/actions/actiontypes.h

@@ -27,6 +27,7 @@
 #include <memory>
 #include <QString>
 #include "global/types/uri.h"
+#include "global/logstream.h"
 
 namespace muse::actions {
 using ActionCode = std::string;
@@ -120,4 +121,17 @@ class ActionData
 };
 }
 
+inline muse::logger::Stream& operator<<(muse::logger::Stream& s, const muse::actions::ActionCodeList& list)
+{
+    s << "[";
+    for (size_t i = 0; i < list.size(); ++i) {
+        s << list.at(i);
+        if (list.size() > 1 && i < (list.size() - 2)) {
+            s << ", ";
+        }
+    }
+    s << "]";
+    return s;
+}
+
 #endif // MUSE_ACTIONS_ACTIONTYPES_H

src/framework/uicomponents/view/abstractmenumodel.cpp

@@ -112,13 +112,7 @@ QVariantMap AbstractMenuModel::get(int index)
 
 void AbstractMenuModel::load()
 {
-    uiActionsRegister()->actionStateChanged().onReceive(this, [this](const ActionCodeList& codes) {
-        onActionsStateChanges(codes);
-    });
-
-    shortcutsRegister()->shortcutsChanged().onNotify(this, [this]() {
-        updateShortcutsAll();
-    });
+    subscribeOnChanges();
 }
 
 QVariantList AbstractMenuModel::itemsProperty() const
@@ -257,6 +251,17 @@ MenuItem* AbstractMenuModel::makeSeparator()
     return item;
 }
 
+void AbstractMenuModel::subscribeOnChanges()
+{
+    uiActionsRegister()->actionStateChanged().onReceive(this, [this](const ActionCodeList& codes) {
+        onActionsStateChanges(codes);
+    });
+
+    shortcutsRegister()->shortcutsChanged().onNotify(this, [this]() {
+        updateShortcutsAll();
+    });
+}
+
 void AbstractMenuModel::onActionsStateChanges(const muse::actions::ActionCodeList& codes)
 {
     TRACEFUNC;

src/framework/uicomponents/view/abstractmenumodel.h

@@ -70,6 +70,7 @@ class AbstractMenuModel : public QAbstractListModel, public muse::Injectable, pu
         UserRole
     };
 
+    virtual void subscribeOnChanges();
     virtual void onActionsStateChanges(const muse::actions::ActionCodeList& codes);
 
     void setItem(int index, MenuItem* item);

src/notation/view/notationcontextmenumodel.cpp

@@ -37,6 +37,8 @@ using namespace muse::actions;
 
 void NotationContextMenuModel::loadItems(int elementType)
 {
+    AbstractMenuModel::load();
+
     MenuItemList items = makeItemsByElementType(static_cast<ElementType>(elementType));
     setItems(items);
 }