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

Add tray menu action to show the main window #3604

Merged
merged 2 commits into from Feb 22, 2019

Conversation

@trudnorx
Copy link
Contributor

commented Feb 22, 2019

Fixes #3509 which involved the user being unable to show the window after hiding it with Mumble on LXDE environment

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Thank you very much for your contribution!

The indentation should use tabs instead of spaces, I can fix that for you if you want.

@trudnorx

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2019

I changed it to tabs.

src/mumble/MainWindow.cpp Outdated Show resolved Hide resolved
src/mumble/MainWindow.cpp Outdated Show resolved Hide resolved
src/mumble/MainWindow.cpp Outdated Show resolved Hide resolved
src/mumble/MainWindow.cpp Outdated Show resolved Hide resolved
@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Thank you very much!

Could you address my review's comments and then squash the commits, please?

I can do it, if you prefer (keeping you as commit author, of course).

@trudnorx trudnorx force-pushed the trudnorx:unminimize-fix branch from 4a911e2 to 6e77492 Feb 22, 2019

@trudnorx

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2019

Done

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Could you run the script updatetranslations.sh located in the scripts folder and then push the commit created by it, please?

While you're at it, could you also change the commit's message, please?

Right now it's:

fix unminimize

tabs

fixes

fix unminimize

The pull request title would be fine as commit message.

@trudnorx

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2019

That script is not working because

Committing changes ...
fatal: cannot do a partial commit during a merge.
ERROR: Failed to commit the changes

I tried changing the script to commit -i manually but

ERROR: The file mumble_en.ts has local changes.

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Did you perhaps run it during a git rebase?

@trudnorx

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2019

No, maybe it's because of the squash which was followed by force push? Can you fix it?

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Sure, no problem.

@davidebeatrici davidebeatrici changed the title Fix showing window on LXDE Add tray menu action to show the main window Feb 22, 2019

trudnorx and others added 2 commits Feb 22, 2019
Add tray menu action to show the main window
This allows to show the main window after minimizing it on LXDE.
Translation update
Updating 'mumble_en.ts'...
    Found 1718 source text(s) (2 new and 1716 already existing)

@davidebeatrici davidebeatrici force-pushed the trudnorx:unminimize-fix branch from 6e77492 to 896d51a Feb 22, 2019

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Your current Git username is user, you should change it to your username or real name.

I set your GitHub's username as commit author.

@trudnorx

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2019

Ok thanks

So everything is done?

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Yes, I will merge as soon as the checks are completed.

@davidebeatrici davidebeatrici merged commit 755c290 into mumble-voip:master Feb 22, 2019

2 checks passed

CI Build #20190222.4 succeeded
Details
Travis CI - Pull Request Build Passed
Details
@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 22, 2019

Thank you again for your contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.