Merge lp:~jamesh/unity-scope-calculator/preview-image into lp:unity-scope-calculator

[James Henstridge]

Add a calculator image to the scope preview.

Add a calculator image to the scope preview.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/unity-scope-calculator-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-calculator-raring-amd64-ci/2

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

LGTM

review: Approve

=== modified file 'src/unity_calculator_daemon.py'
--- src/unity_calculator_daemon.py	2013-03-22 14:24:10 +0000
+++ src/unity_calculator_daemon.py	2013-05-10 05:41:25 +0000
@@ -146,7 +146,8 @@
 class Preview (Unity.ResultPreviewer):
 
     def do_run(self):
-        preview = Unity.GenericPreview.new(self.result.title, '', None)
+        image = Gio.ThemedIcon.new('gnome-calculator')
+        preview = Unity.GenericPreview.new(self.result.title, '', image)
         preview.props.subtitle = self.result.comment
         open_action = Unity.PreviewAction.new("open", _("Open in calculator"), None)
         preview.add_action(open_action)
 
=== modified file 'tests/test_calculator.py'
--- tests/test_calculator.py	2013-03-22 11:32:08 +0000
+++ tests/test_calculator.py	2013-05-10 05:41:25 +0000
@@ -68,5 +68,18 @@
         self.assertResultTitle('bob', [])
         self.assertResultTitle('1**1', [])
 
+    def test_preview(self):
+        result = Unity.ScopeResult()
+        result.uri = "3"
+        result.title = "3"
+        result.comment = "1+2"
+        metadata = Unity.SearchMetadata()
+        previewer = self.scope.create_previewer(result, metadata)
+        preview = previewer.run()
+        self.assertEqual(preview.props.title, "3")
+        self.assertEqual(preview.props.subtitle, "1+2")
+        self.assertNotEqual(preview.props.image, None)
+        self.assertEqual(preview.props.image.get_names(), ['gnome-calculator'])
+
 if __name__ == '__main__':
     unittest.main()