solenv/sanitizers/ui/modules/swriter.suppr |    2 
 sw/uiconfig/swriter/ui/savelabeldialog.ui  |   93 ++++++++++++++---------------
 vcl/qt5/QtInstanceBuilder.cxx              |    1 
 3 files changed, 47 insertions(+), 49 deletions(-)

New commits:
commit 3c47749a76bc8854db5128b96b8aee619e28c0f1
Author:     Michael Weghorn <[email protected]>
AuthorDate: Wed Feb 11 20:45:41 2026 +0100
Commit:     Michael Weghorn <[email protected]>
CommitDate: Thu Feb 12 09:55:50 2026 +0100

    tdf#119931 sw a11y: Set mnemonic widgets in "Save Label Format" dialog
    
    This makes e.g. the Orca screen reader with the qt6 VCL
    plugin announce the corresponding label when the
    entry or combobox receive focus.
    
    Change-Id: I78746a228b75cee3b39caf0720700c66efa8a6fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199211
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index 88bfb3ab577f..234e2346c3e6 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -103,8 +103,6 @@ 
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printer'] orphan-la
 sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printinfo'] 
orphan-label
 
sw/uiconfig/swriter/ui/readonlymenu.ui://GtkMenuItem[@id='backgroundtogallery'] 
button-no-label
 sw/uiconfig/swriter/ui/renameentrydialog.ui://GtkEntry[@id='entry'] 
no-labelled-by
-sw/uiconfig/swriter/ui/savelabeldialog.ui://GtkLabel[@id='label2'] orphan-label
-sw/uiconfig/swriter/ui/savelabeldialog.ui://GtkLabel[@id='label3'] orphan-label
 sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='docname'] 
orphan-label
 sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='saving'] 
orphan-label
 sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='printer'] 
orphan-label
diff --git a/sw/uiconfig/swriter/ui/savelabeldialog.ui 
b/sw/uiconfig/swriter/ui/savelabeldialog.ui
index 878f86ff18f6..f7893ff7c138 100644
--- a/sw/uiconfig/swriter/ui/savelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/savelabeldialog.ui
@@ -95,6 +95,7 @@
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes" 
context="savelabeldialog|label2">Brand</property>
                     <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">brand</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -108,6 +109,7 @@
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes" 
context="savelabeldialog|label3">T_ype</property>
                     <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">type</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
commit a6cd7c3e1605c1617dd4e595060e5e90acaa877f
Author:     Michael Weghorn <[email protected]>
AuthorDate: Wed Feb 11 20:42:06 2026 +0100
Commit:     Michael Weghorn <[email protected]>
CommitDate: Thu Feb 12 09:55:43 2026 +0100

    tdf#130857 qt weld: Support "Save Label Format" 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
    * "File" -> "New" -> "Labels"
    * in the "Format" tab, press the "Save..." button
    
    Change-Id: I4e7c57e540f34343d4d9b9f02ae3fc45793836b2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199210
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>

diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 384810ad552d..3845d4948e3d 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -219,6 +219,7 @@ constexpr auto SUPPORTED_UI_FILES = 
frozen::make_unordered_set<std::u16string_vi
     u"modules/swriter/ui/renameautotextdialog.ui",
     u"modules/swriter/ui/renameobjectdialog.ui",
     u"modules/swriter/ui/rowheight.ui",
+    u"modules/swriter/ui/savelabeldialog.ui",
     u"modules/swriter/ui/splittable.ui",
     u"modules/swriter/ui/stringinput.ui",
     u"modules/swriter/ui/testmailsettings.ui",
commit fab7eda71308fb97bb577e72f34aa3d0bffd567e
Author:     Michael Weghorn <[email protected]>
AuthorDate: Wed Feb 11 20:38:46 2026 +0100
Commit:     Michael Weghorn <[email protected]>
CommitDate: Thu Feb 12 09:55:37 2026 +0100

    sw: Resave savelabeldialog.ui with glade 3.40
    
    The dialog can be triggered like this:
    
    * start Writer
    * "File" -> "New" -> "Labels"
    * in the "Format" tab, press the "Save..." button
    
    Change-Id: I5477a5412aaa6a2a939ddc0ebdb52aa90c8ffc5a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199209
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>

diff --git a/sw/uiconfig/swriter/ui/savelabeldialog.ui 
b/sw/uiconfig/swriter/ui/savelabeldialog.ui
index 3c909f7b9bfe..878f86ff18f6 100644
--- a/sw/uiconfig/swriter/ui/savelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/savelabeldialog.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="sw">
   <requires lib="gtk+" version="3.24"/>
   <object class="GtkDialog" id="SaveLabelDialog">
-    <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="savelabeldialog|SaveLabelDialog">Save Label Format</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="use-underline">True</property>
               </object>
               <packing>
@@ -68,59 +68,59 @@
           <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="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=2 n-rows=2 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</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="row-spacing">6</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <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="savelabeldialog|label2">Brand</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</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="label3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" 
context="savelabeldialog|label3">T_ype</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</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="GtkEntry" id="type">
                     <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>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="type-atkobject">
@@ -129,21 +129,21 @@
                     </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="GtkComboBoxText" id="brand">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="has_entry">True</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">
@@ -153,8 +153,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>
@@ -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="label" translatable="yes" 
context="savelabeldialog|label1">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -183,9 +183,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="SaveLabelDialog-atkobject">
         <property name="AtkObject::accessible-description" translatable="yes" 
context="savelabeldialog|extended_tip|SaveLabelDialog">Enter or select the 
desired brand.</property>

Reply via email to