From 521e41973aa09d00bf3a495507b03a21e4257165 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 2 Jan 2011 19:18:52 -0500
Subject: [PATCH] GUI: TXT, TCR, PDB Inputs gui conversion options updated.

---
 src/calibre/gui2/convert/pdb_input.py | 10 +++--
 src/calibre/gui2/convert/pdb_input.ui | 48 ---------------------
 src/calibre/gui2/convert/tcr_input.py | 23 ++++++++++
 src/calibre/gui2/convert/txt_input.py |  5 ++-
 src/calibre/gui2/convert/txt_input.ui | 60 +++++++--------------------
 5 files changed, 48 insertions(+), 98 deletions(-)
 delete mode 100644 src/calibre/gui2/convert/pdb_input.ui
 create mode 100644 src/calibre/gui2/convert/tcr_input.py

diff --git a/src/calibre/gui2/convert/pdb_input.py b/src/calibre/gui2/convert/pdb_input.py
index 4510cf81ba..655f4025a7 100644
--- a/src/calibre/gui2/convert/pdb_input.py
+++ b/src/calibre/gui2/convert/pdb_input.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 __license__ = 'GPL 3'
-__copyright__ = '2009, John Schember <john@nachtimwald.com>'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-from calibre.gui2.convert.pdb_input_ui import Ui_Form
+from calibre.gui2.convert.txt_input_ui import Ui_Form
 from calibre.gui2.convert import Widget
 
 class PluginWidget(Widget, Ui_Form):
@@ -12,10 +12,12 @@ class PluginWidget(Widget, Ui_Form):
     TITLE = _('PDB Input')
     HELP = _('Options specific to')+' PDB '+_('input')
     COMMIT_NAME = 'pdb_input'
-    ICON = I('mimetypes/unknown.png')
+    ICON = I('mimetypes/txt.png')
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
         Widget.__init__(self, parent,
-            ['single_line_paras', 'print_formatted_paras'])
+            ['paragraph_format', 'markdown_disable_toc', 'preserve_spaces'])
         self.db, self.book_id = db, book_id
+        for x in get_option('paragraph_format').option.choices:
+            self.opt_paragraph_format.addItem(x)
         self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/pdb_input.ui b/src/calibre/gui2/convert/pdb_input.ui
deleted file mode 100644
index 2b632b1a33..0000000000
--- a/src/calibre/gui2/convert/pdb_input.ui
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>213</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0">
-    <widget class="QCheckBox" name="opt_single_line_paras">
-     <property name="text">
-      <string>Treat each &amp;line as a paragraph</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="opt_print_formatted_paras">
-     <property name="text">
-      <string>Assume print formatting</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/calibre/gui2/convert/tcr_input.py b/src/calibre/gui2/convert/tcr_input.py
new file mode 100644
index 0000000000..2aa877ce4d
--- /dev/null
+++ b/src/calibre/gui2/convert/tcr_input.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.gui2.convert.txt_input_ui import Ui_Form
+from calibre.gui2.convert import Widget
+
+class PluginWidget(Widget, Ui_Form):
+
+    TITLE = _('TCR Input')
+    HELP = _('Options specific to')+' TCR '+_('input')
+    COMMIT_NAME = 'tcr_input'
+    ICON = I('mimetypes/txt.png')
+
+    def __init__(self, parent, get_option, get_help, db=None, book_id=None):
+        Widget.__init__(self, parent,
+            ['paragraph_format', 'markdown_disable_toc', 'preserve_spaces'])
+        self.db, self.book_id = db, book_id
+        for x in get_option('paragraph_format').option.choices:
+            self.opt_paragraph_format.addItem(x)
+        self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/txt_input.py b/src/calibre/gui2/convert/txt_input.py
index 31019251e2..99d04fe2f4 100644
--- a/src/calibre/gui2/convert/txt_input.py
+++ b/src/calibre/gui2/convert/txt_input.py
@@ -16,7 +16,8 @@ class PluginWidget(Widget, Ui_Form):
 
     def __init__(self, parent, get_option, get_help, db=None, book_id=None):
         Widget.__init__(self, parent,
-            ['single_line_paras', 'print_formatted_paras', 'markdown',
-                'markdown_disable_toc', 'preserve_spaces'])
+            ['paragraph_format', 'markdown_disable_toc', 'preserve_spaces'])
         self.db, self.book_id = db, book_id
+        for x in get_option('paragraph_format').option.choices:
+            self.opt_paragraph_format.addItem(x)
         self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/txt_input.ui b/src/calibre/gui2/convert/txt_input.ui
index 186783c277..b45297fdf2 100644
--- a/src/calibre/gui2/convert/txt_input.ui
+++ b/src/calibre/gui2/convert/txt_input.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>470</width>
+    <width>488</width>
     <height>300</height>
    </rect>
   </property>
@@ -15,27 +15,16 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QCheckBox" name="opt_single_line_paras">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Treat each &amp;line as a paragraph</string>
+      <string>Document structure detection</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="opt_print_formatted_paras">
-     <property name="text">
-      <string>Assume print formatting</string>
-     </property>
-    </widget>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="opt_paragraph_format"/>
    </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="opt_markdown">
-     <property name="text">
-      <string>Process using markdown</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>&lt;p&gt;Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit &lt;a href=&quot;http://daringfireball.net/projects/markdown&quot;&gt;markdown&lt;/a&gt;.</string>
@@ -48,14 +37,21 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_markdown_disable_toc">
      <property name="text">
       <string>Do not insert Table of Contents into output text when using markdown</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_preserve_spaces">
+     <property name="text">
+      <string>Preserve &amp;spaces</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -68,32 +64,8 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0">
-    <widget class="QCheckBox" name="opt_preserve_spaces">
-     <property name="text">
-      <string>Preserve &amp;spaces</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>opt_markdown</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>opt_markdown_disable_toc</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>76</x>
-     <y>80</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>418</x>
-     <y>105</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>