reportdesign/uiconfig/dbreport/ui/floatingfield.ui | 85 +++---- reportdesign/uiconfig/dbreport/ui/floatingsort.ui | 239 ++++++++++----------- vcl/qt5/QtInstanceToolbar.cxx | 24 +- 3 files changed, 178 insertions(+), 170 deletions(-)
New commits: commit 44c1ee3e101ba7f9402bd4c3cfd9893e403036f7 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Sep 11 20:50:21 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Sep 12 07:17:57 2025 +0200 tdf#130857 qt weld: Implement QtInstanceToolbar::{g,s}et_item_sensitive This will for example be needed for the reportdesign "Add Field" dialog that can be triggered as follows after opening a database in Base (or creating a new one): * select "Reports" on the left * "Create Report in Design View" * click "Add Field" toolbar button More is needed before that dialog can be declared as supported by native Qt widgets. Change-Id: Id752d363259a2fc59a831540ef8fad8ca73c20c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190830 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceToolbar.cxx b/vcl/qt5/QtInstanceToolbar.cxx index cac9734c942f..be06c979689b 100644 --- a/vcl/qt5/QtInstanceToolbar.cxx +++ b/vcl/qt5/QtInstanceToolbar.cxx @@ -29,15 +29,29 @@ QtInstanceToolbar::QtInstanceToolbar(QToolBar* pToolBar) } } -void QtInstanceToolbar::set_item_sensitive(const OUString&, bool) +void QtInstanceToolbar::set_item_sensitive(const OUString& rIdent, bool bSensitive) { - assert(false && "Not implemented yet"); + SolarMutexGuard g; + + GetQtInstance().RunInMainThread([&] { + QWidget* pWidget = m_pToolBar->findChild<QWidget*>(toQString(rIdent)); + assert(pWidget && "No toolbar child for the given ID found"); + pWidget->setEnabled(bSensitive); + }); } -bool QtInstanceToolbar::get_item_sensitive(const OUString&) const +bool QtInstanceToolbar::get_item_sensitive(const OUString& rIdent) const { - assert(false && "Not implemented yet"); - return false; + SolarMutexGuard g; + + bool bSensitive = false; + GetQtInstance().RunInMainThread([&] { + QWidget* pWidget = m_pToolBar->findChild<QWidget*>(toQString(rIdent)); + assert(pWidget && "No toolbar child for the given ID found"); + bSensitive = pWidget->isEnabled(); + }); + + return bSensitive; } void QtInstanceToolbar::set_item_active(const OUString& rIdent, bool bActive) { commit 52a82ebdc9e8ca5bdf3077cc829e2ba62dc8e615 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Sep 11 20:36:30 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Sep 12 07:17:51 2025 +0200 reportdesign: Resave floatingfield.ui with glade 3.40 Drop automatically inserted property name="can-focus">False</property> for GtkToolButton objects again to avoid potential unwanted side effects. The dialog can be triggered as follows after opening a database in Base (or creating a new one): * select "Reports" on the left * "Create Report in Design View" * click "Add Field" toolbar button Change-Id: I688d01d8e2d5402b8592ee73a02b47433183d5cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190829 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui index 172ca7209548..2de8541b91c0 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="rpt"> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="liststore1"> @@ -11,25 +11,22 @@ </columns> </object> <object class="GtkDialog" id="FloatingField"> - <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="floatingfield|FloatingField">Sorting and Grouping</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="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="layout-style">end</property> <child> <placeholder/> </child> @@ -37,31 +34,31 @@ <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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="container"> <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="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkToolbar" id="toolbox"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar-style">icons</property> <child> <object class="GtkToggleToolButton" id="up"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingfield|up">Sort Ascending</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_sortup.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_sortup.png</property> </object> <packing> <property name="expand">False</property> @@ -72,8 +69,8 @@ <object class="GtkToggleToolButton" id="down"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingfield|down">Sort Descending</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_sortdown.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_sortdown.png</property> </object> <packing> <property name="expand">False</property> @@ -84,8 +81,8 @@ <object class="GtkToolButton" id="delete"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingfield|delete">Remove sorting</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_removefiltersort.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_removefiltersort.png</property> </object> <packing> <property name="expand">False</property> @@ -95,7 +92,7 @@ <child> <object class="GtkSeparatorToolItem" id="separator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -106,8 +103,8 @@ <object class="GtkToolButton" id="insert"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingfield|insert">Insert</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_insert.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_insert.png</property> </object> <packing> <property name="expand">False</property> @@ -116,29 +113,29 @@ </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="GtkScrolledWindow" id="scrolledwindow"> <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="GtkTreeView" id="treeview"> <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="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> + <property name="headers-visible">False</property> <property name="reorderable">True</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child> @@ -157,23 +154,23 @@ </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> <child> <object class="GtkLabel" id="helptext"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingfield|helptext">Highlight the fields to insert into the selected section of the template, then click Insert or press Enter.</property> <property name="wrap">True</property> - <property name="width_chars">45</property> - <property name="max_width_chars">45</property> + <property name="width-chars">45</property> + <property name="max-width-chars">45</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> </object> commit 9a3a6f95d29a12b061ba7b37531e8ad2f6fce302 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Sep 11 19:25:22 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Sep 12 07:17:46 2025 +0200 reportdesign: Resave floatingsort.ui with glade 3.40 ... but drop automatically inserted property name="can-focus">False</property> for GtkToolButton objects again to avoid potential unwanted side effects. The dialog can be triggered as follows after opening a database in Base: * select "Reports" on the left * "Create Report in Design View" * click "Sorting and Grouping" toolbar button Change-Id: I2dfda27c0c182648de02ad3ed94a5fc2a64d1bc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190823 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui index 1a9ee1e43a58..bbd569048b4a 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="rpt"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">100</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="GtkDialog" id="FloatingSort"> - <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="floatingsort|FloatingSort">Sorting and Grouping</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="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child internal-child="action_area"> <object class="GtkButtonBox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <child> <placeholder/> </child> @@ -38,64 +35,64 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid1"> <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="row_spacing">12</property> + <property name="row-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="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=2 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</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="vexpand">True</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <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="floatingsort|label5">Group actions</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">toolbox</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">toolbox</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="GtkToolbar" id="toolbox"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">end</property> <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar-style">icons</property> <child> <object class="GtkToolButton" id="up"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingsort|up">Move up</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_moveup.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_moveup.png</property> </object> <packing> <property name="expand">False</property> @@ -106,8 +103,8 @@ <object class="GtkToolButton" id="down"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingsort|down">Move down</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_movedown.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_movedown.png</property> </object> <packing> <property name="expand">False</property> @@ -118,8 +115,8 @@ <object class="GtkToolButton" id="delete"> <property name="visible">True</property> <property name="label" translatable="yes" context="floatingsort|delete">Delete</property> - <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_deleterows.png</property> + <property name="use-underline">True</property> + <property name="icon-name">cmd/sc_deleterows.png</property> </object> <packing> <property name="expand">False</property> @@ -128,20 +125,20 @@ </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> <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="GtkBox" id="box"> <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> @@ -150,8 +147,8 @@ </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> </object> @@ -159,7 +156,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="floatingsort|label1">Groups</property> <attributes> <attribute name="weight" value="bold"/> @@ -168,115 +165,115 @@ </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" id="properties"> <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=6 --> <object class="GtkGrid" id="grid4"> <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="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label6">Sorting</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sorting</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">sorting</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="label7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label7">Group Header</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">header</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">header</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="label8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label8">Group Footer</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">footer</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">footer</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="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label9">Group On</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">group</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">group</property> <property name="xalign">0</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="label10"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label10">Group Interval</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">interval</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">interval</property> <property name="xalign">0</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="GtkLabel" id="label11"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="floatingsort|label11">Keep Together</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">keep</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">keep</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkComboBoxText" id="sorting"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <items> @@ -285,14 +282,14 @@ </items> </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="GtkComboBoxText" id="header"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <items> @@ -301,14 +298,14 @@ </items> </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="GtkComboBoxText" id="keep"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <items> @@ -318,14 +315,14 @@ </items> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkComboBoxText" id="footer"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">1</property> <items> @@ -334,14 +331,14 @@ </items> </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="group"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <items> @@ -349,22 +346,22 @@ </items> </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="GtkSpinButton" id="interval"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> </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> </object> @@ -372,7 +369,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="floatingsort|label2">Properties</property> <attributes> <attribute name="weight" value="bold"/> @@ -381,32 +378,32 @@ </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> <child> <object class="GtkFrame" id="frame3"> <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> <object class="GtkLabel" id="helptext"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="wrap">True</property> - <property name="max_width_chars">52</property> + <property name="max-width-chars">52</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> </object> </child> <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="floatingsort|label3">Help</property> <attributes> <attribute name="weight" value="bold"/> @@ -415,8 +412,8 @@ </child> </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> </object>