Merge lp:~submarine/unity-scope-firefoxbookmarks/new-icon into lp:unity-scope-firefoxbookmarks

Proposed by David Callé on 2013-06-07
Status: Merged
Approved by: David Callé on 2013-07-01
Approved revision: 29
Merged at revision: 29
Proposed branch: lp:~submarine/unity-scope-firefoxbookmarks/new-icon
Merge into: lp:unity-scope-firefoxbookmarks
Diff against target: 44 lines (+5/-5)
2 files modified
data/firefoxbookmarks.scope.in (+1/-1)
src/unity_firefoxbookmarks_daemon.py (+4/-4)
To merge this branch: bzr merge lp:~submarine/unity-scope-firefoxbookmarks/new-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-07-01
Paweł Stołowski 2013-06-07 Approve on 2013-06-11
Review via email: mp+168081@code.launchpad.net

Commit message

Use the bookmark icon and change Show to Open

Description of the change

Use the bookmarks icon
Change Show to Open (to match other scopes)

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

31 if not os.path.exists(icon):
32 - icon = 'gtk-about'
33 + icon = None

Why not DEFAULT_RESULT_ICON?

review: Needs Information
David Callé (davidc3) wrote :

the do_run method takes care of that later in the process.

Paweł Stołowski (stolowski) wrote :

Clarified on IRC. +1.

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/firefoxbookmarks.scope.in'
2--- data/firefoxbookmarks.scope.in 2013-05-02 16:27:55 +0000
3+++ data/firefoxbookmarks.scope.in 2013-06-07 14:31:39 +0000
4@@ -1,7 +1,7 @@
5 [Scope]
6 DBusName=com.canonical.Unity.Scope.Webhistory.Firefoxbookmarks
7 DBusPath=/com/canonical/unity/scope/webhistory/firefoxbookmarks
8-Icon=
9+Icon=/usr/share/icons/unity-icon-theme/places/svg/group-browserbookmarks.svg
10 QueryBinary=firefox
11 _Keywords=firefoxbookmarks;firefox;web;bookmarks;
12 RequiredMetadata=
13
14=== modified file 'src/unity_firefoxbookmarks_daemon.py'
15--- src/unity_firefoxbookmarks_daemon.py 2013-04-30 22:54:36 +0000
16+++ src/unity_firefoxbookmarks_daemon.py 2013-06-07 14:31:39 +0000
17@@ -35,8 +35,8 @@
18 NO_RESULTS_HINT = _('Sorry, there are no Bookmarks that match your search.')
19 PROVIDER_CREDITS = _('')
20 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
21-PROVIDER_ICON = SVG_DIR + 'service-firefoxbookmarks.svg'
22-DEFAULT_RESULT_ICON = 'gtk-about'
23+PROVIDER_ICON = SVG_DIR + 'group-browserbookmarks.svg'
24+DEFAULT_RESULT_ICON = SVG_DIR + 'group-browserbookmarks.svg'
25 DEFAULT_RESULT_MIMETYPE = 'text/html'
26 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
27 FIREFOX_EXECUTABLE = '/usr/bin/firefox'
28@@ -107,7 +107,7 @@
29 path = bookmark[4].replace('places.sqlite', 'thumbnails/')
30 icon = '%s%s.png' % (path, hashlib.md5(bookmark[1].encode()).hexdigest())
31 if not os.path.exists(icon):
32- icon = 'gtk-about'
33+ icon = None
34 results.append({'uri': bookmark[1],
35 'icon': icon,
36 'category': 0,
37@@ -142,7 +142,7 @@
38 preview.props.image_source_uri = 'file://' + self.result.icon_hint
39 else:
40 preview.props.image = Gio.ThemedIcon.new('gtk-about')
41- show_action = Unity.PreviewAction.new("show", _("Show"), None)
42+ show_action = Unity.PreviewAction.new("show", _("Open"), None)
43 preview.add_action(show_action)
44 return preview
45

Subscribers

People subscribed via source and target branches

to all changes: