Merge lp:~mhr3/libunity/new-category-renderers into lp:libunity

[Michal Hruby]

Use new category renderers.

Use new category renderers.

[lp:~mhr3/libunity/new-category-renderers]

257. By Michal Hruby on 2013-07-11

Bump versions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/libunity-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/59/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/libunity-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/60/rebuild

review: Approve (continuous-integration)

[lp:~mhr3/libunity/new-category-renderers]

258. By Michal Hruby on 2013-07-11

Fix email

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/libunity-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/61/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-07-04 20:21:07 +0000
+++ configure.ac	2013-07-11 12:21:26 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 7.0.8)
+AC_INIT(libunity, 7.0.9)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-04 16:41:36 +0000
+++ debian/changelog	2013-07-11 12:21:26 +0000
@@ -1,8 +1,9 @@
-libunity (7.0.8-0ubuntu1) UNRELEASED; urgency=low
+libunity (7.0.9-0ubuntu1) UNRELEASED; urgency=low
 
   * Add support for diff models.
+  * Introduce new category renderers.
 
- -- Michal Hruby <[e-mail]>  Thu, 04 Jul 2013 17:40:34 +0100
+ -- Michal Hruby <[e-mail]>  Thu, 11 Jul 2013 11:41:25 +0100
 
 libunity (7.0.7+13.10.20130703.2-0ubuntu1) saucy; urgency=low
 

=== modified file 'src/unity-category.vala'
--- src/unity-category.vala	2013-06-25 11:19:09 +0000
+++ src/unity-category.vala	2013-07-11 12:21:26 +0000
@@ -24,32 +24,38 @@
 
 public enum CategoryRenderer
 {
-  VERTICAL_TILE,
-  HORIZONTAL_TILE,
-  LIST_TILE,
-  FLOW,
-  TABULAR_TILE,
-  DYNAMIC;
+  DEFAULT = 0,
+
+  GRID = 1,
+  CAROUSEL = 2,
+  LIST = 3,
+
+  DYNAMIC = 1000,
+  SPECIAL = 1001,
+
+  /* deprecated */
+  VERTICAL_TILE = 0,
+  HORIZONTAL_TILE = 1;
 
   public static CategoryRenderer from_string (string renderer_name)
   {
     switch (renderer_name)
     {
-      case "tile-vertical":
-        return CategoryRenderer.VERTICAL_TILE;
-      case "tile-horizontal":
-        return CategoryRenderer.HORIZONTAL_TILE;
-      case "tile-list":
-        return CategoryRenderer.LIST_TILE;
-      case "flow":
-        return CategoryRenderer.FLOW;
-      case "tile-tabular":
-        return CategoryRenderer.TABULAR_TILE;
+      case "default":
+        return CategoryRenderer.DEFAULT;
+      case "grid":
+        return CategoryRenderer.GRID;
+      case "carousel":
+        return CategoryRenderer.CAROUSEL;
+      case "list":
+        return CategoryRenderer.LIST;
       case "dynamic":
         return CategoryRenderer.DYNAMIC;
+      case "special":
+        return CategoryRenderer.SPECIAL;
       default:
         warning ("Unknown CategoryRenderer: %s", renderer_name);
-        return CategoryRenderer.VERTICAL_TILE; // reserve a value for unknown?
+        return CategoryRenderer.DEFAULT;
     }
   }
 
@@ -57,20 +63,20 @@
   {
     switch (val)
     {
-      case CategoryRenderer.VERTICAL_TILE:
-        return "tile-vertical";
-      case CategoryRenderer.HORIZONTAL_TILE:
-        return "tile-horizontal";
-      case CategoryRenderer.LIST_TILE:
-        return "tile-list";
-      case CategoryRenderer.FLOW:
-        return "flow";
-      case CategoryRenderer.TABULAR_TILE:
-        return "tile-tabular";
+      case CategoryRenderer.DEFAULT:
+        return "default";
+      case CategoryRenderer.GRID:
+        return "grid";
+      case CategoryRenderer.LIST:
+        return "list";
+      case CategoryRenderer.CAROUSEL:
+        return "carousel";
       case CategoryRenderer.DYNAMIC:
         return "dynamic";
+      case CategoryRenderer.SPECIAL:
+        return "special";
       default:
-        return "unknown-renderer";
+        return "default";
     }
   }
 }
@@ -82,7 +88,8 @@
   MUSIC,
   VIDEO,
   PLACES,
-  SOCIAL;
+  SOCIAL,
+  WEATHER;
 
   public static CategoryContentType from_string (string content_type)
   {
@@ -98,6 +105,8 @@
         return CategoryContentType.PLACES;
       case "social":
         return CategoryContentType.SOCIAL;
+      case "weather":
+        return CategoryContentType.WEATHER;
       default:
         return CategoryContentType.DEFAULT;
     }
@@ -117,6 +126,8 @@
         return "places";
       case CategoryContentType.SOCIAL:
         return "social";
+      case CategoryContentType.WEATHER:
+        return "weather";
       default:
         return "default";
     }

=== modified file 'test/data/unity/scopes/masterscope_b.scope'
--- test/data/unity/scopes/masterscope_b.scope	2013-06-25 11:19:09 +0000
+++ test/data/unity/scopes/masterscope_b.scope	2013-07-11 12:21:26 +0000
@@ -26,7 +26,7 @@
 [Category cat2]
 Name=Category #2
 Icon=/usr/share/unity/category2_icon.svg
-Renderer=vertical-tile
+Renderer=list
 ContentType=music
 SortField=title
 

=== modified file 'test/vala/test-scope-discovery.vala'
--- test/vala/test-scope-discovery.vala	2013-06-25 11:19:09 +0000
+++ test/vala/test-scope-discovery.vala	2013-07-11 12:21:26 +0000
@@ -306,7 +306,7 @@
       assert (category.icon == "/usr/share/unity/category2_icon.svg");
       assert (category.dedup_field == null);
       assert (category.sort_field == "title");
-      assert (category.renderer == "vertical-tile");
+      assert (category.renderer == "list");
       assert (category.content_type == "music");
 
       var filters = metadata.get_filters ();