icon-themes/colibre/links.txt | 7
sw/uiconfig/swriter/ui/templatedialog1.ui | 268 ++++++++++++++++++++++++++----
2 files changed, 245 insertions(+), 30 deletions(-)
New commits:
commit c674ba2e7aafae1955f43ad377fa8369b5f1eb11
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Jun 12 10:05:47 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Jun 12 16:10:52 2025 +0200
Resolves tdf#166959 - Apply VT style to Character Style dialog
Change-Id: I38b3f5f213cce1a8f0ec456b1d892a9b9c0c010e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186403
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Tested-by: Jenkins
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index f81cc12002e0..461c2289ab3e 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2793,7 +2793,7 @@ cmd/32/tabletransformdialog.png cmd/32/transformdialog.png
cmd/lc_tabletransformdialog.png cmd/lc_transformdialog.png
cmd/sc_tabletransformdialog.png cmd/sc_transformdialog.png
-# templatedialog8
+# templatedialog8, *1
res/organizer.png cmd/lc_browseview.png
res/page.png cmd/lc_attributepagesize.png
res/area.png cmd/lc_backgroundcolor.png
@@ -2804,3 +2804,8 @@ res/borders.png cmd/lc_borderdialog.png
res/columns.png cmd/lc_pagecolumntype.png
res/footnotes.png cmd/lc_footnotedialog.png
res/textgrid.png cmd/lc_gridvisible.png
+res/font.png cmd/lc_fontdialog.png
+res/fonteffect.png cmd/lc_text_marquee.png
+res/position.png cmd/lc_fontwork.png
+res/asianlayout.png cmd/lc_textdirectiontoptobottom.png
+res/background.png cmd/lc_color.png
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index acf3f3c141ba..c384e0c175d9 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -129,10 +129,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>
@@ -141,10 +140,41 @@
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="organizer">
- <property name="visible">True</property>
+ <object class="GtkBox" id="organizer">
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="templatedialog1|organizer">General</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="imOrganizer">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">res/organizer.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="lbOrganizer"/>
+ </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="lbOrganizer">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="label" translatable="yes"
context="templatedialog1|organizer">General</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">organizer</property>
+ <accessibility>
+ <relation type="label-for" target="imOrganizer"/>
+ </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>
@@ -152,7 +182,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>
@@ -164,10 +194,40 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="font">
- <property name="visible">True</property>
+ <object class="GtkBox" id="font">
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="templatedialog1|font">Font</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="imFont">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">res/font.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="lbFont"/>
+ </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="lbFont">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="templatedialog1|font">Font</property>
+ <property name="mnemonic-widget">font</property>
+ <accessibility>
+ <relation type="label-for" target="imFont"/>
+ </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>
@@ -176,7 +236,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>
@@ -188,10 +248,40 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="fonteffect">
- <property name="visible">True</property>
+ <object class="GtkBox" id="fonteffect">
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="templatedialog1|fonteffect">Font Effects</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="imFontEffect">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">res/fonteffect.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="lbFontEffect"/>
+ </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="lbFontEffect">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="templatedialog1|fonteffect">Font Effects</property>
+ <property name="mnemonic-widget">fonteffect</property>
+ <accessibility>
+ <relation type="label-for" target="imFontEffect"/>
+ </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>
@@ -200,7 +290,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>
@@ -212,10 +302,40 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="position">
- <property name="visible">True</property>
+ <object class="GtkBox" id="position">
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="templatedialog1|position">Position</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="imPosition">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">res/position.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="lbPosition"/>
+ </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="lbPosition">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="templatedialog1|position">Position</property>
+ <property name="mnemonic-widget">position</property>
+ <accessibility>
+ <relation type="label-for" target="imPosition"/>
+ </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>
@@ -224,7 +344,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>
@@ -236,10 +356,40 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="asianlayout">
- <property name="visible">True</property>
+ <object class="GtkBox" id="asianlayout">
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="templatedialog1|asianlayout">Asian Layout</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="imAsianLayout">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">res/asianlayout.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="lbAsianLayout"/>
+ </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="lbAsianLayout">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="templatedialog1|asianlayout">Asian Layout</property>
+ <property name="mnemonic-widget">asianlayout</property>
+ <accessibility>
+ <relation type="label-for" target="imAsianLayout"/>
+ </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>
@@ -248,7 +398,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>
@@ -260,10 +410,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="templatedialog1|background">Highlighting</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">res/background.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="templatedialog1|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">5</property>
@@ -272,7 +452,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>
@@ -284,10 +464,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="templatedialog1|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">res/borders.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="templatedialog1|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>
