svx/uiconfig/ui/themecoloreditdialog.ui |  342 +++++++++++++-------------------
 1 file changed, 145 insertions(+), 197 deletions(-)

New commits:
commit 242716574ec606b791818a3d5fad6793829c538a
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jul 25 23:38:27 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 29 05:20:26 2025 +0200

    tdf#130857 Define widgets in "Theme Color Edit" dialog in order
    
    Switch the order in which the widgets in the .ui file
    are defined so that the order 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 <m.wegh...@posteo.de>
        Date:   Thu Oct 24 17:43:35 2024 +0200
    
            tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in 
order
    
    for more background.
    
    To trigger the dialog from Writer:
    "Format" -> "Theme" -> "Add"
    
    Change-Id: I7a528c403b9683b6ad21eb85c4819a5775fc48ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188376
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui 
b/svx/uiconfig/ui/themecoloreditdialog.ui
index 44feb860b515..523bde8c6dcd 100644
--- a/svx/uiconfig/ui/themecoloreditdialog.ui
+++ b/svx/uiconfig/ui/themecoloreditdialog.ui
@@ -139,6 +139,22 @@
                 <property name="vexpand">True</property>
                 <property name="row-spacing">6</property>
                 <property name="column-spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="labelDark1">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">6</property>
+                    <property name="margin-end">12</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark">Dark 1:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonDark1</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonDark1">
                     <property name="visible">True</property>
@@ -155,6 +171,22 @@
                     <property name="top-attach">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="labelLight1">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">6</property>
+                    <property name="margin-end">12</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight1">Light 1:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonLight1</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonLight1">
                     <property name="visible">True</property>
@@ -171,6 +203,22 @@
                     <property name="top-attach">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="labelDark2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">6</property>
+                    <property name="margin-end">12</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark2">Dark 2:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonDark2</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonDark2">
                     <property name="visible">True</property>
@@ -188,71 +236,87 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelDark1">
+                  <object class="GtkLabel" id="labelLight2">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark">Dark 1:</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight2">Light 2:</property>
                     <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonDark1</property>
+                    <property name="mnemonic-widget">buttonLight2</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelLight1">
+                  <object class="GtkMenuButton" id="buttonLight2">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">6</property>
-                    <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight1">Light 1:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonLight1</property>
-                    <property name="xalign">0</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="label" translatable="no"></property>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelDark2">
+                  <object class="GtkLabel" id="labelHyperlink">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark2">Dark 2:</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelHyperlink">Hyperlink:</property>
                     <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonDark2</property>
+                    <property name="mnemonic-widget">buttonHyperlink</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelLight2">
+                  <object class="GtkMenuButton" id="buttonHyperlink">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="label" translatable="no"></property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="labelFollowedHyperlink">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight2">Light 2:</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelFollowedHyperlink">Followed 
Hyperlink:</property>
                     <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonLight2</property>
+                    <property 
name="mnemonic-widget">buttonFollowHyperlink</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuButton" id="buttonLight2">
+                  <object class="GtkMenuButton" id="buttonFollowHyperlink">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
@@ -264,7 +328,7 @@
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
+                    <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
@@ -283,22 +347,6 @@
                     <property name="top-attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="labelAccent2">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">6</property>
-                    <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent2">Accent 2:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonAccent2</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonAccent1">
                     <property name="visible">True</property>
@@ -315,6 +363,22 @@
                     <property name="top-attach">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="labelAccent2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">6</property>
+                    <property name="margin-end">12</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent2">Accent 2:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent2</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonAccent2">
                     <property name="visible">True</property>
@@ -348,67 +412,35 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelAccent4">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">6</property>
-                    <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent4">Accent 4:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonAccent4</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="labelAccent5">
+                  <object class="GtkMenuButton" id="buttonAccent3">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">6</property>
-                    <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent5">Accent 5:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonAccent5</property>
-                    <property name="xalign">0</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="label" translatable="no"></property>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">4</property>
+                    <property name="left-attach">3</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelAccent6">
+                  <object class="GtkLabel" id="labelAccent4">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent6">Accent 6:</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent4">Accent 4:</property>
                     <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonAccent6</property>
+                    <property name="mnemonic-widget">buttonAccent4</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
-                    <property name="top-attach">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="buttonAccent3">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
-                    <property name="label" translatable="no"></property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">3</property>
-                    <property name="top-attach">2</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
@@ -428,23 +460,23 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuButton" id="buttonAccent5">
+                  <object class="GtkLabel" id="labelAccent5">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
-                    <property name="label" translatable="no"></property>
-                    <child>
-                      <placeholder/>
-                    </child>
+                    <property name="can-focus">False</property>
+                    <property name="margin-start">6</property>
+                    <property name="margin-end">12</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent5">Accent 5:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent5</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left-attach">3</property>
+                    <property name="left-attach">2</property>
                     <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuButton" id="buttonAccent6">
+                  <object class="GtkMenuButton" id="buttonAccent5">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
@@ -456,59 +488,27 @@
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
-                    <property name="top-attach">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="labelHyperlink">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-start">6</property>
-                    <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelHyperlink">Hyperlink:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">buttonHyperlink</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
                     <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="labelFollowedHyperlink">
+                  <object class="GtkLabel" id="labelAccent6">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
-                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelFollowedHyperlink">Followed 
Hyperlink:</property>
+                    <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent6">Accent 6:</property>
                     <property name="use-underline">True</property>
-                    <property 
name="mnemonic-widget">buttonFollowHyperlink</property>
+                    <property name="mnemonic-widget">buttonAccent6</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
+                    <property name="left-attach">2</property>
                     <property name="top-attach">5</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkMenuButton" id="buttonHyperlink">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
-                    <property name="label" translatable="no"></property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="buttonFollowHyperlink">
+                  <object class="GtkMenuButton" id="buttonAccent6">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
@@ -519,7 +519,7 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left-attach">1</property>
+                    <property name="left-attach">3</property>
                     <property name="top-attach">5</property>
                   </packing>
                 </child>
commit 5ee0f4ff6155995e27fe6fd331970df72022ea37
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jul 25 23:26:09 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 29 05:20:18 2025 +0200

    tdf#130857 a11y: Set mnemonic widgets in "Theme Color Edit" dialog
    
    ... instead of manually setting the label-for and labelled-by
    a11y relations.
    
    This ensure that moving focus to one of the
    menu buttons is possible using the accelerator key
    for the gtk3 VCL plugin, and also that the a11y relations
    are set for the qt6 VCL plugin on Linux when using native Qt
    widgets with SAL_VCL_QT_USE_WELDED_WIDGETS=1.
    
    To trigger the dialog from Writer:
    "Format" -> "Theme" -> "Add"
    
    Change-Id: I15d7279b42c8c3bc54b4a771ca05553ef3178561
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188375
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui 
b/svx/uiconfig/ui/themecoloreditdialog.ui
index cee3626d00f5..44feb860b515 100644
--- a/svx/uiconfig/ui/themecoloreditdialog.ui
+++ b/svx/uiconfig/ui/themecoloreditdialog.ui
@@ -90,9 +90,6 @@
                 <property name="margin-bottom">6</property>
                 <property name="hexpand">True</property>
                 <property name="truncate-multiline">True</property>
-                <accessibility>
-                  <relation type="labelled-by" target="labelThemeColorsName"/>
-                </accessibility>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -108,9 +105,8 @@
                 <property name="margin-top">6</property>
                 <property name="margin-bottom">6</property>
                 <property name="label" translatable="yes" 
context="themecoloreditdialog|labelThemeColorsName">Name:</property>
-                <accessibility>
-                  <relation type="label-for" target="entryThemeColorsName"/>
-                </accessibility>
+                <property name="use-underline">True</property>
+                <property 
name="mnemonic-widget">entryThemeColorsName</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -153,9 +149,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelDark1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -172,9 +165,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelLight1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -191,9 +181,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelDark2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -207,10 +194,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark">Dark 1:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonDark1</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonDark1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -224,10 +210,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight1">Light 1:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonLight1</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonLight1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -241,10 +226,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelDark2">Dark 2:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonDark2</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonDark2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -258,10 +242,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelLight2">Light 2:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonLight2</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonLight2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -278,9 +261,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelLight2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -294,10 +274,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent1">Accent 1:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent1</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -311,10 +290,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent2">Accent 2:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent2</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -331,9 +309,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent1"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -350,9 +325,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent2"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -366,10 +338,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent3">Accent 3:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent3</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent3"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -383,10 +354,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent4">Accent 4:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent4</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent4"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -400,10 +370,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent5">Accent 5:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent5</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent5"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -417,10 +386,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelAccent6">Accent 6:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonAccent6</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonAccent6"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">2</property>
@@ -437,9 +405,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent3"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -456,9 +421,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent4"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -475,9 +437,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent5"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -494,9 +453,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelAccent6"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">3</property>
@@ -510,10 +466,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelHyperlink">Hyperlink:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">buttonHyperlink</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" target="buttonHyperlink"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -527,10 +482,9 @@
                     <property name="margin-start">6</property>
                     <property name="margin-end">12</property>
                     <property name="label" translatable="yes" 
context="themecoloreditdialog|labelFollowedHyperlink">Followed 
Hyperlink:</property>
+                    <property name="use-underline">True</property>
+                    <property 
name="mnemonic-widget">buttonFollowHyperlink</property>
                     <property name="xalign">0</property>
-                    <accessibility>
-                      <relation type="label-for" 
target="buttonFollowHyperlink"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -547,9 +501,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="labelHyperlink"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -566,9 +517,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" 
target="labelFollowedHyperlink"/>
-                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>

Reply via email to