Skip to content

Commit

Permalink
Merge branch 'muse-sequencer:master' into Fix-issue-1084
Browse files Browse the repository at this point in the history
  • Loading branch information
donarturo11 authored Sep 23, 2022
2 parents bbbf95e + 653dec2 commit 75bf5af
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/muse/arranger/pcanvas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1014,11 +1014,11 @@ QMenu* PartCanvas::genItemPopup(CItem* item)

QAction *act_cut = partPopup->addAction(*cutSVGIcon, tr("C&ut"));
act_cut->setData(OP_CUT);
act_cut->setShortcut(Qt::CTRL+Qt::Key_X);
act_cut->setShortcut(shortcuts[SHRT_CUT].key);

QAction *act_copy = partPopup->addAction(*copySVGIcon, tr("&Copy"));
act_copy->setData(OP_COPY);
act_copy->setShortcut(Qt::CTRL+Qt::Key_C);
act_copy->setShortcut(shortcuts[SHRT_COPY].key);

partPopup->addSeparator();
int rc = npart->part()->nClones();
Expand Down Expand Up @@ -1091,7 +1091,7 @@ QMenu* PartCanvas::genItemPopup(CItem* item)
act_wfinfo->setData(OP_FILEINFO);
QAction *act_wfnorm = partPopup->addAction(tr("Normalize"));
act_wfnorm->setData(OP_NORMALIZE);
act_wfnorm->setShortcut(Qt::CTRL+Qt::Key_N);
act_wfnorm->setShortcut(shortcuts[SHRT_PART_NORMALIZE].key);
}
break;
case MusECore::Track::AUDIO_OUTPUT:
Expand Down
2 changes: 1 addition & 1 deletion src/muse/shortcuts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ void initShortCuts()
defShrt(SHRT_NEXT_MARKER, Qt::Key_F6, QT_TRANSLATE_NOOP("shortcuts", "Goto Next Marker"), GLOBAL_SHRT, "me_sel_next");
defShrt(SHRT_PREV_MARKER, Qt::Key_F5, QT_TRANSLATE_NOOP("shortcuts", "Goto Prev Marker"), GLOBAL_SHRT, "me_sel_prev");

defShrt(SHRT_PART_NORMALIZE, Qt::ALT + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Normalize"), ARRANG_SHRT, "wave_part_normalize");
defShrt(SHRT_PART_NORMALIZE, Qt::ALT + Qt::SHIFT + Qt::Key_N, QT_TRANSLATE_NOOP("shortcuts", "Normalize"), ARRANG_SHRT, "wave_part_normalize");

//-----------------------------------------------------------
// Mixer:
Expand Down
2 changes: 1 addition & 1 deletion src/muse/shortcuts.h
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ enum {
SHRT_PREV_MARKER,

// Arranger
SHRT_PART_NORMALIZE, // Alt+N
SHRT_PART_NORMALIZE, // Alt+Shift+N

SHRT_TOOL_STRETCH,
SHRT_TOOL_SAMPLERATE,
Expand Down

0 comments on commit 75bf5af

Please sign in to comment.