From 692b6bcf02e6dbc75f5f5088a122626ece3e4d42 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Fri, 3 Dec 2010 19:11:33 -0500
Subject: [PATCH] FB2 Output: Remove FB2 options that are no longer
 implemented.

---
 src/calibre/ebooks/fb2/output.py       | 14 -------------
 src/calibre/gui2/convert/fb2_output.py |  4 +---
 src/calibre/gui2/convert/fb2_output.ui | 27 +++-----------------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/calibre/ebooks/fb2/output.py b/src/calibre/ebooks/fb2/output.py
index bacaf0da91..88508b83e0 100644
--- a/src/calibre/ebooks/fb2/output.py
+++ b/src/calibre/ebooks/fb2/output.py
@@ -16,20 +16,6 @@ class FB2Output(OutputFormatPlugin):
     file_type = 'fb2'
 
     options = set([
-        OptionRecommendation(name='inline_toc',
-            recommended_value=False, level=OptionRecommendation.LOW,
-            help=_('Add Table of Contents to beginning of the book.')),
-        OptionRecommendation(name='sectionize_chapters',
-            recommended_value=False, level=OptionRecommendation.LOW,
-            help=_('Try to turn chapters into individual sections. ' \
-                   'WARNING: ' \
-                   'This option is experimental. It can cause conversion ' \
-                   'to fail. It can also produce unexpected output.')),
-        OptionRecommendation(name='sectionize_chapters_using_file_structure',
-            recommended_value=False, level=OptionRecommendation.LOW,
-            help=_('Try to turn chapters into individual sections using the ' \
-                   'internal structure of the ebook. This works well for EPUB ' \
-                   'books that have been internally split by chapter.')),
         OptionRecommendation(name='h1_to_title',
             recommended_value=False, level=OptionRecommendation.LOW,
             help=_('Wrap all h1 tags with fb2 title elements.')),
diff --git a/src/calibre/gui2/convert/fb2_output.py b/src/calibre/gui2/convert/fb2_output.py
index 5d927146a5..6b1497a9db 100644
--- a/src/calibre/gui2/convert/fb2_output.py
+++ b/src/calibre/gui2/convert/fb2_output.py
@@ -17,8 +17,6 @@ class PluginWidget(Widget, Ui_Form):
     ICON = I('mimetypes/fb2.png')
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
-        Widget.__init__(self, parent, ['inline_toc', 'sectionize_chapters', 
-            'sectionize_chapters_using_file_structure', 'h1_to_title', 
-            'h2_to_title', 'h3_to_title'])
+        Widget.__init__(self, parent, ['h1_to_title', 'h2_to_title', 'h3_to_title'])
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/fb2_output.ui b/src/calibre/gui2/convert/fb2_output.ui
index a90ecd615e..436719aed4 100644
--- a/src/calibre/gui2/convert/fb2_output.ui
+++ b/src/calibre/gui2/convert/fb2_output.ui
@@ -14,7 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="6" column="0">
+   <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -28,41 +28,20 @@
     </spacer>
    </item>
    <item row="0" column="0">
-    <widget class="QCheckBox" name="opt_inline_toc">
-     <property name="text">
-      <string>&amp;Inline TOC</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="opt_sectionize_chapters">
-     <property name="text">
-      <string>Sectionize Chapters (Use with care!)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="opt_sectionize_chapters_using_file_structure">
-     <property name="text">
-      <string>Sectionize Chapters using file structure</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
     <widget class="QCheckBox" name="opt_h1_to_title">
      <property name="text">
       <string>Wrap h1 tags with &lt;title&gt; elements</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="1" column="0">
     <widget class="QCheckBox" name="opt_h2_to_title">
      <property name="text">
       <string>Wrap h2 tags with &lt;title&gt; elements</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="2" column="0">
     <widget class="QCheckBox" name="opt_h3_to_title">
      <property name="text">
       <string>Wrap h3 tags with &lt;title&gt; elements</string>