Merge lp:~submarine/unity-scope-yelp/add-manual-in-preview into lp:unity-scope-yelp

[David Callé]

Add manual name as preview subtitle

- Add manual name as preview subtitle
- Add provider icon to preview action button
http://ubuntuone.com/7UTpEsWwbCAZq6NH1G7QDi

[lp:~submarine/unity-scope-yelp/add-manual-in-preview]

30. By David Callé on 2013-05-14

Fix preview test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-yelp-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good, works fine and looks nice! +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/yelp.scope.in'
--- data/yelp.scope.in	2013-04-26 14:38:28 +0000
+++ data/yelp.scope.in	2013-05-14 13:33:25 +0000
@@ -4,7 +4,7 @@
 Icon=/usr/share/icons/unity-icon-theme/places/svg/service-yelp.svg
 _Keywords=yelp;
 RequiredMetadata=
-OptionalMetadata=
+OptionalMetadata=manual[s];
 Loader=/usr/share/unity-scopes/yelp/unity_yelp_daemon.py
 RemoteContent=true
 Type=help
 
=== modified file 'src/unity_yelp_daemon.py'
--- src/unity_yelp_daemon.py	2013-05-13 07:07:33 +0000
+++ src/unity_yelp_daemon.py	2013-05-14 13:33:25 +0000
@@ -53,8 +53,10 @@
 CATEGORIES = [c1]
 
 FILTERS = []
-
-EXTRA_METADATA = []
+m1 = {'id'   :'manual',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+EXTRA_METADATA = [m1]
 
 
 def _get_manuals_in_dir(dir, manuals):
@@ -150,14 +152,15 @@
                 icon_hint = Gio.ThemedIcon.new(manual).to_string()
         except:
             icon_hint = Gio.ThemedIcon.new("help").to_string()
-
+            manual = "ubuntu-help"
         if (search in title.lower() or
             search in desc.lower() or
             search in manual.lower()):
             results.append({'uri': filename,
                             'icon': icon_hint,
                             'title': title,
-                            'comment': desc})
+                            'comment': desc,
+                            'manual': manual.title()})
     return results
 
 
@@ -167,7 +170,10 @@
         image = Gio.ThemedIcon.new(self.result.icon_hint)
         preview = Unity.GenericPreview.new(
             self.result.title, html.escape(self.result.comment), image)
-        action = Unity.PreviewAction.new("open", _("Open"), None)
+        if self.result.metadata:
+            preview.props.subtitle = self.result.metadata['manual'].get_string()
+        icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
+        action = Unity.PreviewAction.new("open", _("Open"), icon)
         preview.add_action(action)
         return preview
 
@@ -212,12 +218,7 @@
                             if m['id'] == e:
                                 i['metadata'][e] = i[e]
                 i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
+                result_set.add_result(**i)
         except Exception as error:
             print(error)