sw/uiconfig/swriter/ui/picturedialog.ui |  385 ++++++++++++++++++++++++++++----
 1 file changed, 341 insertions(+), 44 deletions(-)

New commits:
commit aacabca3aeecb93fe11df8c40916293b3c6cfe42
Author:     Heiko Tietze <[email protected]>
AuthorDate: Thu Jun 19 11:15:30 2025 +0200
Commit:     Heiko Tietze <[email protected]>
CommitDate: Thu Jun 19 12:51:52 2025 +0200

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

diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui 
b/sw/uiconfig/swriter/ui/picturedialog.ui
index f64223defb1f..e4dfae41dcaa 100644
--- a/sw/uiconfig/swriter/ui/picturedialog.ui
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -91,10 +91,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>
@@ -103,18 +103,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="picturedialog|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="picturedialog|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>
@@ -126,10 +153,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="picturedialog|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="picturedialog|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>
@@ -138,7 +195,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>
@@ -150,10 +207,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="picturedialog|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="picturedialog|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>
@@ -162,7 +249,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>
@@ -174,10 +261,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="picturedialog|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="picturedialog|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>
@@ -186,7 +303,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>
@@ -198,10 +315,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="picture">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="picture">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="picturedialog|picture">Rotation</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imPicture">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property 
name="icon-name">cmd/lc_toggleobjectrotatemode.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbPicture"/>
+                    </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="lbPicture">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="picturedialog|picture">Rotation</property>
+                    <property name="mnemonic-widget">picture</property>
+                    <accessibility>
+                      <relation type="label-for" target="imPicture"/>
+                    </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>
@@ -210,7 +357,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>
@@ -222,10 +369,40 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="crop">
-                <property name="visible">True</property>
+              <object class="GtkBox" id="crop">
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes" 
context="picturedialog|crop">Crop</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="imCrop">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">cmd/lc_crop.png</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="lbCrop"/>
+                    </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="lbCrop">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes" 
context="picturedialog|crop">Crop</property>
+                    <property name="mnemonic-widget">crop</property>
+                    <accessibility>
+                      <relation type="label-for" target="imCrop"/>
+                    </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>
@@ -234,7 +411,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>
@@ -246,10 +423,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="picturedialog|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="picturedialog|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">6</property>
@@ -258,7 +465,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>
@@ -270,10 +477,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="picturedialog|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="picturedialog|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">7</property>
@@ -282,7 +519,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>
@@ -294,10 +531,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="picturedialog|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="picturedialog|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">8</property>
@@ -306,7 +573,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>
@@ -318,10 +585,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="picturedialog|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="picturedialog|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">9</property>

Reply via email to