Kaydet (Commit) 7a06806a authored tarafından Muhammet Kara's avatar Muhammet Kara Kaydeden (comit) Katarina Behrens

Move accessibility relations to .ui files tdf#87026

Get rid of SetAccessibleRelationLabeledBy and SetAccessibleName
in C++ files by moving the relations to .ui files.

Change-Id: I8b425a0c7d923ff6f99540f0a6c18112f6f4d0c0
Reviewed-on: https://gerrit.libreoffice.org/25518Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst e4358002
...@@ -105,7 +105,6 @@ void AlignmentPropertyPanel::Initialize() ...@@ -105,7 +105,6 @@ void AlignmentPropertyPanel::Initialize()
{ {
mpFTLeftIndent->Disable(); mpFTLeftIndent->Disable();
mpMFLeftIndent->Disable(); mpMFLeftIndent->Disable();
mpMFLeftIndent->SetAccessibleName("Left Indent"); //wj acc
Link<Edit&,void> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl); Link<Edit&,void> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
mpMFLeftIndent->SetModifyHdl ( aLink ); mpMFLeftIndent->SetModifyHdl ( aLink );
...@@ -114,7 +113,6 @@ void AlignmentPropertyPanel::Initialize() ...@@ -114,7 +113,6 @@ void AlignmentPropertyPanel::Initialize()
mpCBXWrapText->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl) ); mpCBXWrapText->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl) );
//rotation //rotation
mpMtrAngle->SetAccessibleName("Text Orientation"); //wj acc
mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl)); mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl));
mpMtrAngle->EnableAutocomplete( false ); mpMtrAngle->EnableAutocomplete( false );
mpCBStacked->SetClickHdl(LINK(this, AlignmentPropertyPanel, ClickStackHdl)); mpCBStacked->SetClickHdl(LINK(this, AlignmentPropertyPanel, ClickStackHdl));
...@@ -133,9 +131,6 @@ void AlignmentPropertyPanel::Initialize() ...@@ -133,9 +131,6 @@ void AlignmentPropertyPanel::Initialize()
mpMtrAngle->InsertValue(270, FUNIT_CUSTOM); mpMtrAngle->InsertValue(270, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(315, FUNIT_CUSTOM); mpMtrAngle->InsertValue(315, FUNIT_CUSTOM);
mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount()); mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount());
mpMFLeftIndent->SetAccessibleRelationLabeledBy(mpFTLeftIndent);
mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate);
} }
IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void )
......
...@@ -85,15 +85,12 @@ void NumberFormatPropertyPanel::Initialize() ...@@ -85,15 +85,12 @@ void NumberFormatPropertyPanel::Initialize()
{ {
mpLbCategory->SetSelectHdl ( LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl) ); mpLbCategory->SetSelectHdl ( LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl) );
mpLbCategory->SelectEntryPos(0); mpLbCategory->SelectEntryPos(0);
mpLbCategory->SetAccessibleName("Category");
mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount()); mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
Link<Edit&,void> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl); Link<Edit&,void> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl);
mpEdDecimals->SetModifyHdl( aLink ); mpEdDecimals->SetModifyHdl( aLink );
mpEdLeadZeroes->SetModifyHdl( aLink ); mpEdLeadZeroes->SetModifyHdl( aLink );
mpEdDecimals->SetAccessibleName("Decimal Places");
mpEdLeadZeroes->SetAccessibleName("Leading Zeroes");
mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
......
<?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="GtkImage" id="image1"> <object class="GtkImage" id="image1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogenous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -240,7 +241,7 @@ ...@@ -240,7 +241,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogenous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -253,10 +254,10 @@ ...@@ -253,10 +254,10 @@
<object class="GtkLabel" id="leftindentlabel"> <object class="GtkLabel" id="leftindentlabel">
<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">_Indent:</property> <property name="label" translatable="yes">_Indent:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">leftindent:0pt</property> <property name="mnemonic_widget">leftindent:0pt</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -278,6 +279,14 @@ ...@@ -278,6 +279,14 @@
<property name="tooltip_markup" translatable="yes">Indents from the left edge.</property> <property name="tooltip_markup" translatable="yes">Indents from the left edge.</property>
<property name="tooltip_text" translatable="yes">Indents from the left edge.</property> <property name="tooltip_text" translatable="yes">Indents from the left edge.</property>
<property name="invisible_char"></property> <property name="invisible_char"></property>
<accessibility>
<relation type="labelled-by" target="leftindentlabel"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="leftindent:0pt-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Left Indent</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -361,9 +370,9 @@ ...@@ -361,9 +370,9 @@
<object class="GtkLabel" id="orientationlabel"> <object class="GtkLabel" id="orientationlabel">
<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">Text _orientation:</property> <property name="label" translatable="yes">Text _orientation:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -373,12 +382,20 @@ ...@@ -373,12 +382,20 @@
</child> </child>
<child> <child>
<object class="VclComboBoxNumeric" id="orientationdegrees:0degrees"> <object class="VclComboBoxNumeric" id="orientationdegrees:0degrees">
<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_markup" translatable="yes">Select the angle for rotation.</property> <property name="tooltip_markup" translatable="yes">Select the angle for rotation.</property>
<property name="tooltip_text" translatable="yes">Select the angle for rotation.</property> <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
<accessibility>
<relation type="labelled-by" target="orientationlabel"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="orientationdegrees:0degrees-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Text Orientation</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -394,10 +411,10 @@ ...@@ -394,10 +411,10 @@
<object class="GtkRadioButton" id="bottom"> <object class="GtkRadioButton" id="bottom">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Text Extension From Lower Cell Border</property> <property name="focus_on_click">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Text Extension From Lower Cell Border</property>
<property name="image">image3</property> <property name="image">image3</property>
<property name="focus_on_click">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="always_show_image">True</property> <property name="always_show_image">True</property>
<property name="draw_indicator">False</property> <property name="draw_indicator">False</property>
...@@ -412,10 +429,10 @@ ...@@ -412,10 +429,10 @@
<object class="GtkRadioButton" id="top"> <object class="GtkRadioButton" id="top">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Text Extension From Upper Cell Border</property> <property name="focus_on_click">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Text Extension From Upper Cell Border</property>
<property name="image">image2</property> <property name="image">image2</property>
<property name="focus_on_click">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="always_show_image">True</property> <property name="always_show_image">True</property>
<property name="draw_indicator">False</property> <property name="draw_indicator">False</property>
...@@ -430,10 +447,10 @@ ...@@ -430,10 +447,10 @@
<object class="GtkRadioButton" id="standard"> <object class="GtkRadioButton" id="standard">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Text Extension Inside Cell</property> <property name="focus_on_click">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Text Extension Inside Cell</property>
<property name="image">image1</property> <property name="image">image1</property>
<property name="focus_on_click">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="always_show_image">True</property> <property name="always_show_image">True</property>
<property name="draw_indicator">False</property> <property name="draw_indicator">False</property>
......
<?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="NumberFormatPropertyPanel"> <object class="GtkGrid" id="NumberFormatPropertyPanel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -39,6 +40,11 @@ ...@@ -39,6 +40,11 @@
<item translatable="yes">Boolean Value</item> <item translatable="yes">Boolean Value</item>
<item translatable="yes">Text</item> <item translatable="yes">Text</item>
</items> </items>
<child internal-child="accessible">
<object class="AtkObject" id="category-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Category</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -135,6 +141,11 @@ ...@@ -135,6 +141,11 @@
<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>
<child internal-child="accessible">
<object class="AtkObject" id="decimalplaces-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Decimal Places</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -159,10 +170,10 @@ ...@@ -159,10 +170,10 @@
<object class="GtkLabel" id="leadingzeroeslabel"> <object class="GtkLabel" id="leadingzeroeslabel">
<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">Leading _zeroes:</property> <property name="label" translatable="yes">Leading _zeroes:</property>
<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>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -178,6 +189,11 @@ ...@@ -178,6 +189,11 @@
<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>
<child internal-child="accessible">
<object class="AtkObject" id="leadingzeroes-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Leading Zeroes</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
...@@ -66,9 +66,6 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs ...@@ -66,9 +66,6 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs
#ifndef MACOSX #ifndef MACOSX
SetDrawMode(); SetDrawMode();
#endif #endif
m_pCbxFront->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
} }
SdPrintOptions::~SdPrintOptions() SdPrintOptions::~SdPrintOptions()
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Wed Jan 8 18:58:38 2014 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="prntopts"> <object class="GtkBox" id="prntopts">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -244,6 +244,9 @@ ...@@ -244,6 +244,9 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<accessibility>
<relation type="labelled-by" target="brouchrb"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -261,6 +264,9 @@ ...@@ -261,6 +264,9 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<accessibility>
<relation type="labelled-by" target="brouchrb"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment