chart2/uiconfig/ui/insertgriddlg.ui | 117 +++++++++++++--------------- sw/uiconfig/swriter/ui/exchangedatabases.ui | 82 +++++++++---------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 99 insertions(+), 101 deletions(-)
New commits: commit a79ce1a7181e1d8e44819a814aada419eb3f0acb Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:29:25 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:13 2026 +0100 chart2: Resave insertgriddlg.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Insert" -> "Chart" * "Insert" -> "Grids..." Change-Id: I3ce0a7b4b8fa6d9d2ce66c74a4aade82c1f88976 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199109 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/chart2/uiconfig/ui/insertgriddlg.ui b/chart2/uiconfig/ui/insertgriddlg.ui index 00403f182582..e64198b85ae5 100644 --- a/chart2/uiconfig/ui/insertgriddlg.ui +++ b/chart2/uiconfig/ui/insertgriddlg.ui @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="InsertGridDialog"> - <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="insertgriddlg|InsertGridDialog">Grids</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="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> @@ -39,8 +39,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> @@ -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="margin-end">6</property> <property name="use-underline">True</property> </object> @@ -69,14 +69,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">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="vexpand">True</property> <property name="spacing">12</property> @@ -84,27 +84,27 @@ <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="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkCheckButton" id="primaryX"> <property name="label" translatable="yes" context="insertgriddlg|primaryX">_X axis</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryX-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryX">Adds gridlines to the X axis of the chart.</property> @@ -121,10 +121,10 @@ <object class="GtkCheckButton" id="primaryY"> <property name="label" translatable="yes" context="insertgriddlg|primaryY">_Y axis</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryY-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryY">Adds gridlines to the Y axis of the chart.</property> @@ -141,10 +141,10 @@ <object class="GtkCheckButton" id="primaryZ"> <property name="label" translatable="yes" context="insertgriddlg|primaryZ">_Z axis</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryZ-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryZ">Adds gridlines to the Z axis of the chart.</property> @@ -162,7 +162,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="hexpand">True</property> <property name="label" translatable="yes" context="insertgriddlg|label1">Major Grids</property> <attributes> @@ -180,27 +180,27 @@ <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> <object class="GtkBox" id="box3"> <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="vexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkCheckButton" id="secondaryX"> <property name="label" translatable="yes" context="insertgriddlg|secondaryX">X _axis</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="secondaryX-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryX">Adds gridlines that subdivide the X axis into smaller sections.</property> @@ -217,10 +217,10 @@ <object class="GtkCheckButton" id="secondaryY"> <property name="label" translatable="yes" context="insertgriddlg|secondaryY">Y ax_is</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="secondaryY-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryY">Adds gridlines that subdivide the Y axis into smaller sections.</property> @@ -237,10 +237,10 @@ <object class="GtkCheckButton" id="secondaryZ"> <property name="label" translatable="yes" context="insertgriddlg|secondaryZ">Z axi_s</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="secondaryZ-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryZ">Adds gridlines that subdivide the Z axis into smaller sections.</property> @@ -258,7 +258,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="hexpand">True</property> <property name="label" translatable="yes" context="insertgriddlg|label2">Minor Grids</property> <attributes> @@ -287,9 +287,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="InsertGridDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|InsertGridDialog">You can divide the axes into sections by assigning gridlines to them. This allows you to get a better overview of the chart, especially if you are working with large charts.</property> commit b6205a922f1673c8f2a117555c0ed1e528aa34c1 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:16:08 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:07 2026 +0100 tdf#130857 Define widgets in "Exchange Databases" dialog in order Switch the order in which the widgets in the .ui file are defined so that the order better matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. The dialog can be triggered using "Edit" -> "Exchange Database..." in Writer. Change-Id: I8474889e0465d04f1f549bf6ed12b12d9a2205cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199108 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index cbd3b18ad579..b3057c9478d1 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -143,47 +143,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkButton" id="browse"> - <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="use-underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|browse">Opens the Open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-top">12</property> - <property name="margin-bottom">12</property> - <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left. -Use the browse button to select a database file.</property> - <property name="wrap">True</property> - <property name="width-chars">72</property> - <property name="max-width-chars">72</property> - <property name="xalign">0</property> - <attributes> - <attribute name="scale" value="0.9"/> - </attributes> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -288,6 +247,47 @@ Use the browse button to select a database file.</property> <property name="top-attach">1</property> </packing> </child> + <child> + <object class="GtkButton" id="browse"> + <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <property name="use-underline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="exchangedatabases|extended_tip|browse">Opens the Open dialog to select a database file (*.odb). The selected file is added to the Available Databases list.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="margin-bottom">12</property> + <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left. +Use the browse button to select a database file.</property> + <property name="wrap">True</property> + <property name="width-chars">72</property> + <property name="max-width-chars">72</property> + <property name="xalign">0</property> + <attributes> + <attribute name="scale" value="0.9"/> + </attributes> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + <property name="width">2</property> + </packing> + </child> <child> <placeholder/> </child> commit ac6930cf11664902bba1c6a672c9075b2f6ce2b6 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:09:29 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:00 2026 +0100 tdf#130857 qt weld: Support "Exchange Databases" 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 using "Edit" -> "Exchange Database..." in Writer. Change-Id: I58ab379fe42b2922f3d67cd835c1fa7e7c3ca811 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199107 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index ee680aae93c2..b94eb7167606 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -193,6 +193,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/swriter/ui/createauthorentry.ui", u"modules/swriter/ui/editcategories.ui", u"modules/swriter/ui/endnotepage.ui", + u"modules/swriter/ui/exchangedatabases.ui", u"modules/swriter/ui/fielddialog.ui", u"modules/swriter/ui/footendnotedialog.ui", u"modules/swriter/ui/footnotepage.ui",
