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

Properly display names of libraries containing the ampersand character. Fixes #1447188 [ampersand does not show in library name](https://bugs.launchpad.net/calibre/+bug/1447188)

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-23 09:17:28 +05:30
parent 54c880fb2b
commit 795fdf8376
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/actions/choose_library.py
View File

@ -303,7 +303,7 @@ class ChooseLibraryAction(InterfaceAction):
if len(lname) > 16: if len(lname) > 16:
lname = lname[:16] + u'…' lname = lname[:16] + u'…'
a = self.qaction a = self.qaction
a.setText(lname) a.setText(lname.replace('&', '&&&')) # I have no idea why this requires a triple ampersand
self.update_tooltip(db.count()) self.update_tooltip(db.count())
self.build_menus() self.build_menus()
state = self.view_state_map.get(self.stats.canonicalize_path( state = self.view_state_map.get(self.stats.canonicalize_path(
@ -331,6 +331,7 @@ class ChooseLibraryAction(InterfaceAction):
self.delete_menu.clear() self.delete_menu.clear()
quick_actions, rename_actions, delete_actions = [], [], [] quick_actions, rename_actions, delete_actions = [], [], []
for name, loc in locations: for name, loc in locations:
name = name.replace('&', '&&')
ac = self.quick_menu.addAction(name, Dispatcher(partial(self.switch_requested, ac = self.quick_menu.addAction(name, Dispatcher(partial(self.switch_requested,
loc))) loc)))
ac.setStatusTip(_('Switch to: %s') % loc) ac.setStatusTip(_('Switch to: %s') % loc)
@ -347,6 +348,7 @@ class ChooseLibraryAction(InterfaceAction):
qs_actions = [] qs_actions = []
for i, x in enumerate(locations[:len(self.switch_actions)]): for i, x in enumerate(locations[:len(self.switch_actions)]):
name, loc = x name, loc = x
name = name.replace('&', '&&')
ac = self.switch_actions[i] ac = self.switch_actions[i]
ac.setText(name) ac.setText(name)
ac.setStatusTip(_('Switch to: %s') % loc) ac.setStatusTip(_('Switch to: %s') % loc)
@ -371,12 +373,13 @@ class ChooseLibraryAction(InterfaceAction):
LibraryDatabase = db_class() LibraryDatabase = db_class()
loc = location.replace('/', os.sep) loc = location.replace('/', os.sep)
base = os.path.dirname(loc) base = os.path.dirname(loc)
newname, ok = QInputDialog.getText(self.gui, _('Rename') + ' ' + name, old_name = name.replace('&&', '&')
newname, ok = QInputDialog.getText(self.gui, _('Rename') + ' ' + old_name,
'<p>'+_('Choose a new name for the library <b>%s</b>. ')%name + '<p>'+_('Choose a new name for the library <b>%s</b>. ')%name +
'<p>'+_('Note that the actual library folder will be renamed.'), '<p>'+_('Note that the actual library folder will be renamed.'),
text=name) text=old_name)
newname = sanitize_file_name_unicode(unicode(newname)) newname = sanitize_file_name_unicode(unicode(newname))
if not ok or not newname or newname == name: if not ok or not newname or newname == old_name:
return return
newloc = os.path.join(base, newname) newloc = os.path.join(base, newname)
if os.path.exists(newloc): if os.path.exists(newloc):

1
src/calibre/gui2/actions/copy_to_library.py
View File

@ -351,6 +351,7 @@ class CopyToLibraryAction(InterfaceAction):
self.menu.addAction(_('Choose library by path...'), self.choose_library) self.menu.addAction(_('Choose library by path...'), self.choose_library)
self.menu.addSeparator() self.menu.addSeparator()
for name, loc in locations: for name, loc in locations:
name = name.replace('&', '&&')
self.menu.addAction(name, partial(self.copy_to_library, self.menu.addAction(name, partial(self.copy_to_library,
loc)) loc))
self.menu.addAction(name + ' ' + _('(delete after copy)'), self.menu.addAction(name + ' ' + _('(delete after copy)'),