sc/source/ui/miscdlgs/textdlgs.cxx | 12 +- sc/uiconfig/scalc/ui/paradialog.ui | 159 +++++++++++++++++++++++++++++++----- sw/uiconfig/swriter/ui/tocdialog.ui | 10 +- 3 files changed, 149 insertions(+), 32 deletions(-)
New commits: commit ef8e8421de71f080f5976d1abe3b576f121ff8eb Author: Heiko Tietze <[email protected]> AuthorDate: Thu Jun 26 10:21:59 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Thu Jun 26 12:48:25 2025 +0200 Related tdf#167207 - Use large icons on VT-styled dialogs Change-Id: I13026850626ebf897a1aa45f54f34a27a88b79fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187023 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui index ea57fb84c773..04c390ab24b1 100644 --- a/sw/uiconfig/swriter/ui/tocdialog.ui +++ b/sw/uiconfig/swriter/ui/tocdialog.ui @@ -136,7 +136,7 @@ <object class="GtkImage" id="imIndex"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_insertindexesentry.png</property> + <property name="icon-name">cmd/32/insertindexesentry.png</property> <accessibility> <relation type="labelled-by" target="lbIndex"/> </accessibility> @@ -188,7 +188,7 @@ <object class="GtkImage" id="imEntries"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_updatecurindex.png</property> + <property name="icon-name">cmd/32/updatecurindex.png</property> <accessibility> <relation type="labelled-by" target="lbEntries"/> </accessibility> @@ -241,7 +241,7 @@ <object class="GtkImage" id="imStyles"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_editstyle.png</property> + <property name="icon-name">cmd/32/editstyle.png</property> <accessibility> <relation type="labelled-by" target="lbStyles"/> </accessibility> @@ -294,7 +294,7 @@ <object class="GtkImage" id="imColumns"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_formatcolumns.png</property> + <property name="icon-name">cmd/32/formatcolumns.png</property> <accessibility> <relation type="labelled-by" target="lbColumns"/> </accessibility> @@ -347,7 +347,7 @@ <object class="GtkImage" id="imBackground"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_backgroundcolor.png</property> + <property name="icon-name">cmd/32/backgroundcolor.png</property> <accessibility> <relation type="labelled-by" target="lbBackground"/> </accessibility> commit 9ba87a13e1a9d2adad412be19ea6c8f323cfadde Author: Heiko Tietze <[email protected]> AuthorDate: Thu Jun 26 11:12:51 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Thu Jun 26 12:48:11 2025 +0200 Resolves tdf#167232 - Apply VT style to Paragraph Formatting dialog Change-Id: I6af42f850b92a2f94d7cf11670abd664a47e6ebb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187027 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 4ac869ad06a7..94933ca144ca 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -73,18 +73,18 @@ void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) : SfxTabDialogController(pParent, u"modules/scalc/ui/paradialog.ui"_ustr, u"ParagraphDialog"_ustr, pAttr) { - AddTabPage(u"labelTP_PARA_STD"_ustr, RID_SVXPAGE_STD_PARAGRAPH); - AddTabPage(u"labelTP_PARA_ALIGN"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH); + AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH); if (SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage(u"labelTP_PARA_ASIAN"_ustr, RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr); - AddTabPage(u"labelTP_TABULATOR"_ustr, RID_SVXPAGE_TABULATOR); + RemoveTabPage(u"asiantypo"_ustr); + AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR); } void ScParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { - if (rId == "labelTP_TABULATOR") + if (rId == "tabs") { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); TabulatorDisableFlags const nFlags((TabulatorDisableFlags::TypeMask &~TabulatorDisableFlags::TypeLeft) | diff --git a/sc/uiconfig/scalc/ui/paradialog.ui b/sc/uiconfig/scalc/ui/paradialog.ui index ae6bbacb4e48..3b868936a3e0 100644 --- a/sc/uiconfig/scalc/ui/paradialog.ui +++ b/sc/uiconfig/scalc/ui/paradialog.ui @@ -91,10 +91,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> @@ -103,18 +104,45 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_STD"> - <property name="visible">True</property> + <object class="GtkBox" id="indents"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents & Spacing</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imParaIndent"> + <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="lbParaIndent"/> + </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="lbParaIndent"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents & Spacing</property> + <property name="mnemonic-widget">indents</property> + <accessibility> + <relation type="label-for" target="imParaIndent"/> + </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,11 +154,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_ALIGN"> - <property name="visible">True</property> + <object class="GtkBox" id="alignment"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property> - <property name="xalign">0.5</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/alignblock.png</property> + <accessibility> + <relation type="labelled-by" target="lbAlignment"/> + </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="lbAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property> + <property name="mnemonic-widget">alignment</property> + <accessibility> + <relation type="label-for" target="imAlignment"/> + </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="labelTP_PARA_ASIAN"> - <property name="visible">True</property> + <object class="GtkBox" id="asiantypo"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAsiantypo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/defaultcharstyle.png</property> + <accessibility> + <relation type="labelled-by" target="lbAsiantypo"/> + </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="lbAsiantypo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property> + <property name="mnemonic-widget">asiantypo</property> + <accessibility> + <relation type="label-for" target="imAsiantypo"/> + </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="labelTP_TABULATOR"> - <property name="visible">True</property> + <object class="GtkBox" id="tabs"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imTabs"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/hangingindent.png</property> + <accessibility> + <relation type="labelled-by" target="lbTabs"/> + </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="lbTabs"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property> + <property name="mnemonic-widget">tabs</property> + <accessibility> + <relation type="label-for" target="imTabs"/> + </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>
