Fix #17615: Enabled the Delete menu in menu bar

musescore · Jun 4, 2017 · 13da822 · Jojo-Schmitz · Jun 26, 2017 · 13da822
1 parent a459522
commit 13da822
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -753,6 +753,7 @@ MuseScore::MuseScore()
       menuEdit->addAction(getAction("copy"));
       menuEdit->addAction(getAction("paste"));
       menuEdit->addAction(getAction("swap"));
+      menuEdit->addAction(getAction("delete"));
 
       menuEdit->addSeparator();
       menuEdit->addAction(getAction("select-all"));
@@ -1272,6 +1273,7 @@ void MuseScore::selectionChanged(SelState selectionState)
       bool enable = selectionState != SelState::NONE;
       getAction("cut")->setEnabled(enable);
       getAction("copy")->setEnabled(enable);
+      getAction("delete")->setEnabled(enable);
       getAction("select-similar-range")->setEnabled(selectionState == SelState::RANGE);
       if (pianorollEditor)
             pianorollEditor->changeSelection(selectionState);
@@ -2769,6 +2771,8 @@ void MuseScore::changeState(ScoreState val)
                   a->setEnabled(cs && cs->selection().state() != SelState::NONE);
             else if (enable && (s->key() == "copy"))
                   a->setEnabled(cs && (cs->selection().state() != SelState::NONE || val == STATE_FOTO));
+            else if (enable && (s->key() == "delete"))
+                  a->setEnabled(cs && cs->selection().state() != SelState::NONE);
             else if (enable && (s->key() == "select-similar-range"))
                   a->setEnabled(cs && cs->selection().state() == SelState::RANGE);
             else if (enable && (s->key() == "synth-control")) {

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -1047,6 +1047,7 @@ void ScoreView::objectPopup(const QPoint& pos, Element* obj)
       popup->addAction(getAction("copy"));
       popup->addAction(getAction("paste"));
       popup->addAction(getAction("swap"));
+      popup->addAction(getAction("delete"));
 
       QMenu* selMenu = popup->addMenu(tr("Select"));
       selMenu->addAction(getAction("select-similar"));
@@ -1075,7 +1076,7 @@ void ScoreView::objectPopup(const QPoint& pos, Element* obj)
       if (a == 0)
             return;
       QString cmd(a->data().toString());
-      if (cmd == "cut" || cmd =="copy" || cmd == "paste" || cmd == "swap") {
+      if (cmd == "cut" || cmd =="copy" || cmd == "paste" || cmd == "swap" || cmd == "delete") {
             // these actions are already activated
             return;
             }