[Libreoffice-commits] core.git: sc/source sc/uiconfig sd/source sd/uiconfig
Muhammet Kara
muhammet.kara at pardus.org.tr
Fri May 27 09:11:54 UTC 2016
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 5 --
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 3 -
sc/uiconfig/scalc/ui/sidebaralignment.ui | 49 ++++++++++++++-------
sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 20 +++++++-
sd/source/ui/dlg/prntopts.cxx | 3 -
sd/uiconfig/simpress/ui/prntopts.ui | 10 +++-
6 files changed, 59 insertions(+), 31 deletions(-)
New commits:
commit 7a06806a8d7f541855a90a1eab8f4b7c6539ab63
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Thu May 26 15:40:31 2016 +0300
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/25518
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 83d4049..8762aad 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -105,7 +105,6 @@ void AlignmentPropertyPanel::Initialize()
{
mpFTLeftIndent->Disable();
mpMFLeftIndent->Disable();
- mpMFLeftIndent->SetAccessibleName("Left Indent"); //wj acc
Link<Edit&,void> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
mpMFLeftIndent->SetModifyHdl ( aLink );
@@ -114,7 +113,6 @@ void AlignmentPropertyPanel::Initialize()
mpCBXWrapText->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl) );
//rotation
- mpMtrAngle->SetAccessibleName("Text Orientation"); //wj acc
mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl));
mpMtrAngle->EnableAutocomplete( false );
mpCBStacked->SetClickHdl(LINK(this, AlignmentPropertyPanel, ClickStackHdl));
@@ -133,9 +131,6 @@ void AlignmentPropertyPanel::Initialize()
mpMtrAngle->InsertValue(270, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(315, FUNIT_CUSTOM);
mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount());
-
- mpMFLeftIndent->SetAccessibleRelationLabeledBy(mpFTLeftIndent);
- mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate);
}
IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void )
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index c559b4f..a1b8f2b 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -85,15 +85,12 @@ void NumberFormatPropertyPanel::Initialize()
{
mpLbCategory->SetSelectHdl ( LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl) );
mpLbCategory->SelectEntryPos(0);
- mpLbCategory->SetAccessibleName("Category");
mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
Link<Edit&,void> aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl);
mpEdDecimals->SetModifyHdl( aLink );
mpEdLeadZeroes->SetModifyHdl( aLink );
- mpEdDecimals->SetAccessibleName("Decimal Places");
- mpEdLeadZeroes->SetAccessibleName("Leading Zeroes");
mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index c718eab..b0d3c5f 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -227,7 +228,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogenous">True</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
@@ -240,7 +241,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="homogenous">True</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -253,10 +254,10 @@
<object class="GtkLabel" id="leftindentlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Indent:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">leftindent:0pt</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -278,6 +279,14 @@
<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="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>
<packing>
<property name="expand">False</property>
@@ -361,9 +370,9 @@
<object class="GtkLabel" id="orientationlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Text _orientation:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -373,12 +382,20 @@
</child>
<child>
<object class="VclComboBoxNumeric" id="orientationdegrees:0degrees">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</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="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</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>
+ <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>
+ </child>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
@@ -394,10 +411,10 @@
<object class="GtkRadioButton" id="bottom">
<property name="visible">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="tooltip_text" translatable="yes">Text Extension From Lower Cell Border</property>
<property name="image">image3</property>
- <property name="focus_on_click">False</property>
<property name="xalign">0</property>
<property name="always_show_image">True</property>
<property name="draw_indicator">False</property>
@@ -412,10 +429,10 @@
<object class="GtkRadioButton" id="top">
<property name="visible">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="tooltip_text" translatable="yes">Text Extension From Upper Cell Border</property>
<property name="image">image2</property>
- <property name="focus_on_click">False</property>
<property name="xalign">0</property>
<property name="always_show_image">True</property>
<property name="draw_indicator">False</property>
@@ -430,10 +447,10 @@
<object class="GtkRadioButton" id="standard">
<property name="visible">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="tooltip_text" translatable="yes">Text Extension Inside Cell</property>
<property name="image">image1</property>
- <property name="focus_on_click">False</property>
<property name="xalign">0</property>
<property name="always_show_image">True</property>
<property name="draw_indicator">False</property>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 57bb762a..6572ad2 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="NumberFormatPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -39,6 +40,11 @@
<item translatable="yes">Boolean Value</item>
<item translatable="yes">Text</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -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_text" translatable="yes">Enter the number of decimal places that you want to display.</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>
<packing>
<property name="expand">False</property>
@@ -159,10 +170,10 @@
<object class="GtkLabel" id="leadingzeroeslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Leading _zeroes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">leadingzeroes</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -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_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</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>
<packing>
<property name="expand">False</property>
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 41e9bfb..f8c2f83 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -66,9 +66,6 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs
#ifndef MACOSX
SetDrawMode();
#endif
-
- m_pCbxFront->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
- m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
}
SdPrintOptions::~SdPrintOptions()
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui
index 466bd1f..1d3b9fd 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -1,7 +1,7 @@
<?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-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="prntopts">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -244,6 +244,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="brouchrb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -261,6 +264,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="brouchrb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list