Skip to content

Commit 48ede95

Browse files
kaiwkaiw
committed
Add icon for Meld development version and accommodate in build
The new development icon is generated thanks to App Icon Preview. This commit also renames the source icons to capitalise the application name, as favoured by general GNOME style. These were already *installed* to that name, but now they're appropriately named in source as well.
1 parent 16355d2 commit 48ede95

7 files changed

Lines changed: 69 additions & 5 deletions

File tree

‎data/icons/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
all:
3-
convert -background transparent hicolor/scalable/apps/org.gnome.meld.svg -define icon:auto-resize=16,22,32,48 org.gnome.meld.ico
3+
convert -background transparent hicolor/scalable/apps/org.gnome.Meld.svg -define icon:auto-resize=16,22,32,48 org.gnome.meld.ico

‎data/icons/README‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ Application icons
33
=================
44

55
On *nix platforms we only ship SVG application icons: the regular Meld icon at
6-
`hicolor/scalable/apps/org.gnome.meld.svg`, and the symbolic icon for GNOME
7-
shell presentation at `hicolor/symbolic/apps/org.gnome.meld.svg`.
6+
`hicolor/scalable/apps/org.gnome.Meld.svg`, the development version of the
7+
icon `hicolor/scalable/apps/org.gnome.MeldDevel.svg`, and the symbolic icon
8+
for GNOME shell presentation at
9+
`hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg`.
810

911
The Windows `ico` file in this folder is converted from the SVG source. See
1012
the `Makefile` in this folder for the very simple command.

data/icons/hicolor/scalable/apps/org.gnome.meld.svg renamed to data/icons/hicolor/scalable/apps/org.gnome.Meld.svg

File renamed without changes.

‎data/icons/hicolor/scalable/apps/org.gnome.MeldDevel.svg‎

Lines changed: 61 additions & 0 deletions
Loading

data/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg renamed to data/icons/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg

File renamed without changes.

‎data/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ icon_sizes = ['scalable']
110110

111111
foreach i : icon_sizes
112112
install_data(
113-
join_paths('icons/hicolor', i , 'apps', resource_base_id + '.svg'),
113+
join_paths('icons/hicolor', i , 'apps', application_id + '.svg'),
114114
install_dir: join_paths(icondir, 'hicolor', i , 'apps'),
115115
rename: '@0@.svg'.format(application_id)
116116
)
117117
endforeach
118118

119119
# Install the symbolic icon
120120
install_data(
121-
join_paths('icons/hicolor/symbolic/apps', resource_base_id + '-symbolic.svg'),
121+
join_paths('icons/hicolor/symbolic/apps', application_id_no_profile + '-symbolic.svg'),
122122
install_dir: join_paths(icondir, 'hicolor', 'symbolic', 'apps'),
123123
rename: '@0@-symbolic.svg'.format(application_id)
124124
)

‎meson.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ else
3232
endif
3333

3434
resource_base_id = 'org.gnome.meld'
35+
application_id_no_profile = 'org.gnome.Meld'
3536
application_id = 'org.gnome.Meld@0@'.format(profile)
3637

3738
prefix = get_option('prefix')

0 commit comments

Comments
 (0)