Fix #2087520 [[Enhancement] Make the output settings look nice](https://bugs.launchpad.net/calibre/+bug/2087520)

This commit is contained in:
Kovid Goyal 2024-11-08 13:25:09 +05:30
parent f207de192f
commit 16c9343bcf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 238 additions and 233 deletions

View File

@ -13,137 +13,88 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QFormLayout" name="formLayout">
<item> <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="opt_autorotation"> <widget class="QCheckBox" name="opt_autorotation">
<property name="text"> <property name="text">
<string>Enable &amp;auto-rotation of wide images</string> <string>Enable &amp;auto-rotation of wide images</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QDoubleSpinBox" name="opt_wordspace">
<item> <property name="suffix">
<widget class="QLabel" name="label"> <string> pt</string>
<property name="text"> </property>
<string>&amp;Wordspace:</string> <property name="decimals">
</property> <number>1</number>
<property name="buddy"> </property>
<cstring>opt_wordspace</cstring> <property name="minimum">
</property> <double>1.000000000000000</double>
</widget> </property>
</item> <property name="maximum">
<item> <double>20.000000000000000</double>
<widget class="QDoubleSpinBox" name="opt_wordspace"> </property>
<property name="suffix"> <property name="value">
<string> pt</string> <double>2.500000000000000</double>
</property> </property>
<property name="decimals"> </widget>
<number>1</number>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
<property name="maximum">
<double>20.000000000000000</double>
</property>
<property name="value">
<double>2.500000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Minimum para. &amp;indent:</string>
</property>
<property name="buddy">
<cstring>opt_minimum_indent</cstring>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="opt_minimum_indent">
<property name="suffix">
<string> pt</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="5" column="1">
<widget class="QDoubleSpinBox" name="opt_minimum_indent">
<property name="suffix">
<string> pt</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="opt_render_tables_as_images"> <widget class="QCheckBox" name="opt_render_tables_as_images">
<property name="text"> <property name="text">
<string>Render &amp;tables as images</string> <string>Render &amp;tables as images</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="10" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QDoubleSpinBox" name="opt_text_size_multiplier_for_rendered_tables"/>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Text size multiplier for text in rendered tables:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="opt_text_size_multiplier_for_rendered_tables"/>
</item>
</layout>
</item> </item>
<item> <item row="11" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout"> <widget class="QCheckBox" name="opt_header">
<item row="0" column="0" colspan="2"> <property name="text">
<widget class="QCheckBox" name="opt_header"> <string>Add &amp;header</string>
<property name="text"> </property>
<string>Add &amp;header</string> </widget>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Header &amp;separation:</string>
</property>
<property name="buddy">
<cstring>opt_header_separation</cstring>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QDoubleSpinBox" name="opt_header_separation">
<property name="suffix">
<string> pt</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Header &amp;format:</string>
</property>
<property name="buddy">
<cstring>opt_header_format</cstring>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="opt_header_format">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="13" column="1">
<widget class="QDoubleSpinBox" name="opt_header_separation">
<property name="suffix">
<string> pt</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Header &amp;format:</string>
</property>
<property name="buddy">
<cstring>opt_header_format</cstring>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLineEdit" name="opt_header_format">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="16" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>&amp;Embed fonts</string> <string>&amp;Embed fonts</string>
@ -191,7 +142,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="18" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -204,6 +155,43 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="13" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Header &amp;separation:</string>
</property>
<property name="buddy">
<cstring>opt_header_separation</cstring>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Text size multiplier for text in rendered tables:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Wordspace:</string>
</property>
<property name="buddy">
<cstring>opt_wordspace</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Minimum para. &amp;indent:</string>
</property>
<property name="buddy">
<cstring>opt_minimum_indent</cstring>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

View File

@ -13,75 +13,76 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="0"> <item>
<widget class="QCheckBox" name="opt_no_inline_toc"> <widget class="QCheckBox" name="opt_no_inline_toc">
<property name="text"> <property name="text">
<string>Do not add &amp;Table of Contents to book</string> <string>Do not add &amp;Table of Contents to book</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="label"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text"> <item>
<string>&amp;Title for Table of Contents:</string> <widget class="QLabel" name="label">
</property> <property name="text">
<property name="buddy"> <string>&amp;Title for Table of Contents:</string>
<cstring>opt_toc_title</cstring> </property>
</property> <property name="buddy">
</widget> <cstring>opt_toc_title</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="opt_toc_title">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="1" column="1"> <item>
<widget class="QLineEdit" name="opt_toc_title">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="opt_mobi_toc_at_start"> <widget class="QCheckBox" name="opt_mobi_toc_at_start">
<property name="text"> <property name="text">
<string>Put generated Table of Contents at &amp;start of book instead of end</string> <string>Put generated Table of Contents at &amp;start of book instead of end</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item>
<widget class="QCheckBox" name="opt_mobi_ignore_margins"> <widget class="QCheckBox" name="opt_mobi_ignore_margins">
<property name="text"> <property name="text">
<string>Ignore &amp;margins</string> <string>Ignore &amp;margins</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item>
<widget class="QCheckBox" name="opt_prefer_author_sort"> <widget class="QCheckBox" name="opt_prefer_author_sort">
<property name="text"> <property name="text">
<string>Use author &amp;sort for author</string> <string>Use author &amp;sort for author</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item>
<widget class="QCheckBox" name="opt_mobi_keep_original_images"> <widget class="QCheckBox" name="opt_mobi_keep_original_images">
<property name="text"> <property name="text">
<string>Do not convert all images to &amp;JPEG (may result in images not working in older viewers)</string> <string>Do not convert all images to &amp;JPEG (may result in images not working in older viewers)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item>
<widget class="QCheckBox" name="opt_dont_compress"> <widget class="QCheckBox" name="opt_dont_compress">
<property name="text"> <property name="text">
<string>Disable &amp;compression of the file contents</string> <string>Disable &amp;compression of the file contents</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Kindle options</string> <string>Kindle options</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
@ -93,30 +94,16 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="opt_mobi_file_type"/> <widget class="QComboBox" name="opt_mobi_file_type">
</item> <property name="sizePolicy">
<item row="3" column="0"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<widget class="QLabel" name="label_3"> <horstretch>0</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>Personal Doc tag:</string> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="opt_personal_doc">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="opt_share_not_sync">
<property name="text">
<string>Enable &amp;sharing of book content via Facebook, etc. WARNING: Disables last read syncing</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>&lt;b&gt;WARNING:&lt;/b&gt; Various Kindle devices have trouble displaying the new or both MOBI filetypes. If you wish to use the new format on your device, convert to AZW3 instead of MOBI.</string> <string>&lt;b&gt;WARNING:&lt;/b&gt; Various Kindle devices have trouble displaying the new or both MOBI filetypes. If you wish to use the new format on your device, convert to AZW3 instead of MOBI.</string>
@ -126,9 +113,43 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Personal Doc tag:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="opt_personal_doc">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="opt_share_not_sync">
<property name="text">
<string>Enable &amp;sharing of book content via Facebook, etc. WARNING: Disables last read syncing</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<resources/> <resources/>

View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -27,26 +27,6 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="opt_format"/> <widget class="QComboBox" name="opt_format"/>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>148</width>
<height>246</height>
</size>
</property>
</spacer>
</item>
<item row="2" 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"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
@ -64,6 +44,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QCheckBox" name="opt_inline_toc">
<property name="text">
<string>&amp;Inline TOC</string>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>148</width>
<height>246</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

View File

@ -13,8 +13,39 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QFormLayout" name="formLayout">
<item row="4" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Output &amp;encoding:</string>
</property>
<property name="buddy">
<cstring>opt_pml_output_encoding</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="EncodingComboBox" name="opt_pml_output_encoding">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="opt_inline_toc">
<property name="text">
<string>&amp;Inline TOC</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="opt_full_image_depth">
<property name="text">
<string>Do not &amp;reduce image size and depth</string>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -27,41 +58,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0">
<widget class="QCheckBox" name="opt_inline_toc">
<property name="text">
<string>&amp;Inline TOC</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="opt_full_image_depth">
<property name="text">
<string>Do not &amp;reduce image size and depth</string>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Output &amp;encoding:</string>
</property>
<property name="buddy">
<cstring>opt_pml_output_encoding</cstring>
</property>
</widget>
</item>
<item>
<widget class="EncodingComboBox" name="opt_pml_output_encoding">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

View File

@ -19,7 +19,7 @@
<property name="title"> <property name="title">
<string>General</string> <string>General</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@ -71,7 +71,14 @@
<property name="title"> <property name="title">
<string>Plain</string> <string>Plain</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<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"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
@ -85,20 +92,13 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="opt_max_line_length"/> <widget class="QSpinBox" name="opt_max_line_length"/>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0">
<widget class="QCheckBox" name="opt_force_max_line_length"> <widget class="QCheckBox" name="opt_force_max_line_length">
<property name="text"> <property name="text">
<string>Force maximum line &amp;length</string> <string>Force maximum line &amp;length</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="opt_inline_toc">
<property name="text">
<string>&amp;Inline TOC</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>