commit 9c0bea33b6fdb98baddf864f710c481b99bb6504
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sat May 5 17:45:17 2018 +0200
Fine-tune character dialog UI
---
src/frontends/qt4/ui/CharacterUi.ui | 550 ++++++++++++++++++-----------------
1 files changed, 282 insertions(+), 268 deletions(-)
diff --git a/src/frontends/qt4/ui/CharacterUi.ui
b/src/frontends/qt4/ui/CharacterUi.ui
index 9f01b84..4341b73 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -17,301 +17,315 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0" rowspan="2">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Font Properties</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Font Properties</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
- <widget class="QLabel" name="familyLA">
- <property name="toolTip">
- <string>Font family</string>
- </property>
- <property name="text">
- <string>Fa&mily:</string>
- </property>
- <property name="buddy">
- <cstring>familyCO</cstring>
- </property>
- </widget>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="familyLA">
+ <property name="toolTip">
+ <string>Font family</string>
+ </property>
+ <property name="text">
+ <string>Fa&mily:</string>
+ </property>
+ <property name="buddy">
+ <cstring>familyCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="familyCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Font family</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="seriesLA">
+ <property name="toolTip">
+ <string>Font series</string>
+ </property>
+ <property name="text">
+ <string>&Series:</string>
+ </property>
+ <property name="buddy">
+ <cstring>seriesCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="seriesCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Font series</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="shapeLA">
+ <property name="toolTip">
+ <string>Font shape</string>
+ </property>
+ <property name="text">
+ <string>S&hape:</string>
+ </property>
+ <property name="buddy">
+ <cstring>shapeCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="shapeCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Font shape</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="sizeLA">
+ <property name="toolTip">
+ <string>Font size</string>
+ </property>
+ <property name="text">
+ <string>Si&ze:</string>
+ </property>
+ <property name="buddy">
+ <cstring>sizeCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="sizeCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Font size</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="familyCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Font family</string>
- </property>
- </widget>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Decoration</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="colorLA">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip">
+ <string>Font color</string>
+ </property>
+ <property name="text">
+ <string>&Color:</string>
+ </property>
+ <property name="buddy">
+ <cstring>colorCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="colorCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Font color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="ulineLA">
+ <property name="text">
+ <string>U&nderlining:</string>
+ </property>
+ <property name="buddy">
+ <cstring>ulineCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="ulineCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Underlining of text</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="strikeLA">
+ <property name="text">
+ <string>S&trikethrough:</string>
+ </property>
+ <property name="buddy">
+ <cstring>strikeCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="strikeCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Strike-through text</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="seriesLA">
- <property name="toolTip">
- <string>Font series</string>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="text">
- <string>&Series:</string>
- </property>
- <property name="buddy">
- <cstring>seriesCO</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="seriesCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="toolTip">
- <string>Font series</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>36</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="shapeLA">
- <property name="toolTip">
- <string>Font shape</string>
- </property>
- <property name="text">
- <string>S&hape:</string>
- </property>
- <property name="buddy">
- <cstring>shapeCO</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="shapeCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Font shape</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="sizeLA">
- <property name="toolTip">
- <string>Font size</string>
- </property>
- <property name="text">
- <string>Si&ze:</string>
- </property>
- <property name="buddy">
- <cstring>sizeCO</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="sizeCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Font size</string>
- </property>
- </widget>
+ </spacer>
</item>
</layout>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Decoration</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="langLA">
+ <property name="toolTip">
+ <string>Language</string>
+ </property>
+ <property name="text">
+ <string>&Language:</string>
+ </property>
+ <property name="buddy">
+ <cstring>langCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="langCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Language</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Semantic Markup</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
- <widget class="QLabel" name="colorLA">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <widget class="QCheckBox" name="emphCB">
<property name="toolTip">
- <string>Font color</string>
+ <string>Semantic emphasizing (italic by default, but can be
adapted)</string>
</property>
<property name="text">
- <string>&Color:</string>
- </property>
- <property name="buddy">
- <cstring>colorCO</cstring>
+ <string>&Emphasized</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="colorCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QCheckBox" name="nounCB">
<property name="toolTip">
- <string>Font color</string>
+ <string>Semantic markup of nouns (small caps by default, but can be
adapted)</string>
</property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="ulineLA">
<property name="text">
- <string>U&nderlining:</string>
- </property>
- <property name="buddy">
- <cstring>ulineCO</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="ulineCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Underlining of text</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="strikeLA">
- <property name="text">
- <string>S&trikethrough:</string>
- </property>
- <property name="buddy">
- <cstring>strikeCO</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="strikeCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Strike-through text</string>
+ <string>&Noun</string>
</property>
</widget>
</item>
</layout>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="1">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>36</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="langLA">
- <property name="toolTip">
- <string>Language</string>
- </property>
- <property name="text">
- <string>&Language:</string>
- </property>
- <property name="buddy">
- <cstring>langCO</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="langCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Language</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
</layout>
</item>
- <item row="2" column="1">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Semantic Markup</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="QCheckBox" name="emphCB">
- <property name="toolTip">
- <string>Semantic emphasizing (italic by default, but can be
adapted)</string>
- </property>
- <property name="text">
- <string>&Emphasized</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="nounCB">
- <property name="toolTip">
- <string>Semantic markup of nouns (small caps by default, but can be
adapted)</string>
- </property>
- <property name="text">
- <string>&Noun</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0">
+ <item row="2" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -327,7 +341,7 @@
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="3" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
