Resolves tdf#139395 - Redesign of font name and effects pages
* Western/CJK/CTL selection placed into a GtkNotebook
* Font color and transparency in one line
* Alignment adjusted at font effects page
* Char-, para- & style dialogs made non-resizable according the guideline
Change-Id: I242c3886534a2696b4c2438ca17e6e778c2c3991
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125909
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index be4db98..70935a6 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -76,8 +76,8 @@ private:
std::unique_ptr<SvxLanguageBox> m_xWestFontLanguageLB;
std::unique_ptr<weld::Label> m_xWestFontTypeFT;
std::unique_ptr<weld::Button> m_xWestFontFeaturesButton;
std::unique_ptr<weld::Notebook> m_xLangNotebook;
std::unique_ptr<weld::Widget> m_xEastFrame;
std::unique_ptr<weld::Label> m_xEastFontNameFT;
std::unique_ptr<weld::ComboBox> m_xEastFontNameLB;
std::unique_ptr<weld::Label> m_xEastFontStyleFT;
@@ -89,7 +89,6 @@ private:
std::unique_ptr<weld::Label> m_xEastFontTypeFT;
std::unique_ptr<weld::Button> m_xEastFontFeaturesButton;
std::unique_ptr<weld::Widget> m_xCTLFrame;
std::unique_ptr<weld::Label> m_xCTLFontNameFT;
std::unique_ptr<weld::ComboBox> m_xCTLFontNameLB;
std::unique_ptr<weld::Label> m_xCTLFontStyleFT;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 4c19018..86e29f9 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -189,7 +189,7 @@ struct SvxCharNamePage_Impl
SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
: SvxCharBasePage(pPage, pController, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
, m_xEastFrame(m_xBuilder->weld_widget("asian"))
, m_xLangNotebook(m_xBuilder->weld_notebook("notebook"))
, m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
, m_xEastFontNameLB(m_xBuilder->weld_combo_box("eastfontnamelb"))
, m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft"))
@@ -200,7 +200,6 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xEastFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("eastlanglb")))
, m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo"))
, m_xEastFontFeaturesButton(m_xBuilder->weld_button("east_features_button"))
, m_xCTLFrame(m_xBuilder->weld_widget("ctl"))
, m_xCTLFontNameFT(m_xBuilder->weld_label("ctlfontnameft"))
, m_xCTLFontNameLB(m_xBuilder->weld_combo_box("ctlfontnamelb"))
, m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
@@ -293,8 +292,10 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
m_xCTLFontStyleFT->set_label(sFontStyleString);
m_xWestFrame->show();
m_xEastFrame->set_visible(bShowCJK);
m_xCTLFrame->set_visible(bShowCTL);
if (!bShowCJK)
m_xLangNotebook->remove_page("lbAsian");
if (!bShowCTL)
m_xLangNotebook->remove_page("lbComplex");
m_xWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN, true, false, true, true,
LANGUAGE_SYSTEM, css::i18n::ScriptType::LATIN);
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 61f6a6b..27be565 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<!-- Generated with glade 3.38.2 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
@@ -68,69 +68,73 @@
</object>
<object class="GtkBox" id="CharNamePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=3 n-rows=3 -->
<object class="GtkGrid" id="simple">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="westfontinfo-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="can-focus">False</property>
<property name="margin-top">6</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
<property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="namegrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">3</property>
<property name="margin-top">6</property>
<property name="row-spacing">3</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="westfontnamelb-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="headers-visible">False</property>
<property name="headers-clickable">False</property>
<property name="search-column">0</property>
<property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
@@ -148,21 +152,21 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="westfontname-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
@@ -170,52 +174,52 @@
<child type="label">
<object class="GtkLabel" id="westfontnameft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|westfontnameft-nocjk">Family:</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|westfontnameft-nocjk">Family:</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="stylegrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">3</property>
<property name="margin-top">6</property>
<property name="row-spacing">3</property>
<child>
<object class="GtkScrolledWindow">
<property name="width_request">42</property>
<property name="width-request">42</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="weststylelb-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="headers-visible">False</property>
<property name="headers-clickable">False</property>
<property name="search-column">0</property>
<property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
@@ -238,21 +242,21 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="weststyle-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
@@ -260,52 +264,52 @@
<child type="label">
<object class="GtkLabel" id="weststyleft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|weststyleft-nocjk">Style:</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|weststyleft-nocjk">Style:</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="sizegrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">3</property>
<property name="margin-top">6</property>
<property name="row-spacing">3</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<property name="vscrollbar-policy">always</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="westsizelb-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore3</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="headers-visible">False</property>
<property name="headers-clickable">False</property>
<property name="search-column">0</property>
<property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
@@ -328,21 +332,21 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="westsize-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
@@ -350,36 +354,36 @@
<child type="label">
<object class="GtkLabel" id="westsizeft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|westsizeft-nocjk">Size:</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="spacing">24</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="westlangft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|westlangft-nocjk">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westlanglb-nocjk</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">westlanglb-nocjk</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -391,13 +395,13 @@
<child>
<object class="GtkComboBox" id="westlanglb-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="model">liststore4</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<property name="has-entry">True</property>
<property name="entry-text-column">0</property>
<property name="id-column">1</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
<attributes>
@@ -406,9 +410,9 @@
</child>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
@@ -434,8 +438,8 @@
<object class="GtkButton" id="west_features_button-nocjk">
<property name="label" translatable="yes" context="charnamepage|west_features_button-nocjk">Features...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
</object>
@@ -447,8 +451,8 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="width">3</property>
</packing>
</child>
@@ -461,210 +465,586 @@
</child>
<child>
<object class="GtkFrame" id="western">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid1">
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<property name="margin-start">12</property>
<property name="can-focus">True</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<child>
<object class="GtkLabel" id="westfontnameft-cjk">
<!-- n-columns=3 n-rows=5 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|westfontnameft-cjk">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westfontnamelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="weststyleft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|weststyleft-cjk">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">weststylelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westsizeft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|westsizeft-cjk">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westsizelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westlangft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|westlangft-cjk">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westlanglb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="westfontnamelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="weststylelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="weststylelb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|weststylelb-cjk">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="westsizelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="westsizelb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|westsizelb-cjk">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="westlanglb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore5</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext5"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="westlanglb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|westlanglb-cjk">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="westfontinfo-cjk">
<object class="GtkLabel" id="westfontnameft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="hexpand">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|westfontnameft-cjk">Family:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">westfontnamelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westlangft-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|westlangft-cjk">Language:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">westlanglb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="westlanglb-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="model">liststore5</property>
<property name="has-entry">True</property>
<property name="entry-text-column">0</property>
<property name="id-column">1</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext5"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="westlanglb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|westlanglb-cjk">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="westfontnamelb-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="weststyleft-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|weststyleft-cjk">Style:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">weststylelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="weststylelb-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="weststylelb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|weststylelb-cjk">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westsizeft-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|westsizeft-cjk">Size:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">westsizelb-cjk</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="westsizelb-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="westsizelb-cjk-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|westsizelb-cjk">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westfontinfo-cjk">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="width-chars">30</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="west_features_button-cjk">
<property name="label" translatable="yes" context="charnamepage|west_features_button-cjk">Features...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="lbWestern">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|tab_western">Western</property>
</object>
<packing>
<property name="tab-fill">False</property>
</packing>
</child>
<child>
<!-- n-columns=3 n-rows=5 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="eastfontnameft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|eastfontnameft">Family:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">eastfontnamelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eastsizeft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|eastsizeft">Size:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">eastsizelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eastlangft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|eastlangft">Language:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">eastlanglb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eastfontnamelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="has-entry">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eaststylelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="eaststylelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eaststylelb">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eastsizelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="eastsizelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eastsizelb">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="eastlanglb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="model">liststore6</property>
<property name="entry-text-column">0</property>
<property name="id-column">1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext9"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="eastlanglb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eastlanglb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eaststyleft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|eaststyleft">Style:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">eaststylelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eastfontinfo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="width-chars">30</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="east_features_button">
<property name="label" translatable="yes" context="charnamepage|east_features_button">Features...</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
<property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="lbAsian">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|tab_asian">Asian</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab-fill">False</property>
</packing>
</child>
<child>
<!-- n-columns=3 n-rows=5 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="ctlfontnameft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|ctlfontnameft">Family:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ctlfontnamelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctlstyleft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" context="charnamepage|ctlstyleft">Style:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ctlstylelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctlsizeft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|ctlsizeft">Size:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ctlsizelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlfontnamelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="has-entry">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlstylelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ctlstylelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctlstylelb">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlsizelb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="has-entry">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ctlsizelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctlsizelb">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="ctllanglb">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="model">liststore7</property>
<property name="entry-text-column">0</property>
<property name="id-column">1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext7"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext11"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="ctllanglb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctllanglb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctlfontinfo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="width-chars">30</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ctl_features_button">
<property name="label" translatable="yes" context="charnamepage|ctl_features_button">Features...</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctllangft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|ctllangft">Language:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ctllanglb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="lbComplex">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|tab_complex">Complex</property>
</object>
<packing>
<property name="position">2</property>
<property name="tab-fill">False</property>
</packing>
</child>
</object>
@@ -672,8 +1052,8 @@
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|label4">Western Text Font</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="charnamepage|label4">Text Font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -687,473 +1067,24 @@
</packing>
</child>
<child>
<object class="GtkFrame" id="asian">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<child>
<object class="GtkLabel" id="eastfontnameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|eastfontnameft">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastfontnamelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eaststyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|eaststyleft">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eaststylelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eastsizeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|eastsizeft">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastsizelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="eastlangft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|eastlangft">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastlanglb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eastfontnamelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eaststylelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="eaststylelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eaststylelb">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="eastsizelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="eastsizelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eastsizelb">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="eastlanglb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore6</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext9"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="eastlanglb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|eastlanglb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="eastfontinfo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="east_features_button">
<property name="label" translatable="yes" context="charnamepage|east_features_button">Features...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|label5">Asian Text Font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="ctl">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<child>
<object class="GtkLabel" id="ctlfontnameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|ctlfontnameft">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlfontnamelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctlstyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="no" context="charnamepage|ctlstyleft">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlstylelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctlsizeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|ctlsizeft">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlsizelb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ctllangft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|ctllangft">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctllanglb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlfontnamelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlstylelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="ctlstylelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctlstylelb">Select the formatting that you want to apply.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="ctlsizelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="ctlsizelb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctlsizelb">Enter or select the font size that you want to apply. For scalable fonts, you can also enter decimal values.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="ctllanglb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore7</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext7"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext11"/>
<attributes>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="ctllanglb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="charnamepage|extended_tip|ctllanglb">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="ctlfontinfo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ctl_features_button">
<property name="label" translatable="yes" context="charnamepage|ctl_features_button">Features...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="charnamepage|label6">CTL Font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="margin-end">12</property>
<property name="can-focus">False</property>
<property name="valign">end</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">6</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<child>
<object class="GtkDrawingArea" id="preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="preview-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="charnamepage|preview-atkobject">Preview</property>
@@ -1167,7 +1098,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">4</property>
</packing>
</child>
@@ -1177,36 +1108,21 @@
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<property name="ignore_hidden">True</property>
<widgets>
<widget name="westlanglb-cjk"/>
<widget name="eastlanglb"/>
<widget name="ctllanglb"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
<property name="ignore_hidden">True</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="westfontnameft-cjk"/>
<widget name="eastfontnameft"/>
<widget name="ctlfontnameft"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<property name="ignore-hidden">True</property>
</object>
<object class="GtkSizeGroup" id="sizegroup3">
<property name="ignore_hidden">True</property>
<widgets>
<widget name="weststylelb-cjk"/>
<widget name="eaststylelb"/>
<widget name="ctlstylelb"/>
</widgets>
<property name="ignore-hidden">True</property>
</object>
<object class="GtkSizeGroup" id="sizegroup4">
<property name="ignore_hidden">True</property>
<widgets>
<widget name="westsizelb-cjk"/>
<widget name="eastsizelb"/>
<widget name="ctlsizelb"/>
</widgets>
<property name="ignore-hidden">True</property>
</object>
</interface>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 3851af4..d5c5b08 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -63,9 +63,9 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
@@ -312,6 +312,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="row-spacing">6</property>
@@ -454,9 +455,9 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
<property name="draw-indicator">True</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -476,9 +477,9 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
<property name="draw-indicator">True</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -567,7 +568,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=2 n-rows=3 -->
<!-- n-columns=4 n-rows=2 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -596,7 +597,6 @@
<property name="receives-default">False</property>
<property name="xalign">0</property>
<property name="draw-indicator">True</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -634,8 +634,8 @@
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
@@ -647,13 +647,19 @@
<property name="adjustment">adjustmentPercent</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="left-attach">3</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child type="label">
@@ -702,7 +708,6 @@
<widget name="overlinelb"/>
<widget name="underlinelb"/>
<widget name="strikeoutlb"/>
<widget name="fontcolorlb"/>
</widgets>
</object>
</interface>
diff --git a/sc/qa/uitest/calc_tests/formatCells.py b/sc/qa/uitest/calc_tests/formatCells.py
index 6785d69..86d844d 100644
--- a/sc/qa/uitest/calc_tests/formatCells.py
+++ b/sc/qa/uitest/calc_tests/formatCells.py
@@ -91,8 +91,12 @@ class formatCell(UITestCase):
xSizeFontEast.executeAction("TYPE", mkPropertyValues({"TEXT":"18"})) #set font size 18
xSizeFontCTL.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
xSizeFontCTL.executeAction("TYPE", mkPropertyValues({"TEXT":"18"})) #set font size 18
xNoteBook = xDialog.getChild("notebook")
select_pos(xNoteBook, "0")
select_pos(xLangFont, "0")
select_pos(xNoteBook, "1")
select_pos(xLangFontEast, "0")
select_pos(xNoteBook, "2")
select_pos(xLangFontCTL, "0")
#Verify - select cell A1
diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py
index 9d6fcaf..ecba5bd 100644
--- a/sw/qa/uitest/writer_tests2/formatCharacter.py
+++ b/sw/qa/uitest/writer_tests2/formatCharacter.py
@@ -37,8 +37,13 @@ class formatCharacter(UITestCase):
xSizeFontEast.executeAction("TYPE", mkPropertyValues({"TEXT":"18"})) #set font size 18
xSizeFontCTL.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
xSizeFontCTL.executeAction("TYPE", mkPropertyValues({"TEXT":"18"})) #set font size 18
xNoteBook = xDialog.getChild("notebook")
select_pos(xNoteBook, "0")
select_pos(xLangFont, "0")
select_pos(xNoteBook, "1")
select_pos(xLangFontEast, "0")
select_pos(xNoteBook, "2")
select_pos(xLangFontCTL, "0")
with self.ui_test.execute_dialog_through_command(".uno:FontDialog", close_button="cancel") as xDialog:
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui
index faa9f03..1ba9823 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="CharacterPropertiesDialog">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="characterproperties|CharacterPropertiesDialog">Character</property>
diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui
index d70b7bc..0014cf9 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="ParagraphPropertiesDialog">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="paradialog|ParagraphPropertiesDialog">Paragraph</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui
index cb6e829..196f295 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TemplateDialog1">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="templatedialog1|TemplateDialog1">Character Style</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 6c85d25..5872fcb 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TemplateDialog16">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="templatedialog16|TemplateDialog16">List Style</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui
index f27c074..92bbeaa 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TemplateDialog2">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="templatedialog2|TemplateDialog2">Paragraph Style</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 26777e1..022b045 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TemplateDialog4">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="templatedialog4|TemplateDialog4">Frame Style</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 5826266..1045515 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -3,6 +3,7 @@
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TemplateDialog8">
<property name="resizable">False</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="templatedialog8|TemplateDialog8">Page Style</property>
