diff --git a/src/calibre/gui2/convert/heuristics.py b/src/calibre/gui2/convert/heuristics.py index 904804f32e..525d5ba2f1 100644 --- a/src/calibre/gui2/convert/heuristics.py +++ b/src/calibre/gui2/convert/heuristics.py @@ -53,7 +53,7 @@ class HeuristicsWidget(Widget, Ui_Form): self.opt_delete_blank_paragraphs.setEnabled(state) self.opt_format_scene_breaks.setEnabled(state) self.opt_dehyphenate.setEnabled(state) - self.opt_renumber_headings(state) + self.opt_renumber_headings.setEnabled(state) self.opt_unwrap_lines.setEnabled(state) if state and self.opt_unwrap_lines.checkState() == Qt.Checked: diff --git a/src/calibre/gui2/convert/heuristics.ui b/src/calibre/gui2/convert/heuristics.ui index c5f3c2cb3e..1578b7146c 100644 --- a/src/calibre/gui2/convert/heuristics.ui +++ b/src/calibre/gui2/convert/heuristics.ui @@ -6,8 +6,8 @@ 0 0 - 811 - 479 + 938 + 470 @@ -26,7 +26,7 @@ Heuristics - + @@ -34,19 +34,6 @@ - - - - Qt::Horizontal - - - - 131 - 22 - - - - @@ -73,13 +60,33 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Detect and markup unformatted chapter headings and sub headings + + + + Renumber sequences of <h1> or <h2> tags to prevent splitting + + + @@ -87,7 +94,7 @@ - + Ensure scene breaks are consistently formatted @@ -115,7 +122,7 @@ - + Qt::Vertical @@ -128,26 +135,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Renumber sequences of <h1> or <h2> tags to prevent splitting - - - diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py index 36a496c520..fff75a29ba 100644 --- a/src/calibre/gui2/convert/search_and_replace.py +++ b/src/calibre/gui2/convert/search_and_replace.py @@ -12,7 +12,7 @@ from calibre.gui2 import error_dialog class SearchAndReplaceWidget(Widget, Ui_Form): - TITLE = _('Search and Replace') + TITLE = _('Search &\nReplace') HELP = _('Modify the document text and structure using user defined patterns.') COMMIT_NAME = 'search_and_replace' @@ -24,9 +24,9 @@ class SearchAndReplaceWidget(Widget, Ui_Form): ) self.db, self.book_id = db, book_id self.initialize_options(get_option, get_help, db, book_id) - self.opt_sr1_search.set_msg(_('Regular Expression')) - self.opt_sr2_search.set_msg(_('Regular Expression')) - self.opt_sr3_search.set_msg(_('Regular Expression')) + self.opt_sr1_search.set_msg(_('Search Regular Expression')) + self.opt_sr2_search.set_msg(_('Search Regular Expression')) + self.opt_sr3_search.set_msg(_('Search Regular Expression')) def break_cycles(self): Widget.break_cycles(self) diff --git a/src/calibre/gui2/convert/search_and_replace.ui b/src/calibre/gui2/convert/search_and_replace.ui index ed500a4dd0..e0e9570f8c 100644 --- a/src/calibre/gui2/convert/search_and_replace.ui +++ b/src/calibre/gui2/convert/search_and_replace.ui @@ -6,80 +6,176 @@ 0 0 - 657 - 479 + 198 + 350 + + + 0 + 0 + + Form - - - - - Search + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + - - - - - - Replace + + 1. + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Replacement Text + + + + + + + + 0 + 0 + + + + + - - - 1. + + + + 0 + 0 + - - - - - - - - - - - + 2. + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Replacement Text + + + + + + + + 0 + 0 + + + + + - - - - - - - - - + + + + + 0 + 0 + + + 3. + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Replacement Text + + + + + + + + 0 + 0 + + + + + - - - - - - - - - - Qt::Vertical - - - - 20 - 330 - - - - diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui index 262894d42d..ef0677a67c 100644 --- a/src/calibre/gui2/convert/structure_detection.ui +++ b/src/calibre/gui2/convert/structure_detection.ui @@ -27,7 +27,7 @@ - + 20 @@ -64,6 +64,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/calibre/gui2/convert/xexp_edit.ui b/src/calibre/gui2/convert/xexp_edit.ui index 7e89ec5d43..4b26eb8dcf 100644 --- a/src/calibre/gui2/convert/xexp_edit.ui +++ b/src/calibre/gui2/convert/xexp_edit.ui @@ -6,8 +6,8 @@ 0 0 - 422 - 64 + 434 + 74 @@ -53,13 +53,13 @@ - Use a wizard to help construct the XPath expression + Use a wizard to help construct the Regular expression ... - + :/images/wizard.png:/images/wizard.png @@ -70,19 +70,6 @@ - - - - Qt::Horizontal - - - - 20 - 20 - - - -