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.tietze@documentfoundation.org>

1 files changed, 5 insertions, 5 deletions

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;