From: Uwe Stöhr <uwestoehr@web.de>
Date: Fri, 2 Apr 2010 13:04:40 +0000 (+0000)
Subject: FontUi.ui: remove HTML and use plain text
X-Git-Tag: 2.0.0~3568
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a8825b88c2c6cfb2cdf61f03aafd83b5a3ba9b25;p=features.git

FontUi.ui: remove HTML and use plain text
(it turned out that Qt's designer uses by default HTML when there are linebreaks)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34015 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index 7ac625dbbf..ea32e446d3 100644
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -6,12 +6,15 @@
     <x>0</x>
     <y>0</y>
     <width>404</width>
-    <height>349</height>
+    <height>321</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>FontUi</string>
   </property>
+  <property name="toolTip">
+   <string>Revert the color to the default</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="fontsDefaultLA">
@@ -31,7 +34,7 @@
     </widget>
    </item>
    <item row="0" column="2">
-    <widget class="QLabel" name="TextLabel2_2">
+    <widget class="QLabel" name="BaseSizeLA">
      <property name="text">
       <string>&amp;Base Size:</string>
      </property>
@@ -204,12 +207,8 @@
    <item row="8" column="0">
     <widget class="QLabel" name="noteFontColorLA">
      <property name="text">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Font color for&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;greyed-out notes:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>Font color for
+greyed-out notes:</string>
      </property>
     </widget>
    </item>