sfx2/source/dialog/passwd.cxx | 2 sfx2/uiconfig/ui/password.ui | 175 ++++++++++++++++++++---------------------- 2 files changed, 88 insertions(+), 89 deletions(-)
New commits: commit 037cae112958be3894e734d308f5f4b468a2d710 Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 18 11:24:40 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 18 16:35:17 2022 +0200 resave with latest glade Change-Id: Ib6b221a9264d4563e0cdd41246871c7c96cc0e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134524 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index e093676f1ec9..8aaa94ea38a4 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.38.2 --> <interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="PasswordDialog"> - <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="password|PasswordDialog">Enter Password</property> <property name="modal">True</property> - <property name="window_position">center</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="window-position">center</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" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <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="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> <property name="sensitive">False</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> <property name="use-underline">True</property> </object> <packing> @@ -41,8 +41,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> @@ -55,8 +55,8 @@ <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> @@ -70,95 +70,95 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="password1frame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=3 --> <object class="GtkGrid" id="grid1"> <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="userft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|userft">User:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">usered</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">usered</property> <property name="xalign">0</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="pass1ft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|pass1ft">Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pass1ed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">pass1ed</property> <property name="xalign">0</property> </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> <child> <object class="GtkLabel" id="confirm1ft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|confirm1ft">Confirm:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">confirm1ed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">confirm1ed</property> <property name="xalign">0</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="GtkEntry" id="usered"> <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="truncate-multiline">True</property> - <property name="activates_default">True</property> </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="GtkEntry" id="pass1ed"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="input-purpose">password</property> <child internal-child="accessible"> <object class="AtkObject" id="pass1ed-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="password|pass1ed-atkobject">Password</property> @@ -167,19 +167,19 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="confirm1ed"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="input-purpose">password</property> <child internal-child="accessible"> <object class="AtkObject" id="confirm1ed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="password|extended_tip|confirm1ed">Re-enter the password.</property> @@ -187,8 +187,8 @@ </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> </packing> </child> </object> @@ -196,7 +196,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label1">Password</property> <attributes> <attribute name="weight" value="bold"/> @@ -213,55 +213,55 @@ <child> <object class="GtkFrame" id="password2frame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid2"> <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="pass2ft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|pass2ft">Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pass2ed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">pass2ed</property> <property name="xalign">0</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="confirm2ft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|confirm2ft">Confirm:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">confirm2ed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">confirm2ed</property> <property name="xalign">0</property> </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> <child> <object class="GtkEntry" id="pass2ed"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="input-purpose">password</property> <child internal-child="accessible"> <object class="AtkObject" id="pass2ed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="password|extended_tip|pass2ed">Type a password. A password is case sensitive.</property> @@ -269,19 +269,19 @@ </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="GtkEntry" id="confirm2ed"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="input-purpose">password</property> <child internal-child="accessible"> <object class="AtkObject" id="confirm2ed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="password|extended_tip|confirm2ed">Re-enter the password.</property> @@ -289,8 +289,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -298,7 +298,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label2">Second Password</property> <attributes> <attribute name="weight" value="bold"/> @@ -315,7 +315,7 @@ <child> <object class="GtkLabel" id="minlenft"> <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="xalign">0</property> </object> @@ -338,8 +338,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> commit 9a474985387fabeed6814e1b69cd2b71a3289020 Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 18 11:09:45 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 18 16:35:03 2022 +0200 Related: tdf#50400 restrict "confirm" to same rules as "password" Change-Id: Idb8946e3d737557d2c05941dcf2be001a04cca2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134522 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index efc108278c09..da4dd80f0e6c 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -111,6 +111,8 @@ SfxPasswordDialog::SfxPasswordDialog(weld::Widget* pParent, const OUString* pGro Link<OUString&,bool> aLink2 = LINK(this, SfxPasswordDialog, InsertTextHdl); m_xPassword1ED->connect_insert_text(aLink2); m_xPassword2ED->connect_insert_text(aLink2); + m_xConfirm1ED->connect_insert_text(aLink2); + m_xConfirm2ED->connect_insert_text(aLink2); m_xOKBtn->connect_clicked(LINK(this, SfxPasswordDialog, OKHdl)); if (pGroupText)
