From f00104d222d39da2b2abaff78ab1c3082124cbf7 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Sat, 22 Mar 2014 21:21:59 -0400
Subject: [PATCH] Revert "Tooltip for completion word length."

This reverts commit 2aadcec1fc9ae784e6029b56790753ce82b9f055.

Conflicts:
	src/frontends/qt4/ui/PrefCompletionUi.ui
---
 src/frontends/qt4/ui/PrefCompletionUi.ui | 216 +++++++++++------------
 1 file changed, 106 insertions(+), 110 deletions(-)

diff --git a/src/frontends/qt4/ui/PrefCompletionUi.ui b/src/frontends/qt4/ui/PrefCompletionUi.ui
index d833302053..0cb8751b73 100644
--- a/src/frontends/qt4/ui/PrefCompletionUi.ui
+++ b/src/frontends/qt4/ui/PrefCompletionUi.ui
@@ -1,63 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+2aadcec1fc9<ui version="4.0" >
  <class>PrefCompletionUi</class>
- <widget class="QWidget" name="PrefCompletionUi">
-  <property name="geometry">
+ <widget class="QWidget" name="PrefCompletionUi" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>412</width>
-    <height>468</height>
+    <width>400</width>
+    <height>404</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
+  <layout class="QGridLayout" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="spacing">
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
       <string>In Math</string>
      </property>
-     <property name="flat">
+     <property name="flat" >
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
        <number>9</number>
       </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
-       <widget class="QCheckBox" name="inlineMathCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="inlineMathCB" >
+        <property name="toolTip" >
          <string>Show the grey inline completion behind the cursor in math mode after the delay.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Automatic in&amp;line completion</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="popupMathCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="popupMathCB" >
+        <property name="toolTip" >
          <string>Show the popup in math mode after the delay.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Automatic p&amp;opup</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="autocorrectionCB">
-        <property name="text">
+       <widget class="QCheckBox" name="autocorrectionCB" >
+        <property name="text" >
          <string>Autoco&amp;rrection</string>
         </property>
        </widget>
@@ -65,47 +64,47 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
       <string>In Text</string>
      </property>
-     <property name="flat">
+     <property name="flat" >
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
        <number>9</number>
       </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
-       <widget class="QCheckBox" name="inlineTextCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="inlineTextCB" >
+        <property name="toolTip" >
          <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Automatic &amp;inline completion</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="popupTextCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="popupTextCB" >
+        <property name="toolTip" >
          <string>Show the popup after the set delay in text mode.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Automatic &amp;popup</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="cursorTextCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="cursorTextCB" >
+        <property name="toolTip" >
          <string>Show a small triangle on the cursor if a completion is available in text mode.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Cursor i&amp;ndicator</string>
         </property>
        </widget>
@@ -113,58 +112,58 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="title">
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox_4" >
+     <property name="title" >
       <string>General</string>
      </property>
-     <property name="flat">
+     <property name="flat" >
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
        <number>9</number>
       </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
-       <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
          <number>0</number>
         </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
-         <widget class="QDoubleSpinBox" name="inlineDelaySB">
-          <property name="toolTip">
+         <widget class="QDoubleSpinBox" name="inlineDelaySB" >
+          <property name="toolTip" >
            <string>After the cursor has not moved for this time, the inline completion is shown if it is available.</string>
           </property>
-          <property name="maximum">
+          <property name="maximum" >
            <double>10.000000000000000</double>
           </property>
-          <property name="singleStep">
+          <property name="singleStep" >
            <double>0.100000000000000</double>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="label_4">
-          <property name="text">
+         <widget class="QLabel" name="label_4" >
+          <property name="text" >
            <string>s inline completion dela&amp;y</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>inlineDelaySB</cstring>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation">
+          <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0">
+          <property name="sizeHint" >
            <size>
             <width>40</width>
             <height>20</height>
@@ -175,42 +174,42 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
          <number>0</number>
         </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
-         <widget class="QDoubleSpinBox" name="popupDelaySB">
-          <property name="toolTip">
+         <widget class="QDoubleSpinBox" name="popupDelaySB" >
+          <property name="toolTip" >
            <string>After the cursor has not moved for this time, the completion popup is shown if it is available.</string>
           </property>
-          <property name="maximum">
+          <property name="maximum" >
            <double>10.000000000000000</double>
           </property>
-          <property name="singleStep">
+          <property name="singleStep" >
            <double>0.100000000000000</double>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="label_3">
-          <property name="text">
+         <widget class="QLabel" name="label_3" >
+          <property name="text" >
            <string>s popup d&amp;elay</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>popupDelaySB</cstring>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation">
+          <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0">
+          <property name="sizeHint" >
            <size>
             <width>40</width>
             <height>20</height>
@@ -221,16 +220,16 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
          <number>0</number>
         </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
-         <widget class="QSpinBox" name="minlengthSB">
-          <property name="toolTip">
+         <widget class="QSpinBox" name="minlengthSB" >
+          <property name="toolTip" >
            <string>.</string>
           </property>
           <property name="minimum">
@@ -245,24 +244,21 @@
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="label_5">
-          <property name="toolTip">
-           <string>Shortest word that LyX will offer to complete.</string>
-          </property>
-          <property name="text">
+         <widget class="QLabel" name="label_5" >
+          <property name="text" >
            <string>Minimum word length for completion</string>
           </property>
-          <property name="buddy">
+          <property name="buddy" >
            <cstring>minlengthSB</cstring>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation">
+          <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0">
+          <property name="sizeHint" >
            <size>
             <width>40</width>
             <height>20</height>
@@ -273,37 +269,37 @@
        </layout>
       </item>
       <item>
-       <widget class="QCheckBox" name="popupAfterCompleteCB">
-        <property name="toolTip">
+       <widget class="QCheckBox" name="popupAfterCompleteCB" >
+        <property name="toolTip" >
          <string>When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away.</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>Sho&amp;w popup without delay for non-unique completions</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="inlineDotsCB">
-        <property name="toolTip">
-         <string>Long completions are cut-off and shown with &quot;...&quot;.</string>
+       <widget class="QCheckBox" name="inlineDotsCB" >
+        <property name="toolTip" >
+         <string>Long completions are cut-off and shown with "...".</string>
         </property>
-        <property name="text">
-         <string>&amp;Use &quot;...&quot; to shorten long completions</string>
+        <property name="text" >
+         <string>&amp;Use "..." to shorten long completions</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="3" column="0" >
     <spacer>
-     <property name="orientation">
+     <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType">
+     <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" >
       <size>
        <width>0</width>
        <height>16</height>
@@ -322,7 +318,7 @@
   <tabstop>autocorrectionCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local">qt_i18n.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>