tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a few bugs in the unity scope and try to improve icon generation. Thumbnails are broken because python and the desktop have different ideas about url encoding

Browse Source
This commit is contained in:
Jean-Francois Dockes 2014-04-01 11:22:02 +02:00
parent 25948240a7
commit 20fea118c5
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/desktop/unity-scope-recoll/unity_recoll_daemon.py
View File

@ -95,10 +95,11 @@ UNITY_TYPE_TO_RECOLL_CLAUSE = {
} }
# Icon names for some recoll mime types which don't have standard icon # Icon names for some recoll mime types which don't have standard icon
# by the normal method # by the normal method. Some keys are actually icon names, not mime types
SPEC_MIME_ICONS = {'application/x-fsdirectory' : 'gnome-fs-directory.svg', SPEC_MIME_ICONS = {'application/x-fsdirectory' : 'gnome-fs-directory',
'inode/directory' : 'gnome-fs-directory.svg', 'inode/directory' : 'gnome-fs-directory',
'message/rfc822' : 'mail-read', 'message/rfc822' : 'emblem-mail',
'message-rfc822' : 'emblem-mail',
'application/x-recoll' : 'recoll'} 'application/x-recoll' : 'recoll'}
# Truncate results here: # Truncate results here:
@ -205,7 +206,7 @@ class RecollScope(Unity.AbstractScope):
filters.add(f) filters.add(f)
f2 = Unity.CheckOptionFilter.new ( f2 = Unity.CheckOptionFilter.new (
"type", _("Type"), Gio.ThemedIcon.new("inpt-keyboard-symbolic"), False) "type", _("Type"), Gio.ThemedIcon.new("input-keyboard-symbolic"), False)
f2.add_option ("documents", _("Documents"), None) f2.add_option ("documents", _("Documents"), None)
f2.add_option ("folders", _("Folders"), None) f2.add_option ("folders", _("Folders"), None)
f2.add_option ("images", _("Images"), None) f2.add_option ("images", _("Images"), None)
@ -216,7 +217,7 @@ class RecollScope(Unity.AbstractScope):
filters.add (f2) filters.add (f2)
f3 = Unity.MultiRangeFilter.new ( f3 = Unity.MultiRangeFilter.new (
"size", _("Size"), Gio.ThemedIcon.new("inpt-keyboard-symbolic"), False) "size", _("Size"), Gio.ThemedIcon.new("input-keyboard-symbolic"), False)
f3.add_option ("1kb", _("1KB"), None) f3.add_option ("1kb", _("1KB"), None)
f3.add_option ("100kb", _("100KB"), None) f3.add_option ("100kb", _("100KB"), None)
f3.add_option ("1mb", _("1MB"), None) f3.add_option ("1mb", _("1MB"), None)
@ -239,12 +240,14 @@ class RecollScope(Unity.AbstractScope):
return RecollScopeSearch(search_context) return RecollScopeSearch(search_context)
def do_activate(self, result, metadata, id): def do_activate(self, result, metadata, id):
print("RecollScope: do_activate. id [%s] uri [%s]" % (id,uri), print("RecollScope: do_activate. id [%s] uri [%s]" % (id, result.uri),
file=sys.stderr) file=sys.stderr)
if id == 'show': if id == 'show':
filename = result.uri filename = result.uri
dirname = os.path.dirname(filename) dirname = os.path.dirname(filename)
os.system("xdg-open '%s'" % str(dirname)) os.system("xdg-open '%s'" % str(dirname))
return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH,
goto_uri=None)
else: else:
uri = result.uri uri = result.uri
# Pass all uri without fragments to the desktop handler # Pass all uri without fragments to the desktop handler
@ -441,10 +444,8 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
if thumbnail: if thumbnail:
iconname = thumbnail iconname = thumbnail
else: else:
if doc.mimetype in SPEC_MIME_ICONS: content_type = Gio.content_type_from_mime_type(doc.mimetype)
iconname = SPEC_MIME_ICONS[doc.mimetype] icon = Gio.content_type_get_icon(content_type)
else:
icon = Gio.content_type_get_icon(doc.mimetype)
if icon: if icon:
# At least on Quantal, get_names() sometimes returns # At least on Quantal, get_names() sometimes returns
# a list with '(null)' in the first position... # a list with '(null)' in the first position...
@ -452,6 +453,11 @@ class RecollScopeSearch(Unity.ScopeSearchBase):
if iname != '(null)': if iname != '(null)':
iconname = iname iconname = iname
break break
if iconname in SPEC_MIME_ICONS:
iconname = SPEC_MIME_ICONS[iconname]
if iconname == "":
if doc.mimetype in SPEC_MIME_ICONS:
iconname = SPEC_MIME_ICONS[doc.mimetype]
return (url, mimetype, iconname); return (url, mimetype, iconname);