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

more fixes to prevent invalid names

Browse Source
This commit is contained in:
Charles Haley 2011-02-25 15:30:37 +00:00
parent cf684a052b
commit 77307904ff
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/tag_view.py
View File

@ -1276,6 +1276,12 @@ class TagsModel(QAbstractItemModel): # {{{
return False return False
item = index.internalPointer() item = index.internalPointer()
if item.type == TagTreeItem.CATEGORY and item.category_key.startswith('@'): if item.type == TagTreeItem.CATEGORY and item.category_key.startswith('@'):
if val.find('.') >= 0:
error_dialog(self.tags_view, _('Rename user category'),
_('You cannot use periods in the name when '
'renaming user categories'), show=True)
return False
user_cats = self.db.prefs.get('user_categories', {}) user_cats = self.db.prefs.get('user_categories', {})
ckey = item.category_key[1:] ckey = item.category_key[1:]
dotpos = ckey.rfind('.') dotpos = ckey.rfind('.')
@ -1288,7 +1294,7 @@ class TagsModel(QAbstractItemModel): # {{{
if len(c) == len(ckey): if len(c) == len(ckey):
if nkey in user_cats: if nkey in user_cats:
error_dialog(self.tags_view, _('Rename user category'), error_dialog(self.tags_view, _('Rename user category'),
_('The name %s is already used'%nkey), show=True) _('The name %s is already used')%nkey, show=True)
return False return False
user_cats[nkey] = user_cats[ckey] user_cats[nkey] = user_cats[ckey]
del user_cats[ckey] del user_cats[ckey]