[orca/gnome-3-36] Use official footnote role rather than our temporary one
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca/gnome-3-36] Use official footnote role rather than our temporary one
- Date: Fri, 28 Feb 2020 14:03:31 +0000 (UTC)
commit 38fde914600e6afa7d344547559005a4e422c596
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Fri Feb 28 15:00:05 2020 +0100
Use official footnote role rather than our temporary one
The footnote role was added to AT-SPI2 in version 2.26, and Orca's
minimum required version of AT-SPI2 is 2.26. Thus there is no longer
a need for a special role in Orca.
src/orca/formatting.py | 2 +-
src/orca/generator.py | 4 ----
src/orca/object_properties.py | 6 ------
3 files changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 22ce285e5..8e193a50e 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -243,7 +243,7 @@ formatting = {
'basicWhereAmI': 'labelOrName + readOnly + textRole + (textContent or placeholderText) +
anyTextSelection + required + pause + invalid + ' + MNEMONIC,
'detailedWhereAmI': 'labelOrName + readOnly + textRole + (textContentWithAttributes or
placeholderText) + anyTextSelection + required + pause + invalid + ' + MNEMONIC,
},
- 'ROLE_FOOTNOTE': {
+ pyatspi.ROLE_FOOTNOTE: {
'unfocused': 'labelOrName + roleName + pause + currentLineText + allTextSelection',
},
pyatspi.ROLE_FOOTER: {
diff --git a/src/orca/generator.py b/src/orca/generator.py
index fc529864a..c7cbbc950 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -1220,8 +1220,6 @@ class Generator:
if self._script.utilities.isMathTableRow(obj):
return 'ROLE_MATH_TABLE_ROW'
if self._script.utilities.isDPub(obj):
- if self._script.utilities.isDPubFootnote(obj):
- return 'ROLE_FOOTNOTE'
if self._script.utilities.isLandmark(obj):
return 'ROLE_DPUB_LANDMARK'
if obj.getRole() == pyatspi.ROLE_SECTION:
@@ -1363,8 +1361,6 @@ class Generator:
else:
if self._script.utilities.isDPubCover(obj):
return object_properties.ROLE_COVER
- if self._script.utilities.isDPubFootnote(obj):
- return object_properties.ROLE_FOOTNOTE
if self._script.utilities.isDPubPagebreak(obj):
return object_properties.ROLE_PAGEBREAK
if self._script.utilities.isDPubSubtitle(obj):
diff --git a/src/orca/object_properties.py b/src/orca/object_properties.py
index 5202f4eba..978cb6205 100644
--- a/src/orca/object_properties.py
+++ b/src/orca/object_properties.py
@@ -242,12 +242,6 @@ ROLE_ERRATA = C_("role", "errata")
# https://w3c.github.io/dpub-aria/#doc-example
ROLE_EXAMPLE = C_("role", "example")
-# Translators: This string should be treated as a role describing an object.
-# Examples of roles include "checkbox", "radio button", "paragraph", and "link."
-# This role refers to a single footnote in a digitally-published document.
-# https://w3c.github.io/dpub-aria/#doc-footnote
-ROLE_FOOTNOTE = C_("role", "footnote")
-
# Translators: This string should be treated as a role describing an object.
# Examples of roles include "checkbox", "radio button", "paragraph", and "link."
# This role refers to the foreword in a digitally-published document.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]