sw/uiconfig/swriter/ui/tableproperties.ui |    1 
 sw/uiconfig/swriter/ui/tocdialog.ui       |  198 ++++++++++++++++++++++++++----
 2 files changed, 172 insertions(+), 27 deletions(-)

New commits:
commit 98012f53ff7d42aff3e7fc18846d30c27980a5f3
Author:     Heiko Tietze <[email protected]>
AuthorDate: Wed Jun 25 15:36:09 2025 +0200
Commit:     Heiko Tietze <[email protected]>
CommitDate: Thu Jun 26 09:02:28 2025 +0200

    Resolves tdf#167207 - Apply VT style to Table of Contents dialog
    
    Change-Id: I2a67c8caaa80df7407ffa0cb252eb4ef22012b99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186980
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <[email protected]>

diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui 
b/sw/uiconfig/swriter/ui/tableproperties.ui
index 6b1501ae4b72..c0efc2db3677 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -93,7 +93,6 @@
             <property name="vexpand">True</property>
             <property name="tab-pos">left</property>
             <property name="scrollable">True</property>
-            <property name="enable-popup">True</property>
             <property name="group-name">icons</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui 
b/sw/uiconfig/swriter/ui/tocdialog.ui
index 1d6a2d20c5fb..ea57fb84c773 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -116,11 +116,11 @@
                 <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
+                <property name="tab-pos">left</property>
                 <property name="scrollable">True</property>
-                <property name="enable-popup">True</property>
+                <property name="group-name">icons</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
@@ -129,18 +129,47 @@
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="index">
-                    <property name="visible">True</property>
+                  <object class="GtkBox" id="index">
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="tocdialog|index">Type</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkImage" id="imIndex">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property 
name="icon-name">cmd/lc_insertindexesentry.png</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbIndex"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lbIndex">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" 
context="tocdialog|index">Type</property>
+                        <property name="mnemonic-widget">index</property>
+                        <accessibility>
+                          <relation type="label-for" target="imIndex"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="tab-fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
@@ -152,10 +181,40 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="entries">
-                    <property name="visible">True</property>
+                  <object class="GtkBox" id="entries">
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="tocdialog|entries">Entries</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkImage" id="imEntries">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property 
name="icon-name">cmd/lc_updatecurindex.png</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbEntries"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lbEntries">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" 
context="tocdialog|entries">Entries</property>
+                        <property name="mnemonic-widget">entries</property>
+                        <accessibility>
+                          <relation type="label-for" target="imEntries"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -163,8 +222,7 @@
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
@@ -176,10 +234,40 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="styles">
-                    <property name="visible">True</property>
+                  <object class="GtkBox" id="styles">
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="tocdialog|styles">Styles</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkImage" id="imStyles">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property 
name="icon-name">cmd/lc_editstyle.png</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbStyles"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lbStyles">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" 
context="tocdialog|styles">Styles</property>
+                        <property name="mnemonic-widget">styles</property>
+                        <accessibility>
+                          <relation type="label-for" target="imStyles"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">2</property>
@@ -187,8 +275,7 @@
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
@@ -200,10 +287,40 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="columns">
-                    <property name="visible">True</property>
+                  <object class="GtkBox" id="columns">
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="tocdialog|columns">Columns</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkImage" id="imColumns">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property 
name="icon-name">cmd/lc_formatcolumns.png</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbColumns"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lbColumns">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" 
context="tocdialog|columns">Columns</property>
+                        <property name="mnemonic-widget">columns</property>
+                        <accessibility>
+                          <relation type="label-for" target="imColumns"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">3</property>
@@ -211,8 +328,7 @@
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
@@ -224,10 +340,40 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="background">
-                    <property name="visible">True</property>
+                  <object class="GtkBox" id="background">
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="tocdialog|background">Background</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkImage" id="imBackground">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property 
name="icon-name">cmd/lc_backgroundcolor.png</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbBackground"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lbBackground">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes" 
context="tocdialog|background">Background</property>
+                        <property name="mnemonic-widget">background</property>
+                        <accessibility>
+                          <relation type="label-for" target="imBackground"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="position">4</property>

Reply via email to