Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-01-12 09:12:56 -07:00
parent e3bbb4a0de
commit 40b05944c2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/preferences/toolbar.py
View File

@ -37,7 +37,10 @@ class BaseModel(QAbstractListModel):
dont_remove_from=set(['toolbar-device'])) dont_remove_from=set(['toolbar-device']))
if name is None: if name is None:
return FakeAction('--- '+_('Separator')+' ---', None) return FakeAction('--- '+_('Separator')+' ---', None)
return gui.iactions[name] try:
return gui.iactions[name]
except:
return None
def rowCount(self, parent): def rowCount(self, parent):
return len(self._data) return len(self._data)
@ -124,7 +127,8 @@ class CurrentModel(BaseModel):
BaseModel.__init__(self) BaseModel.__init__(self)
self.gprefs_name = 'action-layout-'+key self.gprefs_name = 'action-layout-'+key
current = gprefs[self.gprefs_name] current = gprefs[self.gprefs_name]
self._data = [self.name_to_action(x, gui) for x in current] self._data = [self.name_to_action(x, gui) for x in current]
self._data = [x for x in self._data if x is not None]
self.key = key self.key = key
self.gui = gui self.gui = gui