filter/uiconfig/ui/pdfoptionsdialog.ui | 234 ++++++++++++-- reportdesign/uiconfig/dbreport/ui/chardialog.ui | 399 ++++++++++++------------ 2 files changed, 422 insertions(+), 211 deletions(-)
New commits: commit 47f76e52b609f8fa265b616ffc428daacd5f22ea Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Tue Jun 24 09:01:13 2025 +0200 Commit: Heiko Tietze <heiko.tie...@documentfoundation.org> CommitDate: Tue Jun 24 13:20:15 2025 +0200 Resolves tdf#167106 - Apply VT style to Character Formatting dialog Scope reportdesign Change-Id: I25503bcfcdd26162e86a18af7481b4c32056e1cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186870 Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> Tested-by: Jenkins diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index 66bc3b9b184a..4a5d252c6cf9 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -96,289 +96,322 @@ <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="tab"> - <object class="GtkLabel" id="font"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|font">Font</property> + <object class="GtkBox" id="font"> + <property name="can-focus">False</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="chardialog|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="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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">1</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="fonteffects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|fonteffects">Font Effects</property> + <object class="GtkBox" id="fonteffects"> + <property name="can-focus">False</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="chardialog|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">1</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">2</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|position">Position</property> + <object class="GtkBox" id="position"> + <property name="can-focus">False</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">cmd/lc_fontwork.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="chardialog|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">2</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">3</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="asianlayout"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|asianlayout">Asian Layout</property> + <object class="GtkBox" id="asianlayout"> + <property name="can-focus">False</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">cmd/lc_textdirectiontoptobottom.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="chardialog|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">3</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">4</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="background"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|background">Background</property> + <object class="GtkBox" id="background"> + <property name="can-focus">False</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_backcolor.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="chardialog|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">4</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">5</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="alignment"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="chardialog|alignment">Alignment</property> + <object class="GtkBox" id="alignment"> + <property name="can-focus">False</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="chardialog|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">5</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> commit 0e419327539392355853f5e6d23a5507e922a972 Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Tue Jun 24 10:29:28 2025 +0200 Commit: Heiko Tietze <heiko.tie...@documentfoundation.org> CommitDate: Tue Jun 24 13:20:00 2025 +0200 Resolves tdf#167105 - Apply VT style to PDF Export dialog Change-Id: I9490e67e1105f72853dbc04f0e866b6bc3779528 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186879 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> diff --git a/filter/uiconfig/ui/pdfoptionsdialog.ui b/filter/uiconfig/ui/pdfoptionsdialog.ui index 63444c040824..5c8fc555fc85 100644 --- a/filter/uiconfig/ui/pdfoptionsdialog.ui +++ b/filter/uiconfig/ui/pdfoptionsdialog.ui @@ -93,10 +93,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> @@ -105,18 +106,45 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="general"> - <property name="visible">True</property> + <object class="GtkBox" id="general"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|general">General</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imGeneral"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/exportdialog.pdf</property> + <accessibility> + <relation type="labelled-by" target="lbGeneral"/> + </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="lbGeneral"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|general">General</property> + <property name="mnemonic-widget">general</property> + <accessibility> + <relation type="label-for" target="imGeneral"/> + </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 +156,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="initialview"> - <property name="visible">True</property> + <object class="GtkBox" id="initialview"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|initialview">Initial View</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imInitialview"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/showbookview.png</property> + <accessibility> + <relation type="labelled-by" target="lbInitialview"/> + </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="lbInitialview"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|initialview">Initial View</property> + <property name="mnemonic-widget">initialview</property> + <accessibility> + <relation type="label-for" target="imInitialview"/> + </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 +198,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 +210,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="userinterface"> - <property name="visible">True</property> + <object class="GtkBox" id="userinterface"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|userinterface">User Interface</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imUserinterface"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/dbviewaliases.png</property> + <accessibility> + <relation type="labelled-by" target="lbUserinterface"/> + </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="lbUserinterface"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|userinterface">User Interface</property> + <property name="mnemonic-widget">userinterface</property> + <accessibility> + <relation type="label-for" target="imUserinterface"/> + </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 +252,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 +264,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="links"> - <property name="visible">True</property> + <object class="GtkBox" id="links"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|links">Links</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imLinks"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/inserthyperlinkcontrol.png</property> + <accessibility> + <relation type="labelled-by" target="lbLinks"/> + </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="lbLinks"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|links">Links</property> + <property name="mnemonic-widget">links</property> + <accessibility> + <relation type="label-for" target="imLinks"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="position">3</property> @@ -188,7 +306,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 +318,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="security"> - <property name="visible">True</property> + <object class="GtkBox" id="security"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|security">Security</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imSecurity"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/protect.png</property> + <accessibility> + <relation type="labelled-by" target="lbSecurity"/> + </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="lbSecurity"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|security">Security</property> + <property name="mnemonic-widget">security</property> + <accessibility> + <relation type="label-for" target="imSecurity"/> + </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 +360,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 +372,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="digitalsignatures"> - <property name="visible">True</property> + <object class="GtkBox" id="digitalsignatures"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="pdfoptionsdialog|digitalsignatures">Digital Signatures</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imDigitalsignatures"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/32/signpdf.png</property> + <accessibility> + <relation type="labelled-by" target="lbDigitalsignatures"/> + </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="lbDigitalsignatures"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="pdfoptionsdialog|digitalsignatures">Digital Signatures</property> + <property name="mnemonic-widget">digitalsignatures</property> + <accessibility> + <relation type="label-for" target="imDigitalsignatures"/> + </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>