diff options
author | Samuel Thibault <[email protected]> | 2019-07-01 17:10:44 +0200 |
---|---|---|
committer | raveit65 <[email protected]> | 2019-07-08 15:11:17 +0200 |
commit | 45145244b6dd9dc11b6d9a6daf4e442cef9457fa (patch) | |
tree | 7a177dc7e47804d72766a6b852ab34c9523ee8e5 | |
parent | db655f3fb2f67b695d36369e584fcb598e0e1bea (diff) | |
download | pluma-45145244b6dd9dc11b6d9a6daf4e442cef9457fa.tar.bz2 pluma-45145244b6dd9dc11b6d9a6daf4e442cef9457fa.tar.xz |
Add support for checking .ui accessibility with gla11y
-rw-r--r-- | .travis.yml | 5 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | gla11y.mk | 19 | ||||
-rw-r--r-- | plugins/docinfo/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/docinfo/ui-a11y.suppr | 19 | ||||
-rw-r--r-- | plugins/externaltools/tools/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/externaltools/tools/ui-a11y.suppr | 15 | ||||
-rw-r--r-- | plugins/pythonconsole/pythonconsole/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/pythonconsole/pythonconsole/ui-a11y.suppr | 7 | ||||
-rw-r--r-- | plugins/snippets/snippets/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/snippets/snippets/ui-a11y.suppr | 8 | ||||
-rw-r--r-- | plugins/sort/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/sort/ui-a11y.suppr | 2 | ||||
-rw-r--r-- | plugins/spell/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/spell/ui-a11y.suppr | 6 | ||||
-rw-r--r-- | plugins/time/Makefile.am | 6 | ||||
-rw-r--r-- | plugins/time/ui-a11y.suppr | 10 | ||||
-rw-r--r-- | pluma/Makefile.am | 7 | ||||
-rw-r--r-- | pluma/dialogs/Makefile.am | 8 | ||||
-rw-r--r-- | pluma/dialogs/ui-a11y.suppr | 31 | ||||
-rw-r--r-- | pluma/ui-a11y.suppr | 6 |
21 files changed, 169 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 02177c9c..1bd7435f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,7 @@ requires: - make - mate-common - python3-dev + - python3-lxml - yelp-tools fedora: @@ -126,6 +127,7 @@ requires: - mate-common - pygobject3-devel - python3-devel + - python3-lxml - redhat-rpm-config ubuntu: @@ -148,6 +150,7 @@ requires: - make - mate-common - python3-dev + - python3-lxml - yelp-tools variables: @@ -173,6 +176,8 @@ before_scripts: - curl -Ls -o debian.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/debian.sh - bash ./debian.sh - fi + - curl -Ls -o /usr/bin/gla11y https://github.com/hypra/gla11y/raw/v0.2/gla11y + - chmod +x /usr/bin/gla11y build_scripts: - ./autogen.sh diff --git a/configure.ac b/configure.ac index c381583e..1278e428 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_SYS_LARGEFILE PKG_PROG_PKG_CONFIG +AC_PATH_PROG([GLA11Y], [gla11y], [true]) # Initialize libtool LT_PREREQ([2.2.6]) diff --git a/gla11y.mk b/gla11y.mk new file mode 100644 index 00000000..abe9f534 --- /dev/null +++ b/gla11y.mk @@ -0,0 +1,19 @@ +GLA11Y_OUTPUT = ui-a11y.err +GLA11Y_SUPPR = ui-a11y.suppr +GLA11Y_FALSE = ui-a11y.false + +a11y_verbose = $(a11y_verbose_@AM_V@) +a11y_verbose_ = $(a11y_verbose_@AM_DEFAULT_V@) +a11y_verbose_0 = @echo " A11Y " $@; +a11y_verbose_1 = + + +all-local: $(GLA11Y_OUTPUT) +$(GLA11Y_OUTPUT): $(ui_files) + $(a11y_verbose) python3 $(GLA11Y) -P $(srcdir)/ -f $(srcdir)/$(GLA11Y_FALSE) -s $(srcdir)/$(GLA11Y_SUPPR) -o $@ $(ui_files:%=$(srcdir)/%) + +clean-local: clean-local-check +clean-local-check: + -rm -f $(GLA11Y_OUTPUT) + +.PHONY: clean-local-check diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am index 1a6cc931..611dc17e 100644 --- a/plugins/docinfo/Makefile.am +++ b/plugins/docinfo/Makefile.am @@ -16,7 +16,9 @@ libdocinfo_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libdocinfo_la_LIBADD = $(PLUMA_LIBS) uidir = $(PLUMA_PLUGINS_DATA_DIR)/docinfo -ui_DATA = docinfo.ui +ui_files = docinfo.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) plugin_in_files = docinfo.plugin.desktop.in @@ -24,7 +26,7 @@ plugin_in_files = docinfo.plugin.desktop.in plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) diff --git a/plugins/docinfo/ui-a11y.suppr b/plugins/docinfo/ui-a11y.suppr new file mode 100644 index 00000000..79340e77 --- /dev/null +++ b/plugins/docinfo/ui-a11y.suppr @@ -0,0 +1,19 @@ +docinfo.ui://GtkLabel[@id='file_name_label'] orphan-label +docinfo.ui://GtkLabel[@id='label28'] orphan-label +docinfo.ui://GtkLabel[@id='label26'] orphan-label +docinfo.ui://GtkLabel[@id='bytes_label'] orphan-label +docinfo.ui://GtkLabel[@id='label5'] orphan-label +docinfo.ui://GtkLabel[@id='chars_ns_label'] orphan-label +docinfo.ui://GtkLabel[@id='label4'] orphan-label +docinfo.ui://GtkLabel[@id='chars_label'] orphan-label +docinfo.ui://GtkLabel[@id='words_label'] orphan-label +docinfo.ui://GtkLabel[@id='label2'] orphan-label +docinfo.ui://GtkLabel[@id='label6'] orphan-label +docinfo.ui://GtkLabel[@id='lines_label'] orphan-label +docinfo.ui://GtkLabel[@id='label30'] orphan-label +docinfo.ui://GtkLabel[@id='selection_label'] orphan-label +docinfo.ui://GtkLabel[@id='selected_lines_label'] orphan-label +docinfo.ui://GtkLabel[@id='selected_words_label'] orphan-label +docinfo.ui://GtkLabel[@id='selected_chars_label'] orphan-label +docinfo.ui://GtkLabel[@id='selected_chars_ns_label'] orphan-label +docinfo.ui://GtkLabel[@id='selected_bytes_label'] orphan-label diff --git a/plugins/externaltools/tools/Makefile.am b/plugins/externaltools/tools/Makefile.am index d90eb4aa..7eeceb98 100644 --- a/plugins/externaltools/tools/Makefile.am +++ b/plugins/externaltools/tools/Makefile.am @@ -12,10 +12,12 @@ plugin_PYTHON = \ linkparsing.py uidir = $(PLUMA_PLUGINS_DATA_DIR)/externaltools/ui -ui_DATA = tools.ui \ +ui_files = tools.ui \ outputpanel.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) ui-a11y.suppr CLEANFILES = *.bak *.gladep DISTCLEANFILES = *.bak *.gladep diff --git a/plugins/externaltools/tools/ui-a11y.suppr b/plugins/externaltools/tools/ui-a11y.suppr new file mode 100644 index 00000000..1e7a68e1 --- /dev/null +++ b/plugins/externaltools/tools/ui-a11y.suppr @@ -0,0 +1,15 @@ +tools.ui://GtkButton[@id='new-tool-button'] button-no-label +tools.ui://GtkButton[@id='remove-tool-button'] button-no-label +tools.ui://GtkButton[@id='revert-tool-button'] button-no-label +tools.ui://GtkLabel[@id='label23'] orphan-label +tools.ui://GtkLabel[@id='label8'] orphan-label +tools.ui://GtkLabel[@id='label7'] orphan-label +tools.ui://GtkLabel[@id='label6'] orphan-label +tools.ui://GtkLabel[@id='label3'] orphan-label +tools.ui://GtkComboBox[@id='output'] no-labelled-by +tools.ui://GtkComboBox[@id='input'] no-labelled-by +tools.ui://GtkComboBox[@id='save-files'] no-labelled-by +tools.ui://GtkEntry[@id='accelerator'] no-labelled-by +tools.ui://PlumaView[@id='commands'] no-labelled-by +tools.ui://GtkComboBox[@id='applicability'] no-labelled-by +tools.ui://GtkLabel[@id='title'] orphan-label diff --git a/plugins/pythonconsole/pythonconsole/Makefile.am b/plugins/pythonconsole/pythonconsole/Makefile.am index 05327ed6..77cb194f 100644 --- a/plugins/pythonconsole/pythonconsole/Makefile.am +++ b/plugins/pythonconsole/pythonconsole/Makefile.am @@ -7,9 +7,11 @@ plugin_PYTHON = \ config.py uidir = $(PLUMA_PLUGINS_DATA_DIR)/pythonconsole/ui -ui_DATA = config.ui +ui_files = config.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) ui-a11y.suppr CLEANFILES = DISTCLEANFILES = diff --git a/plugins/pythonconsole/pythonconsole/ui-a11y.suppr b/plugins/pythonconsole/pythonconsole/ui-a11y.suppr new file mode 100644 index 00000000..8b9e8cb4 --- /dev/null +++ b/plugins/pythonconsole/pythonconsole/ui-a11y.suppr @@ -0,0 +1,7 @@ +config.ui://GtkLabel[@id='label-error'] orphan-label +config.ui://GtkColorButton[@id='colorbutton-error'] button-no-label +config.ui://GtkColorButton[@id='colorbutton-command'] button-no-label +config.ui://GtkLabel[@id='label-command'] orphan-label +config.ui:GtkGrid[@id='widget-config']/GtkLabel orphan-label +config.ui:GtkGrid[@id='widget-config']/GtkLabel orphan-label +config.ui://GtkFontButton[@id='fontbutton-font'] no-labelled-by diff --git a/plugins/snippets/snippets/Makefile.am b/plugins/snippets/snippets/Makefile.am index 2568707f..8ca77bdc 100644 --- a/plugins/snippets/snippets/Makefile.am +++ b/plugins/snippets/snippets/Makefile.am @@ -19,9 +19,11 @@ plugin_PYTHON = \ comment.py uidir = $(PLUMA_PLUGINS_DATA_DIR)/snippets/ui -ui_DATA = snippets.ui +ui_files = snippets.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) ui-a11y.suppr CLEANFILES = *.bak *.gladep *.pyc DISTCLEANFILES = *.bak *.gladep *.pyc diff --git a/plugins/snippets/snippets/ui-a11y.suppr b/plugins/snippets/snippets/ui-a11y.suppr new file mode 100644 index 00000000..2ddd19d0 --- /dev/null +++ b/plugins/snippets/snippets/ui-a11y.suppr @@ -0,0 +1,8 @@ +snippets.ui://PlumaView[@id='source_view_snippet'] no-labelled-by +snippets.ui://GtkLabel[@id='label4'] orphan-label +snippets.ui://GtkLabel[@id='label3'] orphan-label +snippets.ui://GtkComboBox[@id='combo_drop_targets'] no-labelled-by +snippets.ui://GtkLabel[@id='label_drop_targets'] orphan-label +snippets.ui://GtkLabel[@id='label_accelerator'] orphan-label +snippets.ui://GtkLabel[@id='label_tab_trigger'] orphan-label +snippets.ui://GtkImage[@id='image_tab_trigger'] no-labelled-by diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am index 1738a50c..a442c645 100644 --- a/plugins/sort/Makefile.am +++ b/plugins/sort/Makefile.am @@ -16,7 +16,9 @@ libsort_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libsort_la_LIBADD = $(PLUMA_LIBS) uidir = $(PLUMA_PLUGINS_DATA_DIR)/sort -ui_DATA = sort.ui +ui_files = sort.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) plugin_in_files = sort.plugin.desktop.in @@ -24,7 +26,7 @@ plugin_in_files = sort.plugin.desktop.in plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) diff --git a/plugins/sort/ui-a11y.suppr b/plugins/sort/ui-a11y.suppr new file mode 100644 index 00000000..8753f966 --- /dev/null +++ b/plugins/sort/ui-a11y.suppr @@ -0,0 +1,2 @@ +sort.ui://GtkImage[@id='image7'] no-labelled-by +sort.ui://GtkLabel[@id='label17'] orphan-label diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am index 3d2d5f93..1ea7462e 100644 --- a/plugins/spell/Makefile.am +++ b/plugins/spell/Makefile.am @@ -34,7 +34,9 @@ libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libspell_la_LIBADD = $(PLUMA_LIBS) $(ENCHANT_LIBS) uidir = $(PLUMA_PLUGINS_DATA_DIR)/spell -ui_DATA = spell-checker.ui languages-dialog.ui pluma-spell-setup-dialog.ui +ui_files = spell-checker.ui languages-dialog.ui pluma-spell-setup-dialog.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) pluma-spell-marshal.h: pluma-spell-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=pluma_marshal > $@ @@ -59,7 +61,8 @@ EXTRA_DIST = \ $(ui_DATA) \ $(plugin_in_files) \ pluma-spell-marshal.list \ - $(spell_gschema_in) + $(spell_gschema_in) \ + ui-a11y.suppr CLEANFILES = $(BUILT_SOURCES) $(plugin_DATA) $(gsettings_SCHEMAS) diff --git a/plugins/spell/ui-a11y.suppr b/plugins/spell/ui-a11y.suppr new file mode 100644 index 00000000..4fbeed70 --- /dev/null +++ b/plugins/spell/ui-a11y.suppr @@ -0,0 +1,6 @@ +pluma-spell-setup-dialog.ui://GtkLabel[@id='label1'] orphan-label +spell-checker.ui://GtkLabel[@id='label1'] orphan-label +spell-checker.ui://GtkLabel[@id='misspelled_word_label'] orphan-label +spell-checker.ui://GtkLabel[@id='label6'] orphan-label +spell-checker.ui://GtkLabel[@id='label44'] orphan-label +spell-checker.ui://GtkLabel[@id='language_label'] orphan-label diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index e9b5f329..591a04d6 100644 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -16,9 +16,11 @@ libtime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libtime_la_LIBADD = $(PLUMA_LIBS) uidir = $(PLUMA_PLUGINS_DATA_DIR)/time -ui_DATA = \ +ui_files = \ pluma-time-dialog.ui \ pluma-time-setup-dialog.ui +include $(top_srcdir)/gla11y.mk +ui_DATA = $(ui_files) plugin_in_files = time.plugin.desktop.in @@ -31,7 +33,7 @@ time_gschema_in = org.mate.pluma.plugins.time.gschema.xml.in gsettings_SCHEMAS = $(time_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in) ui-a11y.suppr CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn) DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) diff --git a/plugins/time/ui-a11y.suppr b/plugins/time/ui-a11y.suppr new file mode 100644 index 00000000..805ff4d6 --- /dev/null +++ b/plugins/time/ui-a11y.suppr @@ -0,0 +1,10 @@ +pluma-time-dialog.ui://GtkLabel[@id='label5'] orphan-label +pluma-time-dialog.ui://GtkTreeView[@id='choice_list'] no-labelled-by +pluma-time-dialog.ui://GtkEntry[@id='custom_entry'] no-labelled-by +pluma-time-dialog.ui://GtkLabel[@id='custom_format_example'] orphan-label +pluma-time-setup-dialog.ui://GtkLabel[@id='label1'] orphan-label +pluma-time-setup-dialog.ui://GtkLabel[@id='label3'] orphan-label +pluma-time-setup-dialog.ui://GtkLabel[@id='label4'] orphan-label +pluma-time-setup-dialog.ui://GtkTreeView[@id='formats_tree'] no-labelled-by +pluma-time-setup-dialog.ui://GtkEntry[@id='custom_entry'] no-labelled-by +pluma-time-setup-dialog.ui://GtkLabel[@id='custom_format_example'] orphan-label diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 3baa21a0..0dfc5a42 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -179,9 +179,11 @@ about_DATA = \ $(NULL) uidir = $(datadir)/pluma/ui/ +ui_files = pluma-print-preferences.ui +include $(top_srcdir)/gla11y.mk ui_DATA = \ pluma-ui.xml \ - pluma-print-preferences.ui + $(ui_files) EXTRA_DIST = \ $(ui_DATA) \ @@ -189,7 +191,8 @@ EXTRA_DIST = \ pluma-enum-types.h.template \ pluma-enum-types.c.template \ pluma-marshal.list \ - pluma.rc + pluma.rc \ + ui-a11y.suppr CLEANFILES = $(BUILT_SOURCES) diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am index 7dbada66..524f7a6f 100644 --- a/pluma/dialogs/Makefile.am +++ b/pluma/dialogs/Makefile.am @@ -20,11 +20,15 @@ libdialogs_la_SOURCES = \ pluma-search-dialog.h \ pluma-search-dialog.c -ui_DATA = \ +ui_files = \ pluma-encodings-dialog.ui \ pluma-preferences-dialog.ui \ pluma-search-dialog.ui -EXTRA_DIST = $(ui_DATA) +include $(top_srcdir)/gla11y.mk + +ui_DATA = $(ui_files) + +EXTRA_DIST = $(ui_DATA) ui-a11y.suppr -include $(top_srcdir)/git.mk diff --git a/pluma/dialogs/ui-a11y.suppr b/pluma/dialogs/ui-a11y.suppr new file mode 100644 index 00000000..f3ef7eda --- /dev/null +++ b/pluma/dialogs/ui-a11y.suppr @@ -0,0 +1,31 @@ +pluma-preferences-dialog.ui://GtkLabel[@id='label848'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label849'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label854'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label843'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label876'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label877'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label855'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label856'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label881'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label882'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label846'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label847'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label851'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label852'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label859'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label860'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label1'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label3'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label2_2'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label2_4'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label4'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label2'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label2_3'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label2_1'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label819'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label800'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label798'] orphan-label +pluma-preferences-dialog.ui://GtkLabel[@id='label797'] orphan-label +pluma-preferences-dialog.ui://GtkTreeView[@id='schemes_treeview'] no-labelled-by +pluma-search-dialog.ui://GtkLabel[@id='search_label'] orphan-label +pluma-search-dialog.ui://GtkLabel[@id='replace_with_label'] orphan-label diff --git a/pluma/ui-a11y.suppr b/pluma/ui-a11y.suppr new file mode 100644 index 00000000..ff581b07 --- /dev/null +++ b/pluma/ui-a11y.suppr @@ -0,0 +1,6 @@ +pluma-print-preferences.ui://GtkLabel[@id='label33'] orphan-label +pluma-print-preferences.ui://GtkLabel[@id='label27'] orphan-label +pluma-print-preferences.ui://GtkLabel[@id='label4'] orphan-label +pluma-print-preferences.ui://GtkLabel[@id='label31'] orphan-label +pluma-print-preferences.ui://GtkLabel[@id='label45'] orphan-label +pluma-print-preferences.ui://GtkLabel[@id='label43'] orphan-label |