Remove self-labeling SetAccessibleRelationLabeledBy calls tdf#87026

And add some accessibility properties to the related .ui file

Change-Id: I42e2c3f9af6c00536c4ec8cbe0669a7202d4377e
Reviewed-on: https://gerrit.libreoffice.org/25723
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Muhammet Kara
2016-05-31 15:43:46 +03:00
committed by Caolán McNamara
parent 98f4556823
commit f96041798b
4 changed files with 33 additions and 9 deletions

View File

@@ -176,9 +176,6 @@ void CellAppearancePropertyPanel::Initialize()
mpTBLineStyle->Disable(); mpTBLineStyle->Disable();
mpTBLineColor->Disable(); mpTBLineColor->Disable();
mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor);
mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle);
} }
IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void) IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void)

View File

@@ -95,8 +95,6 @@ void NumberFormatPropertyPanel::Initialize()
mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnEngineering->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpBtnEngineering->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpTBCategory->SetAccessibleRelationLabeledBy(mpTBCategory);
} }
IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void )

View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.0"/> <requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="CellAppearancePropertyPanel"> <object class="GtkGrid" id="CellAppearancePropertyPanel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@@ -22,9 +23,12 @@
<object class="GtkLabel" id="cellbackgroundlabel"> <object class="GtkLabel" id="cellbackgroundlabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Background:</property> <property name="label" translatable="yes">_Background:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
<accessibility>
<relation type="label-for" target="cellbackgroundcolor"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -40,13 +44,13 @@
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property> <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<child> <child>
<object class="GtkMenuToolButton" id="cellbackground"> <object class="GtkMenuToolButton" id="cellbackground">
<property name="use_action_appearance">False</property>
<property name="width_request">105</property> <property name="width_request">105</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="has_tooltip">True</property> <property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property> <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_action_appearance">False</property>
<property name="action_name">.uno:BackgroundColor</property> <property name="action_name">.uno:BackgroundColor</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
@@ -55,6 +59,9 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
<accessibility>
<relation type="labelled-by" target="cellbackgroundlabel"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -134,6 +141,11 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
<child internal-child="accessible">
<object class="AtkObject" id="borderlinestyle-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Border Line Style</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -150,6 +162,7 @@
<property name="tooltip_text" translatable="yes">Select the line color of the borders.</property> <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
<child> <child>
<object class="GtkMenuToolButton" id="linecolor"> <object class="GtkMenuToolButton" id="linecolor">
<property name="use_action_appearance">False</property>
<property name="width_request">105</property> <property name="width_request">105</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@@ -158,7 +171,6 @@
<property name="tooltip_text" translatable="yes">Select the line color of the borders.</property> <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="use_action_appearance">False</property>
<property name="action_name">.uno:FrameLineColor</property> <property name="action_name">.uno:FrameLineColor</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
@@ -167,6 +179,11 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
<child internal-child="accessible">
<object class="AtkObject" id="borderlinecolor-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Border Line Color</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

View File

@@ -126,6 +126,9 @@
<property name="label" translatable="yes">_Decimal places:</property> <property name="label" translatable="yes">_Decimal places:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">decimalplaces</property> <property name="mnemonic_widget">decimalplaces</property>
<accessibility>
<relation type="label-for" target="decimalplaces"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -141,6 +144,9 @@
<property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property> <property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property>
<property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property> <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<accessibility>
<relation type="labelled-by" target="decimalplaceslabel"/>
</accessibility>
<child internal-child="accessible"> <child internal-child="accessible">
<object class="AtkObject" id="decimalplaces-atkobject"> <object class="AtkObject" id="decimalplaces-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Decimal Places</property> <property name="AtkObject::accessible-name" translatable="yes">Decimal Places</property>
@@ -174,6 +180,9 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">leadingzeroes</property> <property name="mnemonic_widget">leadingzeroes</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<accessibility>
<relation type="label-for" target="leadingzeroes"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -189,6 +198,9 @@
<property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property> <property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
<property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property> <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<accessibility>
<relation type="labelled-by" target="leadingzeroeslabel"/>
</accessibility>
<child internal-child="accessible"> <child internal-child="accessible">
<object class="AtkObject" id="leadingzeroes-atkobject"> <object class="AtkObject" id="leadingzeroes-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Leading Zeroes</property> <property name="AtkObject::accessible-name" translatable="yes">Leading Zeroes</property>