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

LateNight: use correct tooltip for key control toggle #4696

Merged
merged 1 commit into from
Mar 16, 2022

Conversation

Russe
Copy link
Contributor

@Russe Russe commented Mar 6, 2022

At skin settings wrong tooltip ID was used at Key Control toggle.
As well the corresponding ID at file tooltips.cpp was missing.

@github-actions github-actions bot added the skins label Mar 6, 2022
@Russe
Copy link
Contributor Author

Russe commented Mar 8, 2022

Tested on Ubuntu and Windows 10: OK

@ronso0
Copy link
Member

ronso0 commented Mar 8, 2022

Please sqash the commits so that there's either one commit, or two (add tooltip string + add tooltip Id to skin(s))

@Russe
Copy link
Contributor Author

Russe commented Mar 8, 2022

I'm not allowed to sqash my commits here, or should I do this in my own fork?
I'm working with github.com and not with a client or command line. Sorry, I'm still a beginner here.

@ronso0
Copy link
Member

ronso0 commented Mar 9, 2022

The squashing I referred to would happen in your local git repo.
I have a feeling you'll continue contributing so learning git (and building Mixxx locally) would be a good investment ;)
https://github.com/mixxxdj/mixxx/wiki/Using-Git

@ywwg
Copy link
Member

ywwg commented Mar 12, 2022

you'd do a rebase -i on your machine and then a git push --force.

Also a note for our reviewers, we do have the Squash And Merge feature enabled for github. We can just use that instead of making contributors squash everything manually

@Russe
Copy link
Contributor Author

Russe commented Mar 12, 2022

you'd do a rebase -i on your machine and then a git push --force.

Thank you very much.
Currently I'm testing with my fork to get familiar with git and command line.
Hopefully within the next days I can update and finish this PR, currently I'm quite busy.

@Russe
Copy link
Contributor Author

Russe commented Mar 13, 2022

I did a commit with command line.
Then with "rebase -i [sha of first commit]" I got all commits listet with "pick" at beginning of lines.
Should I duplicate all these lines and add a squash in front of each commit?

I did not find an example for this which I understand.

@daschuer
Copy link
Member

daschuer commented Mar 13, 2022

It is the commit before your first commit.

rebase -i c56bc35142d358c1202ccfcee57ac0ecbb8c549d~1

Or

rebase -i upstream/main

You need to put an s in front of all commits except the first.

@Russe Russe force-pushed the LateNight-Tooltip-Key-Control branch from f1f2700 to 1b2e86d Compare March 13, 2022 18:39
@Russe Russe force-pushed the LateNight-Tooltip-Key-Control branch from 1b2e86d to 153a8e7 Compare March 13, 2022 19:11
@Russe
Copy link
Contributor Author

Russe commented Mar 13, 2022

That helped me, thank you.
Hopefully I did it right.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM, Thank you very much.

@daschuer daschuer merged commit 4cdae70 into mixxxdj:main Mar 16, 2022
@Russe Russe deleted the LateNight-Tooltip-Key-Control branch March 24, 2022 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants