From 7f66c5317d9073a456573ed007e19c1450d71209 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 May 2012 09:56:52 +0530
Subject: [PATCH] remove useless options from azw3 output plugin

---
 .../ebooks/conversion/plugins/mobi_output.py  |  3 -
 src/calibre/gui2/convert/azw3_output.py       |  4 +-
 src/calibre/gui2/convert/azw3_output.ui       | 89 +++++--------------
 3 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/src/calibre/ebooks/conversion/plugins/mobi_output.py b/src/calibre/ebooks/conversion/plugins/mobi_output.py
index f13ee0312f..a32a4444f8 100644
--- a/src/calibre/ebooks/conversion/plugins/mobi_output.py
+++ b/src/calibre/ebooks/conversion/plugins/mobi_output.py
@@ -258,9 +258,6 @@ class AZW3Output(OutputFormatPlugin):
             recommended_value=False, level=OptionRecommendation.LOW,
             help=_('Disable compression of the file contents.')
         ),
-        OptionRecommendation(name='personal_doc', recommended_value='[PDOC]',
-            help=_('Tag marking book to be filed with Personal Docs')
-        ),
         OptionRecommendation(name='mobi_toc_at_start',
             recommended_value=False,
             help=_('When adding the Table of Contents to the book, add it at the start of the '
diff --git a/src/calibre/gui2/convert/azw3_output.py b/src/calibre/gui2/convert/azw3_output.py
index 8b1ef25aac..0acb436d2c 100644
--- a/src/calibre/gui2/convert/azw3_output.py
+++ b/src/calibre/gui2/convert/azw3_output.py
@@ -22,9 +22,9 @@ class PluginWidget(Widget, Ui_Form):
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
         Widget.__init__(self, parent,
                 ['prefer_author_sort', 'toc_title',
-                    'mobi_ignore_margins', 'mobi_toc_at_start',
+                    'mobi_toc_at_start',
                 'dont_compress', 'no_inline_toc', 'share_not_sync',
-                'personal_doc']#, 'mobi_navpoints_only_deepest']
+                ]
                 )
         self.db, self.book_id = db, book_id
 
diff --git a/src/calibre/gui2/convert/azw3_output.ui b/src/calibre/gui2/convert/azw3_output.ui
index 657a38861d..b85c6155e9 100644
--- a/src/calibre/gui2/convert/azw3_output.ui
+++ b/src/calibre/gui2/convert/azw3_output.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>588</width>
+    <width>724</width>
     <height>342</height>
    </rect>
   </property>
@@ -14,7 +14,20 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="0" colspan="2">
+   <item row="6" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_prefer_author_sort">
      <property name="text">
       <string>Use author &amp;sort for author</string>
@@ -31,13 +44,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="opt_toc_title"/>
-   </item>
    <item row="5" column="0">
-    <widget class="QCheckBox" name="opt_dont_compress">
+    <widget class="QCheckBox" name="opt_share_not_sync">
      <property name="text">
-      <string>Disable compression of the file contents</string>
+      <string>Enable sharing of book content via Facebook, etc. WARNING: Disables last read syncing</string>
      </property>
     </widget>
    </item>
@@ -55,69 +65,16 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QCheckBox" name="opt_mobi_ignore_margins">
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="opt_toc_title"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="opt_dont_compress">
      <property name="text">
-      <string>Ignore &amp;margins</string>
+      <string>Disable compression of the file contents</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Kindle options</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Personal Doc tag:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="opt_personal_doc"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="opt_share_not_sync">
-        <property name="text">
-         <string>Enable sharing of book content via Facebook, etc. WARNING: Disables last read syncing</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>