Merge lp:~macslow/libunity/libunity.fix-841902 into lp:libunity

[Mirco Müller]

Superseded by: https://code.launchpad.net/~kamstrup/libunity/libunity.fix-841902/+merge/88924

This is the first branch of the three parts that are needed to fix LP: #841902. It is now using a new derived CheckOptionFilter and new renderer.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Sorry; there's a merge conflict...

review: Needs Fixing

[Mirco Müller (macslow)]

Merged with trunk again and fixed merge-conflicts.

[Michal Hruby (mhr3)]

Please move the new enum option to the end, otherwise we'd break ABI.

review: Needs Fixing

[Mirco Müller (macslow)]

Fixed. Please review.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looking great!

review: Approve

[Michal Hruby (mhr3)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/31/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/33/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Mirco there is a compilation error in this branch:

  unity-lens-filters.vala:366.13-366.54: error: Property `renderer_name' not found in `Unity.CheckOptionFilterCompact'
            renderer_name:"filter-checkoption-compact", visible:true,

review: Needs Fixing

[Michal Hruby (mhr3)]

Whoops, yea we turned the renderer-name into an enum (called just "renderer").

[Mikkel Kamstrup Erlandsen (kamstrup)]

looks good

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/42/console reported an error when processing this lp:~macslow/libunity/libunity.fix-841902 branch.
Not merging it.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Fixed the branch and pushed it to https://code.launchpad.net/~kamstrup/libunity/libunity.fix-841902/+merge/88924. Marking this branch superseded.

Unmerged revisions

=== modified file 'src/unity-lens-filters.vala'
--- src/unity-lens-filters.vala	2012-01-09 15:32:37 +0000
+++ src/unity-lens-filters.vala	2012-01-17 16:03:33 +0000
@@ -39,7 +39,8 @@
   CHECK_OPTIONS = 0,
   RADIO_OPTIONS,
   MULTIRANGE,
-  RATINGS
+  RATINGS,
+  CHECK_COMPACT_OPTIONS
 }
 
 /*
@@ -94,6 +95,7 @@
     switch (renderer)
     {
       case FilterRenderer.CHECK_OPTIONS: return "filter-checkoption";
+      case FilterRenderer.CHECK_COMPACT_OPTIONS: return "filter-checkoption-compact";
       case FilterRenderer.RADIO_OPTIONS: return "filter-radiooption";
       case FilterRenderer.RATINGS: return "filter-ratings";
       case FilterRenderer.MULTIRANGE: return "filter-multirange";
@@ -106,6 +108,7 @@
     switch (renderer_name)
     {
       case "filter-checkoption": return FilterRenderer.CHECK_OPTIONS;
+      case "filter-checkoption-compact": return FilterRenderer.CHECK_COMPACT_OPTIONS;
       case "filter-radiooption": return FilterRenderer.RADIO_OPTIONS;
       case "filter-ratings": return FilterRenderer.RATINGS;
       case "filter-multirange": return FilterRenderer.MULTIRANGE;
@@ -351,6 +354,20 @@
   }
 }
 
+public class CheckOptionFilterCompact : OptionsFilter
+{
+  public CheckOptionFilterCompact (string id,
+                                   string display_name,
+                                   Icon? icon_hint=null,
+                                   bool collapsed=false)
+  {
+    Object (id:id, display_name:display_name,
+            icon_hint:icon_hint, collapsed:collapsed,
+            renderer:FilterRenderer.CHECK_OPTIONS_COMPACT, visible:true,
+            filtering:false);
+  }
+}
+
 /* RatingsFilter allows the user to choose a rating between 0.0f and 1.0f in
  * 0.2f blocks (i.e. a rating up to five stars).
  */

=== modified file 'src/unity-scope-private.vala'
--- src/unity-scope-private.vala	2012-01-11 10:51:07 +0000
+++ src/unity-scope-private.vala	2012-01-17 16:03:33 +0000
@@ -215,6 +215,11 @@
                                         model.get_string (iter, FilterColumn.NAME),
                                         icon_hint);
         break;
+      case FilterRenderer.CHECK_COMPACT_OPTIONS:
+        filter = new CheckOptionFilterCompact (model.get_string (iter, FilterColumn.ID),
+                                               model.get_string (iter, FilterColumn.NAME),
+                                               icon_hint);
+        break;
       case FilterRenderer.MULTIRANGE:
         filter = new MultiRangeFilter (model.get_string (iter, FilterColumn.ID),
                                        model.get_string (iter, FilterColumn.NAME),