Skip to content

Commit

Permalink
Try #1464:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] committed Apr 3, 2020
2 parents 9148960 + acd2c8f commit d62cab5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/client/gui/gui_cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,12 @@ void cmd::GuiCmd::create_menu()
{
tray_icon.setContextMenu(&tray_icon_menu);

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

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

Expand Down
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
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>

1 comment on commit d62cab5

@multipass-ci-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Snap build available: snap refresh multipass --channel edge/pr1464

Please sign in to comment.