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

fix: Ensure proper support for breeze icon theme #93

Merged
merged 2 commits into from
Nov 28, 2020
Merged

fix: Ensure proper support for breeze icon theme #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d9bd98
fix: Ensure proper support for breeze icon theme
pktiuk Nov 27, 2020
625b1f1
Merge branch 'master' into dark_tray_icon
pktiuk Nov 28, 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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ if(UNIX)
ecm_install_icons(ICONS src/icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
ecm_install_icons(ICONS src/icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

install(FILES src/images/antimicrox.png src/images/antimicrox_trayicon.png src/images/axis.png src/images/button.png src/images/controllermap.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/antimicrox/images")
ecm_install_icons(ICONS src/images/breeze_themed/48-apps-antimicrox_trayicon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons THEME breeze)
ecm_install_icons(ICONS src/images/48-apps-antimicrox_trayicon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

install(FILES CHANGELOG.md DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/doc/antimicrox")
install(FILES other/io.github.antimicrox.antimicrox.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
Expand Down
0 src/images/antimicrox_trayicon.png → src/images/48-apps-antimicrox_trayicon.png
View file
Open in desktop
File renamed without changes
Binary file added src/images/breeze_themed/48-apps-antimicrox_trayicon.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.
2 changes: 1 addition & 1 deletion src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ void MainWindow::populateTrayIcon()
trayIconMenu->addAction(updateJoy);
trayIconMenu->addAction(closeAction);

QIcon icon = QIcon::fromTheme("antimicrox", QIcon(":/images/antimicrox_trayicon.png"));
QIcon icon = PadderCommon::loadIcon("antimicrox_trayicon", ":/images/antimicrox_trayicon.png");
trayIcon->setIcon(icon);
trayIcon->setContextMenu(trayIconMenu);

Expand Down
2 changes: 1 addition & 1 deletion src/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/">
<file>images/antimicrox.png</file>
<file>images/antimicrox_trayicon.png</file>
<file alias="images/antimicrox_trayicon.png">images/48-apps-antimicrox_trayicon.png</file>
<file>images/axis.png</file>
<file>images/button.png</file>
<file>images/controllermap.png</file>
Expand Down