Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-27 11:15:40 +01:00
Code Issues Projects Releases Wiki Activity

Table of Contents Edit tool: When generating from XPath's add a checkbox to control if duplicate entries at the same level are added or not. Fixes #1790761 [Generate ToC from XPath](https://bugs.launchpad.net/calibre/+bug/1790761)

Browse source
This commit is contained in:
Kovid Goyal 2018-09-05 10:10:45 +05:30
parent 2fcf979b3c
commit d07f070a66
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/calibre/gui2/toc/main.py
View file

@ -12,7 +12,7 @@
from functools import partial
from future_builtins import map
from PyQt5.Qt import (QPushButton, QFrame, QMenu, QInputDialog,
from PyQt5.Qt import (QPushButton, QFrame, QMenu, QInputDialog, QCheckBox,
QDialog, QVBoxLayout, QDialogButtonBox, QSize, QStackedWidget, QWidget,
QLabel, Qt, pyqtSignal, QIcon, QTreeWidget, QGridLayout, QTreeWidgetItem,
QToolButton, QItemSelectionModel, QCursor, QKeySequence, QSizePolicy)
@ -60,6 +60,9 @@ def __init__(self, parent, prefs):
self.load_menu = QMenu(b)
b.setMenu(self.load_menu)
self.setup_load_button()
self.remove_duplicates_cb = QCheckBox(_('Do not add duplicate entries at the same level'))
self.remove_duplicates_cb.setChecked(self.prefs.get('xpath_toc_remove_duplicates', True))
l.addWidget(self.remove_duplicates_cb)
l.addStretch()
l.addWidget(bb)
self.resize(self.sizeHint() + QSize(50, 75))
@ -115,6 +118,7 @@ def check(self):
def accept(self):
if self.check():
self.prefs.set('xpath_toc_remove_duplicates', self.remove_duplicates_cb.isChecked())
super(XPathDialog, self).accept()
@property
@ -129,7 +133,7 @@ class ItemView(QFrame): # {{{
delete_item = pyqtSignal()
flatten_item = pyqtSignal()
go_to_root = pyqtSignal()
create_from_xpath = pyqtSignal(object)
create_from_xpath = pyqtSignal(object, object)
create_from_links = pyqtSignal()
create_from_files = pyqtSignal()
flatten_toc = pyqtSignal()
@ -303,15 +307,15 @@ def __init__(self, parent, prefs):
l.addWidget(la, l.rowCount(), 0, 1, 2)
def create_from_major_headings(self):
self.create_from_xpath.emit(['//h:h%d'%i for i in xrange(1, 4)])
self.create_from_xpath.emit(['//h:h%d'%i for i in xrange(1, 4)], True)
def create_from_all_headings(self):
self.create_from_xpath.emit(['//h:h%d'%i for i in xrange(1, 7)])
self.create_from_xpath.emit(['//h:h%d'%i for i in xrange(1, 7)], True)
def create_from_user_xpath(self):
d = XPathDialog(self, self.prefs)
if d.exec_() == d.Accepted and d.xpaths:
self.create_from_xpath.emit(d.xpaths)
self.create_from_xpath.emit(d.xpaths, d.remove_duplicates_cb.isChecked())
def hide_azw3_warning(self):
self.w1.setVisible(False), self.w2.setVisible(False)
@ -928,12 +932,14 @@ def process_node(root, tocparent, added):
process_node(self.root, toc, nodes)
self.highlight_item(nodes[0])
def create_from_xpath(self, xpaths):
def create_from_xpath(self, xpaths, remove_duplicates=True):
toc = from_xpaths(self.ebook, xpaths)
print(1111111, remove_duplicates)
if len(toc) == 0:
return error_dialog(self, _('No items found'),
_('No items were found that could be added to the Table of Contents.'), show=True)
toc.remove_duplicates()
if remove_duplicates:
toc.remove_duplicates()
self.insert_toc_fragment(toc)
def create_from_links(self):