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

Indicate push-to-mute in tray #2824

Merged
merged 4 commits into from Feb 14, 2017

Conversation

@Piratonym
Copy link
Contributor

commented Feb 7, 2017

This changes the tray icon when the push-to-mute hotkey is pressed. Fixes #2736.

This still needs icons, as I am not experienced with graphic design and was not sure how they should look. I would be grateful if someone could provide some.

@@ -66,6 +66,7 @@ MainWindow::MainWindow(QWidget *p) : QMainWindow(p) {
qiIconMuteSelf.addFile(QLatin1String("skin:muted_self.svg"));
qiIconMuteServer.addFile(QLatin1String("skin:muted_server.svg"));
qiIconMuteSuppressed.addFile(QLatin1String("skin:muted_suppressed.svg"));
qiIconMutePushToMute.addFile(QLatin1String("skin:muted_pushtomute.svg"));

This comment has been minimized.

Copy link
@mkrautz

mkrautz Feb 7, 2017

Member

For this to work, you would need to add the icon to mumble.qrc: https://github.com/mumble-voip/mumble/blob/master/src/mumble/mumble.qrc

This comment has been minimized.

Copy link
@Piratonym

Piratonym Feb 7, 2017

Author Contributor

Interesting, it worked for me without that when testing. I'll add it.

@mkrautz

This comment has been minimized.

Copy link
Member

commented Feb 7, 2017

How about these icons?

SVGs in...
pushtomute.zip

Classic:
muted_pushtomute2

Theme:
muted_pushtomute_theme

@Nuc1eoN

This comment has been minimized.

Copy link

commented Feb 8, 2017

@mkrautz LGTM. So yellow would be our indicator for client side/local actions.

@Kissaki What do you think?

@Kissaki

This comment has been minimized.

Copy link
Member

commented Feb 9, 2017

Yeah, icons look good to me.

I just noticed the (dark) theme uses orange checkmark for the authenticated icon.This should probably be revisited if/once we establish orange for local status.

@Kissaki

This comment has been minimized.

Copy link
Member

commented Feb 13, 2017

I will build and test before landing

@@ -39,6 +39,7 @@
<file alias="muted_self.svg">Mumble/muted_self.svg</file>
<file alias="muted_server.svg">Mumble/muted_server.svg</file>
<file alias="muted_suppressed.svg">Mumble/muted_suppressed.svg</file>
<file alias="muted_pushtomute.svg">Mumble/muted_suppressed.svg</file>

This comment has been minimized.

Copy link
@Kissaki

Kissaki Feb 14, 2017

Member

File does not exist in the theme yet.

@Kissaki Kissaki force-pushed the Piratonym:feature-ptm-indicator branch from b9f985a to f318e05 Feb 14, 2017

@Kissaki Kissaki referenced this pull request Feb 14, 2017

@Kissaki Kissaki force-pushed the Piratonym:feature-ptm-indicator branch from f318e05 to ef03f56 Feb 14, 2017

@Kissaki Kissaki merged commit fa818bd into mumble-voip:master Feb 14, 2017

2 checks passed

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

@Kissaki Kissaki changed the title WIP: Indicate push-to-mute in tray Indicate push-to-mute in tray Feb 14, 2017

mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017
mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017
mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017

@Piratonym Piratonym deleted the Piratonym:feature-ptm-indicator branch Apr 9, 2017

@Nuc1eoN

This comment has been minimized.

Copy link

commented May 10, 2017

I see this has been implemented in recent snapshots, however instead of the yellow icon:
mute
I get a green one. Is this intended?
I thought I should get this one: https://github.com/mumble-voip/mumble-theme/blob/master/muted_pushtomute.svg ??

@Kissaki

This comment has been minimized.

Copy link
Member

commented May 10, 2017

Do you use the Mumble Lite or Dark theme?

@Nuc1eoN

This comment has been minimized.

Copy link

commented May 10, 2017

Lite theme (the default)
EDIT: just tested it, it's the same when I choose dark theme

@Kissaki

This comment has been minimized.

Copy link
Member

commented May 10, 2017

Those two use their own icons (see https://github.com/mumble-voip/mumble-theme). If you select "none" you should see the default mouth icon.

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