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(-)
New commits:
commit a34c898844abe9ad139d3ee22474726eed84351a
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Wed Jul 24 10:45:14 2019 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon Jul 29 12:11:09 2019 +0200
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 <heiko.tie...@documentfoundation.org>
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
@@ -397,6 +397,100 @@
</packing>
</child>
<child>
+ <object class="GtkFrame" id="beforeafter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox">
+ <property
name="width_request">350</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_top">6</property>
+ <property name="spacing">17</property>
+ <child>
+ <object class="GtkLabel"
id="prefixft">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="bulletandposition|prefixft">Before:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">prefix</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>
+ <child>
+ <object class="GtkEntry" id="prefix">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="activates_default">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="suffixft">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="bulletandposition|suffixft">After:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">suffix</property>
+ <property
name="xalign">0</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="suffix">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="activates_default">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="bulletandposition|beforeafter">Separator</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -477,7 +571,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -506,95 +600,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="beforeafter">
- <property
name="name">beforeafter</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="expanded">True</property>
- <child>
- <object class="GtkBox">
- <property
name="width_request">350</property>
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="margin_top">6</property>
- <property name="spacing">17</property>
- <child>
- <object class="GtkLabel"
id="prefixft">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="bulletandposition|prefixft">Before:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">prefix</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>
- <child>
- <object class="GtkEntry" id="prefix">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="activates_default">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="suffixft">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="bulletandposition|suffixft">After:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">suffix</property>
- <property
name="xalign">0</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="suffix">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="activates_default">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="bulletandposition|beforeafter">Separator</property>
- <attributes>
- <attribute name="weight"
value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
</packing>
</child>
<child>
@@ -676,19 +682,20 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkExpander">
+ <object class="GtkAlignment">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkGrid">
<property
name="visible">True</property>
@@ -774,157 +781,180 @@
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="position">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="bulletandposition|position">Position</property>
- <attributes>
- <attribute name="weight"
value="bold"/>
- </attributes>
- </object>
- </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="position">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="bulletandposition|position">Position</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkExpander">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">7</property>
- <property
name="column_spacing">6</property>
- <child>
- <object class="GtkToggleButton"
id="center">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="image">image2</property>
- <property
name="always_show_image">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
+ <property name="label_xalign">0</property>
+ <property
name="shadow_type">none</property>
<child>
- <object class="GtkToggleButton"
id="left">
+ <object class="GtkAlignment">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="margin_left">88</property>
- <property
name="image">image1</property>
- <property
name="always_show_image">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="margin_top">7</property>
+ <property
name="column_spacing">6</property>
+ <child>
+ <object class="GtkToggleButton"
id="center">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="image">image2</property>
+ <property
name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton"
id="left">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="margin_left">88</property>
+ <property
name="image">image1</property>
+ <property
name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton"
id="right">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="image">image3</property>
+ <property
name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton"
id="right">
+ <child type="label">
+ <object class="GtkLabel" id="ALlabel">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="image">image3</property>
- <property
name="always_show_image">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="bulletandposition|ALlabel">Alignment</property>
+ <attributes>
+ <attribute name="weight"
value="bold"/>
+ </attributes>
</object>
- <packing>
- <property
name="left_attach">2</property>
- <property
name="top_attach">0</property>
- </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="ALlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="bulletandposition|ALlabel">Alignment</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="GtkExpander">
+ <object class="GtkFrame">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">7</property>
- <property name="row_spacing">16</property>
- <property
name="column_spacing">93</property>
- <child>
- <object class="GtkRadioButton"
id="sliderb">
- <property name="label"
translatable="yes" context="bulletandposition|sliderb">Slide</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="halign">start</property>
- <property name="active">True</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkRadioButton"
id="selectionrb">
- <property name="label"
translatable="yes" context="bulletandposition|selectionrb">Selection</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="halign">start</property>
- <property name="active">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">sliderb</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton"
id="applytomaster">
- <property name="label"
translatable="yes" context="bulletandposition|applytomaster">Apply to
Master</property>
- <property
name="height_request">34</property>
+ <object class="GtkGrid">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="valign">center</property>
+ <property
name="can_focus">False</property>
+ <property
name="margin_top">7</property>
+ <property
name="row_spacing">16</property>
+ <property
name="column_spacing">93</property>
+ <child>
+ <object class="GtkRadioButton"
id="sliderb">
+ <property name="label"
translatable="yes" context="bulletandposition|sliderb">Slide</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="selectionrb">
+ <property name="label"
translatable="yes" context="bulletandposition|selectionrb">Selection</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">sliderb</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton"
id="applytomaster">
+ <property name="label"
translatable="yes" context="bulletandposition|applytomaster">Apply to
Master</property>
+ <property
name="height_request">34</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="valign">center</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property
name="height">2</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
@@ -942,7 +972,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
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<weld::Entry> m_xPrefixED;
std::unique_ptr<weld::Label> m_xSuffixFT;
std::unique_ptr<weld::Entry> m_xSuffixED;
- std::unique_ptr<weld::Expander> m_xBeforeAfter;
+ std::unique_ptr<weld::Frame> m_xBeforeAfter;
std::unique_ptr<weld::Label> m_xBulColorFT;
std::unique_ptr<ColorListBox> m_xBulColLB;
std::unique_ptr<weld::Label> m_xBulRelSizeFT;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
