-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
FEAT(client): Add popup when mute cue is activated for the first time #6155
Conversation
Sorry about the new pull request, I got confused on the squashing and ended up with 6 commits that I could not get to squash. I believe I addressed all of the concerns from the previous code review but the PR still seems to be failing even though I ran clang-format version 10. |
For future reference what you would have wanted to do is for example: |
This is a continuation of #6153 |
I tested this and it works as advertised. From my perspective the MR looks good. But the keen eyes of @Krzmbrzl might disagree. The only thing missing is the translation commit. This can be automatically generated by running the update translation script in the Mumble repo |
Perfect, I am happy to make any changes if any suggestions come up too. If you could run the script that would be very helpful. Since rebuilding I am having issues with python in vcpkg. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, when you added the braces, please run clang-format-10 again to make sure everything is correctly formatted.
To add the change to your existing commit you could do it like this: (assuming you did not change your branch in the meantime)
git fetch
git pull
- Commit the small changes in a new commit
git rebase HEAD~3 --interactive
- This opens a text editor. Move the line with your new commit under the line with the first commit. Change the action of the new commit to
squash
- Save and exit the text editor
- Change the commit message to only include your original text and not the new commit message from you fix commit
git push <your remote name e.g. origin> <your branch name e.g. master> --force-with-lease
Well, you almost got it right :D Now you squashed the bracket commit into the translation commit. |
What I meant by saying "Move the line with your new commit under the line with the first commit" was this:
what you did was
Do you want me to fix this for you real quick, or do you want to give it a go yourself? |
Haha yeah I got a little confused with that. I also forgot to run the clang format before which might make things more complicated too. Sorry about that, I will see if I can fix it quickly. |
To undo these changes would I use git reset with the commit that I overwrote (7a7e9b3)? I am hoping this would undo the changes I introduced in the translation commit. Thanks for the help! |
I guess the easiest way is to reset the translation commit entirely and rerun the .py script. |
@kbanushi Would you like me to rebase your changes and restore the correct order of your commits :) ? |
My apologies! I completely forgot about the commit issues. If you could do the rebasing that would be great, I remember getting confused and messing up my commits again. If not, I am willing to give it another go! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for having taken this long to have a look at this 🙏
As requested in mumble-voip#6094 this commit implements a popup to inform the user that the mute cue just played while also giving them the option to keep it enabled or not. For that a new slot function was added in the MainWindow Class along with a signal function in the AudioInput class. These use a new boolean variable in the Settings Class to check if the popup has been shown and a boolean variable in the Global Class to check if the Configuration UI is open. The popup works by emitting a signal from the AudioInput class to the MainWindow Class. Implements mumble-voip#6094
I took the liberty of fixing the merge conflicts and incorporating the little nitpick of my late review. |
Thank you for working on this 👍 |
As requested in #6094 this commit implements a popup to inform the user that the mute cue just played while also giving them the option to keep it enabled or not.
For that a new slot function was added in the MainWindow Class along with a signal function in the AudioInput class. These use a new boolean variable in the Settings Class to check if the popup has been shown and a boolean variable in the Global Class to check if the Configuration UI is open.
The popup works by emitting a signal from the AudioInput class to the MainWindow Class.
Fixes #6094
Checks