include/vcl/weld/weld.hxx | 5 sfx2/source/appl/sfxhelp.cxx | 25 ++- sw/uiconfig/swriter/ui/insertcaption.ui | 201 +++++++++++++++----------------- vcl/inc/qt5/QtInstanceWidget.hxx | 2 vcl/inc/salvtables.hxx | 2 vcl/qt5/QtInstanceBuilder.cxx | 1 vcl/qt5/QtInstanceWidget.cxx | 5 vcl/source/app/salvtables.cxx | 12 - vcl/unx/gtk3/gtkinst.cxx | 14 -- 9 files changed, 116 insertions(+), 151 deletions(-)
New commits: commit 1a22d36b1ffe57559b124d4fe9a868d947ce58a7 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 8 20:35:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 10 23:18:50 2026 +0100 tdf#130857 weld: Move Widget::help_hierarchy_foreach logic to SfxHelp Instead of letting each toolkit-specific implementation implement iterating over all parent widgets to call a function on the parent's help ID if it's non empty, implement the corresponding logic directly in the only caller of that method, SfxHelp::Start_Impl. weld::Widget::weld_parent provides access to the parent widget and its help ID can be retrieved via weld::Widget::get_help_id, so there is no need for Widget::help_hierarchy_foreach. Drop Widget::help_hierarchy_foreach, now that its only caller has been ported away from using it. This also makes this work for the Qt implementation, which didn't implement the logic yet. This addresses the remaining aspect mentioned in previous commit Change-Id: Id834a5c8821b1cbd4190549304687bfc70782cfa Author: Michael Weghorn <[email protected]> Date: Thu Jan 8 19:58:48 2026 +0100 tdf#130857 qt weld: Support Writer "Insert Caption" 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 like this: * start Writer * insert image (via "Insert" -> "Image...") * right-click on the image to open the context menu * select the "Insert Caption..." menu entry Right now, clicking the "Help" button in the dialog triggers an assert because QtInstanceWidget::help_hierarchy_foreach isn't implemented yet. This will be addressed separately in an upcoming commit. Pressing the "Help" button in that dialog with qt6 and SAL_VCL_QT_USE_WELDED_WIDGETS=1 now opens the corresponding help page as well. Change-Id: I2c0afddaaad35ead5576046e2a569722bce3816e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196879 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index cd89a170522a..d885ced2ffd3 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -353,11 +353,6 @@ public: virtual std::unique_ptr<Container> weld_parent() const = 0; - //iterate upwards through the hierarchy starting at this widgets parent, - //calling func with their helpid until func returns true or we run out of - //parents - virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) = 0; - virtual OUString strip_mnemonic(const OUString& rLabel) const = 0; /* Escapes string contents which are interpreted by the UI. diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cbef151d2bdc..7f9cd7c884da 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -1215,15 +1215,22 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt { bool bUseFinalFallback = true; // no help found -> try ids of parents. - pWidget->help_hierarchy_foreach([&aHelpModuleName, &aHelpURL, &bUseFinalFallback](const OUString& rHelpId){ - if (rHelpId.isEmpty()) - return false; - aHelpURL = CreateHelpURL(rHelpId, aHelpModuleName); - bool bFinished = !SfxContentHelper::IsHelpErrorDocument(aHelpURL); - if (bFinished) - bUseFinalFallback = false; - return bFinished; - }); + std::unique_ptr<weld::Container> pParent = pWidget->weld_parent(); + while (pParent) + { + const OUString sHelpId = pParent->get_help_id(); + if (!sHelpId.isEmpty()) + { + aHelpURL = CreateHelpURL(sHelpId, aHelpModuleName); + if (!SfxContentHelper::IsHelpErrorDocument(aHelpURL)) + { + bUseFinalFallback = false; + break; + } + } + + pParent = pParent->weld_parent(); + } if (bUseFinalFallback) { diff --git a/vcl/inc/qt5/QtInstanceWidget.hxx b/vcl/inc/qt5/QtInstanceWidget.hxx index 8c480e406ec1..25925defa72d 100644 --- a/vcl/inc/qt5/QtInstanceWidget.hxx +++ b/vcl/inc/qt5/QtInstanceWidget.hxx @@ -143,8 +143,6 @@ public: virtual void queue_resize() override; - virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>&) override; - virtual OUString strip_mnemonic(const OUString& rLabel) const override; virtual OUString escape_ui_str(const OUString& rLabel) const override; diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index bb266b116b2e..4660c2a13b11 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -372,8 +372,6 @@ public: virtual void queue_resize() override; - virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) override; - virtual OUString strip_mnemonic(const OUString& rLabel) const override; virtual OUString escape_ui_str(const OUString& rLabel) const override; diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx index 724895c70612..3f9f5fc5e630 100644 --- a/vcl/qt5/QtInstanceWidget.cxx +++ b/vcl/qt5/QtInstanceWidget.cxx @@ -743,11 +743,6 @@ void QtInstanceWidget::queue_resize() GetQtInstance().RunInMainThread([&] { getQWidget()->adjustSize(); }); } -void QtInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OUString&)>&) -{ - assert(false && "Not implemented yet"); -} - OUString QtInstanceWidget::strip_mnemonic(const OUString& rLabel) const { return rLabel.replaceFirst("&", ""); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 9c4727fc0251..3141286c0972 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -7053,18 +7053,6 @@ void SalInstanceWindow::help() pHelp->Start(sHelpId, pSource); } -//iterate upwards through the hierarchy from this widgets through its parents -//calling func with their helpid until func returns true or we run out of parents -void SalInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) -{ - vcl::Window* pParent = m_xWidget; - while ((pParent = pParent->GetParent())) - { - if (func(pParent->GetHelpId())) - return; - } -} - weld::MessageDialog* SalInstance::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonsType, diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index ed05bc33ffc1..91356d586874 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -4294,8 +4294,6 @@ public: } } - virtual void help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) override; - virtual OUString strip_mnemonic(const OUString &rLabel) const override { return rLabel.replaceFirst("_", ""); @@ -24413,18 +24411,6 @@ void GtkInstanceWindow::help() pHelp->Start(sHelpId, pSource); } -//iterate upwards through the hierarchy from this widgets through its parents -//calling func with their helpid until func returns true or we run out of parents -void GtkInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OUString&)>& func) -{ - GtkWidget* pParent = m_pWidget; - while ((pParent = gtk_widget_get_parent(pParent))) - { - if (func(::get_help_id(pParent))) - return; - } -} - std::unique_ptr<weld::Builder> GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile) { GtkInstanceWidget* pParentWidget = dynamic_cast<GtkInstanceWidget*>(pParent); commit a96e2ec51e783ebbed0f9e2d347508ed26707de0 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 8 19:58:48 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 10 23:18:43 2026 +0100 tdf#130857 qt weld: Support Writer "Insert Caption" 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 like this: * start Writer * insert image (via "Insert" -> "Image...") * right-click on the image to open the context menu * select the "Insert Caption..." menu entry Right now, clicking the "Help" button in the dialog triggers an assert because QtInstanceWidget::help_hierarchy_foreach isn't implemented yet. This will be addressed separately in an upcoming commit. Change-Id: Id834a5c8821b1cbd4190549304687bfc70782cfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196878 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 5c5a156c23b6..bf454f670b77 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -182,6 +182,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/footnotepage.ui"_ustr, u"modules/swriter/ui/inforeadonlydialog.ui"_ustr, u"modules/swriter/ui/insertbreak.ui"_ustr, + u"modules/swriter/ui/insertcaption.ui"_ustr, u"modules/swriter/ui/inserttable.ui"_ustr, u"modules/swriter/ui/linenumbering.ui"_ustr, u"modules/swriter/ui/numberingnamedialog.ui"_ustr, commit b546f9191f6b674ef21c3c62970b6cec0062def3 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 8 19:52:13 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 10 23:18:36 2026 +0100 sw: Resave insertcaption.ui with glade 3.40 The dialog can be triggered like this: * start Writer * insert image (via "Insert" -> "Image...") * right-click on the image to open the context menu * select the "Insert Caption..." menu entry Change-Id: I03dc15732e70274409baeb8be328f1985ae5bfc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196877 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index 48ef6c1a2bf8..0580a92ae083 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.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="sw"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="InsertCaptionDialog"> - <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="insertcaption|InsertCaptionDialog">Insert Caption</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="auto"> <property name="label" translatable="yes" context="insertcaption|auto">Auto...</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="expand">False</property> @@ -36,8 +36,8 @@ <object class="GtkButton" id="options"> <property name="label" translatable="yes" context="insertcaption|options">Options...</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="expand">False</property> @@ -49,10 +49,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> @@ -65,8 +65,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> @@ -79,8 +79,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> @@ -94,14 +94,14 @@ <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">1</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="vexpand">True</property> <property name="orientation">vertical</property> @@ -109,25 +109,25 @@ <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="GtkEntry" id="caption_edit"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> <property name="margin-start">12</property> - <property name="truncate-multiline">True</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> </object> </child> <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="insertcaption|label1">Caption</property> <attributes> <attribute name="weight" value="bold"/> @@ -144,66 +144,66 @@ <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=5 --> <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="GtkLabel" id="numbering_label"> <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="insertcaption|numbering_label">Numbering:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numbering</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">numbering</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="separator_label"> <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="insertcaption|separator_label">Before caption:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">separator_edit</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">separator_edit</property> </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="position_label"> <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="insertcaption|position_label">Position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">position</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">position</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkComboBoxText" id="numbering"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="numbering-atkobject"> @@ -212,19 +212,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="separator_edit"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes" context="insertcaption|separator_edit|tooltip_text">Enter optional text characters to appear after the caption category and number and before the caption text.</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="text" translatable="yes" context="insertcaption|separator_edit">: </property> <property name="truncate-multiline">True</property> - <property name="tooltip-text" translatable="yes" context="insertcaption|separator_edit|tooltip_text">Enter optional text characters to appear after the caption category and number and before the caption text.</property> <child internal-child="accessible"> <object class="AtkObject" id="separator_edit-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|separator_edit">Enter optional text characters to appear after the caption category and number and before the caption text. The optional text characters are not inserted if no caption text is given.</property> @@ -232,33 +232,33 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="num_separator"> <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="insertcaption|num_separator">After number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">num_separator_edit</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">num_separator_edit</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="num_separator_edit"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes" context="insertcaption|num_separator_edit|tooltip_text">When “Caption order” (in Options) is “Numbering first”, enter optional text to appear after caption number.</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property> <property name="truncate-multiline">True</property> - <property name="tooltip-text" translatable="yes" context="insertcaption|num_separator_edit|tooltip_text">When “Caption order” (in Options) is “Numbering first”, enter optional text to appear after caption number.</property> <child internal-child="accessible"> <object class="AtkObject" id="num_separator_edit-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|num_separator_edit">Enter optional text to appear after the caption number. Only available when “Numbering first” is selected for “Caption order” in Options.</property> @@ -266,14 +266,14 @@ </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> <child> <object class="GtkComboBoxText" id="position"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="position-atkobject"> @@ -282,34 +282,34 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</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="halign">start</property> <property name="label" translatable="yes" context="insertcaption|label4">Category:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">category</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">category</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="GtkComboBoxText" id="category"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> + <property name="can-focus">False</property> + <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="activates_default">True</property> </object> </child> <child internal-child="accessible"> @@ -319,8 +319,8 @@ </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> </object> @@ -328,7 +328,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="insertcaption|label2">Properties</property> <attributes> <attribute name="weight" value="bold"/> @@ -345,27 +345,27 @@ <child> <object class="GtkFrame" id="frame3"> <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="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="preview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child internal-child="accessible"> <object class="AtkObject" id="preview-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="insertcaption|preview-atkobject">Preview</property> @@ -380,7 +380,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="insertcaption|label3">Preview</property> <attributes> <attribute name="weight" value="bold"/> @@ -410,9 +410,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="InsertCaptionDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|InsertCaptionDialog">Adds a numbered caption to a selected image, table, chart, frame, or shape.</property> @@ -423,8 +420,8 @@ <property name="lower">1</property> <property name="upper">9999</property> <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkListStore" id="liststore1"> <columns>
