Merge lp:~mterry/ubuntu-app-launch/default-themes into lp:ubuntu-app-launch

[Michael Terry]

Look in Adwaita and gnome icon themes as well as hicolor and Humanity for fallbacks.

Run "ubuntu-app-info gucharmap" before and after to see amazing results!

GTK+ uses Adwaita, gnome, and hicolor as icon fallbacks [1]. We should probably match that behavior, else some apps on the desktop don't show icons (like gucharmap).

[1] https://git.gnome.org/browse/gtk+/tree/gtk/gtkicontheme.c#n1331

[Michael Terry (mterry)]

Do we want to look at suru too?

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:295
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/242/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1743/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1750
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1525
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1525/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1525/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1525/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1525/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1525
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1525/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1525/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/242/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

I'm not sure what to say about this right now. It seems we don't really handle icon themes at all under Unity8, which is very unfortunate. Should we actually handle themes?

[Ted Gould (ted)]

I think that's a larger question. For now this fixes the issue of a broken ISO, which is an immediate need. If we want to do more theming in the future is different question.

review: Approve

[Michael Terry (mterry)]

Rejecting, this was done in lp:~larryprice/ubuntu-app-launch/better-icon-themes.

Unmerged revisions

295. By Michael Terry on 2017-03-03

Look in Adwaita and gnome icon themes too

=== modified file 'libubuntu-app-launch/application-icon-finder.cpp'
--- libubuntu-app-launch/application-icon-finder.cpp	2017-01-10 18:41:25 +0000
+++ libubuntu-app-launch/application-icon-finder.cpp	2017-03-03 22:05:22 +0000
@@ -29,6 +29,8 @@
 constexpr auto ICONS_DIR = "/icons";
 constexpr auto HICOLOR_THEME_DIR = "/icons/hicolor";
 constexpr auto HUMANITY_THEME_DIR = "/icons/Humanity";
+constexpr auto ADWAITA_THEME_DIR = "/icons/Adwaita";
+constexpr auto GNOME_THEME_DIR = "/icons/gnome";
 constexpr auto THEME_INDEX_FILE = "index.theme";
 constexpr auto APPLICATIONS_TYPE = "Applications";
 constexpr auto SIZE_PROPERTY = "Size";
@@ -347,6 +349,18 @@
     iconPaths.splice(iconPaths.end(), humanityIcons);
     g_free(humanityDir);
 
+    /* Icons from the Adwaita theme (gtk looks here by default, so lets match its behavior) */
+    auto adwaitaDir = g_build_filename(basePath.c_str(), ADWAITA_THEME_DIR, nullptr);
+    auto adwaitaIcons = iconsFromThemePath(adwaitaDir);
+    iconPaths.splice(iconPaths.end(), adwaitaIcons);
+    g_free(adwaitaDir);
+
+    /* Icons from the gnome theme (gtk looks here by default, so lets match its behavior) */
+    auto gnomeDir = g_build_filename(basePath.c_str(), GNOME_THEME_DIR, nullptr);
+    auto gnomeIcons = iconsFromThemePath(gnomeDir);
+    iconPaths.splice(iconPaths.end(), gnomeIcons);
+    g_free(gnomeDir);
+
     /* Add root icons directory as potential path */
     auto iconsPath = g_build_filename(basePath.c_str(), ICONS_DIR, nullptr);
     if (g_file_test(iconsPath, G_FILE_TEST_IS_DIR))