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

Window icons can be changed by the tileset #984

Closed
lmoureaux opened this issue Apr 18, 2022 · 0 comments · Fixed by #2088
Closed

Window icons can be changed by the tileset #984

lmoureaux opened this issue Apr 18, 2022 · 0 comments · Fixed by #2088
Labels
bug Something isn't working gui This issue requires changes to the user interface spec-file Related to Rulesets, Tilesets, Musicsets, Soundsets, etc.

Comments

@lmoureaux
Copy link
Contributor

Describe the bug

Tilesets are able to override the window icon using icon.freeciv (and icon.citydlg). This shouldn't be allowed.

To Reproduce

Steps to reproduce the behavior:

  1. In misc/icons.spec change "icon.freeciv", "misc/civicon" to "icon.freeciv", "misc/cityicon".
  2. Start the client.
  3. Look at the window icon in the task bar.
  4. Cry.

Expected behavior

The icon is part of the brand and cannot be overriden easily.

Screenshots

image
image

Platform and version (please complete the following information):

  • OS: all
  • Freeciv21 version: 3.0-beta1

Additional context

#978
@lmoureaux lmoureaux added bug Something isn't working gui This issue requires changes to the user interface spec-file Related to Rulesets, Tilesets, Musicsets, Soundsets, etc. labels Apr 18, 2022
@lmoureaux lmoureaux mentioned this issue Apr 18, 2022
Closed
@lmoureaux lmoureaux mentioned this issue Aug 1, 2023
Closed
lmoureaux added a commit to lmoureaux/freeciv21 that referenced this issue Dec 25, 2023
@lmoureaux
Remove .client from the main desktop file name
e1ac6d7 
This syncs with Flatpak usage, allowing the use of a single desktop file name
on all platform. (Flatpak is very opinionated.) This will be useful to set the
desktop file name on the QApplication.

Related to longturn#2019, longturn#984.
lmoureaux added a commit to lmoureaux/freeciv21 that referenced this issue Dec 25, 2023
@lmoureaux
Set desktop file names in GUI executables
56b63f2 
This gives us window icons on Wayland.

Related to longturn#2019, longturn#984.
lmoureaux added a commit that referenced this issue Dec 26, 2023
@lmoureaux
Remove .client from the main desktop file name
ca5de9d 
This syncs with Flatpak usage, allowing the use of a single desktop file name
on all platform. (Flatpak is very opinionated.) This will be useful to set the
desktop file name on the QApplication.

Related to #2019, #984.
lmoureaux added a commit that referenced this issue Dec 26, 2023
@lmoureaux
Set desktop file names in GUI executables
b204f10 
This gives us window icons on Wayland.

Related to #2019, #984.
lmoureaux added a commit to lmoureaux/freeciv21 that referenced this issue Dec 26, 2023
@lmoureaux
Load window icons from a custom icon theme
ee56c33 
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 mentioned this issue Dec 26, 2023
Merged
jwrober pushed a commit that referenced this issue Dec 29, 2023
@lmoureaux @jwrober
Load window icons from a custom icon theme
e47752e 
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working gui This issue requires changes to the user interface spec-file Related to Rulesets, Tilesets, Musicsets, Soundsets, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Load window icons from a custom icon theme lmoureaux/freeciv21
1 participant
@lmoureaux