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

Change Detune To Pitch Bend in Piano Roll For Stable-1.2 #4194

Merged
merged 39 commits into from Mar 19, 2018

Conversation

Projects
5 participants
@Anonymouqs
Contributor

Anonymouqs commented Feb 26, 2018

Fixes #4174 in order to give a clearer name to the mode in the Piano Roll.

This Pull Request is for the 1.2 Stable Branch while there is another Pull Request for the Master Branch.

Change Detune To Pitch Bend in Piano Roll
The name of detuneAction is changed into pitchBendAction as well.

Fixes Issue #4174 in order to give a clearer name to the mode in the Piano Roll.

@Anonymouqs Anonymouqs changed the title from Change Detune To Pitch Bend in Piano Roll to Change Detune To Pitch Bend in Piano Roll For Stable-1.2 Feb 26, 2018

@@ -4077,14 +4077,14 @@ PianoRollWindow::PianoRollWindow() :
QAction* drawAction = editModeGroup->addAction( embed::getIconPixmap( "edit_draw" ), tr( "Draw mode (Shift+D)" ) );
QAction* eraseAction = editModeGroup->addAction( embed::getIconPixmap( "edit_erase" ), tr("Erase mode (Shift+E)" ) );
QAction* selectAction = editModeGroup->addAction( embed::getIconPixmap( "edit_select" ), tr( "Select mode (Shift+S)" ) );
QAction* detuneAction = editModeGroup->addAction( embed::getIconPixmap( "automation" ), tr("Detune mode (Shift+T)" ) );
QAction* pitchBendAction = editModeGroup->addAction( embed::getIconPixmap( "automation" ), tr("Detune mode (Shift+T)" ) );

This comment has been minimized.

@tresf

tresf Feb 26, 2018

Member

Did you mean to change the text for this as well?

This comment has been minimized.

@Anonymouqs

Anonymouqs Feb 26, 2018

Contributor

Yeah, so the source code is clearer.

This comment has been minimized.

@tresf

tresf Feb 26, 2018

Member

@Anonymouqs I do not understand your reply. Did you make a mistake and forget this line? Will you fix it? (Hint, the text still reads "Detune mode (Shift+T)")

@Anonymouqs

This comment has been minimized.

Contributor

Anonymouqs commented Feb 26, 2018

Added the fix. Apologies for the confusion.

@@ -4077,14 +4077,14 @@ PianoRollWindow::PianoRollWindow() :
QAction* drawAction = editModeGroup->addAction( embed::getIconPixmap( "edit_draw" ), tr( "Draw mode (Shift+D)" ) );
QAction* eraseAction = editModeGroup->addAction( embed::getIconPixmap( "edit_erase" ), tr("Erase mode (Shift+E)" ) );
QAction* selectAction = editModeGroup->addAction( embed::getIconPixmap( "edit_select" ), tr( "Select mode (Shift+S)" ) );
QAction* detuneAction = editModeGroup->addAction( embed::getIconPixmap( "automation" ), tr("Detune mode (Shift+T)" ) );
QAction* pitchBendAction = editModeGroup->addAction( embed::getIconPixmap( "automation" ), tr("Pitch Bend Mode (Shift+T)" ) );

This comment has been minimized.

@DomClark

DomClark Feb 26, 2018

Member

"Mode" here ought to start with a lowercase "m" for consistency with the other tooltips.

This comment has been minimized.

@Anonymouqs

Anonymouqs Feb 27, 2018

Contributor

Added a new commit.

Anonymouqs added some commits Feb 27, 2018

Change internal references of detune to Pitch Bend in Piano Roll and …
…DetuningHelper

Rename DetuningHelper.h as PitchBendHelper.h:
* Detune to PitchBend
* detune to pitchBend

PianoRoll.cpp:
* detuning to pitchBend
* Detuning to PitchBend
Add final detune to pitchbend replacements
* I would reccomend testing to make sure all of the features still work. Any detune mention not pertaining to the pitch bend funtion remained detune.
@PhysSong

This comment has been minimized.

Member

PhysSong commented Mar 8, 2018

@Anonymouqs You can find remaining detune or detuning by:

git grep -i detune -- include/ src/ plugins/ # for detune
git grep -i detuning -- include/ src/ plugins/ # for detuning

However, I think first three commits are sufficient because internal references are not important for stable releases. That may be done in master after synchronizing branches.

@Anonymouqs

This comment has been minimized.

Contributor

Anonymouqs commented Mar 8, 2018

@PhysSong Should we discuss on #devtalk if we should revert the internal reference commits?

Anonymouqs added some commits Mar 8, 2018

Fix InstrumentFunctions.cpp
fix references to detuning to pitchBend
Fix DetuningReferences (again)
I'm at the point where I am hoping that AI will be able to carry out this repetitively tedious task of refactoring. It's simple enough for reptitiveness, but just a tad bit complex to require a human(for now)
Another fix
I feel like a while true do loop
Thank you programming gods
Thank you for my dilligence of making this piece of softare better. Thank you for giving the strength on not leaving this branch behind to rot for 10 years and leave LMMS with the Pitch Bench feature instead of the Detune feature. Thank you for giving the strength to go on and get into the Bassline. Thank you for the fact that this is not a corporate setting where every commit has to be 100% serious. Thank you for
@PhysSong

This comment has been minimized.

Member

PhysSong commented Mar 9, 2018

@Anonymouqs There have been some discussions on Discord #devtalk. Changing UI part and related variable names(which is done by first three commits) seems enough for stable-1.2. Further renaming can be done later(in master).

@Anonymouqs

This comment has been minimized.

Contributor

Anonymouqs commented Mar 9, 2018

@PhysSong I just read your message when I just finished renaming all of the code; I had to trace the dependencies of the variable names across files or else the build would crash. This branch passes through the Travis Build successfully now.

@Umcaruje Umcaruje added this to In Progress in Release LMMS 1.2.0-RC6 Mar 9, 2018

Anonymouqs added some commits Mar 19, 2018

Revert "Another fix"
This reverts commit 34fd806.
Revert "Final Fix"
This reverts commit ef70809.
Fix
FIx
@tresf

This comment has been minimized.

Member

tresf commented Mar 19, 2018

Although I'm sympathetic to learning the PR process, 39 commits is growing excessive for a cosmetic change. Let's please wrap this up.

@Sawuare Sawuare merged commit fc5fc1c into LMMS:stable-1.2 Mar 19, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Sawuare Sawuare moved this from In Progress to Done in Release LMMS 1.2.0-RC6 Mar 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment