diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2025-01-18 18:05:39 +0100 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2025-01-19 21:34:59 +0100 |
commit | 58544c8fec07b151bb74094e1a0be8b965caf1e9 (patch) | |
tree | 2cb2cc93063133f493314ff4cf111171c783b404 /sfx2/uiconfig | |
parent | c6c756864dd4b052b63079fb6931ad5af0b3158f (diff) |
tdf#130857 templatedlg.ui: Don't use "pack-type end"
Don't use the "pack-type" property with a value of "end"
to reverse the order of GtkBox children, but use the
default (of "start") and set the indices for the "packing"
properties of the children in the usual order, which is more
straighforward.
The "pack-type" GtkBox property no longer exists in GTK 4 (see [1];
`Convert3To4` in vcl/unx/gtk4/convert3to4.cxx currently
has special handling for it for the "GtkBox" case to revert
the order) and I also think it makes more sense to "normalize"
the .ui files than implementing such a special handling in
QtBuilder.
Adjusting this in glade and resaving the .ui file also results
in the GtkBox children to be defined in visual order, which ensures
that the (focus) order is correct in Qt as it (by default) is based
on the order in which widgets are created.
(The "File" -> "Templates" -> "Manage Templates" dialog is not
yet supported by QtInstanceBuilder, just noticed this while
experimenting in a WIP branch.)
[1] https://discourse.gnome.org/t/gtk4-replacement-for-pack-type/5574
Change-Id: I1633fc05da68a7ccce36e17d13d0d654f4e6145b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180463
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'sfx2/uiconfig')
-rw-r--r-- | sfx2/uiconfig/ui/templatedlg.ui | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 7f7fe31d6371..23d8cc8d8720 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="contextmenu"> @@ -158,40 +158,14 @@ <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="box7"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can-focus">False</property> - <child> - <object class="GtkMenuButton" id="action_menu"> - <property name="label" translatable="yes" context="templatedlg|action_menu|label">_Manage</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="always-show-image">True</property> - <property name="draw-indicator">True</property> - <property name="popup">menu1</property> - <property name="use-popover">False</property> - <child> - <placeholder/> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="action_menu-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="templatedlg|extended_tip|action_menu">Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager.</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="label" translatable="yes" context="templatedlg|label1">Filter</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -239,20 +213,43 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="templatedlg|label1">Filter</property> + <child> + <object class="GtkMenuButton" id="action_menu"> + <property name="label" translatable="yes" context="templatedlg|action_menu|label">_Manage</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="always-show-image">True</property> + <property name="draw-indicator">True</property> + <property name="popup">menu1</property> + <property name="use-popover">False</property> + <child> + <placeholder/> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="action_menu-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="templatedlg|extended_tip|action_menu">Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">2</property> </packing> </child> @@ -260,7 +257,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> |