Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #152766: Add keyboard shortcuts for up bow and down bow symbols #2924

Conversation

divya-urs
Copy link
Contributor

No description provided.

@@ -604,6 +604,26 @@ Shortcut Shortcut::_sc[] = {
{
MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"add-stringsUpBow",
QT_TRANSLATE_NOOP("action","Up bow"),
QT_TRANSLATE_NOOP("action","Toggle Up bow"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

up, lowercase

STATE_NORMAL | STATE_NOTE_ENTRY,
"add-stringsDownBow",
QT_TRANSLATE_NOOP("action","Down bow"),
QT_TRANSLATE_NOOP("action","Toggle Down bow"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

down, lowercase

change shortcut.cpp

fix #152766: Add keyboard shortcuts for up bow and down bow symbols
@divya-urs
Copy link
Contributor Author

Is it fine now, or do I have to make more changes?

MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"add-stringsDownBow",
QT_TRANSLATE_NOOP("action","Down bow"),
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Dec 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bow, uppercase here, (sorry, missed it first time round)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it should be "action", "Down Bow" ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

@@ -604,6 +604,26 @@ Shortcut Shortcut::_sc[] = {
{
MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"add-stringsUpBow",
QT_TRANSLATE_NOOP("action","Up bow"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bow, uppercase here, (sorry, missed it first time round)

@Jojo-Schmitz
Copy link
Contributor

And then you should most probably squash into a single commit

@divya-urs
Copy link
Contributor Author

I'm having difficulty squashing into a single commit. I'm sorry, I'm new to using GitHub.

@lasconic
Copy link
Contributor

What type of difficulty do you have?
There are 5 commits in this branch on top of master, see https://github.com/musescore/MuseScore/pull/2924/commits
We want to have a single one.

On the command line, in the MuseScore directory:

$ git checkout 152766-keyboard_shortcuts_bowing_symbols
$ git rebase -i HEAD~5

a text editor should open. For all the lines but the first one, replace the word "pick" by "squash" and save the file. Then a new text editor will open, remove all the lines but the one of the right commit message. Read http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html again.

@divya-urs
Copy link
Contributor Author

I did this, but in the text editor I see more than 5 commits. The first commit is a8f4268.

@Jojo-Schmitz
Copy link
Contributor

This doesn't look right at all

@divya-urs
Copy link
Contributor Author

I must have made some mistake. I'll close this pull request and open another one.

@divya-urs divya-urs closed this Dec 28, 2016
@divya-urs divya-urs deleted the 152766-keyboard_shortcuts_bowing_symbols branch December 28, 2016 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants