--- a/Preferences/ConfigurationPages/EditorPropertiesPage.ui Sat Mar 12 13:47:25 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.ui Sat Mar 12 17:42:26 2011 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>558</width> - <height>1559</height> + <height>2000</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -145,6 +145,16 @@ </property> </widget> </item> + <item row="4" column="0"> + <widget class="QCheckBox" name="cppStylePreprocessorCheckBox"> + <property name="toolTip"> + <string>Select to style preprocessor lines</string> + </property> + <property name="text"> + <string>Style preprocessor lines</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -281,7 +291,27 @@ </property> </widget> </item> - <item row="3" column="0" colspan="2"> + <item row="3" column="0"> + <widget class="QCheckBox" name="htmlDjangoCheckBox"> + <property name="toolTip"> + <string>Select to enable support for Django templates</string> + </property> + <property name="text"> + <string>Enable Django templates</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QCheckBox" name="htmlMakoCheckBox"> + <property name="toolTip"> + <string>Select to enable support for Mako templates</string> + </property> + <property name="text"> + <string>Enable Mako templates</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> <widget class="QGroupBox" name="xmlGroup"> <property name="title"> <string>XML Lexer Properties</string> @@ -483,6 +513,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_13"> + <property name="title"> + <string>Properties Lexer Properties</string> + </property> + <layout class="QVBoxLayout" name="_2"> + <item> + <widget class="QCheckBox" name="propertiesInitialSpacesCheckBox"> + <property name="toolTip"> + <string>Select to allow initial spaces in a line</string> + </property> + <property name="text"> + <string>Allow initial spaces</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox_8"> <property name="title"> <string>Python Lexer Properties</string> @@ -499,16 +548,6 @@ </widget> </item> <item row="0" column="1"> - <widget class="QCheckBox" name="pythonBadIndentationCheckBox"> - <property name="toolTip"> - <string>Select whether bad indentation shall be highlighted</string> - </property> - <property name="text"> - <string>Highlight bad indentation</string> - </property> - </widget> - </item> - <item row="1" column="0"> <widget class="QCheckBox" name="foldPythonStringCheckBox"> <property name="toolTip"> <string>Select whether folding of strings shall be possible</string> @@ -518,7 +557,27 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="1" column="0"> + <widget class="QCheckBox" name="foldPythonQuotesCheckBox"> + <property name="toolTip"> + <string>Select whether folding of triple quoted strings shall be possible</string> + </property> + <property name="text"> + <string>Fold triple quoted strings</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="pythonBadIndentationCheckBox"> + <property name="toolTip"> + <string>Select whether bad indentation shall be highlighted</string> + </property> + <property name="text"> + <string>Highlight bad indentation</string> + </property> + </widget> + </item> + <item row="2" column="1"> <widget class="QCheckBox" name="pythonAutoindentCheckBox"> <property name="toolTip"> <string>Select whether text should be autoindented after a ':'</string> @@ -528,7 +587,17 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="pythonStringsOverNewlineCheckBox"> + <property name="toolTip"> + <string>Select to allow strings to span newline characters</string> + </property> + <property name="text"> + <string>Strings may span newline characters</string> + </property> + </widget> + </item> + <item row="4" column="0"> <widget class="QCheckBox" name="pythonV2UnicodeAllowedCheckBox"> <property name="toolTip"> <string>Select to allow Python v2 unicode string literals (e.g. u"utf8")</string> @@ -538,7 +607,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="5" column="0"> <widget class="QCheckBox" name="pythonV3BinaryAllowedCheckBox"> <property name="toolTip"> <string>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</string> @@ -548,7 +617,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="5" column="1"> <widget class="QCheckBox" name="pythonV3BytesAllowedCheckBox"> <property name="toolTip"> <string>Select to allow Python v3 bytes string literals (e.g. b"bytes")</string> @@ -562,12 +631,31 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_14"> + <property name="title"> + <string>Ruby Lexer Properties</string> + </property> + <layout class="QVBoxLayout" name="_3"> + <item> + <widget class="QCheckBox" name="foldRubyCommentCheckBox"> + <property name="toolTip"> + <string>Select whether folding of comments shall be possible</string> + </property> + <property name="text"> + <string>Fold comments</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox_12"> <property name="title"> <string>SQL Lexer Properties</string> </property> - <layout class="QHBoxLayout" name="_13"> - <item> + <layout class="QGridLayout" name="gridLayout_8"> + <item row="0" column="0"> <widget class="QCheckBox" name="foldSqlCommentCheckBox"> <property name="toolTip"> <string>Select whether folding of comments shall be possible</string> @@ -577,7 +665,27 @@ </property> </widget> </item> - <item> + <item row="0" column="1"> + <widget class="QCheckBox" name="sqlFoldAtElseCheckBox"> + <property name="toolTip"> + <string>Select whether folding at else statement should be possible</string> + </property> + <property name="text"> + <string>Fold at else</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="sqlFoldOnlyBeginCheckBox"> + <property name="toolTip"> + <string>Select whether only BEGIN blocks can be folded</string> + </property> + <property name="text"> + <string>Only BEGIN blocks can be folded</string> + </property> + </widget> + </item> + <item row="2" column="0"> <widget class="QCheckBox" name="sqlBackslashEscapesCheckBox"> <property name="toolTip"> <string>Select to enable Backslash Escapes</string> @@ -587,6 +695,94 @@ </property> </widget> </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="sqlDottedWordsCheckBox"> + <property name="toolTip"> + <string>Select if words may contain dots</string> + </property> + <property name="text"> + <string>Words may contain dots</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="sqlHashCommentsCheckBox"> + <property name="toolTip"> + <string>Select to allow '#' as a comment character</string> + </property> + <property name="text"> + <string>Allow '#' as comment character</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QCheckBox" name="sqlQuotedIdentifiersCheckBox"> + <property name="toolTip"> + <string>Select to enable quoted identifiers</string> + </property> + <property name="text"> + <string>Enable quoted identifiers</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_15"> + <property name="title"> + <string>TCL Lexer Properties</string> + </property> + <layout class="QVBoxLayout" name="_4"> + <item> + <widget class="QCheckBox" name="foldTclCommentCheckBox"> + <property name="toolTip"> + <string>Select whether folding of comments shall be possible</string> + </property> + <property name="text"> + <string>Fold comments</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_16"> + <property name="title"> + <string>TeX Lexer Properties</string> + </property> + <layout class="QGridLayout" name="gridLayout_9"> + <item row="0" column="0"> + <widget class="QCheckBox" name="foldTexCommentCheckBox"> + <property name="toolTip"> + <string>Select whether folding of comments shall be possible</string> + </property> + <property name="text"> + <string>Fold comments</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="texProcessCommentsCheckBox"> + <property name="toolTip"> + <string>Select to treat comments as TeX source</string> + </property> + <property name="text"> + <string>Treat comments as TeX source</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="texProcessIfCheckBox"> + <property name="toolTip"> + <string>Select to treat \if<unknown> as a command</string> + </property> + <property name="text"> + <string>Treat \if<unknown> as command</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -683,6 +879,7 @@ <tabstop>cppIndentClosingBraceCheckBox</tabstop> <tabstop>cppCaseInsensitiveCheckBox</tabstop> <tabstop>cppDollarAllowedCheckBox</tabstop> + <tabstop>cppStylePreprocessorCheckBox</tabstop> <tabstop>cmakeFoldAtElseCheckBox</tabstop> <tabstop>foldCssCommentCheckBox</tabstop> <tabstop>foldDCommentCheckBox</tabstop> @@ -693,6 +890,8 @@ <tabstop>foldHtmlScriptCommentsCheckBox</tabstop> <tabstop>foldHtmlScriptHereDocsCheckBox</tabstop> <tabstop>htmlCaseSensitiveTagsCheckBox</tabstop> + <tabstop>htmlDjangoCheckBox</tabstop> + <tabstop>htmlMakoCheckBox</tabstop> <tabstop>xmlSyleScriptsCheckBox</tabstop> <tabstop>foldPascalCommentCheckBox</tabstop> <tabstop>foldPascalPreprocessorCheckBox</tabstop> @@ -705,15 +904,28 @@ <tabstop>psLevelSpinBox</tabstop> <tabstop>foldPovrayCommentCheckBox</tabstop> <tabstop>foldPovrayDirectivesCheckBox</tabstop> + <tabstop>propertiesInitialSpacesCheckBox</tabstop> <tabstop>foldPythonCommentCheckBox</tabstop> + <tabstop>foldPythonStringCheckBox</tabstop> + <tabstop>foldPythonQuotesCheckBox</tabstop> <tabstop>pythonBadIndentationCheckBox</tabstop> - <tabstop>foldPythonStringCheckBox</tabstop> <tabstop>pythonAutoindentCheckBox</tabstop> + <tabstop>pythonStringsOverNewlineCheckBox</tabstop> <tabstop>pythonV2UnicodeAllowedCheckBox</tabstop> <tabstop>pythonV3BinaryAllowedCheckBox</tabstop> <tabstop>pythonV3BytesAllowedCheckBox</tabstop> + <tabstop>foldRubyCommentCheckBox</tabstop> <tabstop>foldSqlCommentCheckBox</tabstop> + <tabstop>sqlFoldAtElseCheckBox</tabstop> + <tabstop>sqlFoldOnlyBeginCheckBox</tabstop> <tabstop>sqlBackslashEscapesCheckBox</tabstop> + <tabstop>sqlDottedWordsCheckBox</tabstop> + <tabstop>sqlHashCommentsCheckBox</tabstop> + <tabstop>sqlQuotedIdentifiersCheckBox</tabstop> + <tabstop>foldTclCommentCheckBox</tabstop> + <tabstop>foldTexCommentCheckBox</tabstop> + <tabstop>texProcessCommentsCheckBox</tabstop> + <tabstop>texProcessIfCheckBox</tabstop> <tabstop>vhdlFoldCommentCheckBox</tabstop> <tabstop>vhdlFoldAtElseCheckBox</tabstop> <tabstop>vhdlFoldAtBeginCheckBox</tabstop>