From 50b164a7ce83cdaec18209c7c2226d2fdb9cf29e Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 17 Apr 2014 09:55:33 +0100 Subject: New syntax for ecm_install_icons() This requires the icon files to be specified (which is better than globbing, because the build system will then be able to tell when files are added or removed and re-run CMake). It also removes the theme name from the filename pattern: the old code used a shorthand theme name for a small number of themes, and didn't allow any other themes. Extending this to arbitrary themes could cause problems with themes that have numbers or hyphens (or whatever other delimiter character was used) in their names. Most users are likely to just want to install to a single theme anyway (based on a random sampling of users of kde4_install_icons), so that is what the new syntax requires. The old syntax still works and behaves as before. ecm_update_iconcache is renamed to _ecm_update_iconcache - it was never documented as public API anyway. REVIEW: 117617 --- .../l10n/en_US/drive-removable-media-usb-pendrive.png | Bin 0 -> 1860 bytes .../oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png | Bin 0 -> 1860 bytes .../oxygen/128x128/places/l10n/en_US/home.mng | Bin 0 -> 450 bytes .../oxygen/16x16/actions/l10n/en_US/computer.png | Bin 0 -> 146 bytes .../oxygen/16x16/animations/l10n/en_US/loading.mng | Bin 0 -> 233 bytes .../oxygen/16x16/apps/l10n/en_US/cmake.png | Bin 0 -> 233 bytes .../oxygen/16x16/categories/l10n/en_US/system-help.mng | Bin 0 -> 233 bytes .../oxygen/16x16/emotes/l10n/en_US/face-smile.png | Bin 0 -> 146 bytes .../oxygen/16x16/intl/l10n/en_US/something.png | Bin 0 -> 146 bytes .../oxygen/16x16/status/l10n/en_US/user-online.png | Bin 0 -> 146 bytes .../scalable/mimetypes/l10n/en_US/fonts-package.svgz | Bin 0 -> 819 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/places/l10n/en_US/home.mng create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/actions/l10n/en_US/computer.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/animations/l10n/en_US/loading.mng create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/apps/l10n/en_US/cmake.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/categories/l10n/en_US/system-help.mng create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/emotes/l10n/en_US/face-smile.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/intl/l10n/en_US/something.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/status/l10n/en_US/user-online.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/scalable/mimetypes/l10n/en_US/fonts-package.svgz (limited to 'tests/ECMInstallIconsTest/expected-tree/themed-lang-test') diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png new file mode 100644 index 00000000..715218d9 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png new file mode 100644 index 00000000..715218d9 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/places/l10n/en_US/home.mng b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/places/l10n/en_US/home.mng new file mode 100644 index 00000000..c81faca3 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/places/l10n/en_US/home.mng differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/actions/l10n/en_US/computer.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/actions/l10n/en_US/computer.png new file mode 100644 index 00000000..c60150f8 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/actions/l10n/en_US/computer.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/animations/l10n/en_US/loading.mng b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/animations/l10n/en_US/loading.mng new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/animations/l10n/en_US/loading.mng differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/apps/l10n/en_US/cmake.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/apps/l10n/en_US/cmake.png new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/apps/l10n/en_US/cmake.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/categories/l10n/en_US/system-help.mng b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/categories/l10n/en_US/system-help.mng new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/categories/l10n/en_US/system-help.mng differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/emotes/l10n/en_US/face-smile.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/emotes/l10n/en_US/face-smile.png new file mode 100644 index 00000000..c60150f8 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/emotes/l10n/en_US/face-smile.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/intl/l10n/en_US/something.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/intl/l10n/en_US/something.png new file mode 100644 index 00000000..c60150f8 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/intl/l10n/en_US/something.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/status/l10n/en_US/user-online.png b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/status/l10n/en_US/user-online.png new file mode 100644 index 00000000..c60150f8 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/status/l10n/en_US/user-online.png differ diff --git a/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/scalable/mimetypes/l10n/en_US/fonts-package.svgz b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/scalable/mimetypes/l10n/en_US/fonts-package.svgz new file mode 100644 index 00000000..125002e8 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/scalable/mimetypes/l10n/en_US/fonts-package.svgz differ -- cgit v1.2.1