From a34c898844abe9ad139d3ee22474726eed84351a Mon Sep 17 00:00:00 2001 From: Heiko Tietze Date: Wed, 24 Jul 2019 10:45:14 +0200 Subject: Resolves: tdf#126510 - Expander sections are bad UX GtkExpander replaced by GtkFrames Change-Id: I07130f7f070e45bf60ffb4fc26605b79556534b3 Reviewed-on: https://gerrit.libreoffice.org/76219 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- cui/uiconfig/ui/bulletandposition.ui | 452 ++++++++++++++++-------------- sd/source/ui/dlg/BulletAndPositionDlg.cxx | 2 +- sd/source/ui/inc/BulletAndPositionDlg.hxx | 2 +- 3 files changed, 243 insertions(+), 213 deletions(-) diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui index 44b850369869..c27d72e5dd4e 100644 --- a/cui/uiconfig/ui/bulletandposition.ui +++ b/cui/uiconfig/ui/bulletandposition.ui @@ -396,6 +396,100 @@ 0 + + + True + False + 0 + none + + + True + False + 12 + + + 350 + True + False + start + 6 + 17 + + + True + False + Before: + True + prefix + 0 + + + False + True + 0 + + + + + True + True + True + + + False + True + 1 + + + + + True + False + After: + True + suffix + 0 + + + False + True + 2 + + + + + True + True + True + + + False + True + 3 + + + + + + + + + True + False + Separator + + + + + + + + False + True + 1 + + True @@ -477,7 +571,7 @@ 0 - 2 + 1 @@ -506,95 +600,7 @@ 1 - 2 - - - - - beforeafter - True - True - start - True - - - 350 - True - False - start - 6 - 17 - - - True - False - Before: - True - prefix - 0 - - - False - True - 0 - - - - - True - True - True - - - False - True - 1 - - - - - True - False - After: - True - suffix - 0 - - - False - True - 2 - - - - - True - True - True - - - False - True - 3 - - - - - - - True - False - Separator - - - - - - - - 0 1 - 2 @@ -676,19 +682,20 @@ False True - 1 + 2 - + True False - vertical + 0 + none - + True - True - True + False + 12 True @@ -774,157 +781,180 @@ - - - True - False - Position - - - - - - - False - True - 0 - + + + + True + False + Position + + + + False True - 2 + 3 - + True - True - True + False + vertical - + True False - 7 - 6 - - - True - True - True - image2 - True - - - 1 - 0 - - + 0 + none - + True - True - True - 88 - image1 - True + False + 12 + + + True + False + 7 + 6 + + + True + True + True + image2 + True + + + 1 + 0 + + + + + True + True + True + 88 + image1 + True + + + 0 + 0 + + + + + True + True + True + image3 + True + + + 2 + 0 + + + + - - 0 - 0 - - - + + True - True - True - image3 - True + False + Alignment + + + - - 2 - 0 - - - - - True - False - Alignment - - - - + + False + True + 0 + False True - 3 + 4 - + True - True - True + False + 0 + none - + True False - 7 - 16 - 93 - - - Slide - True - True - False - start - True - True - - - 0 - 0 - - + 12 - - Selection - True - True - False - start - True - True - sliderb - - - 0 - 1 - - - - - Apply to Master - 34 + True - True - True - center + False + 7 + 16 + 93 + + + Slide + True + True + False + start + True + True + + + 0 + 0 + + + + + Selection + True + True + False + start + True + True + sliderb + + + 0 + 1 + + + + + Apply to Master + 34 + True + True + True + center + + + 1 + 0 + 2 + + - - 1 - 0 - 2 - @@ -942,7 +972,7 @@ False True - 4 + 5 diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index dd811411d493..ae5655b32c55 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -133,7 +133,7 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf , m_xPrefixED(m_xBuilder->weld_entry("prefix")) , m_xSuffixFT(m_xBuilder->weld_label("suffixft")) , m_xSuffixED(m_xBuilder->weld_entry("suffix")) - , m_xBeforeAfter(m_xBuilder->weld_expander("beforeafter")) + , m_xBeforeAfter(m_xBuilder->weld_frame("beforeafter")) , m_xBulColorFT(m_xBuilder->weld_label("colorft")) , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pWindow)) , m_xBulRelSizeFT(m_xBuilder->weld_label("relsizeft")) diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 1a90c98ff9b1..d6c38825111d 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -81,7 +81,7 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController std::unique_ptr m_xPrefixED; std::unique_ptr m_xSuffixFT; std::unique_ptr m_xSuffixED; - std::unique_ptr m_xBeforeAfter; + std::unique_ptr m_xBeforeAfter; std::unique_ptr m_xBulColorFT; std::unique_ptr m_xBulColLB; std::unique_ptr m_xBulRelSizeFT; -- cgit