Merge lp:~submarine/unity-scope-manpages/icon-fixes into lp:unity-scope-manpages

[David Callé]

Kill warning from preview image, add provider icon to the preview, fix wrong results icons

- Kill warning from preview image
- Add provider icon to the preview
- Fix wrong results icons : when an app icon was matched with a manpage, it was used for all subsequent results until the next app icon match
- Update translations

[Paweł Stołowski (stolowski)]

Works fine, just one question:

51 +msgid ""
52 +"This is an Ubuntu search plugin that enables information from local manpages "
53 +"to be searched and displayed in the Dash underneath the Code header. If you "
54 +"do not wish to search this content source, you can disable this search "
55 +"plugin."

I know this is auto-generated, but looks a bit suspicious; is this a correct multi-line msgid?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

That's a very good question. From what I can see elsewhere (eg http://bazaar.launchpad.net/~ubuntuone-control-tower/software-center/trunk/files/head:/po/ ) this is the correct multi-line syntax.

[Paweł Stołowski (stolowski)]

review: Approve

=== modified file 'po/unity-scope-manpages.pot'
--- po/unity-scope-manpages.pot	2013-02-21 01:00:03 +0000
+++ po/unity-scope-manpages.pot	2013-05-13 16:58:27 +0000
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../src/unity_manpages_daemon.py:36
+#: ../src/unity_manpages_daemon.py:37
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-21 02:00+0100\n"
+"POT-Creation-Date: 2013-05-13 18:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,18 +18,22 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/unity_manpages_daemon.py:34
+#: ../src/unity_manpages_daemon.py:35
 msgid "Search Manpages"
 msgstr ""
 
-#: ../src/unity_manpages_daemon.py:35
+#: ../src/unity_manpages_daemon.py:36
 msgid "Sorry, there are no Manpages that match your search."
 msgstr ""
 
-#: ../src/unity_manpages_daemon.py:44
+#: ../src/unity_manpages_daemon.py:45
 msgid "Technical Documents"
 msgstr ""
 
+#: ../src/unity_manpages_daemon.py:99
+msgid "Show"
+msgstr ""
+
 #: ../data/manpages.scope.in.h:1
 msgid "manpages;"
 msgstr ""
@@ -39,7 +43,11 @@
 msgstr ""
 
 #: ../data/manpages.scope.in.h:3
-msgid "Find Manpages"
+msgid ""
+"This is an Ubuntu search plugin that enables information from local manpages "
+"to be searched and displayed in the Dash underneath the Code header. If you "
+"do not wish to search this content source, you can disable this search "
+"plugin."
 msgstr ""
 
 #: ../data/manpages.scope.in.h:4

=== modified file 'src/unity_manpages_daemon.py'
--- src/unity_manpages_daemon.py	2013-03-29 23:02:38 +0000
+++ src/unity_manpages_daemon.py	2013-05-13 16:58:27 +0000
@@ -37,7 +37,7 @@
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
 PROVIDER_ICON = SVG_DIR + 'service-manpages.svg'
-DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
+DEFAULT_RESULT_ICON = SVG_DIR + 'service-manpages.svg'
 DEFAULT_RESULT_MIMETYPE = 'x-scheme-handler/man'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 
@@ -75,6 +75,8 @@
         icon_info = icon_theme.lookup_icon(res[0], 128, 0)
         if icon_info:
             icon_hint = Gio.ThemedIcon.new(res[0]).to_string()
+        else:
+            icon_hint = None
         results.append({'uri': uri,
                         'icon': icon_hint,
                         'category': 0,
@@ -88,7 +90,8 @@
     def do_run(self):
         preview = Unity.GenericPreview.new(self.result.title, '', None)
         preview.props.subtitle = self.result.comment
-        preview.props.image = Gio.ThemedIcon.new(self.result.icon_hint)
+        image = Gio.ThemedIcon.new(self.result.icon_hint)
+        preview.props.image = image
         manpage = subprocess.check_output(['man', self.result.title])
         match = re.search('NAME', manpage.decode('utf-8'))
         description = manpage.decode('utf-8')[match.start():]
@@ -96,7 +99,8 @@
         if len(description) > 5000:
             description = description[:5000] + '…'
         preview.props.description_markup = description
-        view_action = Unity.PreviewAction.new("show", _("Show"), None)
+        icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
+        view_action = Unity.PreviewAction.new("open", _("Open"), icon)
         preview.add_action(view_action)
         return preview