From 92f80837c0d6adceb0f37a3d3d81c205cd884779 Mon Sep 17 00:00:00 2001
From: uwestoehr <uwestoehr@a592a061-630c-0410-9148-cb99ea01b6c8>
Date: Tue, 7 Jul 2009 12:06:15 +0000
Subject: [PATCH] NomenclUi.ui: fix #3936 also for the description field of the
 nomenclature dialog as reported in #6054

OK for branch too?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30401 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/NomenclUi.ui | 93 +++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/frontends/qt4/ui/NomenclUi.ui b/src/frontends/qt4/ui/NomenclUi.ui
index c011c394b8..3260d9cfed 100644
--- a/src/frontends/qt4/ui/NomenclUi.ui
+++ b/src/frontends/qt4/ui/NomenclUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>NomenclUi</class>
- <widget class="QDialog" name="NomenclUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="NomenclUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,76 +10,76 @@
     <height>165</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </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="2" column="1" >
-    <widget class="QLineEdit" name="prefixED" />
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="prefixED"/>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="prefixLA" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="prefixLA">
+     <property name="text">
       <string>Sort &amp;as:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>prefixED</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="descrLA" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="descrLA">
+     <property name="text">
       <string>&amp;Description:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>descriptionTE</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="symbolLA" >
-     <property name="text" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="symbolLA">
+     <property name="text">
       <string>&amp;Symbol:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>symbolED</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="symbolED" >
-     <property name="toolTip" >
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="symbolED">
+     <property name="toolTip">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
+   <item row="3" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -87,33 +88,37 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
+      <widget class="QPushButton" name="okPB">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+O</string>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="1" >
-    <widget class="QTextEdit" name="descriptionTE" />
+   <item row="1" column="1">
+    <widget class="QTextEdit" name="descriptionTE">
+     <property name="acceptRichText">
+      <bool>false</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>symbolED</tabstop>
   <tabstop>descriptionTE</tabstop>
@@ -122,7 +127,7 @@
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
-- 
2.11.4.GIT