sw/source/ui/index/cnttab.cxx            |    2 
 sw/uiconfig/swriter/ui/tocentriespage.ui |   91 ++++++++++++++++---------------
 2 files changed, 50 insertions(+), 43 deletions(-)

New commits:
commit fd7b7b94029edfdef458793e5a1949e7ca3a4f1d
Author:     Parth Raiyani <[email protected]>
AuthorDate: Wed Jan 28 15:36:38 2026 +0530
Commit:     Caolán McNamara <[email protected]>
CommitDate: Thu Jan 29 12:23:12 2026 +0100

    a11y: enhance accessibility features in the table of contents entries page
    
    Change-Id: I5e2d0f972abd4888bd860c95fc13640bdaf382a0
    Signed-off-by: Parth Raiyani <[email protected]>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198308
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Tested-by: Caolán McNamara <[email protected]>
    Reviewed-by: Caolán McNamara <[email protected]>

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d083d7a59e65..73be23de797f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1948,7 +1948,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* 
pPage, weld::DialogControl
     , m_xTabPosMF(m_xBuilder->weld_metric_spin_button(u"tabstoppos"_ustr, 
FieldUnit::CM))
     , m_xAutoRightCB(m_xBuilder->weld_check_button(u"alignright"_ustr))
     , m_xFormatFrame(m_xBuilder->weld_widget(u"formatframe"_ustr))
-    , m_xMainEntryStyleFT(m_xBuilder->weld_label(u"mainstyleft"_ustr))
+    , 
m_xMainEntryStyleFT(m_xBuilder->weld_label(u"tocentriesmainstyleft"_ustr))
     , m_xMainEntryStyleLB(m_xBuilder->weld_combo_box(u"mainstyle"_ustr))
     , m_xAlphaDelimCB(m_xBuilder->weld_check_button(u"alphadelim"_ustr))
     , m_xCommaSeparatedCB(m_xBuilder->weld_check_button(u"commasep"_ustr))
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui 
b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 0b9af0c65af8..5c0f00bfac79 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -195,59 +195,66 @@
                     <property name="vexpand">True</property>
                     <property name="row-spacing">6</property>
                     <child>
-                      <!-- n-columns=3 n-rows=1 -->
-                      <object class="GtkGrid" id="grid4">
+                      <object class="GtkFrame" id="structure_frame">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="column-spacing">12</property>
+                        <property name="label-xalign">0</property>
+                        <property name="shadow-type">none</property>
                         <child>
-                          <object class="GtkLabel" id="label4">
+                          <!-- n-columns=2 n-rows=1 -->
+                          <object class="GtkGrid" id="grid4">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" 
context="tocentriespage|label4">_Structure:</property>
-                            <property name="use-underline">True</property>
-                            <property name="mnemonic-widget">token</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="all">
-                            <property name="label" translatable="yes" 
context="tocentriespage|all">_All</property>
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="receives-default">True</property>
-                            <property name="use-underline">True</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="all-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|all">Applies the current settings to all 
levels without closing the dialog.</property>
+                            <property name="column-spacing">12</property>
+                            <property name="margin-start">12</property>
+                            <property name="margin-top">6</property>
+                            <child>
+                              <object class="GtkBox" id="token">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="valign">center</property>
+                                <property name="hexpand">True</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" 
id="token-atkobject">
+                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|token">Displays the remainder of the 
Structure line.</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="all">
+                                <property name="label" translatable="yes" 
context="tocentriespage|all">_All</property>
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="receives-default">True</property>
+                                <property name="use-underline">True</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="all-atkobject">
+                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|all">Applies the current settings to all 
levels without closing the dialog.</property>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="left-attach">2</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkBox" id="token">
+                        <child type="label">
+                          <object class="GtkLabel" id="structure_label">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="hexpand">True</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="token-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|token">Displays the remainder of the 
Structure line.</property>
-                              </object>
-                            </child>
+                            <property name="label" translatable="yes" 
context="tocentriespage|structure_label">_Structure</property>
+                            <property name="use-underline">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -841,7 +848,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="mainstyleft">
+                      <object class="GtkLabel" id="tocentriesmainstyleft">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes" 
context="tocentriespage|mainstyleft">Character style for main 
entries:</property>

Reply via email to