Merge lp:~mhr3/unity-lens-applications/colorize-scopes into lp:unity-lens-applications

[Michal Hruby]

Colorize scope icons - use orange color for enabled scopes and dim disabled ones.

Colorize scope icons - use orange color for enabled scopes and dim disabled ones.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/44/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

43 + anno_icon.set_colorize_rgba (1.0, 1.0, 1.0, 0.5);
44 + else
45 + anno_icon.set_colorize_rgba (0.86666, 0.28235, 0.07843, 1.0);

Can you add comments about what are the resulting colors (white / orange), including hex value of the orange variant?

Otherwise looking good.

review: Needs Fixing

[lp:~mhr3/unity-lens-applications/colorize-scopes]

363. By Michal Hruby on 2013-08-28

Add a comment about used colors

[Michal Hruby (mhr3)]

> Can you add comments about what are the resulting colors (white / orange),
> including hex value of the orange variant?

Added.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/45/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-07-26 09:36:11 +0000
+++ configure.ac	2013-08-28 11:43:23 +0000
@@ -78,7 +78,7 @@
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
                   libcolumbus0 >= 0.4.0
-                  unity >= 7.0.0
+                  unity >= 7.1.0
                   unity-protocol-private
                   libgnome-menu-3.0 >= 3.6.0)
 

=== modified file 'debian/control'
--- debian/control	2013-07-15 10:33:36 +0000
+++ debian/control	2013-08-28 11:43:23 +0000
@@ -11,7 +11,7 @@
                libgee-dev,
                libdee-dev (>= 0.5.16),
                libzeitgeist-dev (>= 0.3.8),
-               libunity-dev (>= 7.0.0),
+               libunity-dev (>= 7.1.0),
                libgnome-menu-3-dev,
                dh-autoreconf,
                libxapian-dev,

=== modified file 'src/scopes-scope.vala'
--- src/scopes-scope.vala	2013-08-08 16:21:51 +0000
+++ src/scopes-scope.vala	2013-08-28 11:43:23 +0000
@@ -260,6 +260,28 @@
       callback (this);
     }
 
+    private string get_scope_icon (string icon_hint, bool is_disabled)
+    {
+      try
+      {
+        Icon base_icon = icon_hint == null || icon_hint == "" ?
+          ScopesScope.get_default_icon () : Icon.new_for_string (icon_hint);
+        var anno_icon = new AnnotatedIcon (base_icon);
+        anno_icon.size_hint = IconSizeHint.SMALL;
+        // dim disabled icons by decreasing their alpha, tint enabled ones
+        // to brand orange #dd4814
+        if (is_disabled)
+          anno_icon.set_colorize_rgba (1.0, 1.0, 1.0, 0.5);
+        else
+          anno_icon.set_colorize_rgba (0.86666, 0.28235, 0.07843, 1.0);
+        return anno_icon.to_string ();
+      }
+      catch (Error err)
+      {
+        return "";
+      }
+    }
+
     private void add_local_results (string search_query, Unity.ResultSet result_set)
     {
       bool has_search = !Utils.is_search_empty (search_query);
@@ -275,13 +297,15 @@
       {
         /* Don't include master scopes in the search results.  This is
          * performed after deduping so the master scopes don't just
-         * move to hte "available" category. */
+         * move to the "available" category. */
         if (info.is_master_scope)
           continue;
 
+        bool is_disabled = info.desktop_file in scope.disabled_scope_ids;
         var result = Unity.ScopeResult ();
         result.uri = @"scope://$(info.desktop_file)";
         result.category = 0;
+        result.icon_hint = get_scope_icon (info.icon, is_disabled);
         result.result_type = Unity.ResultType.DEFAULT;
         result.mimetype = "application/x-unity-scope";
         result.title = info.application_name;
@@ -290,22 +314,7 @@
         result.comment = "";
         result.dnd_uri = "";
         result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
-        result.metadata["scope_disabled"] = new Variant.uint32 (info.desktop_file in scope.disabled_scope_ids ? 1 : 0);
-
-        var icon_hint = info.icon;
-        try
-        {
-          Icon base_icon = icon_hint == null || icon_hint == "" ?
-            ScopesScope.get_default_icon () : Icon.new_for_string (icon_hint);
-          var anno_icon = new AnnotatedIcon (base_icon);
-          anno_icon.size_hint = IconSizeHint.SMALL;
-          icon_hint = anno_icon.to_string ();
-        }
-        catch (Error err)
-        {
-          icon_hint = "";
-        }
-        result.icon_hint = icon_hint;
+        result.metadata["scope_disabled"] = new Variant.uint32 (is_disabled ? 1 : 0);
 
         result_set.add_result (result);
       }
@@ -317,11 +326,16 @@
         scope.scopes_index, scope.analyzer, search_query);
       foreach (var iter in results)
       {
-        var result = Unity.ScopeResult ();
         unowned string scope_id =
           scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.SCOPE_ID);
+        unowned string icon_hint =
+          scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.ICON_HINT);
+        bool is_disabled = scope_id in scope.disabled_scope_ids;
+
+        var result = Unity.ScopeResult ();
         result.uri = @"scope://$(scope_id)";
         result.category = 0;
+        result.icon_hint = get_scope_icon (icon_hint, is_disabled);
         result.result_type = Unity.ResultType.DEFAULT;
         result.mimetype = "application/x-unity-scope";
         result.title =
@@ -329,23 +343,7 @@
         result.comment = "";
         result.dnd_uri = "";
         result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
-        result.metadata["scope_disabled"] = new Variant.uint32 (scope_id in scope.disabled_scope_ids ? 1 : 0);
-
-        var icon_hint =
-          scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.ICON_HINT);
-        try
-        {
-          Icon base_icon = icon_hint == null || icon_hint == "" ?
-            ScopesScope.get_default_icon () : Icon.new_for_string (icon_hint);
-          var anno_icon = new AnnotatedIcon (base_icon);
-          anno_icon.size_hint = IconSizeHint.SMALL;
-          icon_hint = anno_icon.to_string ();
-        }
-        catch (Error err)
-        {
-          icon_hint = "";
-        }
-        result.icon_hint = icon_hint;
+        result.metadata["scope_disabled"] = new Variant.uint32 (is_disabled ? 1 : 0);
 
         result_set.add_result (result);
       }