X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FCharacterUi.ui;h=eedcc0a5af5547a82bac360a201c8e2c4fcdf7b1;hb=0de23da9cd0ff804d5ee53133138e1acab217158;hp=9eba9fd01ec5812b0a6c9519c74ce40786c984dc;hpb=a1607b414ae8a523f735e02d5bd3772f212f7d91;p=lyx.git

diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui
index 9eba9fd01e..eedcc0a5af 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>QCharacterUi</class>
- <widget class="QDialog" name="QCharacterUi" >
+ <class>CharacterUi</class>
+ <widget class="QDialog" name="CharacterUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -64,9 +64,6 @@
          <property name="toolTip" >
           <string>Font shape</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="2" column="0" >
@@ -95,9 +92,6 @@
          <property name="toolTip" >
           <string>Font series</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="4" column="1" >
@@ -113,9 +107,6 @@
          <property name="toolTip" >
           <string>Language</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="0" column="1" >
@@ -131,9 +122,6 @@
          <property name="toolTip" >
           <string>Font family</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="3" column="1" >
@@ -149,9 +137,6 @@
          <property name="toolTip" >
           <string>Font color</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="4" column="0" >
@@ -235,7 +220,7 @@
            <widget class="QComboBox" name="sizeCO" >
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>1</hsizetype>
+              <hsizetype>3</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -244,9 +229,6 @@
             <property name="toolTip" >
              <string>Font size</string>
             </property>
-            <property name="sizeAdjustPolicy" >
-             <enum>QComboBox::AdjustToContents</enum>
-            </property>
            </widget>
           </item>
          </layout>
@@ -279,12 +261,17 @@
           </item>
           <item>
            <widget class="QComboBox" name="miscCO" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>3</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>           
             <property name="toolTip" >
              <string>Other font settings</string>
             </property>
-            <property name="sizeAdjustPolicy" >
-             <enum>QComboBox::AdjustToContents</enum>
-            </property>
            </widget>
           </item>
          </layout>
@@ -318,7 +305,7 @@
         <string>Apply each change automatically</string>
        </property>
        <property name="text" >
-        <string>Apply changes immediately</string>
+        <string>Apply changes &amp;immediately</string>
        </property>
       </widget>
      </item>
@@ -416,7 +403,7 @@
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>