sw/uiconfig/swriter/ui/navigatorpanel.ui | 5 ++
vcl/uiconfig/ui/combobox.ui | 75 ++++++++++++++-----------------
2 files changed, 41 insertions(+), 39 deletions(-)
New commits:
commit 9bb46a8e9819fa74dee53b305a4255bb72a89e22
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 18 13:50:12 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 20 15:28:24 2024 +0200
tdf#159910 gtk3: Resave vcl/uiconfig/ui/combobox.ui with glade 3.40
... before doing more changes to the file in an upcoming
commit, to keep the diff clearer.
Change-Id: I3da5d9d708681888418251139e1d5aad4c152ad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166247
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui
index 23cfe7ed9e31..a0b72e27821f 100644
--- a/vcl/uiconfig/ui/combobox.ui
+++ b/vcl/uiconfig/ui/combobox.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="vcl">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="box">
<property name="name">combobox</property>
<property name="visible">True</property>
- <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>
<object class="GtkEntry" id="entry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="no-show-all">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<style>
<class name="combo"/>
@@ -27,25 +27,25 @@
<child>
<object class="GtkToggleButton" id="button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="always_show_image">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="always-show-image">True</property>
+ <property name="draw-indicator">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkImage" id="arrow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">pan-down-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">pan-down-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
@@ -58,7 +58,7 @@
<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">2</property>
</packing>
</child>
@@ -67,49 +67,46 @@
</style>
</object>
<object class="GtkMenuButton" id="overlaybutton">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="draw_indicator">True</property>
- <property name="use_popover">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="use-popover">False</property>
<child>
<object class="GtkImage" id="overlayarrow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">pan-down-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">pan-down-symbolic</property>
</object>
</child>
</object>
<object class="GtkWindow" id="popup">
<property name="name">gtk-combobox-popup-window</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="type">popup</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="type_hint">combo</property>
- <child type="titlebar">
- <placeholder/>
- </child>
+ <property name="type-hint">combo</property>
<child>
<object class="GtkOverlay" id="overlay">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <property name="overlay_scrolling">False</property>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="shadow-type">in</property>
+ <property name="overlay-scrolling">False</property>
<child>
<object class="GtkTreeView" id="treeview">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
- <property name="activate_on_single_click">True</property>
+ <property name="can-focus">True</property>
+ <property name="headers-visible">False</property>
+ <property name="enable-search">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
+ <property name="activate-on-single-click">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
commit b9f51395bd763d01c8ac2b957ac047ff07fbcdfc
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 18 11:40:35 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 20 15:28:14 2024 +0200
tdf#159910 sw a11y: Set a11y name for Navigator combobox
Set a11y name for this combobox in the Navigator to
"Navigate By".
This is in line with the tooltip shown when hovering over
the combobox, which is set for the combobox's parent,
the panel.
This makes Orca with the qt6 VCL plugin now announce
the a11y name of the combobox with the corresponding
role, rather than the panel
("Navigator, panel, Navigate By, combobox" instead of
"Navigator, panel, Navigate by, panel, combobox").
For gtk3, Orca still doesn't announce the combobox or
it's a11y name set in the .ui file, but still just says
"Toggle button, not pressed", which will have to be
addressed separately.
This is because while there is a combobox with accessible
name "Navigate By" in the AT-SPI tree now, the object
that gets focus is a toggle button that doesn't have
a name set for the gtk3 VCL plugin, which will be
addressed in a separate commit.
Change-Id: Id6b615f033c78d318611b520d49332714fa40eb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166246
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui
b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index 18599af36c90..e12dc94e3f47 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -283,6 +283,11 @@
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="NavElementWidget-atkobject">
+ <property
name="AtkObject::accessible-name" translatable="yes"
context="navigatorpanel|accessible_name|navigateby">Navigate By</property>
+ </object>
+ </child>
</object>
</child>
</object>
