Sidebar tidy-up and bug fixes

svn: r16319
This commit is contained in:
Nick Hall
2010-12-28 17:04:41 +00:00
parent a5ab94721f
commit 6f7ce7726f
26 changed files with 388 additions and 572 deletions

View File

@ -113,7 +113,7 @@ class MediaView(ListView):
_DND_TYPE = DdTargets.URI_LIST
def __init__(self, dbstate, uistate, wspace, nav_group=0):
def __init__(self, pdata, dbstate, uistate, nav_group=0):
signal_map = {
'media-add' : self.row_add,
@ -124,7 +124,7 @@ class MediaView(ListView):
}
ListView.__init__(
self, _('Media'), dbstate, uistate,
self, _('Media'), pdata, dbstate, uistate,
MediaView.COLUMN_NAMES, len(MediaView.COLUMN_NAMES),
MediaModel,
signal_map, dbstate.db.get_media_bookmarks(),
@ -137,6 +137,8 @@ class MediaView(ListView):
'<CONTROL>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())
def navigation_type(self):
return 'Media'
@ -335,7 +337,7 @@ class MediaView(ListView):
Utils.media_path_full(self.dbstate.db, obj.get_path()))
self.image.set_from_pixbuf(pix)
def ui_definition(self):
def additional_ui(self):
"""
Return the UIManager XML description of the menus
"""