[Libreoffice-commits] core.git: cui/source cui/uiconfig filter/source filter/uiconfig formula/source formula/uiconfig sw/source sw/uiconfig
Muhammet Kara
muhammet.kara at pardus.org.tr
Wed Jun 15 20:27:07 UTC 2016
cui/source/inc/cuires.hrc | 4 -
cui/source/options/optlingu.cxx | 8 --
cui/source/options/optlingu.src | 12 ---
cui/uiconfig/ui/optlingupage.ui | 23 ++++-
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 1
filter/uiconfig/ui/xmlfiltersettings.ui | 7 +
formula/source/ui/dlg/formula.cxx | 1
formula/uiconfig/ui/formuladialog.ui | 15 ++-
sw/source/ui/index/cnttab.cxx | 1
sw/source/ui/table/tabledlg.cxx | 6 -
sw/uiconfig/swriter/ui/tabletextflowpage.ui | 76 ++++---------------
sw/uiconfig/swriter/ui/tocdialog.ui | 7 +
12 files changed, 61 insertions(+), 100 deletions(-)
New commits:
commit a00757e75b7d55239f97c1ca9e50c68252ff227f
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Wed Jun 8 14:43:53 2016 +0300
Move accessibility relations to .ui files, Part 9: tdf#87026
By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.
Change-Id: I52e3f2a16519aee13b06f0efc6beb3385bcb0f1c
Reviewed-on: https://gerrit.libreoffice.org/26066
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 4fa00c0..376117c 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -378,9 +378,7 @@
#define RID_SVXSTR_HYPH_SPECIAL (RID_SVX_START + 1232)
#define RID_SVXSTR_NUM_MIN_WORDLEN (RID_SVX_START + 1233)
#define RID_SVXSTR_GRAMMAR_AUTO (RID_SVX_START + 1234)
-#define RID_SVXSTR_LINGU_MODULES_EDIT (RID_SVX_START + 1235)
-#define RID_SVXSTR_LINGU_DICS_EDIT_DIC (RID_SVX_START + 1236)
-#define RID_SVXSTR_LINGU_OPTIONS_EDIT (RID_SVX_START + 1237)
+// There is a gap here because of removed strings
#define RID_SVXSTR_CHG_MATH (RID_SVX_START + 1238)
#define RID_SVXSTR_CHG_WRITER (RID_SVX_START + 1239)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index fd1cdd5..29f30ac 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1088,14 +1088,6 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
else
m_pMoreDictsLink->Hide();
- OUString sAccessibleNameModuleEdit(CUI_RES(RID_SVXSTR_LINGU_MODULES_EDIT));
- OUString sAccessibleNameDicsEdit (CUI_RES(RID_SVXSTR_LINGU_DICS_EDIT_DIC));
- OUString sAccessibleNameOptionEdit(CUI_RES(RID_SVXSTR_LINGU_OPTIONS_EDIT));
-
- m_pLinguModulesEditPB->SetAccessibleName(sAccessibleNameModuleEdit);
- m_pLinguDicsEditPB->SetAccessibleName(sAccessibleNameDicsEdit);
- m_pLinguOptionsEditPB->SetAccessibleName(sAccessibleNameOptionEdit);
-
xProp = SvxGetLinguPropertySet();
xDicList.set( SvxGetDictionaryList(), UNO_QUERY );
if (xDicList.is())
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 5621f89..084f3a9 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -83,17 +83,5 @@ String RID_SVXSTR_HYPH_SPECIAL
{
Text [ en-US ] = "Hyphenate special regions";
};
-String RID_SVXSTR_LINGU_MODULES_EDIT
-{
- Text [ en-US ] = "Edit Available language modules";
-};
-String RID_SVXSTR_LINGU_DICS_EDIT_DIC
-{
- Text [ en-US ] = "Edit User-defined dictionaries";
-};
-String RID_SVXSTR_LINGU_OPTIONS_EDIT
-{
- Text [ en-US ] = "Edit Options";
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index ad7d577..5034a5d 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -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"/>
@@ -44,10 +44,10 @@
<object class="GtkLabel" id="lingumodulesft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Available language modules:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lingumodules:border</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -77,6 +77,11 @@
<property name="receives_default">True</property>
<property name="valign">start</property>
<property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lingumodulesedit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Edit Available language modules</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -104,10 +109,10 @@
<object class="GtkLabel" id="lingudictsft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_User-defined dictionaries:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lingudicts:border</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -157,6 +162,11 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lingudictsedit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Edit User-defined dictionaries</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -205,10 +215,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Options:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linguoptions:border</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -255,6 +265,11 @@
<property name="receives_default">True</property>
<property name="valign">start</property>
<property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="linguoptionsedit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Edit Options</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 6216673..e22acfe5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -79,7 +79,6 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
m_pFilterListBox->SetDeselectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) );
m_pFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, DoubleClickHdl_Impl ) );
m_pFilterListBox->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
- m_pCtrlFilterList->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
m_pFilterListBox->SetHelpId(m_pCtrlFilterList->GetHelpId());
m_pPBNew->SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) );
diff --git a/filter/uiconfig/ui/xmlfiltersettings.ui b/filter/uiconfig/ui/xmlfiltersettings.ui
index e8a2424..79de962 100644
--- a/filter/uiconfig/ui/xmlfiltersettings.ui
+++ b/filter/uiconfig/ui/xmlfiltersettings.ui
@@ -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"/>
@@ -146,6 +146,11 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="filterlist-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">XML Filter List</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index cedd2f3..b0925fb 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -295,7 +295,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pMEdit = m_pMEFormula->GetEdit();
- m_pMEFormula->SetAccessibleName(m_pFtFormula->GetText());
pMEdit->SetAccessibleName(m_pFtFormula->GetText());
m_aEditHelpId = pMEdit->GetHelpId();
diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui
index 0b7137b..613272b 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -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"/>
@@ -281,9 +281,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="wrap">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="wrap">True</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -298,9 +298,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="wrap">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="wrap">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -313,9 +313,9 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="vexpand">True</property>
+ <property name="wrap">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="wrap">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -341,10 +341,10 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="yalign">1</property>
<property name="label" translatable="yes">For_mula</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ed_formula</property>
+ <property name="yalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -389,6 +389,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ed_formula-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Formula</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d8383ce..18945f4 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -314,7 +314,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
m_pShowExampleCB->Check( SW_MOD()->GetModuleConfig()->IsShowIndexPreview());
- m_pExampleContainerWIN->SetAccessibleName(m_pShowExampleCB->GetText());
SetViewAlign( WindowAlign::Left );
// SetViewWindow does not work if the dialog is visible!
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 139712a..c5fe6f8 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1301,12 +1301,6 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pTextDirectionLB, "textdirection");
get(m_pVertOrientLB, "vertorient");
- m_pPgBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
- m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
- m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
- m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
- m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText());
-
m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
m_pPgBrkBeforeRB->SetClickHdl(
LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) );
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index 9af0800..76b2f3c 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -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="upper">9999</property>
<property name="step_increment">1</property>
@@ -103,8 +104,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>
@@ -118,12 +117,13 @@
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">column</property>
+ <accessibility>
+ <relation type="member-of" target="break"/>
+ </accessibility>
</object>
<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>
@@ -136,12 +136,13 @@
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">page</property>
+ <accessibility>
+ <relation type="member-of" target="break"/>
+ </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>
@@ -155,12 +156,13 @@
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">after</property>
+ <accessibility>
+ <relation type="member-of" target="break"/>
+ </accessibility>
</object>
<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>
@@ -172,12 +174,13 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="member-of" target="break"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -187,8 +190,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>
@@ -212,8 +213,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>
@@ -227,8 +226,6 @@
<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>
@@ -236,14 +233,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -255,20 +249,21 @@
<accessibility>
<relation type="labelled-by" target="pagestyle"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="pagestylelb-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">With Page Style</property>
+ </object>
+ </child>
</object>
<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>
<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>
@@ -284,8 +279,6 @@
<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>
@@ -303,8 +296,6 @@
<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>
@@ -320,8 +311,6 @@
<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>
@@ -340,8 +329,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>
@@ -353,16 +340,12 @@
<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>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -383,8 +366,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>
@@ -403,8 +384,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>
@@ -416,8 +395,6 @@
<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>
@@ -425,30 +402,23 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
</object>
<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>
<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>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -469,8 +439,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>
@@ -501,8 +469,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>
@@ -514,8 +480,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>
@@ -536,8 +500,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>
</object>
diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui
index 3857a2f..d909528 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -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"/>
<object class="GtkDialog" id="TocDialog">
@@ -114,6 +114,11 @@
<object class="GtkDrawingArea" id="example">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="example-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list