Indicate push-to-mute in tray #2824

Merged
merged 4 commits into from Feb 14, 2017

Projects

None yet

4 participants

@Piratonym
Contributor

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"));
@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

@Piratonym
Piratonym Feb 7, 2017 Contributor

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

@mkrautz
Member
mkrautz commented Feb 7, 2017

How about these icons?

SVGs in...
pushtomute.zip

Classic:
muted_pushtomute2

Theme:
muted_pushtomute_theme

@Nuc1eoN
Nuc1eoN commented Feb 8, 2017 edited

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

@Kissaki What do you think?

@Kissaki
Member
Kissaki 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
Member
Kissaki commented Feb 13, 2017 edited

I will build and test before landing

themes/MumbleTheme.qrc
@@ -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>
@Kissaki
Kissaki Feb 14, 2017 Member

File does not exist in the theme yet.

@Kissaki Kissaki referenced this pull request in mumble-voip/mumble-theme Feb 14, 2017
Merged

Add push-to-mute icon #11

@Kissaki Kissaki Add theme push-to-mute icon
ef03f56
@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 from WIP: Indicate push-to-mute in tray to Indicate push-to-mute in tray Feb 14, 2017
@mkrautz mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017
@Kissaki @mkrautz Kissaki + mkrautz Add push-to-mute icon 2aff56f
@mkrautz mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017
@Kissaki @mkrautz Kissaki + mkrautz Add push-to-mute icon 8bc3927
@mkrautz mkrautz added a commit to mkrautz/mumble that referenced this pull request Feb 19, 2017
@Kissaki @mkrautz Kissaki + mkrautz Add push-to-mute icon 5154947
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment