basctl/source/basicide/macrodlg.cxx | 6 - basctl/source/basicide/macrodlg.hxx | 2 basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 4 basctl/uiconfig/basicide/ui/organizedialog.ui | 129 +++++------------------- svx/uiconfig/ui/passwd.ui | 125 +++++++++++------------ 5 files changed, 94 insertions(+), 172 deletions(-)
New commits: commit a6837912ddd691c8e61ce0fa5143f54b52cf8899 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jan 14 15:17:28 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 15 01:35:21 2026 +0100 svx: Resave passwd.ui with glade 3.40 The dialog using this .ui file can e.g. be triggered like this in Writer: * "Tools" -> "Macros" -> "Organize Macros" -> "Basic" * press the "Organizer..." button * switch to the "Libraries" tab * press "New" button, type any name and confirm with "OK" * with the newly created library selected, press the "Password" button Change-Id: I558edf02bf90aedc68d14838306b566f2eb39601 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197276 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/svx/uiconfig/ui/passwd.ui b/svx/uiconfig/ui/passwd.ui index 2e4dac0028b3..d8f93612cc2f 100644 --- a/svx/uiconfig/ui/passwd.ui +++ b/svx/uiconfig/ui/passwd.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="svx"> <requires lib="gtk+" version="3.24"/> <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="passwd|PasswordDialog">Change Password</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" 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="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> @@ -37,10 +37,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</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> <property name="use-underline">True</property> </object> <packing> @@ -53,8 +53,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> @@ -68,39 +68,39 @@ <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="hexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <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> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="oldpassL"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="passwd|oldpassL">_Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">oldpassEntry</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">oldpassEntry</property> <property name="xalign">1</property> </object> <packing> @@ -112,12 +112,12 @@ <child> <object class="GtkEntry" id="oldpassEntry"> <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="oldpassEntry-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="passwd|extended_tip|oldpassEntry">Enter the current password for the selected library.</property> @@ -135,7 +135,7 @@ <child type="label"> <object class="GtkLabel" id="oldpass"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="passwd|oldpass">Old Password</property> <attributes> <attribute name="weight" value="bold"/> @@ -152,29 +152,29 @@ <child> <object class="GtkFrame" id="frame2"> <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=2 n-rows=2 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</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="hexpand">True</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkEntry" id="newpassEntry"> <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="newpassEntry-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="passwd|extended_tip|newpassEntry">Enter a new password for the selected library.</property> @@ -182,19 +182,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="confirmpassEntry"> <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="confirmpassEntry-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="passwd|extended_tip|confirmpassEntry">Reenter the new password for the selected library.</property> @@ -202,36 +202,36 @@ </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="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="passwd|label4">Pa_ssword:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">newpassEntry</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">newpassEntry</property> <property name="xalign">1</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="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="passwd|label5">Confi_rm:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">confirmpassEntry</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">confirmpassEntry</property> <property name="xalign">1</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> </object> @@ -239,7 +239,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="passwd|label2">New Password</property> <attributes> <attribute name="weight" value="bold"/> @@ -267,9 +267,6 @@ <action-widget response="-5">ok</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="PasswordDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="passwd|extended_tip|PasswordDialog">Protects the selected library with a password.</property> commit 0f8f608ba853d09be2a03c17e643c1c78989d16b Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jan 14 15:11:11 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 15 01:35:13 2026 +0100 basctl: Resave organizedialog.ui with glade 3.40 The dialog using this .ui file can be triggered as follows in Writer: * "Tools" -> "Macros" -> "Organize Macros" -> "Basic" * press the "Organizer..." button Change-Id: I353edfa7e8276a13afa8a3cc676970adcdd8bf5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197275 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/uiconfig/basicide/ui/organizedialog.ui b/basctl/uiconfig/basicide/ui/organizedialog.ui index 00244b2f51c7..5090ecb26ee0 100644 --- a/basctl/uiconfig/basicide/ui/organizedialog.ui +++ b/basctl/uiconfig/basicide/ui/organizedialog.ui @@ -1,36 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="basctl"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="OrganizeDialog"> - <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="organizedialog|OrganizeDialog">Basic Macro Organizer</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <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="close"> <property name="label" translatable="yes" context="stock">_Close</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> <property name="use-underline">True</property> </object> <packing> @@ -43,8 +40,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> @@ -58,47 +55,23 @@ <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="GtkNotebook" id="tabcontrol"> <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="scrollable">True</property> - <property name="enable_popup">True</property> + <property name="enable-popup">True</property> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <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> + <property name="can-focus">False</property> <child> <placeholder/> </child> @@ -107,42 +80,18 @@ <child type="tab"> <object class="GtkLabel" id="modules"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="organizedialog|modules">Modules</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <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> + <property name="can-focus">False</property> <child> <placeholder/> </child> @@ -154,43 +103,19 @@ <child type="tab"> <object class="GtkLabel" id="dialogs"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="organizedialog|dialogs">Dialogs</property> </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"> <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> + <property name="can-focus">False</property> <child> <placeholder/> </child> @@ -202,12 +127,12 @@ <child type="tab"> <object class="GtkLabel" id="libraries"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="organizedialog|libraries">Libraries</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> commit a791c1bd6dd80d0386e9bd4583792d2384e73dca Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jan 14 14:59:58 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 15 01:35:06 2026 +0100 tdf#130857 macrodialog: Don't use weld::Frame's label child Don't use the GtkFrame's internal label child to get/set the frame's label, but use the weld::Frame methods directly. This also prepares for supporting the use of native widgets with that dialog, where QtInstanceFrame doesn't have a separate widget for the label, but its QGroupBox handles the label itself. Change-Id: I4659d35112d055f31190a19a52b62215c18a6adb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197274 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 9a9e4918fc02..209c75358af5 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -63,7 +63,7 @@ MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame , m_xMacroNameEdit(m_xBuilder->weld_entry(u"macronameedit"_ustr)) , m_xMacroLibsFrame(m_xBuilder->weld_frame(u"librariesframe"_ustr)) , m_xBasicBox(new SbTreeListBox(m_xBuilder->weld_tree_view(u"libraries"_ustr), m_xDialog.get())) - , m_xMacrosInTxt(m_xBuilder->weld_label(u"existingmacrosft"_ustr)) + , m_xExistingMacrosFrame(m_xBuilder->weld_frame(u"existingmacrosframe"_ustr)) , m_xMacroBox(m_xBuilder->weld_tree_view(u"macros"_ustr)) , m_xMacroBoxIter(m_xMacroBox->make_iterator()) , m_xRunButton(m_xBuilder->weld_button(u"ok"_ustr)) @@ -79,7 +79,7 @@ MacroChooser::MacroChooser(weld::Window* pParnt, const Reference< frame::XFrame m_xBasicBox->set_size_request(m_xBasicBox->get_approximate_digit_width() * 30, m_xBasicBox->get_height_rows(18)); m_xMacroBox->set_size_request(m_xMacroBox->get_approximate_digit_width() * 30, m_xMacroBox->get_height_rows(18)); - m_aMacrosInTxtBaseStr = m_xMacrosInTxt->get_label(); + m_aMacrosInTxtBaseStr = m_xExistingMacrosFrame->get_label(); m_xRunButton->connect_clicked( LINK( this, MacroChooser, ButtonHdl ) ); m_xCloseButton->connect_clicked( LINK( this, MacroChooser, ButtonHdl ) ); @@ -495,7 +495,7 @@ IMPL_LINK_NOARG(MacroChooser, BasicSelectHdl, weld::TreeView&, void) m_xMacroBox->clear(); if (pModule) { - m_xMacrosInTxt->set_label(m_aMacrosInTxtBaseStr + " " + pModule->GetName()); + m_xExistingMacrosFrame->set_label(m_aMacrosInTxtBaseStr + " " + pModule->GetName()); m_xMacroBox->freeze(); diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 608ac3003cef..67fc9706bbf0 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -77,7 +77,7 @@ private: std::unique_ptr<weld::Entry> m_xMacroNameEdit; std::unique_ptr<weld::Frame> m_xMacroLibsFrame; std::unique_ptr<SbTreeListBox> m_xBasicBox; - std::unique_ptr<weld::Label> m_xMacrosInTxt; + std::unique_ptr<weld::Frame> m_xExistingMacrosFrame; std::unique_ptr<weld::TreeView> m_xMacroBox; std::unique_ptr<weld::TreeIter> m_xMacroBoxIter; std::unique_ptr<weld::Button> m_xRunButton; diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index 3c0208821eb1..6de472aa230d 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -111,7 +111,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="existingmacrosframe"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> @@ -161,7 +161,7 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="existingmacrosft"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property>
