TextEditor: Clarify "Using keyboard shortcut (Alt)" in the settings.

In Tools > Options > Text Editor > Behavior > "Mouse and Keyboard"
the position of the checkbox "Using keyboard shortcut (Alt)" had an
unclear relation to the mouse settings above. Users assumed those two
were linked.

Now the checkbox is moved above the mouse settings and it is not
indentend any more. Further, both settings labels were slightly changed
to clarify that.

Task-number: QTCREATORBUG-10178
Change-Id: I01c01850213f1f34ed34ebd0d87e25243229b2d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

doc/src/howto/creator-help.qdoc

@@ -60,11 +60,12 @@
     \section1 Viewing Function Tooltips
 
     To hide function tooltips by default, select \gui {Tools > Options >
-    Text Editor > Show help tooltips > On Shift+Mouseover}. You can still view
+    Text Editor > Show help tooltips using the mouse > On Shift+Mouseover}. You
-    the tooltips by pressing and holding down the \key Shift key.
+    can still view the tooltips by pressing and holding down the \key Shift
+    key.
 
     To use a keyboard shortcut for viewing help tooltips, select
-    \gui {Using keyboard shortcut (Alt)}.
+    \gui {Show help tooltips using keyboard shortcut (Alt)}.
 
     \section1 Finding Information in Qt Documentation
 

src/plugins/texteditor/behaviorsettingswidget.ui

@@ -11,7 +11,16 @@
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -342,15 +351,41 @@ Specifies how backspace interacts with indentation.
          </widget>
         </item>
         <item>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <widget class="QCheckBox" name="keyboardTooltips">
-          <item row="0" column="0">
+          <property name="toolTip">
-           <widget class="QLabel" name="helpTooltipsLabel">
+           <string>Press Alt to display context-sensitive help or type information as tooltips.</string>
-            <property name="text">
+          </property>
-             <string>Show help tooltips:</string>
+          <property name="text">
+           <string>Show help tooltips using keyboard shortcut (Alt)</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="helpTooltipsLabel">
+          <property name="text">
+           <string>Show help tooltips using the mouse:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-           </widget>
+            <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 row="0" column="1">
+          <item>
            <widget class="QComboBox" name="constrainTooltipsBox">
             <item>
              <property name="text">
@@ -364,8 +399,8 @@ Specifies how backspace interacts with indentation.
             </item>
            </widget>
           </item>
-          <item row="0" column="2">
+          <item>
-           <spacer name="horizontalSpacer">
+           <spacer name="horizontalSpacer_3">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -377,16 +412,6 @@ Specifies how backspace interacts with indentation.
             </property>
            </spacer>
           </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="keyboardTooltips">
-            <property name="toolTip">
-             <string>Press Alt to display context-sensitive help or type information as tooltips.</string>
-            </property>
-            <property name="text">
-             <string>Using keyboard shortcut (Alt)</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
        </layout>