sw/uiconfig/swriter/ui/framedialog.ui | 346 ++++++++++++++++++++++++++++++----
1 file changed, 306 insertions(+), 40 deletions(-)
New commits:
commit cd6963c699ff6e1ce698b009d303f1904e14083b
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Jun 19 11:29:03 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Jun 19 13:28:16 2025 +0200
Resolves tdf#167094 - Apply VT style to Frame Properties dialog
Change-Id: I19e183fe545d6910b00e160861d6649a213b2c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186709
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui
b/sw/uiconfig/swriter/ui/framedialog.ui
index 7e8979f0f451..7ec7c2653646 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -94,10 +94,9 @@
<property name="vexpand">True</property>
<property name="tab-pos">left</property>
<property name="scrollable">True</property>
- <property name="enable-popup">True</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>
@@ -106,18 +105,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="framedialog|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="framedialog|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>
@@ -129,10 +155,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="framedialog|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="framedialog|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>
@@ -141,7 +197,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>
@@ -153,10 +209,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="framedialog|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="framedialog|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>
@@ -165,7 +251,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>
@@ -177,10 +263,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="framedialog|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="framedialog|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>
@@ -189,7 +305,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>
@@ -201,10 +317,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="framedialog|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="framedialog|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>
@@ -213,7 +359,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>
@@ -225,10 +371,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="framedialog|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="framedialog|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>
@@ -237,7 +413,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>
@@ -249,10 +425,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="framedialog|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="framedialog|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>
@@ -261,7 +467,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>
@@ -273,10 +479,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="framedialog|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_pagecolumntype.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="framedialog|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">7</property>
@@ -285,7 +521,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>
@@ -297,10 +533,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="framedialog|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="framedialog|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">8</property>
