[Libreoffice-commits] core.git: svx/source svx/uiconfig
Muhammet Kara
muhammet.kara at pardus.org.tr
Wed May 25 15:45:48 UTC 2016
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 5 --
svx/uiconfig/ui/sidebarline.ui | 39 ++++++++++++++++++----
2 files changed, 32 insertions(+), 12 deletions(-)
New commits:
commit 3b298fb67ade536679678768c55eeb8468b6cf33
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Wed May 25 15:53:16 2016 +0300
tdf#87026: Move accessibility relations to .ui file for LinePropertyPanelBase
Now that all LibO dialogs have been migrated to .ui format,
accessibility relations no longer need to be defined in C++ code
and can be moved to .ui files.
Change-Id: I602907ea0f7f8d40f26a06f6af82a2898693696f
Reviewed-on: https://gerrit.libreoffice.org/25454
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index ab7d993..5bc9fb9 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -236,7 +236,6 @@ void LinePropertyPanelBase::Initialize()
FillLineStyleList();
SelectLineStyle();
mpLBStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeLineStyleHdl ) );
- mpLBStyle->SetAccessibleName("Style");
mpLBStyle->AdaptDropDownLineCountToMaximum();
const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
@@ -250,19 +249,15 @@ void LinePropertyPanelBase::Initialize()
SelectEndStyle(true);
SelectEndStyle(false);
mpLBStart->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeStartHdl ) );
- mpLBStart->SetAccessibleName("Beginning Style"); //wj acc
mpLBStart->AdaptDropDownLineCountToMaximum();
mpLBEnd->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEndHdl ) );
- mpLBEnd->SetAccessibleName("Ending Style"); //wj acc
mpLBEnd->AdaptDropDownLineCountToMaximum();
mpMFTransparent->SetModifyHdl(LINK(this, LinePropertyPanelBase, ChangeTransparentHdl));
mpLBEdgeStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl ) );
- mpLBEdgeStyle->SetAccessibleName("Corner Style");
mpLBCapStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeCapStyleHdl ) );
- mpLBCapStyle->SetAccessibleName("Cap Style");
}
void LinePropertyPanelBase::DataChanged(const DataChangedEvent& /*rEvent*/)
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 1601309..b0170c1 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
@@ -40,6 +40,11 @@
<property name="tooltip_markup" translatable="yes">Select the style of the beginning arrowhead.</property>
<property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
<property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="beginarrowstyle-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Beginning Style</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -56,6 +61,11 @@
<property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
<property name="tooltip_text" translatable="yes">Select the style of the line.</property>
<property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="linestyle-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Style</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -73,6 +83,11 @@
<property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
<property name="margin_right">6</property>
<property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="endarrowstyle-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Ending Style</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -98,9 +113,9 @@
<object class="GtkLabel" id="widthlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -145,9 +160,9 @@
<object class="GtkLabel" id="colorlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Color:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -192,9 +207,9 @@
<object class="GtkLabel" id="translabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Transparency:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -219,7 +234,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="linetransparency:0%-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+ <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
</object>
</child>
</object>
@@ -251,10 +266,10 @@
<object class="GtkLabel" id="cornerlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Corner style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edgestyle</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -276,6 +291,11 @@
<item translatable="yes">Mitered</item>
<item translatable="yes">Beveled</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="edgestyle-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Corner Style</property>
+ </object>
+ </child>
<style>
<class name="Rounded"/>
<class name="- none -"/>
@@ -294,10 +314,10 @@
<object class="GtkLabel" id="caplabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Ca_p style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linecapstyle</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -318,6 +338,11 @@
<item translatable="yes">Round</item>
<item translatable="yes">Square</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="linecapstyle-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Cap Style</property>
+ </object>
+ </child>
<style>
<class name="Flat"/>
<class name="Round"/>
More information about the Libreoffice-commits
mailing list