From e87a1159bd1fc13018d1ed4a702dd172f99be3b3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 29 Dec 2008 13:00:38 -0800 Subject: [PATCH] IGN:String changes for greater user friendliness --- src/calibre/ebooks/lrf/html/convert_from.py | 2 ++ src/calibre/gui2/main.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py index 2ed8d29468..438946f1ef 100644 --- a/src/calibre/ebooks/lrf/html/convert_from.py +++ b/src/calibre/ebooks/lrf/html/convert_from.py @@ -1906,6 +1906,8 @@ def process_file(path, options, logger=None): fpb = re.compile(options.force_page_break, re.IGNORECASE) if options.force_page_break else \ re.compile('$') cq = options.chapter_attr.split(',') + if len(cq) < 3: + raise ValueError('The --chapter-attr setting must have at least 3 commas.') options.chapter_attr = [re.compile(cq[0], re.IGNORECASE), cq[1], re.compile(cq[2], re.IGNORECASE)] options.force_page_break = fpb diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 4bbde629e5..abf0aed0fa 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -187,8 +187,8 @@ class Main(MainWindow, Ui_MainWindow): self.metadata_menu = md self.add_menu = QMenu() self.add_menu.addAction(_('Add books from a single directory')) - self.add_menu.addAction(_('Add books recursively (One book per directory, assumes every ebook file is the same book in a different format)')) - self.add_menu.addAction(_('Add books recursively (Multiple books per directory, assumes every ebook file is a different book)')) + self.add_menu.addAction(_('Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)')) + self.add_menu.addAction(_('Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)')) self.action_add.setMenu(self.add_menu) QObject.connect(self.action_add, SIGNAL("triggered(bool)"), self.add_books) QObject.connect(self.add_menu.actions()[0], SIGNAL("triggered(bool)"), self.add_books)