diff -r 159e6057ad34 -r 9ef6a28f1694 Preferences/ConfigurationPages/EditorFilePage.ui --- a/Preferences/ConfigurationPages/EditorFilePage.ui Mon Aug 07 12:19:34 2017 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.ui Mon Aug 07 18:00:51 2017 +0200 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>600</width> - <height>1193</height> + <height>1622</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -444,71 +444,166 @@ <property name="title"> <string>File Preview</string> </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Extensions of HTML files:</string> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox_12"> + <property name="title"> + <string>HTML Files</string> </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Extensions:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="previewHtmlExtensionsEdit"> + <property name="toolTip"> + <string>Enter the filename extensions of HTML files that may be previewed (separated by a space)</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="previewHtmlExtensionsEdit"> - <property name="toolTip"> - <string>Enter the filename extensions of HTML files that may be previewed (separated by a space)</string> + <item> + <widget class="QGroupBox" name="groupBox_11"> + <property name="title"> + <string>Markdown Files</string> </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Extensions of Markdown files:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="previewMarkdownExtensionsEdit"> - <property name="toolTip"> - <string>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</string> - </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Extensions:</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QLineEdit" name="previewMarkdownExtensionsEdit"> + <property name="toolTip"> + <string>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QCheckBox" name="previewMarkdownNLtoBreakCheckBox"> + <property name="toolTip"> + <string>Select this to convert a new line character to an HTML <br/> tag.</string> + </property> + <property name="text"> + <string>Convert New Line to HTML Break</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>HTML Format:</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QComboBox" name="previewMarkdownHTMLFormatComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the HTML format to be generated</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Extensions of ReST files:</string> + <item> + <widget class="QGroupBox" name="groupBox_10"> + <property name="title"> + <string>ReST Files</string> </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="previewRestExtensionsEdit"> - <property name="toolTip"> - <string>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</string> - </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Extensions:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="previewRestExtensionsEdit"> + <property name="toolTip"> + <string>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="previewRestSphinxCheckBox"> + <property name="toolTip"> + <string>Select to use 'sphinx' to generate the ReST preview</string> + </property> + <property name="text"> + <string>Use 'sphinx' for ReST preview</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox_13"> + <property name="title"> + <string>Docutils</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>HTML Format:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="previewRestDocutilsHTMLFormatComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the HTML format to be generated</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </widget> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Extensions of QSS files:</string> + <item> + <widget class="QGroupBox" name="groupBox_9"> + <property name="title"> + <string>QSS Files</string> </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="previewQssExtensionsEdit"> - <property name="toolTip"> - <string>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</string> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="previewRestSphinxCheckBox"> - <property name="toolTip"> - <string>Select to use 'sphinx' to generate the ReST preview</string> - </property> - <property name="text"> - <string>Use 'sphinx' for ReST preview</string> - </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_10"> + <property name="text"> + <string>Extensions:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="previewQssExtensionsEdit"> + <property name="toolTip"> + <string>Enter the filename extensions of Qt Stylesheet files that may be previewed (separated by a space)</string> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> @@ -537,8 +632,8 @@ <tabstop>crRadioButton</tabstop> <tabstop>crlfRadioButton</tabstop> <tabstop>automaticEolConversionCheckBox</tabstop> + <tabstop>stripWhitespaceCheckBox</tabstop> <tabstop>createBackupFileCheckBox</tabstop> - <tabstop>stripWhitespaceCheckBox</tabstop> <tabstop>autosaveSlider</tabstop> <tabstop>advEncodingCheckBox</tabstop> <tabstop>defaultEncodingComboBox</tabstop> @@ -550,6 +645,14 @@ <tabstop>addFileFilterButton</tabstop> <tabstop>editFileFilterButton</tabstop> <tabstop>deleteFileFilterButton</tabstop> + <tabstop>previewHtmlExtensionsEdit</tabstop> + <tabstop>previewMarkdownExtensionsEdit</tabstop> + <tabstop>previewMarkdownNLtoBreakCheckBox</tabstop> + <tabstop>previewMarkdownHTMLFormatComboBox</tabstop> + <tabstop>previewRestExtensionsEdit</tabstop> + <tabstop>previewRestSphinxCheckBox</tabstop> + <tabstop>previewRestDocutilsHTMLFormatComboBox</tabstop> + <tabstop>previewQssExtensionsEdit</tabstop> </tabstops> <resources/> <connections>