mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move accessibility relations to .ui files, Part 12: tdf#87026

Browse Source 
By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.

As of this commit, all accessible relations have been
moved to .ui files other than a few exceptions.

Change-Id: Ic9dffdde414d245c13f13ee08543f90884991222
Reviewed-on: https://gerrit.libreoffice.org/26707
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Muhammet Kara
2016-06-27 13:46:04 +03:00
committed by Caolán McNamara
parent ed27be2a91
commit 541fcc978d
10 changed files with 787 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cui/source/tabpages/page.cxx
View File

@@ -348,9 +348,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
m_pBottomMarginEdit->SetMax(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM);
m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM);
m_pPortraitBtn->SetAccessibleRelationMemberOf(m_pOrientationFT);
m_pLandscapeBtn->SetAccessibleRelationMemberOf(m_pOrientationFT);
// Get the i18n framework numberings and add them to the listbox.
SvxNumOptionsTabPage::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits<sal_uInt16>::max());
}

1527
cui/uiconfig/ui/pageformatpage.ui
View File

File diff suppressed because it is too large Load Diff

4
extensions/source/dbpilots/groupboxwiz.cxx
View File

@@ -200,8 +200,6 @@ namespace dbp
m_pExistingRadios->EnableMultiSelection(true);
getDialog()->defaultButton(m_pMoveRight.get());
m_pExistingRadios->SetAccessibleRelationMemberOf(m_pExistingRadios);
}
ORadioSelectionPage::~ORadioSelectionPage()
@@ -389,8 +387,6 @@ namespace dbp
get(m_pOptions, "radiobuttons");
m_pOptions->SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected));
m_pOptions->SetAccessibleRelationMemberOf(m_pOptions);
}
OOptionValuesPage::~OOptionValuesPage()

2
svx/source/gallery2/galbrws2.cxx
View File

@@ -445,7 +445,6 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :
mpIconView->SetAccessibleRelationLabeledBy(mpIconView);
else
mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get());
mpIconView->SetAccessibleRelationMemberOf(mpIconView);
}
GalleryBrowser2::~GalleryBrowser2()
@@ -750,7 +749,6 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
mpIconView->SetAccessibleRelationLabeledBy(mpIconView);
else
mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get());
mpIconView->SetAccessibleRelationMemberOf(mpIconView);
}
void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )

3
sw/source/ui/frmdlg/column.cxx
View File

@@ -449,9 +449,6 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
SetExchangeSupport();
VclFrame *pSpacing = get<VclFrame>("spacing");
m_pBtnNext->SetAccessibleRelationMemberOf(pSpacing->get_label_widget());
m_pDefaultVS->SetColCount( 5 );
for (int i = 0; i < 5; ++i)

1
sw/source/ui/index/swuiidxmrk.cxx
View File

@@ -96,7 +96,6 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg,
rDialog.get(m_pTypeFT, "typeft");
rDialog.get(m_pTypeDCB, "typecb");
rDialog.get(m_pNewBT, "new");
m_pNewBT->SetAccessibleRelationMemberOf(m_pFrame->get_label_widget());
rDialog.get(m_pEntryED, "entryed");
rDialog.get(m_pPhoneticFT0, "phonetic0ft");
rDialog.get(m_pPhoneticED0, "phonetic0ed");

2
sw/source/ui/misc/num.cxx
View File

@@ -103,8 +103,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent,
SetExchangeSupport();
m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget());
m_pRelativeCB->Check();
m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));
m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl));

27
sw/uiconfig/swriter/ui/columnpage.ui
View File

@@ -1,5 +1,5 @@
<?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"/>
@@ -131,8 +131,8 @@
<object class="GtkLabel" id="columnft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Column:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="back"/>
<relation type="label-for" target="next"/>
@@ -192,8 +192,8 @@
<object class="GtkLabel" id="widthft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Width:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="width3mf:0.00cm"/>
<relation type="label-for" target="width2mf:0.00cm"/>
@@ -263,8 +263,8 @@
<object class="GtkLabel" id="distft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Spacing:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="spacing1mf:0.00cm"/>
<relation type="label-for" target="spacing2mf:0.00cm"/>
@@ -403,6 +403,9 @@
</attributes>
</object>
</child>
<accessibility>
<relation type="member-of" target="label4"/>
</accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -431,10 +434,10 @@
<object class="GtkLabel" id="linestyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">St_yle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linestylelb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -445,10 +448,10 @@
<object class="GtkLabel" id="linewidthft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linewidthmf:0.00pt</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -459,10 +462,10 @@
<object class="GtkLabel" id="lineheightft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">H_eight:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linewidthmf:0.00pt</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -473,10 +476,10 @@
<object class="GtkLabel" id="lineposft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lineposlb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -549,10 +552,10 @@
<object class="GtkLabel" id="linecolorft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colorlb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -625,10 +628,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Columns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colsnf</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -694,9 +697,9 @@
<object class="GtkLabel" id="applytoft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Apply to:</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -718,9 +721,9 @@
<object class="GtkLabel" id="textdirectionft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Text _direction:</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>

96
sw/uiconfig/swriter/ui/indexentry.ui
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">10</property>
@@ -8,6 +9,22 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="stock">gtk-index</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -126,8 +143,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -142,8 +157,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -158,8 +171,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -174,8 +185,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -218,16 +227,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Index</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">typecb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -239,8 +246,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -250,12 +255,13 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">New User-defined Index</property>
<property name="image">image1</property>
<accessibility>
<relation type="member-of" target="label1"/>
</accessibility>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -263,16 +269,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Entry</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entryed</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -285,7 +289,6 @@
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -294,16 +297,14 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">1st key</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">key1cb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -312,16 +313,14 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">2nd key</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">key2cb</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -329,16 +328,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Level</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">levelnf</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -353,7 +350,6 @@
<property name="left_attach">1</property>
<property name="top_attach">4</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -369,7 +365,6 @@
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -385,7 +380,6 @@
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -402,7 +396,6 @@
<property name="left_attach">0</property>
<property name="top_attach">7</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -419,7 +412,6 @@
<property name="left_attach">0</property>
<property name="top_attach">8</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -428,16 +420,14 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic0ed</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -446,16 +436,14 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic1ed</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -464,16 +452,14 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic2ed</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -485,8 +471,6 @@
<packing>
<property name="left_attach">4</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -498,8 +482,6 @@
<packing>
<property name="left_attach">4</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -511,8 +493,6 @@
<packing>
<property name="left_attach">4</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -534,7 +514,6 @@
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -557,7 +536,6 @@
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -627,20 +605,4 @@
<action-widget response="0">delete</action-widget>
</action-widgets>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="stock">gtk-index</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
</object>
</interface>

23
sw/uiconfig/swriter/ui/outlinepositionpage.ui
View File

@@ -1,5 +1,5 @@
<?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"/>
@@ -134,10 +134,10 @@
<object class="GtkLabel" id="numalign">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Numbering alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numalignlb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -159,12 +159,12 @@
<object class="GtkLabel" id="numdist">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Minimum space between
numbering and text:</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
<property name="mnemonic_widget">numdistmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -188,10 +188,10 @@ numbering and text:</property>
<object class="GtkLabel" id="numberingwidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Width of numbering:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numberingwidthmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -230,10 +230,10 @@ numbering and text:</property>
<object class="GtkLabel" id="indent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Indent:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">indentmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -257,10 +257,10 @@ numbering and text:</property>
<object class="GtkLabel" id="indentat">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Indent at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">indentatmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -283,10 +283,10 @@ numbering and text:</property>
<object class="GtkLabel" id="num2align">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Numbering alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">num2alignlb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -307,10 +307,10 @@ numbering and text:</property>
<object class="GtkLabel" id="alignedat">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Aligned at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">alignedatmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -333,10 +333,10 @@ numbering and text:</property>
<object class="GtkLabel" id="at">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">atmf:0.00cm</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -371,10 +371,10 @@ numbering and text:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Numbering followed by:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numfollowedbylb</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -419,6 +419,9 @@ numbering and text:</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">end</property>
<accessibility>
<relation type="member-of" target="label10"/>
</accessibility>
</object>
<packing>
<property name="left_attach">1</property>