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.

Sign up for GitHub

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

Jump to bottom

[untested] Add monochrome menubar icon for mac #1464

Closed
wants to merge 3 commits into from
Closed

[untested] Add monochrome menubar icon for mac #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0435c6
Add monochrome menubar icon for mac
felixbuenemann Apr 4, 2020
644f9e1
Fix multipass icon cropped top and left edges
felixbuenemann Apr 4, 2020
d071bff
Add missing semicolon.
Saviq Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/client/gui/gui_cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,13 @@ void cmd::GuiCmd::create_menu()
{
tray_icon.setContextMenu(&tray_icon_menu);

tray_icon.setIcon(QIcon{":images/multipass-icon.png"});
#ifdef Q_OS_MACOS
QIcon icon{":images/multipass-menubar-icon-mac.png"};
icon.setIsMask(true);
#else
QIcon icon{":images/multipass-icon.png"};
#endif
tray_icon.setIcon(icon);

QObject::connect(&list_watcher, &QFutureWatcher<ListReply>::finished, this, &GuiCmd::update_menu);

Expand Down
Binary file modified src/client/gui/resources/images/multipass-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/client/gui/resources/images/multipass-menubar-icon-mac.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/client/gui/resources/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
<qresource>
<file>images/multipass-icon.png</file>
</qresource>
<qresource>
<file>images/multipass-menubar-icon-mac.png</file>
</qresource>
</RCC>