Skip to content
Snippets Groups Projects
Commit ad5bdf69 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Added tooltips to editor settings and tweaked layout 

Looks a bit nicer now and the tooltips explain some of the options a bit
better. Header texts have also been simplified.
parent 83216836
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/plugins/cpptools/completionsettingspage.ui
+ 10
− 1
View file @ ad5bdf69
...@@ -17,11 +17,14 @@ ...@@ -17,11 +17,14 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Completion Settings</string> <string>Code Completion</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QCheckBox" name="caseSensitive"> <widget class="QCheckBox" name="caseSensitive">
<property name="toolTip">
<string>Do a case-sensitive match for completion items.</string>
</property>
<property name="text"> <property name="text">
<string>&amp;Case-sensitive completion</string> <string>&amp;Case-sensitive completion</string>
</property> </property>
...@@ -32,6 +35,9 @@ ...@@ -32,6 +35,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="autoInsertBraces"> <widget class="QCheckBox" name="autoInsertBraces">
<property name="toolTip">
<string>Automatically insert (, ) and ; when appropriate.</string>
</property>
<property name="text"> <property name="text">
<string>&amp;Automatically insert braces</string> <string>&amp;Automatically insert braces</string>
</property> </property>
...@@ -42,6 +48,9 @@ ...@@ -42,6 +48,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="partiallyComplete"> <widget class="QCheckBox" name="partiallyComplete">
<property name="toolTip">
<string>Insert the common prefix of available completion items.</string>
</property>
<property name="text"> <property name="text">
<string>Autocomplete common &amp;prefix</string> <string>Autocomplete common &amp;prefix</string>
</property> </property>
......
src/plugins/texteditor/behaviorsettingspage.ui
+ 135
− 120
View file @ ad5bdf69
...@@ -6,27 +6,144 @@ ...@@ -6,27 +6,144 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>484</width> <width>428</width>
<height>398</height> <height>384</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="1" column="0">
<widget class="QGroupBox" name="groupBoxTabAndIndentSettings"> <widget class="QGroupBox" name="groupBoxStorageSettings">
<property name="title"> <property name="title">
<string>Tab/Indent Settings</string> <string>Storage</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="cleanWhitespace">
<property name="toolTip">
<string>Removes trailing whitespace on saving.</string>
</property>
<property name="text">
<string>&amp;Clean whitespace</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="inEntireDocument">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Clean whitespace in entire document instead of only for changed parts.</string>
</property>
<property name="text">
<string>In entire &amp;document</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="cleanIndentationLayout">
<item>
<spacer name="cleanIndentationSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="cleanIndentation">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Correct leading whitespace according to tab settings.</string>
</property>
<property name="text">
<string>Clean indentation</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="addFinalNewLine">
<property name="text">
<string>&amp;Ensure newline at end of file</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBoxInteractionSettings">
<property name="title">
<string>Interaction</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="autoIndent"> <widget class="QCheckBox" name="useVim">
<property name="toolTip">
<string/>
</property>
<property name="text"> <property name="text">
<string>Enable automatic &amp;indentation</string> <string>Use &quot;vi&quot; style editing</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</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>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxTabAndIndentSettings">
<property name="title">
<string>Tabs and Indentation</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="2"> <item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
...@@ -89,13 +206,6 @@ ...@@ -89,13 +206,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0">
<widget class="QCheckBox" name="insertSpaces">
<property name="text">
<string>Insert &amp;spaces instead of tabs</string>
</property>
</widget>
</item>
<item row="1" column="2"> <item row="1" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
...@@ -145,8 +255,11 @@ ...@@ -145,8 +255,11 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="smartBackspace"> <widget class="QCheckBox" name="smartBackspace">
<property name="toolTip">
<string>Backspace will go back one indentation level instead of one space.</string>
</property>
<property name="text"> <property name="text">
<string>&amp;Backspace follows indentation</string> <string>&amp;Backspace follows indentation</string>
</property> </property>
...@@ -168,121 +281,23 @@ ...@@ -168,121 +281,23 @@
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> <item row="0" column="0">
</widget> <widget class="QCheckBox" name="insertSpaces">
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBoxStorageSettings">
<property name="title">
<string>Storage Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="cleanWhitespace">
<property name="text">
<string>&amp;Clean whitespace</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="inEntireDocument">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>In entire &amp;document</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="cleanIndentationLayout">
<item>
<spacer name="cleanIndentationSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="cleanIndentation">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Clean indentation</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="addFinalNewLine">
<property name="text"> <property name="text">
<string>&amp;Ensure newline at end of file</string> <string>Insert &amp;spaces instead of tabs</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="0">
</widget> <widget class="QCheckBox" name="autoIndent">
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBoxInteractionSettings">
<property name="title">
<string>Interaction Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="useVim">
<property name="text"> <property name="text">
<string>Use &quot;vi&quot; style editing</string> <string>Enable automatic &amp;indentation</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</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>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
......
src/plugins/texteditor/displaysettingspage.ui
+ 77
− 52
View file @ ad5bdf69
...@@ -6,70 +6,58 @@ ...@@ -6,70 +6,58 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>514</width> <width>381</width>
<height>194</height> <height>279</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="2" column="0">
<widget class="QGroupBox" name="groupBoxDisplaySettings"> <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Display Settings</string> <string>Display</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="showWrapColumn">
<property name="text">
<string>Display right &amp;margin at column</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="wrapColumn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximum">
<number>999</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="enableTextWrapping">
<property name="text">
<string>Enable text &amp;wrapping</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="displayLineNumbers"> <widget class="QCheckBox" name="displayLineNumbers">
<property name="text"> <property name="text">
<string>Display line &amp;numbers</string> <string>Display line &amp;numbers</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="1" column="0">
<widget class="QCheckBox" name="visualizeWhitespace"> <widget class="QCheckBox" name="displayFoldingMarkers">
<property name="text"> <property name="text">
<string>&amp;Visualize whitespace</string> <string>Display &amp;folding markers</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="displayFoldingMarkers"> <widget class="QCheckBox" name="visualizeWhitespace">
<property name="toolTip">
<string>Show tabs and spaces.</string>
</property>
<property name="text"> <property name="text">
<string>Display &amp;folding markers</string> <string>&amp;Visualize whitespace</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="0">
<widget class="QCheckBox" name="highlightCurrentLine"> <widget class="QCheckBox" name="highlightCurrentLine">
<property name="text"> <property name="text">
<string>Highlight current &amp;line</string> <string>Highlight current &amp;line</string>
...@@ -79,18 +67,55 @@ ...@@ -79,18 +67,55 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<spacer name="verticalSpacer"> <widget class="QGroupBox" name="groupBoxDisplaySettings">
<property name="orientation"> <property name="title">
<enum>Qt::Vertical</enum> <string>Text Wrapping</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property> </property>
</spacer> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="enableTextWrapping">
<property name="text">
<string>Enable text &amp;wrapping</string>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="showWrapColumn">
<property name="text">
<string>Display right &amp;margin at column:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="wrapColumn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximum">
<number>999</number>
</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>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
......
src/plugins/texteditor/fontsettingspage.ui
+ 2
− 2
View file @ ad5bdf69
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>General Font Settings</string> <string>Font</string>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title"> <property name="title">
<string>Item Specific Settings</string> <string>Color Scheme</string>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment