sc/uiconfig/scalc/ui/formatcellsdialog.ui | 309 +++++++++++++++++++++++++---- sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 271 ++++++++++++++++++++++--- 2 files changed, 512 insertions(+), 68 deletions(-)
New commits: commit c80076f5291b953a672955f873f9bb26c3b1fb62 Author: Heiko Tietze <[email protected]> AuthorDate: Fri Jun 20 10:21:19 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Sat Jun 21 07:09:57 2025 +0200 Resolves tdf#167099 - Apply VT style to Page Style dialog in Calc Change-Id: I95b59f569fdcff7cc0626874c88aef8457ad62f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186743 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui index 41caaf10d788..5d19567e6d7d 100644 --- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui +++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui @@ -108,11 +108,11 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="tab-pos">left</property> - <property name="scrollable">True</property> + <property name="tab-pos">left</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> @@ -121,18 +121,45 @@ </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="pagetemplatedialog|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">cmd/lc_browseview.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">False</property> + <property name="label" translatable="yes" context="pagetemplatedialog|organizer">General</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> - </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> @@ -144,10 +171,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="page"> - <property name="visible">True</property> + <object class="GtkBox" id="page"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pagetemplatedialog|page">Page</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imPage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_attributepagesize.png</property> + <accessibility> + <relation type="labelled-by" target="lbPage"/> + </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="lbPage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pagetemplatedialog|page">Page</property> + <property name="mnemonic-widget">page</property> + <accessibility> + <relation type="label-for" target="imPage"/> + </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> @@ -156,7 +213,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> @@ -168,10 +225,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="pagetemplatedialog|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="pagetemplatedialog|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">2</property> @@ -180,7 +267,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> @@ -192,10 +279,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="pagetemplatedialog|background">Background</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">cmd/lc_backgroundcolor.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="pagetemplatedialog|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">3</property> @@ -204,7 +321,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> @@ -216,10 +333,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="header"> - <property name="visible">True</property> + <object class="GtkBox" id="header"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pagetemplatedialog|header">Header</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imHeader"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_insertheader.png</property> + <accessibility> + <relation type="labelled-by" target="lbHeader"/> + </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="lbHeader"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pagetemplatedialog|header">Header</property> + <property name="mnemonic-widget">header</property> + <accessibility> + <relation type="label-for" target="imHeader"/> + </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> @@ -228,7 +375,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> @@ -240,10 +387,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="footer"> - <property name="visible">True</property> + <object class="GtkBox" id="footer"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pagetemplatedialog|footer">Footer</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imFooter"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_insertfooter.png</property> + <accessibility> + <relation type="labelled-by" target="lbFooter"/> + </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="lbFooter"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pagetemplatedialog|footer">Footer</property> + <property name="mnemonic-widget">footer</property> + <accessibility> + <relation type="label-for" target="imFooter"/> + </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> @@ -252,7 +429,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> @@ -264,10 +441,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="sheet"> - <property name="visible">True</property> + <object class="GtkBox" id="sheet"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pagetemplatedialog|sheet">Sheet</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imSheet"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_printersetup.png</property> + <accessibility> + <relation type="labelled-by" target="lbSheet"/> + </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="lbSheet"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pagetemplatedialog|sheet">Sheet</property> + <property name="mnemonic-widget">sheet</property> + <accessibility> + <relation type="label-for" target="imSheet"/> + </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> commit 63eac2a287c2d6f800b58cb0618df1d7717c3c86 Author: Heiko Tietze <[email protected]> AuthorDate: Fri Jun 20 11:05:28 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Sat Jun 21 07:09:45 2025 +0200 Resolves tdf#167100 - Apply VT style to Cell Formatting dialog in Calc Change-Id: I098b59730b6a60ef9a931aef201bb1f160deaa9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186751 Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Jenkins diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index ea0daf8e9fd5..57e93f8e014d 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -93,10 +93,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> @@ -105,18 +105,45 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="numbers"> - <property name="visible">True</property> + <object class="GtkBox" id="numbers"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatcellsdialog|numbers">Numbers</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imNumbers"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_numberformatdecimal.png</property> + <accessibility> + <relation type="labelled-by" target="lbNumbers"/> + </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="lbNumbers"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatcellsdialog|numbers">Numbers</property> + <property name="mnemonic-widget">numbers</property> + <accessibility> + <relation type="label-for" target="imNumbers"/> + </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> @@ -128,10 +155,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="formatcellsdialog|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">cmd/lc_fontdialog.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="formatcellsdialog|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> @@ -140,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> @@ -152,10 +209,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="fonteffects"> - <property name="visible">True</property> + <object class="GtkBox" id="fonteffects"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatcellsdialog|fonteffects">Font Effects</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imFonteffects"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_color.png</property> + <accessibility> + <relation type="labelled-by" target="lbFonteffects"/> + </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="lbFonteffects"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatcellsdialog|fonteffects">Font Effects</property> + <property name="mnemonic-widget">fonteffects</property> + <accessibility> + <relation type="label-for" target="imFonteffects"/> + </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> @@ -164,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> @@ -176,10 +263,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="alignment"> - <property name="visible">True</property> + <object class="GtkBox" id="alignment"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatcellsdialog|alignment">Alignment</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/lc_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="formatcellsdialog|alignment">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">3</property> @@ -188,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> @@ -200,10 +317,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="asiantypography"> - <property name="visible">True</property> + <object class="GtkBox" id="asiantypography"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatcellsdialog|asiantypography">Asian Typography</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAsiantypography"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_defaultcharstyle.png</property> + <accessibility> + <relation type="labelled-by" target="lbAsiantypography"/> + </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="lbAsiantypography"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatcellsdialog|asiantypography">Asian Typography</property> + <property name="mnemonic-widget">asiantypography</property> + <accessibility> + <relation type="label-for" target="imAsiantypography"/> + </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> @@ -212,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> @@ -224,10 +371,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="formatcellsdialog|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="formatcellsdialog|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">5</property> @@ -236,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> @@ -248,10 +425,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="formatcellsdialog|background">Background</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">cmd/lc_backgroundcolor.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="formatcellsdialog|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">6</property> @@ -260,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> @@ -272,10 +479,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="cellprotection"> - <property name="visible">True</property> + <object class="GtkBox" id="cellprotection"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="formatcellsdialog|cellprotection">Cell Protection</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imCellprotection"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_protect.png</property> + <accessibility> + <relation type="labelled-by" target="lbCellprotection"/> + </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="lbCellprotection"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="formatcellsdialog|cellprotection">Cell Protection</property> + <property name="mnemonic-widget">cellprotection</property> + <accessibility> + <relation type="label-for" target="imCellprotection"/> + </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>
