cui/source/inc/chardlg.hxx                    |   10 
 cui/source/tabpages/chardlg.cxx               |  140 +-
 cui/uiconfig/ui/charnamepage.ui               | 1554 ++++++++++----------------
 include/svtools/ctrlbox.hxx                   |    4 
 include/svx/langbox.hxx                       |    5 
 sc/qa/uitest/calc_tests/formatCells.py        |   50 
 sc/qa/uitest/calc_tests3/clearCells.py        |    2 
 sc/qa/uitest/calc_tests8/tdf126248.py         |    4 
 sd/qa/uitest/impress_tests/tdf127900.py       |    2 
 solenv/sanitizers/ui/cui.suppr                |   10 
 sw/qa/uitest/findReplace/findReplace.py       |    2 
 sw/qa/uitest/findReplace/tdf119462.py         |    2 
 sw/qa/uitest/table/tdf115572.py               |    4 
 sw/qa/uitest/table/tdf115573.py               |    8 
 sw/qa/uitest/writer_tests2/formatCharacter.py |   57 
 sw/qa/uitest/writer_tests7/tdf145158.py       |    2 
 16 files changed, 783 insertions(+), 1073 deletions(-)

New commits:
commit 196d9e16b7017db2225531cd240e7b6e8f7c1d66
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Fri May 20 10:35:08 2022 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Jun 7 11:11:19 2022 +0200

    Resolves tdf#146928 - Redesign charnamedialog
    
    Dialog was changed in d73602dc51aa8829fc88e5e67e2b0c4da6b8f715 to fit
    vertical size on small screens by placing Western/CJK/CTL into a notebook.
    But for CJK and CTL it's required to have Western fonts visible in parallel.
    
    * dual solution for western with nocjk and cjk dropped
      western scales to the dialog width if no CJK nor CTL is enabled
    * CJK and CTL placed in a notebook, Western as well for proper alignment
    * font names are presented in lists but size and style per simple dropdowns
    * info text sized at 80%
    * variables renamed to keep track of controls (old names kept in l10n 
descriotion)
    * UITests adjusted for variable names and tab positioning
    
    Change-Id: I45b40e9bc37565f6364f1dfc1b5d837270fe4644
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134666
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 70935a6eaaf6..e61675c1e2c3 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -65,7 +65,7 @@ private:
 
     std::unique_ptr<SvxCharNamePage_Impl>   m_pImpl;
 
-    std::unique_ptr<weld::Widget> m_xWestFrame;
+    std::unique_ptr<weld::Notebook> m_xWestern;
     std::unique_ptr<weld::Label> m_xWestFontNameFT;
     std::unique_ptr<weld::ComboBox> m_xWestFontNameLB;
     std::unique_ptr<weld::Label> m_xWestFontStyleFT;
@@ -74,10 +74,10 @@ private:
     std::unique_ptr<FontSizeBox> m_xWestFontSizeLB;
     std::unique_ptr<weld::Label> m_xWestFontLanguageFT;
     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::Label> m_xWestFontTypeFT;
 
+    std::unique_ptr<weld::Notebook> m_xCJK_CTL;
     std::unique_ptr<weld::Label> m_xEastFontNameFT;
     std::unique_ptr<weld::ComboBox> m_xEastFontNameLB;
     std::unique_ptr<weld::Label> m_xEastFontStyleFT;
@@ -86,8 +86,8 @@ private:
     std::unique_ptr<FontSizeBox> m_xEastFontSizeLB;
     std::unique_ptr<weld::Label> m_xEastFontLanguageFT;
     std::unique_ptr<SvxLanguageBox> m_xEastFontLanguageLB;
-    std::unique_ptr<weld::Label> m_xEastFontTypeFT;
     std::unique_ptr<weld::Button> m_xEastFontFeaturesButton;
+    std::unique_ptr<weld::Label> m_xEastFontTypeFT;
 
     std::unique_ptr<weld::Label> m_xCTLFontNameFT;
     std::unique_ptr<weld::ComboBox> m_xCTLFontNameLB;
@@ -97,8 +97,8 @@ private:
     std::unique_ptr<FontSizeBox> m_xCTLFontSizeLB;
     std::unique_ptr<weld::Label> m_xCTLFontLanguageFT;
     std::unique_ptr<SvxLanguageBox> m_xCTLFontLanguageLB;
-    std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
     std::unique_ptr<weld::Button> m_xCTLFontFeaturesButton;
+    std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
 
     //for getting FontFeatures
     ScopedVclPtrInstance<VirtualDevice> m_xVDev;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 2c2d912ae006..638643601980 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -190,27 +190,40 @@ 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_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"))
-    , m_xEastFontStyleLB(new 
FontStyleBox(m_xBuilder->weld_combo_box("eaststylelb")))
-    , m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft"))
-    , m_xEastFontSizeLB(new 
FontSizeBox(m_xBuilder->weld_combo_box("eastsizelb")))
-    , m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
-    , 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_xCTLFontNameFT(m_xBuilder->weld_label("ctlfontnameft"))
-    , m_xCTLFontNameLB(m_xBuilder->weld_combo_box("ctlfontnamelb"))
-    , m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
-    , m_xCTLFontStyleLB(new 
FontStyleBox(m_xBuilder->weld_combo_box("ctlstylelb")))
-    , m_xCTLFontSizeFT(m_xBuilder->weld_label("ctlsizeft"))
-    , m_xCTLFontSizeLB(new 
FontSizeBox(m_xBuilder->weld_combo_box("ctlsizelb")))
-    , m_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
-    , m_xCTLFontLanguageLB(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("ctllanglb")))
-    , m_xCTLFontTypeFT(m_xBuilder->weld_label("ctlfontinfo"))
-    , m_xCTLFontFeaturesButton(m_xBuilder->weld_button("ctl_features_button"))
+    // Western
+    , m_xWestern(m_xBuilder->weld_notebook("nbWestern"))
+    , m_xWestFontNameFT(m_xBuilder->weld_label("lbWestFontname"))
+    , m_xWestFontStyleFT(m_xBuilder->weld_label("lbWestStyle"))
+    , m_xWestFontStyleLB(new 
FontStyleBox(m_xBuilder->weld_combo_box("cbWestStyle")))
+    , m_xWestFontSizeFT(m_xBuilder->weld_label("lbWestSize"))
+    , m_xWestFontSizeLB(new 
FontSizeBox(m_xBuilder->weld_combo_box("cbWestSize")))
+    , m_xWestFontLanguageFT(m_xBuilder->weld_label("lbWestLanguage"))
+    , m_xWestFontLanguageLB(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("cbWestLanguage")))
+    , m_xWestFontFeaturesButton(m_xBuilder->weld_button("btnWestFeatures"))
+    , m_xWestFontTypeFT(m_xBuilder->weld_label("lbWestFontinfo"))
+    , m_xCJK_CTL(m_xBuilder->weld_notebook("nbCJKCTL"))
+    // CJK
+    , m_xEastFontNameFT(m_xBuilder->weld_label("lbCJKFontname"))
+    , m_xEastFontStyleFT(m_xBuilder->weld_label("lbCJKStyle"))
+    , m_xEastFontStyleLB(new 
FontStyleBox(m_xBuilder->weld_combo_box("cbCJKStyle")))
+    , m_xEastFontSizeFT(m_xBuilder->weld_label("lbCJKSize"))
+    , m_xEastFontSizeLB(new 
FontSizeBox(m_xBuilder->weld_combo_box("cbCJKSize")))
+    , m_xEastFontLanguageFT(m_xBuilder->weld_label("lbCJKLanguage"))
+    , m_xEastFontLanguageLB(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("cbCJKLanguage")))
+    , m_xEastFontFeaturesButton(m_xBuilder->weld_button("btnCJKFeatures"))
+    , m_xEastFontTypeFT(m_xBuilder->weld_label("lbCJKFontinfo"))
+    // CTL
+    , m_xCTLFontNameFT(m_xBuilder->weld_label("lbCTLFontname"))
+    // tree
+    , m_xCTLFontStyleFT(m_xBuilder->weld_label("lbCTLStyle"))
+    , m_xCTLFontStyleLB(new 
FontStyleBox(m_xBuilder->weld_combo_box("cbCTLStyle")))
+    , m_xCTLFontSizeFT(m_xBuilder->weld_label("lbCTLSize"))
+    , m_xCTLFontSizeLB(new 
FontSizeBox(m_xBuilder->weld_combo_box("cbCTLSize")))
+    , m_xCTLFontLanguageFT(m_xBuilder->weld_label("lbCTLLanguage"))
+    , m_xCTLFontLanguageLB(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("cbCTLLanguage")))
+    , m_xCTLFontFeaturesButton(m_xBuilder->weld_button("btnCTLFeatures"))
+    , m_xCTLFontTypeFT(m_xBuilder->weld_label("lbCTLFontinfo"))
+
     , m_xVDev(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, 
DeviceFormat::DEFAULT)
 {
     m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", 
m_aPreviewWin));
@@ -219,54 +232,40 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, 
weld::DialogController*
 #endif
     m_pImpl->m_aNoStyleText = CuiResId( RID_CUISTR_CHARNAME_NOSTYLE );
 
+    std::unique_ptr<weld::EntryTreeView> xWestFontName = 
m_xBuilder->weld_entry_tree_view("gdWestern", "edWestFontName", 
"trWestFontName");
+    std::unique_ptr<weld::EntryTreeView> xCJKFontName = 
m_xBuilder->weld_entry_tree_view("gdCJK", "edCJKFontName", "trCJKFontName");
+    std::unique_ptr<weld::EntryTreeView> xCTLFontName = 
m_xBuilder->weld_entry_tree_view("gdCTL", "edCTLFontName", "trCTLFontName");
+
+    // 7 lines in the treeview
+    xWestFontName->set_height_request_by_rows(7);
+    xCJKFontName->set_height_request_by_rows(7);
+    xCTLFontName->set_height_request_by_rows(7);
+
+    m_xWestFontNameLB = std::move(xWestFontName);
+    m_xEastFontNameLB = std::move(xCJKFontName);
+    m_xCTLFontNameLB = std::move(xCTLFontName);
+
     SvtCTLOptions aCTLLanguageOptions;
     bool bShowCJK = SvtCJKOptions::IsCJKFontEnabled();
     bool bShowCTL = aCTLLanguageOptions.IsCTLFontEnabled();
     bool bShowNonWestern = bShowCJK || bShowCTL;
-
-    if (bShowNonWestern)
+    if (!bShowNonWestern)
     {
-        m_xWestFrame = m_xBuilder->weld_widget("western");
-        m_xWestFontNameFT = m_xBuilder->weld_label("westfontnameft-cjk");
-        m_xWestFontNameLB = m_xBuilder->weld_combo_box("westfontnamelb-cjk");
-        m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-cjk");
-        m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-cjk");
-
-        m_xWestFontStyleLB.reset(new 
FontStyleBox(m_xBuilder->weld_combo_box("weststylelb-cjk")));
-        m_xWestFontSizeLB.reset(new 
FontSizeBox(m_xBuilder->weld_combo_box("westsizelb-cjk")));
-
-        m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
-        m_xWestFontLanguageLB.reset(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("westlanglb-cjk")));
-        m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-cjk");
-
-        m_xWestFontFeaturesButton = 
m_xBuilder->weld_button("west_features_button-cjk");
+        m_xCJK_CTL->hide();
+        m_xWestern->set_show_tabs(false); //hide single tab in case of Western 
only
     }
-    else
-    {
-        m_xWestFrame = m_xBuilder->weld_widget("simple");
-        m_xWestFontNameFT = m_xBuilder->weld_label("westfontnameft-nocjk");
-        m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-nocjk");
-        m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-nocjk");
-
-        m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-nocjk");
-        m_xWestFontLanguageLB.reset(new 
SvxLanguageBox(m_xBuilder->weld_combo_box("westlanglb-nocjk")));
-        m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-nocjk");
-
-        m_xWestFontFeaturesButton = 
m_xBuilder->weld_button("west_features_button-nocjk");
-
-        std::unique_ptr<weld::EntryTreeView> xWestFontNameLB = 
m_xBuilder->weld_entry_tree_view("namegrid", "westfontname-nocjk", 
"westfontnamelb-nocjk");
-        std::unique_ptr<weld::EntryTreeView> xWestFontStyleLB = 
m_xBuilder->weld_entry_tree_view("stylegrid", "weststyle-nocjk", 
"weststylelb-nocjk");
-        std::unique_ptr<weld::EntryTreeView> xWestFontSizeLB = 
m_xBuilder->weld_entry_tree_view("sizegrid", "westsize-nocjk", 
"westsizelb-nocjk");
+    else if (!bShowCJK) m_xCJK_CTL->remove_page("nbCJK");
+    else if (!bShowCTL) m_xCJK_CTL->remove_page("nbCTL");
 
-        // 7 lines in the treeview
-        xWestFontNameLB->set_height_request_by_rows(7);
-        xWestFontStyleLB->set_height_request_by_rows(7);
-        xWestFontSizeLB->set_height_request_by_rows(7);
 
-        m_xWestFontNameLB = std::move(xWestFontNameLB);
-        m_xWestFontStyleLB.reset(new 
FontStyleBox(std::move(xWestFontStyleLB)));
-        m_xWestFontSizeLB.reset(new FontSizeBox(std::move(xWestFontSizeLB)));
-    }
+    // info at 80% font size
+    vcl::Font aFont(m_xWestFontTypeFT->get_font());
+    Size aSize(aFont.GetFontSize());
+    aSize.setHeight(aSize.Height() * 0.8);
+    aFont.SetFontSize(aSize);
+    m_xWestFontTypeFT->set_font(aFont);
+    m_xEastFontTypeFT->set_font(aFont);
+    m_xCTLFontTypeFT->set_font(aFont);
 
     //In MacOSX the standard dialogs name font-name, font-style as
     //Family, Typeface
@@ -280,8 +279,8 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, 
weld::DialogController*
     OUString sFontFamilyString(CuiResId(RID_CUISTR_CHARNAME_FAMILY));
 #endif
     m_xWestFontNameFT->set_label(sFontFamilyString);
-    m_xEastFontNameFT->set_label(sFontFamilyString);
     m_xCTLFontNameFT->set_label(sFontFamilyString);
+    m_xEastFontNameFT->set_label(sFontFamilyString);
 
 #ifdef MACOSX
     OUString sFontStyleString(CuiResId(RID_CUISTR_CHARNAME_TYPEFACE));
@@ -292,18 +291,17 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, 
weld::DialogController*
     m_xEastFontStyleFT->set_label(sFontStyleString);
     m_xCTLFontStyleFT->set_label(sFontStyleString);
 
-    m_xWestFrame->show();
-    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);
+                                             LANGUAGE_SYSTEM, 
css::i18n::ScriptType::LATIN);
     m_xEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true, 
false, true, true,
-                                           LANGUAGE_SYSTEM, 
css::i18n::ScriptType::ASIAN);
+                                            LANGUAGE_SYSTEM, 
css::i18n::ScriptType::ASIAN);
     m_xCTLFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CTL, true, 
false, true, true,
-                                          LANGUAGE_SYSTEM, 
css::i18n::ScriptType::COMPLEX);
+                                            LANGUAGE_SYSTEM, 
css::i18n::ScriptType::COMPLEX);
+    int nVisibleChars = 15;
+    // read-only combobox / HasEntry asserts on set_width_char()
+    m_xWestFontLanguageLB->set_width_chars(nVisibleChars);
+    m_xEastFontLanguageLB->set_width_chars(nVisibleChars);
+    m_xCTLFontLanguageLB->set_width_chars(nVisibleChars);
 
     Initialize();
 }
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index aad4efeb4a74..c4d3501e696e 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -66,1089 +66,825 @@
       <column type="GdkPixbuf"/>
     </columns>
   </object>
-  <object class="GtkBox" id="CharNamePage">
+  <!-- n-columns=2 n-rows=2 -->
+  <object class="GtkGrid" id="CharNamePage">
     <property name="visible">True</property>
     <property name="can-focus">False</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="border-width">6</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">12</property>
+    <property name="row-spacing">6</property>
+    <property name="column-spacing">12</property>
     <child>
-      <!-- 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="margin-start">6</property>
-        <property name="margin-end">6</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
+      <object class="GtkNotebook" id="nbWestern">
+        <property name="visible">True</property>
+        <property name="can-focus">True</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="show-border">False</property>
         <child>
-          <object class="GtkLabel" id="westfontinfo-nocjk">
+          <!-- n-columns=3 n-rows=6 -->
+          <object class="GtkGrid" id="gdWestern">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</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="width">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="hexpand">True</property>
+            <property name="margin-bottom">6</property>
             <property name="vexpand">True</property>
-            <property name="label-xalign">0</property>
-            <property name="shadow-type">none</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">6</property>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid" id="namegrid">
+              <object class="GtkLabel" id="lbWestFontname">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" 
context="charnamepage|westfontnameft-cjk">Name:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">edWestFontName</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="lbWestLanguage">
+                <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">cbWestLanguage</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="cbWestLanguage">
                 <property name="visible">True</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="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="GtkScrolledWindow">
-                    <property name="visible">True</property>
+                  <object class="GtkCellRendererPixbuf" 
id="cellrenderertext5"/>
+                  <attributes>
+                    <attribute name="pixbuf">2</attribute>
+                  </attributes>
+                </child>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
                     <property name="can-focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</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="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>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" 
id="treeview-selection1"/>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                   </object>
-                  <packing>
-                    <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="hexpand">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbWestLanguage-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>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">4</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="westfontnameft-nocjk">
+            <child>
+              <object class="GtkLabel" id="lbWestStyle">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="no" 
context="charnamepage|westfontnameft-nocjk">Family:</property>
+                <property name="label" 
context="charnamepage|weststyleft-cjk">Style:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">cbWestStyle</property>
+                <property name="xalign">0</property>
               </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <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="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="label-xalign">0</property>
-            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid" id="stylegrid">
+              <object class="GtkComboBoxText" id="cbWestStyle">
                 <property name="visible">True</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>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="width-request">42</property>
-                    <property name="visible">True</property>
+                <property name="has-entry">True</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
                     <property name="can-focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</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="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>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" 
id="treeview-selection2"/>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn2">
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext2"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="weststylelb-nocjk-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="charnamepage|extended_tip|weststylelb-nocjk">Select 
the formatting that you want to apply.</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                   </object>
-                  <packing>
-                    <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="hexpand">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbWestStyle-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="charnamepage|extended_tip|weststylelb-cjk">Select 
the formatting that you want to apply.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+                <property name="width">2</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="weststyleft-nocjk">
+            <child>
+              <object class="GtkLabel" id="lbWestSize">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="no" 
context="charnamepage|weststyleft-nocjk">Style:</property>
+                <property name="label" translatable="yes" 
context="charnamepage|westsizeft-cjk">Size:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">cbWestSize</property>
+                <property name="xalign">0</property>
               </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <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="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="label-xalign">0</property>
-            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid" id="sizegrid">
+              <object class="GtkComboBoxText" id="cbWestSize">
                 <property name="visible">True</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>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="visible">True</property>
+                <property name="has-entry">True</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
                     <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>
-                    <child>
-                      <object class="GtkTreeView" id="westsizelb-nocjk">
-                        <property name="visible">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>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" 
id="treeview-selection3"/>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn3">
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext3"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="westsizelb-nocjk-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="charnamepage|extended_tip|westsizelb-nocjk">Enter 
or select the font size that you want to apply. For scalable fonts, you can 
also enter decimal values.</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                   </object>
-                  <packing>
-                    <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="hexpand">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbWestSize-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>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+                <property name="width">2</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="westsizeft-nocjk">
+            <child>
+              <object class="GtkButton" id="btnWestFeatures">
+                <property name="label" translatable="yes" 
context="charnamepage|west_features_button-cjk">Features...</property>
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="charnamepage|westsizeft-nocjk">Size:</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>
-          </object>
-          <packing>
-            <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="spacing">24</property>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</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="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="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow-type">in</property>
                 <child>
-                  <object class="GtkComboBox" id="westlanglb-nocjk">
+                  <object class="GtkTreeView" id="trWestFontName">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="halign">start</property>
+                    <property name="can-focus">True</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>
-                    <child>
-                      <object class="GtkCellRendererPixbuf" 
id="cellrenderertext4"/>
-                      <attributes>
-                        <attribute name="pixbuf">2</attribute>
-                      </attributes>
+                    <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>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
                     </child>
-                    <child internal-child="entry">
-                      <object class="GtkEntry">
-                        <property name="can-focus">True</property>
-                        <property name="activates-default">True</property>
-                        <property name="truncate-multiline">True</property>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                        <child>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                     </child>
                     <child internal-child="accessible">
-                      <object class="AtkObject" 
id="westlanglb-nocjk-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="charnamepage|extended_tip|westlanglb-nocjk">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 class="AtkObject" id="trWestFontName-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="charnamepage|extended_tip|westfontnamelb-nocjk">Select the font that 
you want to apply.</property>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="west_features_button-nocjk">
-                <property name="label" translatable="yes" 
context="charnamepage|west_features_button-nocjk">Features...</property>
+              <object class="GtkEntry" id="edWestFontName">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="halign">end</property>
                 <property name="hexpand">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+                <property name="width">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="lbWestFontinfo">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="valign">start</property>
+                <property name="wrap">True</property>
+                <property name="width-chars">30</property>
+                <property name="max-width-chars">30</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </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="left-attach">0</property>
-            <property name="top-attach">1</property>
-            <property name="width">3</property>
+            <property name="tab-fill">False</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="western">
-        <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>
+      <object class="GtkNotebook" id="nbCJKCTL">
+        <property name="visible">True</property>
+        <property name="can-focus">True</property>
+        <property name="vexpand">True</property>
+        <property name="show-border">False</property>
         <child>
-          <object class="GtkNotebook" id="notebook">
+          <!-- n-columns=3 n-rows=6 -->
+          <object class="GtkGrid" id="gdCJK">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
+            <property name="can-focus">False</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="vexpand">True</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">6</property>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkLabel" id="lbCJKSize">
                 <property name="visible">True</property>
                 <property name="can-focus">False</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>
-                <child>
-                  <!-- n-columns=3 n-rows=4 -->
-                  <object class="GtkGrid">
-                    <property name="visible">True</property>
+                <property name="label" translatable="yes" 
context="charnamepage|eastsizeft">Size:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">cbCJKSize</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="GtkLabel" id="lbCJKLanguage">
+                <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">cbCJKLanguage</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="cbCJKStyle">
+                <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">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row-spacing">6</property>
-                    <property name="column-spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="westfontnameft-cjk">
-                        <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="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="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="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">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>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
-                <child>
-                  <!-- n-columns=2 n-rows=1 -->
-                  <object class="GtkGrid">
-                    <property name="visible">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCJKStyle-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">2</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="cbCJKSize">
+                <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">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="column-spacing">12</property>
-                    <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="halign">end</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="westfontinfo-cjk">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="wrap">True</property>
-                        <property name="width-chars">30</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCJKSize-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">3</property>
+                <property name="width">2</property>
+              </packing>
             </child>
-            <child type="tab">
-              <object class="GtkLabel" id="lbWestern">
+            <child>
+              <object class="GtkLabel" id="lbCJKStyle">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="charnamepage|tab_western">Western</property>
+                <property name="label" 
context="charnamepage|eaststyleft">Style:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">cbCJKStyle</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="tab-fill">False</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkButton" id="btnCJKFeatures">
+                <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>
+              <object class="GtkLabel" id="lbCJKFontname">
                 <property name="visible">True</property>
                 <property name="can-focus">False</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="label" 
context="charnamepage|eastfontnameft">Name:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">edCJKFontName</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="GtkScrolledWindow">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow-type">in</property>
                 <child>
-                  <!-- n-columns=3 n-rows=4 -->
-                  <object class="GtkGrid">
+                  <object class="GtkTreeView" id="trCJKFontName">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="valign">start</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</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" 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="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>
+                    <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>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
                     </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>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                         <child>
-                          <object class="GtkCellRendererText" 
id="cellrenderertext9"/>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext2"/>
                           <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" translatable="no" 
context="charnamepage|eaststyleft">Style:</property>
-                        <property name="use-underline">True</property>
-                        <property name="mnemonic-widget">eaststylelb</property>
-                        <property name="xalign">0</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="trCJKFontName-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="charnamepage|extended_tip|trCJKFontName">Select the 
font that you want to apply.</property>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </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="GtkEntry" id="edCJKFontName">
+                <property name="visible">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>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="cbCJKLanguage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="model">liststore6</property>
+                <property name="has-entry">True</property>
+                <property name="entry-text-column">0</property>
+                <property name="id-column">1</property>
                 <child>
-                  <!-- n-columns=2 n-rows=1 -->
-                  <object class="GtkGrid">
-                    <property name="visible">True</property>
+                  <object class="GtkCellRendererPixbuf" 
id="cellrenderertext6"/>
+                  <attributes>
+                    <attribute name="pixbuf">2</attribute>
+                  </attributes>
+                </child>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
                     <property name="can-focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="column-spacing">12</property>
-                    <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>
-                    <child>
-                      <object class="GtkLabel" id="eastfontinfo">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="wrap">True</property>
-                        <property name="width-chars">30</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCJKLanguage-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">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lbCJKFontinfo">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="valign">start</property>
+                <property name="wrap">True</property>
+                <property name="width-chars">30</property>
+                <property name="max-width-chars">30</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="nbCJK">
+            <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="tab-fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <!-- n-columns=3 n-rows=6 -->
+          <object class="GtkGrid" id="gdCTL">
+            <property name="visible">True</property>
+            <property name="can-focus">False</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="vexpand">True</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="lbCTLFontname">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" 
context="charnamepage|ctlfontnameft">Name:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">edCTLFontName</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="lbCTLStyle">
+                <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">cbCTLStyle</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="lbCTLSize">
+                <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">cbCTLSize</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="cbCTLStyle">
+                <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">False</property>
+                  </object>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCTLStyle-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="position">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+                <property name="width">2</property>
               </packing>
             </child>
-            <child type="tab">
-              <object class="GtkLabel" id="lbAsian">
+            <child>
+              <object class="GtkComboBoxText" id="cbCTLSize">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="charnamepage|tab_asian">Asian</property>
+                <property name="has-entry">True</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
+                    <property name="can-focus">False</property>
+                  </object>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCTLSize-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="position">1</property>
-                <property name="tab-fill">False</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=2 -->
-              <object class="GtkGrid">
+              <object class="GtkLabel" id="lbCTLLanguage">
                 <property name="visible">True</property>
                 <property name="can-focus">False</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="label" translatable="yes" 
context="charnamepage|ctllangft">Language:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">cbCTLLanguage</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnCTLFeatures">
+                <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="GtkComboBox" id="cbCTLLanguage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="model">liststore7</property>
+                <property name="has-entry">True</property>
+                <property name="entry-text-column">0</property>
+                <property name="id-column">1</property>
                 <child>
-                  <!-- n-columns=3 n-rows=4 -->
-                  <object class="GtkGrid" id="grid3">
-                    <property name="visible">True</property>
+                  <object class="GtkCellRendererPixbuf" 
id="cellrenderertext11"/>
+                  <attributes>
+                    <attribute name="pixbuf">2</attribute>
+                  </attributes>
+                </child>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
                     <property name="can-focus">False</property>
-                    <property name="valign">start</property>
+                  </object>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="cbCTLLanguage-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">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow-type">in</property>
+                <child>
+                  <object class="GtkTreeView" id="trCTLFontName">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
                     <property name="hexpand">True</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" 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">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>
+                    <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>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
                     </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>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn3">
                         <child>
-                          <object class="GtkCellRendererText" 
id="cellrenderertext7"/>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext3"/>
                           <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="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>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <!-- n-columns=2 n-rows=1 -->
-                  <object class="GtkGrid">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="column-spacing">12</property>
-                    <child>
-                      <object class="GtkButton" id="ctl_features_button">

... etc. - the rest is truncated

Reply via email to