[Libreoffice-commits] core.git: svx/source svx/uiconfig
Katarina Behrens
bubli at bubli.org
Mon Dec 1 14:40:12 PST 2014
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 12 -----
svx/uiconfig/ui/sidebarpossize.ui | 43 ++++++++++++++++++++
2 files changed, 43 insertions(+), 12 deletions(-)
New commits:
commit 759ae3c367f63ee006cfa8f4239ddcc1302b5879
Author: Katarina Behrens <bubli at bubli.org>
Date: Mon Dec 1 23:25:35 2014 +0100
Move accessibility relations to .ui file
Change-Id: I910f01cbe2f3a87ff9c629a72231dd8106ddf973
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 44c5288..f7f10f8 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -154,14 +154,10 @@ void PosSizePropertyPanel::Initialize()
//Position : Horizontal / Vertical
mpMtrPosX->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosXHdl ) );
mpMtrPosY->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosYHdl ) );
- mpMtrPosX->SetAccessibleName(OUString( "Horizontal")); //wj acc
- mpMtrPosY->SetAccessibleName(OUString( "Vertical")); //wj acc
//Size : Width / Height
mpMtrWidth->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeWidthHdl ) );
mpMtrHeight->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeHeightHdl ) );
- mpMtrWidth->SetAccessibleName(OUString( "Width")); //wj acc
- mpMtrHeight->SetAccessibleName(OUString( "Height")); //wj acc
//Size : Keep ratio
mpCbxScale->SetClickHdl( LINK( this, PosSizePropertyPanel, ClickAutoHdl ) );
@@ -169,7 +165,6 @@ void PosSizePropertyPanel::Initialize()
//rotation:
mpMtrAngle->SetModifyHdl(LINK( this, PosSizePropertyPanel, AngleModifiedHdl));
mpMtrAngle->EnableAutocomplete( false );
- mpMtrAngle->SetAccessibleName(OUString( "Rotation")); //wj acc
//rotation control
mpDial->SetModifyHdl(LINK( this, PosSizePropertyPanel, RotationHdl));
@@ -177,13 +172,6 @@ void PosSizePropertyPanel::Initialize()
//flip:
mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
- mpMtrPosX->SetAccessibleRelationLabeledBy(mpFtPosX);
- mpMtrPosY->SetAccessibleRelationLabeledBy(mpFtPosY);
- mpMtrWidth->SetAccessibleRelationLabeledBy(mpFtWidth);
- mpMtrHeight->SetAccessibleRelationLabeledBy(mpFtHeight);
- mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtAngle);
- mpFlipTbx->SetAccessibleRelationLabeledBy(mpFtFlip);
-
mpMtrAngle->InsertValue(0, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(4500, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(9000, FUNIT_CUSTOM);
diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui
index c135e5c..eeedf5d 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -58,6 +58,14 @@
<property name="tooltip_text" translatable="yes">Enter the value for the horizontal position.</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="horizontallabel"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="horizontalpos:0in-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Horizontal</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -91,6 +99,14 @@
<property name="tooltip_text" translatable="yes">Enter the value for the vertical position.</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="verticallabel"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="verticalpos:0in-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Vertical</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -125,6 +141,14 @@
<property name="tooltip_text" translatable="yes">Enter a width for the selected object.</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="widthlabel"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="selectwidth:0in-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -159,6 +183,14 @@
<property name="tooltip_text" translatable="yes">Enter a height for the selected object.</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="heightlabel"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="selectheight:0in-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Height</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -219,6 +251,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="rotationlabel"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="orientationcontrol-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Rotation</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -275,6 +315,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <accessibility>
+ <relation type="labelled-by" target="fliplabel"/>
+ </accessibility>
<child>
<object class="GtkToolButton" id="flipvertical">
<property name="visible">True</property>
More information about the Libreoffice-commits
mailing list