-
Notifications
You must be signed in to change notification settings - Fork 218
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
issue #2538: Adding global messagebox and commandline parameter parsing classes. #2541
Conversation
Thanks for your PR! @pgScorpio Yes, I think this PR is ok - although merging from your master branch to our master branch is discouraged: https://blog.jasonmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/ If you don't push any other changes to master, it should be ok. BTW: Please run nmake clang_format: https://github.com/jamulussoftware/jamulus/blob/master/CONTRIBUTING.md#source-code-consistency on your computer (after having installed clang format of course) to pass the styling check. Also your code doesn't seem to build on Linux: https://github.com/jamulussoftware/jamulus/runs/5664602526?check_suite_focus=true#step:9:365 |
I hope, but I understand it's still not the way it should be done....
This was the only way I could find to make it work I'm afraid.... If the (unclear) procedure from your link has to be followed for every PR I'm afraid I won't be doing much PR's, there should be a much simpler way, but as said I find the documentation unclear and confusing especially for a newbie to GitHub.
nmake clang_format also doesn't seem to work for me either: But, as far as I know, I did run clang-format "file" on every file before committing, but, as seen before, my clang-format seems to do different things than the autobuild clang-format.
Also strange, because the same code does build on my ubuntu virtual machine using Qt Creator: I hope you can understand that all these issues contribute to my github frustrations.... |
If you don’t push other changes to your master branch you can work as you want to work. If nmake clang_format doesn’t work (maybe since it’s not available in the Linux shell) you can also run clang-format -i src/*.cpp via PowerShell/CMD. If you want, I can also fix it for you by pushing to your repo (this is possible if you didn’t disable the checkbox at the right side bar allowing maintainers to push to your branch. I hate to say that, but personally I dislike developing on Windows (too much hassle to set up tools which clearly don’t integrate well), so I quickly moved to linux. Concerning the failed linux build, I‘d wait for some of the others to review. |
@pgScorpio I think you forgot running it on some files? Never mind: I've just updated your commit. Before working further on this, you probably need to git reset --hard origin/master locally. BTW: It does also build on my linux machine. Maybe some incompatibilities with old versions of Qt have been introduced. |
I think it has to do with the headless build.... I'll take a look. |
No, we had that conversation some time ago when first looking at There is a |
See my earlier post... I get "No rule to make target 'clang_format'" ???? |
OK, that probably means your branch was branched from |
No, I have all the files as in 51b8997 But I've got it working.... |
Ok. So can you add it to the file (in another PR of course). |
@ann0see
So I don't think this should need a code-change but needs a look at the clang-format version. |
No, since there are a lot more prerequisites missing that even I don't know what they should be (still encountering problems myself.), but I can open an issue if you wish so someone else can pick it up. |
Yes. An issue would be great. |
@pgScorpio I think you should not use merge to update your PRs since it will introduce huge confusion later on. Use rebasing instead. See https://www.maxwellantonucci.com/posts/2017/09/24/the-git-rebase-introduction-i-wish-i'd-had/ Therefore: Undo your merge commit: checkout the last commit before the merge with Now fetch the latest upstream. Afterwards, instead of |
Thanks for the link, Unfortunately I saw your post too late, In the mean time I had quite some trouble getting the rebasing done (even the same commands as given in the link you provided initially gave me a lot of errors), And ended up with a no longer building tree. I hope it is all corrected now. |
Short description of changes
Added global messagebox and commandline parameter parsing classes to global.h/main.c
Adapted all messageboxes to use the new CMsgBoxes class.
CHANGELOG:
Context: Fixes an issue?
General improvement and preparation for sound-redesign.
Does this change need documentation? What needs to be documented and how?
Status of this Pull Request
Working...
What is missing until this pull request can be merged?
Checklist