Fix #29009 Update behaviour of reset button

Author: mike-spa

src/inspector/models/notation/frames/fretframe/fretframechordssettingsmodel.cpp

@@ -55,12 +55,15 @@ void FretFrameChordsSettingsModel::requestElements()
 
     m_chordListModel->setFBox(fretBox());
     m_chordListModel->load();
+
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::loadProperties()
 {
     loadProperties({ Pid::FRET_FRAME_DIAGRAMS_ORDER });
     m_chordListModel->load();
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::resetProperties()
@@ -81,6 +84,7 @@ void FretFrameChordsSettingsModel::onNotationChanged(const engraving::PropertyId
                                                      const engraving::StyleIdSet&)
 {
     loadProperties(changedPropertyIdSet);
+    updateHasInvisibleChords();
 }
 
 void FretFrameChordsSettingsModel::loadProperties(const engraving::PropertyIdSet& propertyIdSet)
@@ -90,6 +94,26 @@ void FretFrameChordsSettingsModel::loadProperties(const engraving::PropertyIdSet
     }
 }
 
+void FretFrameChordsSettingsModel::updateHasInvisibleChords()
+{
+    bool hasInvisibleChords = false;
+
+    const FBox* fbox = fretBox();
+    if (fbox) {
+        for (EngravingItem* item : fbox->el()) {
+            if (!item->visible()) {
+                hasInvisibleChords = true;
+                break;
+            }
+        }
+    }
+
+    if (hasInvisibleChords != m_hasInvisibleChords) {
+        m_hasInvisibleChords = hasInvisibleChords;
+        emit hasInvisibleChordsChanged(m_hasInvisibleChords);
+    }
+}
+
 FretFrameChordListModel* FretFrameChordsSettingsModel::chordListModel() const
 {
     return m_chordListModel.get();
@@ -99,3 +123,27 @@ PropertyItem* FretFrameChordsSettingsModel::listOrder() const
 {
     return m_listOrder;
 }
+
+bool FretFrameChordsSettingsModel::hasInvisibleChords() const
+{
+    return m_hasInvisibleChords;
+}
+
+void FretFrameChordsSettingsModel::resetList()
+{
+    beginCommand(TranslatableString("undoableAction", "Reset Fret Diagram Legend chords list"));
+
+    FBox* fbox = fretBox();
+    if (fbox) {
+        fbox->undoResetProperty(Pid::FRET_FRAME_DIAGRAMS_ORDER);
+
+        for (EngravingItem* item : fbox->el()) {
+            item->undoResetProperty(Pid::VISIBLE);
+        }
+    }
+
+    updateNotation();
+    endCommand();
+
+    loadProperties();
+}

src/inspector/models/notation/frames/fretframe/fretframechordssettingsmodel.h

@@ -43,6 +43,8 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
 
     Q_PROPERTY(PropertyItem * listOrder READ listOrder CONSTANT)
 
+    Q_PROPERTY(bool hasInvisibleChords READ hasInvisibleChords NOTIFY hasInvisibleChordsChanged)
+
     muse::Inject<context::IGlobalContext> globalContext = { this };
 
 public:
@@ -51,6 +53,12 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
     FretFrameChordListModel* chordListModel() const;
 
     PropertyItem* listOrder() const;
+    bool hasInvisibleChords() const;
+
+    Q_INVOKABLE void resetList();
+
+signals:
+    void hasInvisibleChordsChanged(bool hasInvisible);
 
 private:
     engraving::FBox* fretBox() const;
@@ -64,8 +72,11 @@ class FretFrameChordsSettingsModel : public AbstractInspectorModel, public muse:
 
     void loadProperties(const mu::engraving::PropertyIdSet& propertyIdSet);
 
+    void updateHasInvisibleChords();
+
     std::shared_ptr<FretFrameChordListModel> m_chordListModel;
 
     PropertyItem* m_listOrder = nullptr;
+    bool m_hasInvisibleChords = false;
 };
 }

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsControlPanel.qml

@@ -40,13 +40,15 @@ RowLayout {
 
     property bool isMovingUpAvailable: false
     property bool isMovingDownAvailable: false
+    property bool hasInvisibleChords: false
 
     height: childrenRect.height
 
     spacing: 6
 
     signal moveSelectionUpRequested()
     signal moveSelectionDownRequested()
+    signal resetListRequested();
 
     FlatButton {
         id: upBotton
@@ -92,10 +94,10 @@ RowLayout {
         navigation.row: downButton.navigation.row + 1
         navigation.accessible.name: qsTrc("inspector", "Reset chord list")
 
-        enabled: root.listOrderItem.isModified
+        enabled: root.listOrderItem.isModified || root.hasInvisibleChords
 
         onClicked: {
-            root.listOrderItem.resetToDefault()
+            root.resetListRequested()
         }
     }
 }

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsTab.qml

@@ -55,6 +55,7 @@ FocusableItem {
             anchors.rightMargin: root.sideMargin
 
             listOrderItem: root.model ? root.model.listOrder : null
+            hasInvisibleChords: root.model ? root.model.hasInvisibleChords : null
 
             isMovingUpAvailable: view.model ? view.model.isMovingUpAvailable : false
             isMovingDownAvailable: view.model ? view.model.isMovingDownAvailable : false
@@ -73,6 +74,10 @@ FocusableItem {
                 view.model.moveSelectionDown()
                 Qt.callLater(view.positionViewAtSelectedItems)
             }
+
+            onResetListRequested: {
+                root.model.resetList()
+            }
         }
 
         FretFrameChordsView {