From ad5bdf6969d250bc138f5cd1d2b92be8b5c4dc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 5 Feb 2009 14:08:50 +0100
Subject: [PATCH] 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.
---
.../cpptools/completionsettingspage.ui | 11 +-
.../texteditor/behaviorsettingspage.ui | 255 +++++++++---------
src/plugins/texteditor/displaysettingspage.ui | 129 +++++----
src/plugins/texteditor/fontsettingspage.ui | 4 +-
4 files changed, 224 insertions(+), 175 deletions(-)
diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui
index c71a2abc821..a044376bc74 100644
--- a/src/plugins/cpptools/completionsettingspage.ui
+++ b/src/plugins/cpptools/completionsettingspage.ui
@@ -17,11 +17,14 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Completion Settings</string>
+ <string>Code Completion</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="caseSensitive">
+ <property name="toolTip">
+ <string>Do a case-sensitive match for completion items.</string>
+ </property>
<property name="text">
<string>&Case-sensitive completion</string>
</property>
@@ -32,6 +35,9 @@
</item>
<item>
<widget class="QCheckBox" name="autoInsertBraces">
+ <property name="toolTip">
+ <string>Automatically insert (, ) and ; when appropriate.</string>
+ </property>
<property name="text">
<string>&Automatically insert braces</string>
</property>
@@ -42,6 +48,9 @@
</item>
<item>
<widget class="QCheckBox" name="partiallyComplete">
+ <property name="toolTip">
+ <string>Insert the common prefix of available completion items.</string>
+ </property>
<property name="text">
<string>Autocomplete common &prefix</string>
</property>
diff --git a/src/plugins/texteditor/behaviorsettingspage.ui b/src/plugins/texteditor/behaviorsettingspage.ui
index e6414918c22..64febb27e5b 100644
--- a/src/plugins/texteditor/behaviorsettingspage.ui
+++ b/src/plugins/texteditor/behaviorsettingspage.ui
@@ -6,27 +6,144 @@
<rect>
<x>0</x>
<y>0</y>
- <width>484</width>
- <height>398</height>
+ <width>428</width>
+ <height>384</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBoxTabAndIndentSettings">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBoxStorageSettings">
<property name="title">
- <string>Tab/Indent Settings</string>
+ <string>Storage</string>
</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>&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 &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>&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">
- <widget class="QCheckBox" name="autoIndent">
+ <widget class="QCheckBox" name="useVim">
+ <property name="toolTip">
+ <string/>
+ </property>
<property name="text">
- <string>Enable automatic &indentation</string>
+ <string>Use "vi" style editing</string>
</property>
</widget>
</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">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
@@ -89,13 +206,6 @@
</property>
</spacer>
</item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="insertSpaces">
- <property name="text">
- <string>Insert &spaces instead of tabs</string>
- </property>
- </widget>
- </item>
<item row="1" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
@@ -145,8 +255,11 @@
</item>
</layout>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<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">
<string>&Backspace follows indentation</string>
</property>
@@ -168,121 +281,23 @@
</property>
</spacer>
</item>
- </layout>
- </widget>
- </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>&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 &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">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="insertSpaces">
<property name="text">
- <string>&Ensure newline at end of file</string>
+ <string>Insert &spaces instead of tabs</string>
</property>
</widget>
</item>
- </layout>
- </widget>
- </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">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="autoIndent">
<property name="text">
- <string>Use "vi" style editing</string>
+ <string>Enable automatic &indentation</string>
</property>
</widget>
</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>
</layout>
</widget>
<resources/>
diff --git a/src/plugins/texteditor/displaysettingspage.ui b/src/plugins/texteditor/displaysettingspage.ui
index 30fdf5cf93b..59c8d676b26 100644
--- a/src/plugins/texteditor/displaysettingspage.ui
+++ b/src/plugins/texteditor/displaysettingspage.ui
@@ -6,70 +6,58 @@
<rect>
<x>0</x>
<y>0</y>
- <width>514</width>
- <height>194</height>
+ <width>381</width>
+ <height>279</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBoxDisplaySettings">
+ <item row="2" 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="1" column="0">
+ <widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Display Settings</string>
+ <string>Display</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QCheckBox" name="showWrapColumn">
- <property name="text">
- <string>Display right &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>
+ <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
- <widget class="QCheckBox" name="enableTextWrapping">
- <property name="text">
- <string>Enable text &wrapping</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
<widget class="QCheckBox" name="displayLineNumbers">
<property name="text">
<string>Display line &numbers</string>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="visualizeWhitespace">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="displayFoldingMarkers">
<property name="text">
- <string>&Visualize whitespace</string>
+ <string>Display &folding markers</string>
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="displayFoldingMarkers">
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="visualizeWhitespace">
+ <property name="toolTip">
+ <string>Show tabs and spaces.</string>
+ </property>
<property name="text">
- <string>Display &folding markers</string>
+ <string>&Visualize whitespace</string>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="3" column="0">
<widget class="QCheckBox" name="highlightCurrentLine">
<property name="text">
<string>Highlight current &line</string>
@@ -79,18 +67,55 @@
</layout>
</widget>
</item>
- <item row="1" 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>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBoxDisplaySettings">
+ <property name="title">
+ <string>Text Wrapping</string>
</property>
- </spacer>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="enableTextWrapping">
+ <property name="text">
+ <string>Enable text &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 &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>
</layout>
</widget>
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 770d5e2935c..8aafb751b2f 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -23,7 +23,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>General Font Settings</string>
+ <string>Font</string>
</property>
<layout class="QHBoxLayout">
<property name="spacing">
@@ -119,7 +119,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Item Specific Settings</string>
+ <string>Color Scheme</string>
</property>
<layout class="QHBoxLayout">
<property name="spacing">
--
GitLab