summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
authorHeiko Tietze <tietze.heiko@gmail.com>2022-05-20 10:35:08 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2022-06-07 11:11:19 +0200
commit196d9e16b7017db2225531cd240e7b6e8f7c1d66 (patch)
tree9c4faeffda5759bae13523e6e053dec30fc6ce0c /include/svtools
parent410a64b472ae9de0bb06ddd8f4b55fd16686c860 (diff)
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>
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/ctrlbox.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 525c23583170..180fb64bfac6 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -410,6 +410,8 @@ public:
void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xComboBox->connect_changed(rLink); }
OUString get_active_text() const { return m_xComboBox->get_active_text(); }
void set_active_text(const OUString& rText) { m_xComboBox->set_active_text(rText); }
+ void set_size_request(int nWidth, int nHeight) { m_xComboBox->set_size_request(nWidth, nHeight); }
+
void append_text(const OUString& rStr) { m_xComboBox->append_text(rStr); }
void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); }
void save_value() { m_xComboBox->save_value(); }
@@ -479,6 +481,8 @@ public:
OUString get_active_text() const { return m_xComboBox->get_active_text(); }
void set_active_or_entry_text(const OUString& rText);
void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); }
+ void set_size_request(int nWidth, int nHeight) { m_xComboBox->set_size_request(nWidth, nHeight); }
+
int get_active() const { return m_xComboBox->get_active(); }
int get_value() const;
void set_value(int nValue);