Merge lp:~donadigo/appcenter/prefer-stock into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

Use icons from the theme when available

Fixes bug #1525037: "Use icons from the theme when available".

Prefer the stock icons, if there is no icon found in the icon theme, fallback to URLs / filenames.

* Instead of duplicating the code, the icon code has been moved to the Package class for consistency.

[Danielle Foré (danrabbit)]

I can confirm that this works and in all views :)

review: Approve (testing)

[Corentin Noël (tintou)]

We discussed about some changes to do

review: Needs Fixing (code)

[lp:~donadigo/appcenter/prefer-stock]

209. By Adam Bieńkowski on 2016-06-21

Prefer stock icons

[Corentin Noël (tintou)]

Nice, now working as intended

review: Approve (code)

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-05-01 22:39:22 +0000
+++ src/Core/Package.vala	2016-06-21 17:44:46 +0000
@@ -141,6 +141,47 @@
         return null;
     }
 
+    public GLib.Icon get_icon (uint size = 32) {
+        GLib.Icon icon = new ThemedIcon ("application-default-icon");
+        uint current_size = 0;
+
+        bool is_stock = false;
+        component.get_icons ().foreach ((_icon) => {
+            if (is_stock) {
+                return;
+            }            
+
+            switch (_icon.get_kind ()) {
+                case AppStream.IconKind.STOCK:
+                    if (Gtk.IconTheme.get_default ().has_icon (_icon.get_name ())) {
+                        is_stock = true;
+                        icon = new ThemedIcon (_icon.get_name ());
+                    }
+                    
+                    break;
+                case AppStream.IconKind.CACHED:
+                case AppStream.IconKind.LOCAL:
+                    if (_icon.get_width () > current_size && current_size < size) {
+                        var file = File.new_for_path (_icon.get_filename ());
+                        icon = new FileIcon (file);
+                        current_size = _icon.get_width ();
+                    }
+
+                    break;
+                case AppStream.IconKind.REMOTE:
+                    if (_icon.get_width () > current_size && current_size < size) {
+                        var file = File.new_for_uri (_icon.get_url ());
+                        icon = new FileIcon (file);
+                        current_size = _icon.get_width ();
+                    }
+
+                    break;
+            }
+        });
+
+        return icon;
+    }
+
     public string? get_version () {
         var package = find_package ();
         if (package != null) {
 
=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2016-06-12 22:00:29 +0000
+++ src/Views/AppInfoView.vala	2016-06-21 17:44:46 +0000
@@ -43,38 +43,7 @@
         app_name.label = package.get_name ();
         app_summary.label = package.get_summary ();
         parse_description (package.component.get_description ());
-        uint size = 0;
-        string icon_name = "application-default-icon";
-        package.component.get_icons ().foreach ((icon) => {
-            switch (icon.get_kind ()) {
-                case AppStream.IconKind.STOCK:
-                    icon_name = icon.get_name ();
-                    break;
-                case AppStream.IconKind.CACHED:
-                case AppStream.IconKind.LOCAL:
-                    var current_size = icon.get_width ();
-                    if (current_size > size) {
-                        size = current_size;
-                        var file = File.new_for_path (icon.get_filename ());
-                        app_icon.gicon = new FileIcon (file);
-                    }
-
-                    break;
-                case AppStream.IconKind.REMOTE:
-                    var current_size = icon.get_width ();
-                    if (current_size > size) {
-                        size = current_size;
-                        var file = File.new_for_uri (icon.get_url ());
-                        app_icon.gicon = new FileIcon (file);
-                    }
-
-                    break;
-            }
-        });
-
-        if (app_icon.gicon == null) {
-            app_icon.gicon = new ThemedIcon (icon_name);
-        }
+        app_icon.gicon = package.get_icon (128);
 
         if (package.update_available) {
             action_button.label = _("Update");
 
=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2016-06-15 17:07:50 +0000
+++ src/Widgets/PackageRow.vala	2016-06-21 17:44:46 +0000
@@ -39,28 +39,7 @@
         package_name.label = package.get_name ();
         package_summary.label = package.get_summary ();
         package_summary.ellipsize = Pango.EllipsizeMode.END;
-
-        string icon_name = "application-default-icon";
-        package.component.get_icons ().foreach ((icon) => {
-            switch (icon.get_kind ()) {
-                case AppStream.IconKind.STOCK:
-                    icon_name = icon.get_name ();
-                    break;
-                case AppStream.IconKind.CACHED:
-                case AppStream.IconKind.LOCAL:
-                    var file = File.new_for_path (icon.get_filename ());
-                    image.gicon = new FileIcon (file);
-                    break;
-                case AppStream.IconKind.REMOTE:
-                    var file = File.new_for_uri (icon.get_url ());
-                    image.gicon = new FileIcon (file);
-                    break;
-            }
-        });
-
-        if (image.gicon == null) {
-            image.gicon = new ThemedIcon (icon_name);
-        }
+        image.gicon = package.get_icon ();
 
         package.notify["installed"].connect (() => {
             changed ();