anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #5063: We don't want the combo boxes to adjust to the contents. Also, make the logic exactly the same for all comboboxes.

Browse Source 
see r31821.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31833 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-11-02 18:53:15 +00:00
parent 792f7b6299
commit 8b4505cb09
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontends/qt4/ui/CharacterUi.ui
View File

@ -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>

3
status.16x
View File

@ -255,6 +255,9 @@ What's new
- Set the correct language after dissolving an Inset. This can give
strange effect especially when dissolving an ERT (bug 6292).
- Fix the appaerance of the combo boxes in the Text Style dialog
(bug 5063).
* DOCUMENTATION AND LOCALIZATION