diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-17 15:24:19 +0300 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-27 20:28:18 +0000 |
commit | 04136c95c5be30004e627f2866fe6ecea60a04f1 (patch) | |
tree | aab4aef8417b0c4c9efc0a4dc921d3da7874c7bf /sc | |
parent | 4318931ac9993527b7ae24a1284903db91254989 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 4 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/advancedfilterdialog.ui | 138 |
2 files changed, 74 insertions, 68 deletions
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index c78040f1c7b5..d0ff5540cd5c 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 0bebd5caa4a9..30b511d186ec 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> |