Finish new GUI option widgets.

src/calibre/ebooks/conversion/cli.py

@@ -131,13 +131,19 @@ def add_pipeline_options(parser, plumber):
                   ),
                   
               'HEURISTICS' : (
-                  _('Modify the document text and strucutre using common patterns.'),
+                  _('Modify the document text and structure using common patterns.'),
                   [
                       'enable_heuristics', 'markup_chapter_headings',
                       'italicize_common_cases', 'fix_indents',
                       'html_unwrap_factor', 'unwrap_lines',
                       'delete_blank_paragraphs', 'format_scene_breaks',
                       'dehyphenate',
+                  ]
+                  ),
+                  
+              'SEARCH AND REPLACE' : (
+                 _('Modify the document text and structure using user defined patterns.'),
+                 [
                       'sr1_search', 'sr1_replace',
                       'sr2_search', 'sr2_replace',
                       'sr3_search', 'sr3_replace',
@@ -177,8 +183,8 @@ def add_pipeline_options(parser, plumber):
               }
 
     group_order = ['', 'LOOK AND FEEL', 'HEURISTICS',
-            'STRUCTURE DETECTION', 'TABLE OF CONTENTS',
+            'SEARCH AND REPLACE' 'STRUCTURE DETECTION',
-            'METADATA', 'DEBUG']
+            'TABLE OF CONTENTS', 'METADATA', 'DEBUG']
 
     for group in group_order:
         desc, options = groups[group]

src/calibre/gui2/convert/bulk.py

@@ -11,6 +11,8 @@ from calibre.gui2.convert.single import Config, sort_formats_by_preference, \
 from calibre.customize.ui import available_output_formats
 from calibre.gui2 import ResizableDialog
 from calibre.gui2.convert.look_and_feel import LookAndFeelWidget
+from calibre.gui2.convert.heuristics import HeuristicsWidget
+from calibre.gui2.convert.search_and_replace import SearchAndReplaceWidget
 from calibre.gui2.convert.page_setup import PageSetupWidget
 from calibre.gui2.convert.structure_detection import StructureDetectionWidget
 from calibre.gui2.convert.toc import TOCWidget
@@ -69,6 +71,8 @@ class BulkConfig(Config):
 
         self.setWindowTitle(_('Bulk Convert'))
         lf = widget_factory(LookAndFeelWidget)
+        hw = widget_factory(HeuristicsWidget)
+        sr = widget_factory(SearchAndReplaceWidget)
         ps = widget_factory(PageSetupWidget)
         sd = widget_factory(StructureDetectionWidget)
         toc = widget_factory(TOCWidget)
@@ -90,7 +94,7 @@ class BulkConfig(Config):
             if not c: break
             self.stack.removeWidget(c)
 
-        widgets = [lf, ps, sd, toc]
+        widgets = [lf, hw, sr, ps, sd, toc]
         if output_widget is not None:
             widgets.append(output_widget)
         for w in widgets:

src/calibre/gui2/convert/heuristics.py

@@ -4,16 +4,15 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import re
+from PyQt4.Qt import Qt
 
 from calibre.gui2.convert.heuristics_ui import Ui_Form
 from calibre.gui2.convert import Widget
-from calibre.gui2 import error_dialog
 
 class HeuristicsWidget(Widget, Ui_Form):
 
     TITLE = _('Heuristics')
-    HELP  = _('')
+    HELP  = _('Modify the document text and structure using common patterns.')
     COMMIT_NAME = 'heuristics'
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
@@ -22,41 +21,48 @@ class HeuristicsWidget(Widget, Ui_Form):
                  'italicize_common_cases', 'fix_indents',
                  'html_unwrap_factor', 'unwrap_lines',
                  'delete_blank_paragraphs', 'format_scene_breaks',
-                 'dehyphenate',
+                 'dehyphenate']
-                 'sr1_search', 'sr1_replace',
-                 'sr2_search', 'sr2_replace',
-                 'sr3_search', 'sr3_replace']
                 )
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
-        self.opt_sr1_search.set_msg(_('Search regular expression 1:'))
+        
-        self.opt_sr1_replace.set_msg(_('Replace regular expression 1:'))
+        self.opt_enable_heuristics.stateChanged.connect(self.enable_heuristics)
-        self.opt_sr2_search.set_msg(_('Search regular expression 2:'))
+        self.opt_unwrap_lines.stateChanged.connect(self.enable_unwrap)
-        self.opt_sr2_replace.set_msg(_('Replace regular expression 2:'))
+        
-        self.opt_sr3_search.set_msg(_('Search regular expression 3:'))
+        self.enable_heuristics(self.opt_enable_heuristics.checkState())
-        self.opt_sr3_replace.set_msg(_('Replace regular expression 3:'))
 
     def break_cycles(self):
         Widget.break_cycles(self)
-        self.opt_sr1_search.break_cycles()
-        self.opt_sr1_replace.break_cycles()
-        self.opt_sr2_search.break_cycles()
-        self.opt_sr2_replace.break_cycles()
-        self.opt_sr3_search.break_cycles()
-        self.opt_sr3_replace.break_cycles()
         
-    def pre_commit_check(self):
+        self.opt_enable_heuristics.stateChanged.disconnect()
-        for x in ('sr1-search', 'sr1-replace', 'sr2-search', 'sr2-replace', 'sr3-search', 'sr3-replace',):
+        self.opt_unwrap_lines.stateChanged.disconnect()
-            x = getattr(self, 'opt_'+x)
-            try:
-                pat = unicode(x.regex)
-                re.compile(pat)
-            except Exception, err:
-                error_dialog(self, _('Invalid regular expression'),
-                             _('Invalid regular expression: %s')%err).exec_()
-                return False
         
     def set_value_handler(self, g, val):
         if val is None and g is self.opt_html_unwrap_factor:
             g.setValue(0.0)
             return True
+
+    def enable_heuristics(self, state):
+        if state == Qt.Checked:
+            state = True
+        else:
+            state = False
+        self.opt_markup_chapter_headings.setEnabled(state)
+        self.opt_italicize_common_cases.setEnabled(state)
+        self.opt_fix_indents.setEnabled(state)
+        self.opt_delete_blank_paragraphs.setEnabled(state)
+        self.opt_format_scene_breaks.setEnabled(state)
+        self.opt_dehyphenate.setEnabled(state)
+        
+        self.opt_unwrap_lines.setEnabled(state)
+        if state and self.opt_unwrap_lines.checkState() == Qt.Checked:
+            self.opt_html_unwrap_factor.setEnabled(True)
+        else:
+            self.opt_html_unwrap_factor.setEnabled(False)
+
+    def enable_unwrap(self, state):
+        if state == Qt.Checked:
+            state = True
+        else:
+            state = False
+        self.opt_html_unwrap_factor.setEnabled(state)

src/calibre/gui2/convert/heuristics.ui

@@ -76,7 +76,7 @@
       <item row="2" column="0" colspan="3">
        <widget class="QCheckBox" name="opt_markup_chapter_headings">
         <property name="text">
-         <string>markup_chapter_headings</string>
+         <string>Detect and markup unformatted chapter headings and sub headings</string>
         </property>
        </widget>
       </item>
@@ -90,28 +90,28 @@
       <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="opt_format_scene_breaks">
         <property name="text">
-         <string>format_scene_breaks</string>
+         <string>Ensure scene breaks are consistently formatted</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="opt_dehyphenate">
         <property name="text">
-         <string>dehyphenate</string>
+         <string>Remove unnecessary hyphens</string>
         </property>
        </widget>
       </item>
       <item row="6" column="0" colspan="2">
        <widget class="QCheckBox" name="opt_italicize_common_cases">
         <property name="text">
-         <string>italicize_common_cases</string>
+         <string>Italicize common words and patterns</string>
         </property>
        </widget>
       </item>
       <item row="7" column="0" colspan="2">
        <widget class="QCheckBox" name="opt_fix_indents">
         <property name="text">
-         <string>fix_indents</string>
+         <string>Replace entity indents with CSS indents</string>
         </property>
        </widget>
       </item>
@@ -123,7 +123,7 @@
         <property name="sizeHint" stdset="0">
          <size>
           <width>131</width>
-          <height>95</height>
+          <height>35</height>
          </size>
         </property>
        </spacer>
@@ -144,43 +144,8 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Search and Replace</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="RegexEdit" name="opt_sr1_search" native="true"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="RegexEdit" name="opt_sr1_replace" native="true"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="RegexEdit" name="opt_sr2_search" native="true"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="RegexEdit" name="opt_sr2_replace" native="true"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="RegexEdit" name="opt_sr3_search" native="true"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="RegexEdit" name="opt_sr3_replace" native="true"/>
-      </item>
   </layout>
  </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>RegexEdit</class>
-   <extends>QWidget</extends>
-   <header>regex_builder.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>

src/calibre/gui2/convert/search_and_replace.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+
+from PyQt4.Qt import Qt
+
+from calibre.gui2.convert.search_and_replace_ui import Ui_Form
+from calibre.gui2.convert import Widget
+from calibre.gui2 import error_dialog
+
+class SearchAndReplaceWidget(Widget, Ui_Form):
+
+    TITLE = _('Search and Replace')
+    HELP  = _('Modify the document text and structure using user defined patterns.')
+    COMMIT_NAME = 'search_and_replace'
+
+    def __init__(self, parent, get_option, get_help, db=None, book_id=None):
+        Widget.__init__(self, parent,
+                ['sr1_search', 'sr1_replace',
+                 'sr2_search', 'sr2_replace',
+                 'sr3_search', 'sr3_replace']
+                )
+        self.db, self.book_id = db, book_id
+        self.initialize_options(get_option, get_help, db, book_id)
+        self.opt_sr1_search.set_msg(_('Search regular expression 1:'))
+        self.opt_sr1_replace.set_msg(_('Replace regular expression 1:'))
+        self.opt_sr2_search.set_msg(_('Search regular expression 2:'))
+        self.opt_sr2_replace.set_msg(_('Replace regular expression 2:'))
+        self.opt_sr3_search.set_msg(_('Search regular expression 3:'))
+        self.opt_sr3_replace.set_msg(_('Replace regular expression 3:'))
+        
+    def break_cycles(self):
+        Widget.break_cycles(self)
+        
+        self.opt_sr1_search.break_cycles()
+        self.opt_sr1_replace.break_cycles()
+        self.opt_sr2_search.break_cycles()
+        self.opt_sr2_replace.break_cycles()
+        self.opt_sr3_search.break_cycles()
+        self.opt_sr3_replace.break_cycles()
+
+    def pre_commit_check(self):
+        for x in ('sr1-search', 'sr1-replace', 'sr2-search', 'sr2-replace', 'sr3-search', 'sr3-replace',):
+            x = getattr(self, 'opt_'+x)
+            try:
+                pat = unicode(x.regex)
+                re.compile(pat)
+            except Exception, err:
+                error_dialog(self, _('Invalid regular expression'),
+                             _('Invalid regular expression: %s')%err).exec_()
+                return False
+            
+

src/calibre/gui2/convert/search_and_replace.ui

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>657</width>
+    <height>479</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="RegexEdit" name="opt_sr1_search" native="true"/>
+   </item>
+   <item>
+    <widget class="RegexEdit" name="opt_sr1_replace" native="true"/>
+   </item>
+   <item>
+    <widget class="RegexEdit" name="opt_sr2_search" native="true"/>
+   </item>
+   <item>
+    <widget class="RegexEdit" name="opt_sr2_replace" native="true"/>
+   </item>
+   <item>
+    <widget class="RegexEdit" name="opt_sr3_search" native="true"/>
+   </item>
+   <item>
+    <widget class="RegexEdit" name="opt_sr3_replace" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>RegexEdit</class>
+   <extends>QWidget</extends>
+   <header>regex_builder.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

src/calibre/gui2/convert/single.py

@@ -17,6 +17,7 @@ from calibre.gui2.convert.single_ui import Ui_Dialog
 from calibre.gui2.convert.metadata import MetadataWidget
 from calibre.gui2.convert.look_and_feel import LookAndFeelWidget
 from calibre.gui2.convert.heuristics import HeuristicsWidget
+from calibre.gui2.convert.search_and_replace import SearchAndReplaceWidget
 from calibre.gui2.convert.page_setup import PageSetupWidget
 from calibre.gui2.convert.structure_detection import StructureDetectionWidget
 from calibre.gui2.convert.toc import TOCWidget
@@ -172,6 +173,7 @@ class Config(ResizableDialog, Ui_Dialog):
         self.setWindowTitle(_('Convert')+ ' ' + unicode(self.mw.title.text()))
         lf = widget_factory(LookAndFeelWidget)
         hw = widget_factory(HeuristicsWidget)
+        sr = widget_factory(SearchAndReplaceWidget)
         ps = widget_factory(PageSetupWidget)
         sd = widget_factory(StructureDetectionWidget)
         toc = widget_factory(TOCWidget)
@@ -205,7 +207,7 @@ class Config(ResizableDialog, Ui_Dialog):
             if not c: break
             self.stack.removeWidget(c)
 
-        widgets = [self.mw, lf, hw, ps, sd, toc]
+        widgets = [self.mw, lf, hw, sr, ps, sd, toc]
         if input_widget is not None:
             widgets.append(input_widget)
         if output_widget is not None:

src/calibre/gui2/convert/structure_detection.ui

@@ -14,10 +14,10 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="0" colspan="3">
     <widget class="XPathEdit" name="opt_chapter" native="true"/>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Chapter &amp;mark:</string>
@@ -27,7 +27,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
+   <item row="1" column="1" colspan="2">
     <widget class="QComboBox" name="opt_chapter_mark">
      <property name="minimumContentsLength">
       <number>20</number>

src/calibre/gui2/preferences/conversion.py

@@ -13,6 +13,7 @@ from calibre.utils.logging import Log
 from calibre.gui2.preferences.conversion_ui import Ui_Form
 from calibre.gui2.convert.look_and_feel import LookAndFeelWidget
 from calibre.gui2.convert.heuristics import HeuristicsWidget
+from calibre.gui2.convert.search_and_replace import SearchAndReplaceWidget
 from calibre.gui2.convert.page_setup import PageSetupWidget
 from calibre.gui2.convert.structure_detection import StructureDetectionWidget
 from calibre.gui2.convert.toc import TOCWidget
@@ -84,7 +85,8 @@ class CommonOptions(Base):
 
     def load_conversion_widgets(self):
         self.conversion_widgets = [LookAndFeelWidget, HeuristicsWidget,
-                PageSetupWidget, StructureDetectionWidget, TOCWidget]
+                SearchAndReplaceWidget, PageSetupWidget,
+                StructureDetectionWidget, TOCWidget]
 
 class InputOptions(Base):