[Libreoffice-commits] core.git: solenv/sanitizers svx/uiconfig
Rasmus Jonsson (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 8 14:36:06 UTC 2019
solenv/sanitizers/ui/svx.false | 6 +
solenv/sanitizers/ui/svx.suppr | 14 ---
svx/uiconfig/ui/classificationdialog.ui | 133 ++++++++++++++++++++++----------
3 files changed, 100 insertions(+), 53 deletions(-)
New commits:
commit 3f3d8a769967918d021b2bf36256cbff420850ef
Author: Rasmus Jonsson <wasmus at zom.bi>
AuthorDate: Sat Apr 6 11:13:48 2019 +0200
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed May 8 16:35:03 2019 +0200
tdf#119931 Fix a11y warnings in classificationdialog.ui
Remove warning suppressions.
Create svx.false for false warnings.
Rearrange objects in code to correspond to their actual
position on the screen.
Add new label for part entry box.
Change-Id: I2a7293024427e65cca2ea754fac4fe1bc7d6d0bd
Reviewed-on: https://gerrit.libreoffice.org/70338
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/solenv/sanitizers/ui/svx.false b/solenv/sanitizers/ui/svx.false
new file mode 100644
index 000000000000..e30560c59517
--- /dev/null
+++ b/solenv/sanitizers/ui/svx.false
@@ -0,0 +1,6 @@
+svx/uiconfig/ui/classificationdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn3'] no-labelled-by
+svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkGrid/GtkLabel orphan-label
+svx/uiconfig/ui/classificationdialog.ui://GtkDrawingArea[@id='classificationEditWindow'] no-labelled-by
+svx/uiconfig/ui/classificationdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn6'] no-labelled-by
+svx/uiconfig/ui/classificationdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn4'] no-labelled-by
+
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index b38dd4e3d3f1..cca429863c96 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -5,20 +5,6 @@ svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkLabel[@id='basetextft'] orphan-
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkLabel[@id='rubytextft'] orphan-label
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Left1ED'] no-labelled-by
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Right1ED'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui://GtkComboBoxText[@id='classificationCB'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui://GtkComboBoxText[@id='internationalClassificationCB'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui://GtkLabel[@id='markingLabel'] orphan-label
-svx/uiconfig/ui/classificationdialog.ui://GtkComboBoxText[@id='recentlyUsedCB'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui://GtkTreeView[@id='markingLB'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkExpander[@id='intellectualPropertyExpander']/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui://GtkEntry[@id='intellectualPropertyPartEntry'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui:GtkDialog[@id='AdvancedDocumentClassificationDialog']/GtkBox[@id='dialog-vbox1']/GtkGrid/GtkExpander[@id='intellectualPropertyExpander']/GtkGrid/GtkLabel orphan-label
-svx/uiconfig/ui/classificationdialog.ui://GtkTreeView[@id='intellectualPropertyPartNumberLB'] no-labelled-by
-svx/uiconfig/ui/classificationdialog.ui://GtkTreeView[@id='intellectualPropertyPartLB'] no-labelled-by
svx/uiconfig/ui/colorwindow.ui://GtkButton[@id='auto_color_button'] button-no-label
svx/uiconfig/ui/compressgraphicdialog.ui://GtkScale[@id='scale-quality'] no-labelled-by
svx/uiconfig/ui/compressgraphicdialog.ui://GtkSpinButton[@id='spin-quality'] no-labelled-by
diff --git a/svx/uiconfig/ui/classificationdialog.ui b/svx/uiconfig/ui/classificationdialog.ui
index fb381e5d227e..e4c9c0299ae6 100644
--- a/svx/uiconfig/ui/classificationdialog.ui
+++ b/svx/uiconfig/ui/classificationdialog.ui
@@ -117,11 +117,14 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="classificationLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="classificationdialog|label-Classification">Classification:</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="classificationCB"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -129,11 +132,14 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="internationalClassificationLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="classificationdialog|label-InternationalClassification">International:</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="internationalClassificationCB"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -145,6 +151,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="classificationLabel"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -155,6 +164,9 @@
<object class="GtkComboBoxText" id="internationalClassificationCB">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <accessibility>
+ <relation type="labelled-by" target="internationalClassificationLabel"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -167,6 +179,9 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="classificationdialog|label-Marking">Marking:</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="markingLB"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -175,25 +190,31 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="recentlyUsedCB">
+ <object class="GtkLabel" id="recentlyUsedLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="label" translatable="yes" context="classificationdialog|label-Classification">Recently Used:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="recentlyUsedCB"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkComboBoxText" id="recentlyUsedCB">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="classificationdialog|label-Classification">Recently Used:</property>
- <property name="xalign">0</property>
+ <property name="hexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="recentlyUsedLabel"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
@@ -212,6 +233,9 @@
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="show_expanders">False</property>
+ <accessibility>
+ <relation type="labelled-by" target="markingLabel"/>
+ </accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
@@ -345,53 +369,64 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="intellectualPropertyPartLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="classificationdialog|label-PartNumber">Part Number:</property>
+ <property name="label" translatable="yes" context="classificationdialog|label-PartNumber">License:</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="intellectualPropertyPartLB"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="intellectualPropertyPartEntry">
+ <object class="GtkLabel" id="intellectualPropertyPartNumberLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="classificationdialog|label-PartNumber">Part Number:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="intellectualPropertyPartNumberLB"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="intellectualPropertyPartAddButton">
- <property name="label" translatable="yes" context="classificationdialog|intellectualPropertyPartAddButton">Add</property>
+ <object class="GtkLabel" id="intellectualPropertyPartEntryLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="classificationdialog|label-PartNumber">Part text:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="intellectualPropertyPartEntry"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkEntry" id="intellectualPropertyPartEntry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="classificationdialog|label-PartNumber">License:</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="intellectualPropertyPartEntryLabel"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -400,24 +435,27 @@
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="intellectualPropertyPartNumberLB">
+ <object class="GtkTreeView" id="intellectualPropertyPartLB">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore2</property>
+ <property name="model">liststore3</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="show_expanders">False</property>
+ <accessibility>
+ <relation type="labelled-by" target="intellectualPropertyPartLabel"/>
+ </accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderer5"/>
+ <object class="GtkCellRendererText" id="cellrenderer6"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -428,7 +466,7 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
@@ -438,24 +476,27 @@
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="intellectualPropertyPartLB">
+ <object class="GtkTreeView" id="intellectualPropertyPartNumberLB">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore3</property>
+ <property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="show_expanders">False</property>
+ <accessibility>
+ <relation type="labelled-by" target="intellectualPropertyPartNumberLabel"/>
+ </accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn6">
+ <object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderer6"/>
+ <object class="GtkCellRendererText" id="cellrenderer5"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -466,11 +507,25 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
+ <object class="GtkButton" id="intellectualPropertyPartAddButton">
+ <property name="label" translatable="yes" context="classificationdialog|intellectualPropertyPartAddButton">Add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
More information about the Libreoffice-commits
mailing list