cui/uiconfig/ui/signsignatureline.ui | 197 +++++++++++++++++------------------ vcl/qt5/QtInstanceBuilder.cxx | 2 2 files changed, 99 insertions(+), 100 deletions(-)
New commits: commit 92c6a2995b9e8b69e45dc9c9bc85a57cfb2a95ce Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Aug 2 19:39:02 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Mon Aug 4 08:59:18 2025 +0200 tdf#130857 qt weld: Support "Sign Signature Line" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered as follows: * start Calc * "Insert" -> "Signature Line" * enter something in the dialog and confirm with "OK" * select the signature line * right-click to open context menu -> "Sign Signature Line" Change-Id: Ifbfc7dda3cbafeab0efd03f8cd342aa79e0e97f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188840 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 28c4b79f6682..e7b29d848098 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -96,6 +96,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/securityoptionsdialog.ui"_ustr, u"cui/ui/selectpathdialog.ui"_ustr, u"cui/ui/signatureline.ui"_ustr, + u"cui/ui/signsignatureline.ui"_ustr, u"cui/ui/similaritysearchdialog.ui"_ustr, u"cui/ui/spelloptionsdialog.ui"_ustr, u"cui/ui/splitcellsdialog.ui"_ustr, commit a7b82d2cd3dba9b67b840c9df9d3745a3948b678 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Aug 2 19:33:17 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Mon Aug 4 08:59:12 2025 +0200 cui: Resave signsignatureline.ui with glade 3.40 The dialog can be triggered as follows: * start Calc * "Insert" -> "Signature Line" * enter something in the dialog and confirm with "OK" * select the signature line * right-click to open context menu -> "Sign Signature Line" Change-Id: I890778a44365611d47e59de4d88c5a6c224e9cd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188839 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/cui/uiconfig/ui/signsignatureline.ui b/cui/uiconfig/ui/signsignatureline.ui index 12a68f2c855c..85c2279f27e6 100644 --- a/cui/uiconfig/ui/signsignatureline.ui +++ b/cui/uiconfig/ui/signsignatureline.ui @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="SignSignatureLineDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="signsignatureline|SignSignatureLineDialog">Sign Signature Line</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -38,8 +38,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -52,10 +52,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="signsignatureline|ok">Sign</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> </object> <packing> <property name="expand">True</property> @@ -71,42 +71,42 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="margin-start">6</property> <property name="margin-end">6</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=5 n-rows=3 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkEntry" id="edit_name"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes" context="signsignatureline|edit_name">Type your name here</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="placeholder-text" translatable="yes" context="signsignatureline|edit_name">Type your name here</property> <child internal-child="accessible"> <object class="AtkObject" id="edit_name-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="signsignatureline|extended_tip|edit_name">Enter your name as signer of the document. Your name will be inserted above the signature horizontal line.</property> @@ -114,44 +114,44 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label_name"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="signsignatureline|label_name" comments="Name of the signer">Your Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edit_name</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">edit_name</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label_certificate"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="signsignatureline|label_certificate" comments="Certificate to be used for signing">Certificate:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">btn_select_certificate</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">btn_select_certificate</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkButton" id="btn_select_certificate"> <property name="label" translatable="yes" context="signsignatureline|btn_select_certificate">Select Certificate</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <child internal-child="accessible"> <object class="AtkObject" id="btn_select_certificate-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="signsignatureline|extended_tip|btn_select_certificate">Click on the Select Certificate button to open the Select Certificate dialog box, where your certificates are listed. Select the certificate suitable for signing the document.</property> @@ -159,56 +159,56 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> <property name="width">4</property> </packing> </child> <child> <object class="GtkLabel" id="label_or"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="signsignatureline|label_name" comments="Name of the signer">or</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="btn_load_image"> <property name="label" translatable="yes" context="signsignatureline|btn_load_image">Use Signature Image</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <accessibility> <relation type="labelled-by" target="label_image_dimensions"/> </accessibility> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="btn_clear_image"> <property name="label" translatable="yes" context="signsignatureline|btn_clear_image">Clear</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> + <property name="left-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label_image_dimensions"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">6</property> + <property name="margin-bottom">6</property> <property name="label" translatable="yes" context="signsignatureline|label_image_dimensions">Best image size: 600 x 100 px</property> <attributes> <attribute name="style" value="italic"/> @@ -218,8 +218,8 @@ </accessibility> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> + <property name="left-attach">3</property> + <property name="top-attach">1</property> <property name="width">2</property> </packing> </child> @@ -237,7 +237,7 @@ <child type="label"> <object class="GtkLabel" id="label_sign"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="signsignatureline|label_sign">Sign</property> <attributes> <attribute name="weight" value="bold"/> @@ -246,53 +246,53 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=4 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="label_add_comment"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="signsignatureline|label_add_comment">Add comment:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edit_comment</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">edit_comment</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="edit_comment"> - <property name="height_request">60</property> + <property name="height-request">60</property> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child internal-child="accessible"> @@ -304,31 +304,31 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="label_hint"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="signsignatureline|label_hint">Instructions from the document creator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">label_hint_text</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">label_hint_text</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label_hint_text"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="margin-start">12</property> - <property name="mnemonic_widget">edit_comment</property> + <property name="mnemonic-widget">edit_comment</property> <attributes> <attribute name="style" value="oblique"/> </attributes> @@ -339,8 +339,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -348,7 +348,7 @@ <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="signsignatureline|label_more">More</property> <attributes> <attribute name="weight" value="bold"/> @@ -357,8 +357,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -375,8 +375,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-5">ok</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> commit 5fdcce73e406b4a4c929e325728ca3d169b2edcf Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Aug 2 19:28:43 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Mon Aug 4 08:59:06 2025 +0200 tdf#130857 qt weld: Support "Signature Line" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered as follows: * start Calc * "Insert" -> "Signature Line" Change-Id: Ica1f0e3aedefdf301ed7017c309eaa65c255230a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188838 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index fdbc768b6e73..28c4b79f6682 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -95,6 +95,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/searchattrdialog.ui"_ustr, u"cui/ui/securityoptionsdialog.ui"_ustr, u"cui/ui/selectpathdialog.ui"_ustr, + u"cui/ui/signatureline.ui"_ustr, u"cui/ui/similaritysearchdialog.ui"_ustr, u"cui/ui/spelloptionsdialog.ui"_ustr, u"cui/ui/splitcellsdialog.ui"_ustr,