sc/source/ui/dbgui/sfiltdlg.cxx | 4
sc/uiconfig/scalc/ui/advancedfilterdialog.ui | 138 ++++++++++++++-------------
sw/source/ui/config/optpage.cxx | 6 -
sw/uiconfig/swriter/ui/optredlinepage.ui | 98 +++++++------------
4 files changed, 110 insertions(+), 136 deletions(-)
New commits:
commit 04136c95c5be30004e627f2866fe6ecea60a04f1
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
Date: Fri Jun 17 15:24:19 2016 +0300
Move accessibility relations to .ui files, Part 10: tdf#87026
By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.
To find the accessible names for ListBoxes in optpage.cxx:
I checked out the old revision and got strings from
the related src file. Then added them into the .ui file.
Change-Id: I05a11f92e07ddb0bd3deab086dd65052ec8395a5
Reviewed-on: https://gerrit.libreoffice.org/26439
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index c78040f..d0ff554 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -82,10 +82,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, vc
Init( rArgSet );
pEdFilterArea->GrabFocus();
-
-
- pLbCopyArea->SetAccessibleName(pBtnCopyResult->GetText());
- pEdCopyArea->SetAccessibleName(pBtnCopyResult->GetText());
}
ScSpecialFilterDlg::~ScSpecialFilterDlg()
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
index 0bebd5c..30b511d 100644
--- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.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"/>
@@ -17,6 +17,67 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkFrame" id="filterframe">
<property name="visible">True</property>
@@ -102,67 +163,6 @@
<property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
<object class="GtkExpander" id="more">
<property name="visible">True</property>
@@ -310,6 +310,11 @@
<accessibility>
<relation type="labelled-by" target="copyresult"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lbcopyarea-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Copy results to:</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -327,6 +332,11 @@
<accessibility>
<relation type="labelled-by" target="copyresult"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="edcopyarea-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Copy results to:</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -362,8 +372,8 @@
<object class="GtkLabel" id="dbarealabel">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Data
range:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -375,8 +385,8 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">dummy</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 2369aa0..8976842 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1788,12 +1788,6 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(
vcl::Window* pParent,
aLk = LINK(this, SwRedlineOptionsTabPage, ChangedMaskPrevHdl);
pMarkPosLB->SetSelectHdl( aLk );
pMarkColorLB->SetSelectHdl( aLk );
-/*
- //solution: set different accessible name of four color box
- pInsertColorLB->SetAccessibleName(OUString( aInsertFT.GetDisplayText()) +
OUString(aInsertColorFT.GetDisplayText()));
- pDeletedColorLB->SetAccessibleName(OUString( aDeletedFT.GetDisplayText())
+ OUString( aDeletedColorFT.GetDisplayText()));
- pChangedColorLB->SetAccessibleName(OUString( aChangedFT.GetDisplayText())
+ OUString( aChangedColorFT.GetDisplayText()));
- pMarkColorLB->SetAccessibleName(OUString( aMarkPosFT.GetDisplayText()) +
OUString( aMarkColorFT.GetDisplayText()));*/
}
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui
b/sw/uiconfig/swriter/ui/optredlinepage.ui
index a099aa3..6eccca9 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -1,8 +1,8 @@
<?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 -->
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="OptRedLinePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,32 +36,28 @@
<object class="GtkLabel" id="insert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">_Attributes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insert</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>
<object class="GtkLabel" id="insertcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Co_lor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insertcolor</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>
@@ -86,8 +82,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>
@@ -95,12 +89,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="insertcolor-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Color of Insertions</property>
+ </object>
+ </child>
</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>
@@ -108,12 +105,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Insert</property>
+ <property name="text">Insert</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
@@ -125,8 +121,8 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Insertions</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -136,8 +132,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>
@@ -166,32 +160,28 @@
<object class="GtkLabel" id="deleted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Attri_butes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deleted</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>
<object class="GtkLabel" id="deletedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Col_or:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deletedcolor</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>
@@ -203,8 +193,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>
@@ -212,12 +200,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="deletedcolor-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Color of Deletions</property>
+ </object>
+ </child>
</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>
@@ -225,12 +216,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Delete</property>
+ <property name="text">Delete</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
@@ -242,8 +232,8 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Deletions</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -253,8 +243,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>
@@ -283,32 +271,28 @@
<object class="GtkLabel" id="changed_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Attrib_utes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changed</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>
<object class="GtkLabel" id="changedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Colo_r:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changedcolor</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>
@@ -320,8 +304,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>
@@ -329,12 +311,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="changedcolor-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Color of Changed Attributes</property>
+ </object>
+ </child>
</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>
@@ -342,12 +327,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text"
translatable="yes">Attributes</property>
+ <property name="text">Attributes</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
@@ -359,8 +343,8 @@
<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">Changed
Attributes</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -370,8 +354,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>
@@ -401,44 +383,43 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="markcolor-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Color of Mark</property>
+ </object>
+ </child>
</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>
<object class="GtkLabel" id="markpos_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Mar_k:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">markpos</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>
<object class="GtkLabel" id="markcolor_label">
<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="mnemonic_widget">markcolor</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>
@@ -450,7 +431,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">2</property>
</packing>
</child>
@@ -470,8 +450,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>
@@ -492,8 +470,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>
@@ -506,8 +482,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>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
