--- a/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.ui Sat Sep 09 17:20:31 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.ui Sun Sep 10 18:04:28 2023 +0200 @@ -127,10 +127,10 @@ <bool>false</bool> </property> <property name="toolTip"> - <string>Select to skip matching braces when typing</string> + <string>Select to skip matching parenthesis when typing</string> </property> <property name="text"> - <string>Automatically skip matching braces when typing</string> + <string>Automatically skip matching parenthesis when typing</string> </property> </widget> </item> @@ -325,7 +325,7 @@ <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout_8"> <item> <widget class="QCheckBox" name="rubyInsertClosingBraceCheckBox"> <property name="toolTip"> @@ -337,14 +337,50 @@ </widget> </item> <item> - <widget class="QCheckBox" name="rubySkipBraceCheckBox"> - <property name="toolTip"> - <string>Select to skip matching braces when typing</string> - </property> - <property name="text"> - <string>Automatically skip matching braces when typing</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QCheckBox" name="rubySkipBraceCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to skip matching parenthesis when typing</string> + </property> + <property name="text"> + <string>Automatically skip matching parenthesis when typing</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> <item> <widget class="QCheckBox" name="rubyIndentBraceCheckBox"> @@ -471,10 +507,10 @@ <bool>false</bool> </property> <property name="toolTip"> - <string>Select to skip matching braces when typing</string> + <string>Select to skip matching parenthesis when typing</string> </property> <property name="text"> - <string>Automatically skip matching braces when typing</string> + <string>Automatically skip matching parenthesis when typing</string> </property> </widget> </item> @@ -581,6 +617,163 @@ </item> </layout> </widget> + <widget class="QWidget" name="tomlPage"> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <item> + <widget class="QGroupBox" name="tomlGroup"> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> + <property name="toolTip"> + <string>Select to enable TOML typing aids</string> + </property> + <property name="title"> + <string>Enable TOML typing aids</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <item> + <widget class="QCheckBox" name="tomlInsertClosingBraceCheckBox"> + <property name="toolTip"> + <string>Select to insert a closing parenthesis</string> + </property> + <property name="text"> + <string>Automatic parenthesis insertion</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="_3"> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QCheckBox" name="tomlSkipBraceCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to skip matching parenthesis when typing</string> + </property> + <property name="text"> + <string>Automatically skip matching parenthesis when typing</string> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>131</width> + <height>21</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="tomlColonDetectionCheckBox"> + <property name="toolTip"> + <string>Select to skip a ':', if typed next to another ':'</string> + </property> + <property name="text"> + <string>Automatic colon detection</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tomlAutoIndentationCheckBox"> + <property name="toolTip"> + <string>Select to indent after typing 'return'</string> + </property> + <property name="text"> + <string>Automatic indent after '(', '{', '['</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tomlInsertQuoteCheckBox"> + <property name="toolTip"> + <string>Select to insert the matching quote character</string> + </property> + <property name="text"> + <string>Automatic quote insertion</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tomlInsertBlankColonCheckBox"> + <property name="toolTip"> + <string>Select to insert a blank after ':'</string> + </property> + <property name="text"> + <string>Automatic insertion of ' ' (blank) after ':'</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tomlInsertBlankEqualCheckBox"> + <property name="toolTip"> + <string>Select to insert a blank after '='</string> + </property> + <property name="text"> + <string>Automatic insertion of ' ' (blank) after '='</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="tomlInsertBlankCommaCheckBox"> + <property name="toolTip"> + <string>Select to insert a blank after ','</string> + </property> + <property name="text"> + <string>Automatic insertion of ' ' (blank) after ','</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>119</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> </widget> </item> <item> @@ -621,6 +814,25 @@ <tabstop>rubyInsertBlankCheckBox</tabstop> <tabstop>rubyInsertHereDocCheckBox</tabstop> <tabstop>rubyInsertInlineDocCheckBox</tabstop> + <tabstop>yamlGroup</tabstop> + <tabstop>yamlInsertClosingBraceCheckBox</tabstop> + <tabstop>yamlSkipBraceCheckBox</tabstop> + <tabstop>yamlColonDetectionCheckBox</tabstop> + <tabstop>yamlAutoIndentationCheckBox</tabstop> + <tabstop>yamlInsertQuoteCheckBox</tabstop> + <tabstop>yamlInsertBlankColonCheckBox</tabstop> + <tabstop>yamlInsertBlankDashCheckBox</tabstop> + <tabstop>yamlInsertBlankQuestionCheckBox</tabstop> + <tabstop>yamlInsertBlankCommaCheckBox</tabstop> + <tabstop>tomlGroup</tabstop> + <tabstop>tomlInsertClosingBraceCheckBox</tabstop> + <tabstop>tomlSkipBraceCheckBox</tabstop> + <tabstop>tomlColonDetectionCheckBox</tabstop> + <tabstop>tomlAutoIndentationCheckBox</tabstop> + <tabstop>tomlInsertQuoteCheckBox</tabstop> + <tabstop>tomlInsertBlankColonCheckBox</tabstop> + <tabstop>tomlInsertBlankEqualCheckBox</tabstop> + <tabstop>tomlInsertBlankCommaCheckBox</tabstop> </tabstops> <resources/> <connections> @@ -641,22 +853,6 @@ </hints> </connection> <connection> - <sender>pythonInsertClosingBraceCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>pythonSkipBraceCheckBox</receiver> - <slot>setChecked(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>236</x> - <y>141</y> - </hint> - <hint type="destinationlabel"> - <x>246</x> - <y>172</y> - </hint> - </hints> - </connection> - <connection> <sender>pythonInsertImportCheckBox</sender> <signal>toggled(bool)</signal> <receiver>pythonImportBraceTypeCheckBox</receiver> @@ -689,18 +885,34 @@ </hints> </connection> <connection> - <sender>yamlInsertClosingBraceCheckBox</sender> + <sender>tomlInsertClosingBraceCheckBox</sender> <signal>toggled(bool)</signal> - <receiver>yamlSkipBraceCheckBox</receiver> - <slot>setChecked(bool)</slot> + <receiver>tomlSkipBraceCheckBox</receiver> + <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>222</x> - <y>129</y> + <x>104</x> + <y>126</y> </hint> <hint type="destinationlabel"> - <x>222</x> - <y>160</y> + <x>117</x> + <y>155</y> + </hint> + </hints> + </connection> + <connection> + <sender>rubyInsertClosingBraceCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>rubySkipBraceCheckBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>136</x> + <y>128</y> + </hint> + <hint type="destinationlabel"> + <x>137</x> + <y>157</y> </hint> </hints> </connection>