From 28223bd848e95a727bd6778de78e8042590df0bc Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 4 Nov 2024 07:39:15 -0800 Subject: [PATCH] Install the SVG icon in the correct location This is a scalable icon that belongs into the scalable directory. Get rid of the other duplicate icon files. --- .../icons/24x24/com.github.avojak.warble.svg | 317 --------------- .../icons/32x32/com.github.avojak.warble.svg | 382 ------------------ .../icons/48x48/com.github.avojak.warble.svg | 382 ------------------ .../icons/64x64/com.github.avojak.warble.svg | 329 --------------- .../com.github.avojak.warble.svg | 0 data/meson.build | 23 +- 6 files changed, 7 insertions(+), 1426 deletions(-) delete mode 100644 data/assets/icons/24x24/com.github.avojak.warble.svg delete mode 100644 data/assets/icons/32x32/com.github.avojak.warble.svg delete mode 100644 data/assets/icons/48x48/com.github.avojak.warble.svg delete mode 100644 data/assets/icons/64x64/com.github.avojak.warble.svg rename data/assets/icons/{128x128 => }/com.github.avojak.warble.svg (100%) diff --git a/data/assets/icons/24x24/com.github.avojak.warble.svg b/data/assets/icons/24x24/com.github.avojak.warble.svg deleted file mode 100644 index 49bc652..0000000 --- a/data/assets/icons/24x24/com.github.avojak.warble.svg +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/assets/icons/32x32/com.github.avojak.warble.svg b/data/assets/icons/32x32/com.github.avojak.warble.svg deleted file mode 100644 index 490b429..0000000 --- a/data/assets/icons/32x32/com.github.avojak.warble.svg +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/assets/icons/48x48/com.github.avojak.warble.svg b/data/assets/icons/48x48/com.github.avojak.warble.svg deleted file mode 100644 index 4c45469..0000000 --- a/data/assets/icons/48x48/com.github.avojak.warble.svg +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/assets/icons/64x64/com.github.avojak.warble.svg b/data/assets/icons/64x64/com.github.avojak.warble.svg deleted file mode 100644 index 16318b9..0000000 --- a/data/assets/icons/64x64/com.github.avojak.warble.svg +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/assets/icons/128x128/com.github.avojak.warble.svg b/data/assets/icons/com.github.avojak.warble.svg similarity index 100% rename from data/assets/icons/128x128/com.github.avojak.warble.svg rename to data/assets/icons/com.github.avojak.warble.svg diff --git a/data/meson.build b/data/meson.build index 99ed90b..caf5296 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,18 +1,9 @@ -icon_sizes = ['24', '32', '48', '64', '128'] - -# Install the icons -foreach i : icon_sizes - install_data( - join_paths('assets', 'icons', i + 'x' + i, meson.project_name() + '.svg'), - install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'), - rename: '@0@.svg'.format(application_id) - ) - install_data( - join_paths('assets', 'icons', i + 'x' + i, meson.project_name() + '.svg'), - install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'), - rename: '@0@.svg'.format(application_id) - ) -endforeach +# Install the icon +install_data( + join_paths('assets', 'icons', meson.project_name() + '.svg'), + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'), + rename: '@0@.svg'.format(application_id) +) # Install the dictionary and candidate words files install_data( @@ -79,4 +70,4 @@ css_gresource = gnome.compile_resources( 'gresource_css', meson.project_name() + '.gresource.xml', source_dir: 'stylesheet' -) \ No newline at end of file +)