sw/uiconfig/swriter/ui/formatsectiondialog.ui | 158 ++++++++++++++++++-- sw/uiconfig/swriter/ui/insertsectiondialog.ui | 196 ++++++++++++++++++++++---- 2 files changed, 310 insertions(+), 44 deletions(-)
New commits: commit c4ef4af4c03625f602f6654d213dd5b216af7a12 Author: Heiko Tietze <[email protected]> AuthorDate: Wed Jun 25 11:04:32 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Wed Jun 25 15:15:48 2025 +0200 Resolves tdf#167197 - Apply VT style to Insert/Format Sections dialog Change-Id: I24dea6cb902cd8d550257966c7ea98e602730602 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186951 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/sw/uiconfig/swriter/ui/formatsectiondialog.ui b/sw/uiconfig/swriter/ui/formatsectiondialog.ui index 19746f70e6de..c7a95b3cb9fa 100644 --- a/sw/uiconfig/swriter/ui/formatsectiondialog.ui +++ b/sw/uiconfig/swriter/ui/formatsectiondialog.ui @@ -94,10 +94,11 @@ <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> + <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> @@ -106,18 +107,45 @@ </object> </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="formatsectiondialog|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/32/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="formatsectiondialog|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="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 +157,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="indents"> - <property name="visible">True</property> + <object class="GtkBox" id="indents"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatsectiondialog|indents">Indents</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imIndents"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/paraspaceincrease.png</property> + <accessibility> + <relation type="labelled-by" target="lbIndents"/> + </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="lbIndents"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatsectiondialog|indents">Indents</property> + <property name="mnemonic-widget">indents</property> + <accessibility> + <relation type="label-for" target="imIndents"/> + </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 +199,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 +211,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="formatsectiondialog|background">Background</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/32/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="formatsectiondialog|background">Background</property> + <property name="mnemonic-widget">background</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">2</property> @@ -165,7 +253,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 +265,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="notes"> - <property name="visible">True</property> + <object class="GtkBox" id="notes"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatsectiondialog|notes">Footnotes/Endnotes</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imNotes"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/footnotedialog.png</property> + <accessibility> + <relation type="labelled-by" target="lbNotes"/> + </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="lbNotes"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatsectiondialog|notes">Footnotes/Endnotes</property> + <property name="mnemonic-widget">notes</property> + <accessibility> + <relation type="label-for" target="imNotes"/> + </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> diff --git a/sw/uiconfig/swriter/ui/insertsectiondialog.ui b/sw/uiconfig/swriter/ui/insertsectiondialog.ui index efcee0f0ed32..a1b184439247 100644 --- a/sw/uiconfig/swriter/ui/insertsectiondialog.ui +++ b/sw/uiconfig/swriter/ui/insertsectiondialog.ui @@ -92,10 +92,11 @@ <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> + <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> @@ -104,18 +105,45 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="section"> - <property name="visible">True</property> + <object class="GtkBox" id="section"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="insertsectiondialog|section">Section</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imSection"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/protectfields.png</property> + <accessibility> + <relation type="labelled-by" target="lbSection"/> + </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="lbSection"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="insertsectiondialog|section">Section</property> + <property name="mnemonic-widget">section</property> + <accessibility> + <relation type="label-for" target="imSection"/> + </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 +155,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="insertsectiondialog|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/32/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="insertsectiondialog|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">1</property> @@ -139,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> @@ -151,10 +209,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="indents"> - <property name="visible">True</property> + <object class="GtkBox" id="indents"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="insertsectiondialog|indents">Indents</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imIndents"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/paraspaceincrease.png</property> + <accessibility> + <relation type="labelled-by" target="lbIndents"/> + </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="lbIndents"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="insertsectiondialog|indents">Indents</property> + <property name="mnemonic-widget">indents</property> + <accessibility> + <relation type="label-for" target="imIndents"/> + </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 +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> @@ -175,10 +263,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="insertsectiondialog|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/32/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="insertsectiondialog|area">Background</property> + <property name="mnemonic-widget">background</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">3</property> @@ -187,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> @@ -199,10 +317,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="notes"> - <property name="visible">True</property> + <object class="GtkBox" id="notes"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="insertsectiondialog|notes">Footnotes/Endnotes</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imNotes"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/footnotedialog.png</property> + <accessibility> + <relation type="labelled-by" target="lbNotes"/> + </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="lbNotes"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="insertsectiondialog|notes">Footnotes/Endnotes</property> + <property name="mnemonic-widget">notes</property> + <accessibility> + <relation type="label-for" target="imNotes"/> + </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>
