cui/uiconfig/ui/pickbulletpage.ui | 59 +++++---------- cui/uiconfig/ui/pickgraphicpage.ui | 135 +++++++++++++++-------------------- cui/uiconfig/ui/picknumberingpage.ui | 59 +++++---------- cui/uiconfig/ui/pickoutlinepage.ui | 59 +++++---------- 4 files changed, 118 insertions(+), 194 deletions(-)
New commits: commit 70ddbaa961321cb1b6ffd7295c22c38032767462 Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Wed Mar 13 09:40:51 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Fri Jun 7 22:12:46 2024 +0200 Resolves tdf#160167 - Remove pointless frames in bullet & numbering dialog Solves the issue that the "Selection" label is inappropriate Change-Id: I1bdaa6922796fcdceec0aac6902011aa21cd9aa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164758 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> (cherry picked from commit aacce8abe239ad679f5e9f9ce9bf2d27fb046d5d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168493 Tested-by: allotropia jenkins <jenk...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui index b9749dda540e..589874506853 100644 --- a/cui/uiconfig/ui/pickbulletpage.ui +++ b/cui/uiconfig/ui/pickbulletpage.ui @@ -1,58 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> - <object class="GtkFrame" id="PickBulletPage"> + <object class="GtkScrolledWindow" id="PickBulletPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">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="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow" id="valuesetwin"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> + <property name="can-focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="valueset"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="valueset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pickbulletpage|extended_tip|valueset">Click the bullet style that you want to use.</property> - </object> - </child> + <property name="can-focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="valueset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pickbulletpage|extended_tip|valueset">Click the bullet style that you want to use.</property> </object> </child> </object> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pickbulletpage|label25">Selection</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> <child internal-child="accessible"> <object class="AtkObject" id="PickBulletPage-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="pickbulletpage|extended_tip|PickBulletPage">Displays the different bullet styles that you can apply.</property> diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui index fd7b9922e950..ea7342844a14 100644 --- a/cui/uiconfig/ui/pickgraphicpage.ui +++ b/cui/uiconfig/ui/pickgraphicpage.ui @@ -1,104 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> - <object class="GtkFrame" id="PickGraphicPage"> + <!-- n-columns=2 n-rows=3 --> + <object class="GtkGrid" id="PickGraphicPage"> <property name="visible">True</property> - <property name="can_focus">False</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="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkScrolledWindow" id="valuesetwin"> <property name="visible">True</property> - <property name="can_focus">False</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="margin-start">12</property> - <property name="margin-top">6</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow" id="valuesetwin"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can-focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="valueset"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="valueset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pickgraphicpage|extended_tip|valueset">Click the graphics that you want to use as bullets.</property> - </object> - </child> + <property name="can-focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="valueset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pickgraphicpage|extended_tip|valueset">Click the graphics that you want to use as bullets.</property> </object> </child> </object> </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="errorft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="pickgraphicpage|errorft">The Gallery theme 'Bullets' is empty (no images).</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="browseBtn"> - <property name="label" translatable="yes" context="pickgraphicpage|browseBtn">Add and Resize</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="errorft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes" context="pickgraphicpage|errorft">The Gallery theme 'Bullets' is empty (no images).</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label25"> + <child> + <object class="GtkButton" id="browseBtn"> + <property name="label" translatable="yes" context="pickgraphicpage|browseBtn">Add and Resize</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pickgraphicpage|label25">Selection</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> <child internal-child="accessible"> <object class="AtkObject" id="PickGraphicPage-atkobject"> diff --git a/cui/uiconfig/ui/picknumberingpage.ui b/cui/uiconfig/ui/picknumberingpage.ui index ef410711a56a..0b80d533a1d6 100644 --- a/cui/uiconfig/ui/picknumberingpage.ui +++ b/cui/uiconfig/ui/picknumberingpage.ui @@ -1,58 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> - <object class="GtkFrame" id="PickNumberingPage"> + <object class="GtkScrolledWindow" id="PickNumberingPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">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="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow" id="valuesetwin"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> + <property name="can-focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="valueset"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="valueset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="picknumberingpage|extended_tip|valueset">Click the numbering scheme that you want to use.</property> - </object> - </child> + <property name="can-focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="valueset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="picknumberingpage|extended_tip|valueset">Click the numbering scheme that you want to use.</property> </object> </child> </object> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="picknumberingpage|label25">Selection</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> <child internal-child="accessible"> <object class="AtkObject" id="PickNumberingPage-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="picknumberingpage|extended_tip|PickNumberingPage">Displays the different numbering schemes that you can apply.</property> diff --git a/cui/uiconfig/ui/pickoutlinepage.ui b/cui/uiconfig/ui/pickoutlinepage.ui index c1050b48e107..297809d0a919 100644 --- a/cui/uiconfig/ui/pickoutlinepage.ui +++ b/cui/uiconfig/ui/pickoutlinepage.ui @@ -1,58 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> - <object class="GtkFrame" id="PickOutlinePage"> + <object class="GtkScrolledWindow" id="PickOutlinePage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">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="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow" id="valuesetwin"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> + <property name="can-focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="valueset"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="valueset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="valueset-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="pickoutlinepage|extended_tip|valueset">Click the outline style that you want to use.</property> - </object> - </child> + <property name="can-focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="valueset-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="pickoutlinepage|extended_tip|valueset">Click the outline style that you want to use.</property> </object> </child> </object> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pickoutlinepage|label25">Selection</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> <child internal-child="accessible"> <object class="AtkObject" id="PickOutlinePage-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="pickoutlinepage|extended_tip|PickOutlinePage">Displays the different styles that you can apply to a hierarchical list. Up to nine outline levels in a list hierarchy are supported.</property>