sw/uiconfig/swriter/ui/objectdialog.ui |  309 +++++++++++++++++++++++++++++----
 1 file changed, 273 insertions(+), 36 deletions(-)

New commits:
commit d1e6a255d36a1bacea04f9ee3ee391075c1f1492
Author:     Heiko Tietze <[email protected]>
AuthorDate: Thu Jun 19 13:27:39 2025 +0200
Commit:     Heiko Tietze <[email protected]>
CommitDate: Thu Jun 19 15:34:40 2025 +0200

    Resolves tdf#167097 - Apply VT style to Object Properties dialog
    
    Change-Id: I86f9db8eb7f02d58a23b73859942087a9d5ebc39
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186717
    Reviewed-by: Heiko Tietze <[email protected]>
    Tested-by: Jenkins

diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui 
b/sw/uiconfig/swriter/ui/objectdialog.ui
index 6ed97b84965b..47e54862cb45 100644
--- a/sw/uiconfig/swriter/ui/objectdialog.ui
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -92,10 +92,10 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="scrollable">True</property>
-            <property name="enable-popup">True</property>
+            <property name="tab-pos">left</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>
@@ -104,18 +104,45 @@
               </object>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="type">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="type">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|type">Position and Size</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imType">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_transformdialog.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbType"/>
+                    </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="lbType">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|type">Position and Size</property>
+                    <property name="mnemonic-widget">type</property>
+                    <accessibility>
+                      <relation type="label-for" target="imType"/>
+                    </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>
@@ -127,10 +154,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="options">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="options">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|options">Options</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imOptions">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_calloutshapes.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbOptions"/>
+                    </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="lbOptions">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|options">Options</property>
+                    <property name="mnemonic-widget">options</property>
+                    <accessibility>
+                      <relation type="label-for" target="imOptions"/>
+                    </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>
@@ -139,7 +196,7 @@
             </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>
@@ -151,10 +208,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="wrap">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="wrap">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|wrap">Wrap</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imWrap">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_wrapcontour.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbWrap"/>
+                    </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="lbWrap">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|wrap">Wrap</property>
+                    <property name="mnemonic-widget">wrap</property>
+                    <accessibility>
+                      <relation type="label-for" target="imWrap"/>
+                    </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>
@@ -163,7 +250,7 @@
             </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>
@@ -175,10 +262,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="hyperlink">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="hyperlink">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|hyperlink">Hyperlink</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imHyperlink">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_inserthyperlink.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbHyperlink"/>
+                    </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="lbHyperlink">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|hyperlink">Hyperlink</property>
+                    <property name="mnemonic-widget">hyperlink</property>
+                    <accessibility>
+                      <relation type="label-for" target="imHyperlink"/>
+                    </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>
@@ -187,7 +304,7 @@
             </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>
@@ -199,10 +316,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="borders">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="borders">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|borders">Borders</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imBorders">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_borderdialog.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbBorders"/>
+                    </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="lbBorders">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|borders">Borders</property>
+                    <property name="mnemonic-widget">borders</property>
+                    <accessibility>
+                      <relation type="label-for" target="imBorders"/>
+                    </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>
@@ -211,7 +358,7 @@
             </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>
@@ -223,10 +370,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="area">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="area">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|area">Area</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imArea">
+                    <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="lbArea"/>
+                    </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="lbArea">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|area">Area</property>
+                    <property name="mnemonic-widget">area</property>
+                    <accessibility>
+                      <relation type="label-for" target="imArea"/>
+                    </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">5</property>
@@ -235,7 +412,7 @@
             </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>
@@ -247,10 +424,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="transparence">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="transparence">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|transparence">Transparency</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imTransparence">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_graftransparence.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbTransparence"/>
+                    </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="lbTransparence">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|transparence">Transparency</property>
+                    <property name="mnemonic-widget">transparence</property>
+                    <accessibility>
+                      <relation type="label-for" target="imTransparence"/>
+                    </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">6</property>
@@ -259,7 +466,7 @@
             </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>
@@ -271,10 +478,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="macro">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="macro">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="objectdialog|macro">Macro</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imMacro">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_choosemacro.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbMacro"/>
+                    </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="lbMacro">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="objectdialog|macro">Macro</property>
+                    <property name="mnemonic-widget">macro</property>
+                    <accessibility>
+                      <relation type="label-for" target="imMacro"/>
+                    </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">7</property>

Reply via email to