[Libreoffice-commits] core.git: sc/source sc/uiconfig
Muhammet Kara
muhammet.kara at pardus.org.tr
Tue May 31 14:40:15 UTC 2016
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 3 --
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2 -
sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 25 +++++++++++++++----
sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 12 +++++++++
4 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit f96041798bfc3db27f23015f6799ad6e299b8fcf
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Tue May 31 15:43:46 2016 +0300
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 5f39d8e..e653c17 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -176,9 +176,6 @@ void CellAppearancePropertyPanel::Initialize()
mpTBLineStyle->Disable();
mpTBLineColor->Disable();
-
- mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor);
- mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle);
}
IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox, void)
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index a1b8f2b..15bc8a1 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -95,8 +95,6 @@ void NumberFormatPropertyPanel::Initialize()
mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
mpBtnEngineering->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) );
-
- mpTBCategory->SetAccessibleRelationLabeledBy(mpTBCategory);
}
IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void )
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index 7957da7..cec235e 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.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="CellAppearancePropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -22,9 +23,12 @@
<object class="GtkLabel" id="cellbackgroundlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Background:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="cellbackgroundcolor"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -40,13 +44,13 @@
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<child>
<object class="GtkMenuToolButton" id="cellbackground">
+ <property name="use_action_appearance">False</property>
<property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<property name="halign">start</property>
- <property name="use_action_appearance">False</property>
<property name="action_name">.uno:BackgroundColor</property>
<property name="use_underline">True</property>
</object>
@@ -55,6 +59,9 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <accessibility>
+ <relation type="labelled-by" target="cellbackgroundlabel"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -134,6 +141,11 @@
<property name="homogeneous">True</property>
</packing>
</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>
<packing>
<property name="expand">False</property>
@@ -150,6 +162,7 @@
<property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
<child>
<object class="GtkMenuToolButton" id="linecolor">
+ <property name="use_action_appearance">False</property>
<property name="width_request">105</property>
<property name="visible">True</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="halign">end</property>
<property name="hexpand">True</property>
- <property name="use_action_appearance">False</property>
<property name="action_name">.uno:FrameLineColor</property>
<property name="use_underline">True</property>
</object>
@@ -167,6 +179,11 @@
<property name="homogeneous">True</property>
</packing>
</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>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 6572ad2..bcec677 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -126,6 +126,9 @@
<property name="label" translatable="yes">_Decimal places:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">decimalplaces</property>
+ <accessibility>
+ <relation type="label-for" target="decimalplaces"/>
+ </accessibility>
</object>
<packing>
<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_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
<property name="invisible_char">•</property>
+ <accessibility>
+ <relation type="labelled-by" target="decimalplaceslabel"/>
+ </accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="decimalplaces-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Decimal Places</property>
@@ -174,6 +180,9 @@
<property name="use_underline">True</property>
<property name="mnemonic_widget">leadingzeroes</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="leadingzeroes"/>
+ </accessibility>
</object>
<packing>
<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_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
<property name="invisible_char">•</property>
+ <accessibility>
+ <relation type="labelled-by" target="leadingzeroeslabel"/>
+ </accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="leadingzeroes-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Leading Zeroes</property>
More information about the Libreoffice-commits
mailing list