From 37b6236b19bd42e73e9953ce479b20a56d7bd876 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 13 Nov 2014 16:14:12 +0530 Subject: [PATCH] Fix #1388651 [[Enhancement] change TOC Auto-Rename mask](https://bugs.launchpad.net/calibre/+bug/1388651) --- src/calibre/gui2/toc/main.py | 7 ++++--- src/calibre/gui2/tweak_book/file_list.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/toc/main.py b/src/calibre/gui2/toc/main.py index 0d361a3a0f..6f7ad7f82e 100644 --- a/src/calibre/gui2/toc/main.py +++ b/src/calibre/gui2/toc/main.py @@ -509,10 +509,11 @@ class TreeWidget(QTreeWidget): # {{{ from calibre.gui2.tweak_book.file_list import get_bulk_rename_settings sort_map = {item:i for i, item in enumerate(self.iteritems())} items = sorted(self.selectedItems(), key=lambda x:sort_map.get(x, -1)) - fmt, num = get_bulk_rename_settings(self, len(items), msg=_( + fmt, num = get_bulk_rename_settings(self, len(items), prefix=_('Chapter '), msg=_( 'All selected items will be renamed to the form prefix-number'), sanitize=lambda x:x, leading_zeros=False) - for i, item in enumerate(items): - item.setData(0, Qt.DisplayRole, fmt % (num + i)) + if fmt is not None and num is not None: + for i, item in enumerate(items): + item.setData(0, Qt.DisplayRole, fmt % (num + i)) def keyPressEvent(self, ev): if ev.key() == Qt.Key_Left and ev.modifiers() & Qt.CTRL: diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py index dc4c47ea59..663ab51b3f 100644 --- a/src/calibre/gui2/tweak_book/file_list.py +++ b/src/calibre/gui2/tweak_book/file_list.py @@ -53,12 +53,13 @@ def name_is_ok(name, show_error): show_error('') return True -def get_bulk_rename_settings(parent, number, msg=None, sanitize=sanitize_file_name_unicode, leading_zeros=True): # {{{ +def get_bulk_rename_settings(parent, number, msg=None, sanitize=sanitize_file_name_unicode, leading_zeros=True, prefix=None): # {{{ d = QDialog(parent) + d.setWindowTitle(_('Bulk rename items')) d.l = l = QFormLayout(d) d.setLayout(l) d.prefix = p = QLineEdit(d) - p.setText(_('Chapter-')) + p.setText(prefix or _('Chapter-')) p.selectAll() d.la = la = QLabel(msg or _( 'All selected files will be renamed to the form prefix-number'))