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

Load window icons from a custom icon theme #2088

Merged
merged 3 commits into from
Dec 29, 2023

Conversation

lmoureaux
Copy link
Contributor

The window icons used to be set by the tileset. This allowed user-made tilesets to override our branding and required loading tilesets before the first window was shown.

This commit moves the app icons away from tilesets into a custom icon theme (this should eventually be merged into the hicolor theme).

Closes #984.
Closes #2019.

Untested on Windows and Mac, but I tried to update all references to misc/freeciv21-*.png.

The window icons used to be set by the tileset. This allowed user-made tilesets
to override our branding and required loading tilesets before the first window
was shown.

This commit moves the app icons away from tilesets into a custom icon theme
(this should eventually be merged into the hicolor theme).

Closes longturn#984.
Closes longturn#2019.
@lmoureaux lmoureaux requested a review from jwrober December 26, 2023 01:50
cmake/FreecivInstall.cmake Outdated Show resolved Hide resolved
@lmoureaux lmoureaux requested a review from jwrober December 27, 2023 17:02
Copy link
Collaborator

@jwrober jwrober left a comment

Choose a reason for hiding this comment

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

need another change

data/CMakeLists.txt Outdated Show resolved Hide resolved
@lmoureaux lmoureaux requested a review from jwrober December 29, 2023 00:51
Copy link
Collaborator

@jwrober jwrober left a comment

Choose a reason for hiding this comment

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

Tada!

@jwrober jwrober merged commit 2b12b82 into longturn:master Dec 29, 2023
19 checks passed
jwrober pushed a commit that referenced this pull request Dec 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The client cannot find its window icon Window icons can be changed by the tileset
2 participants