diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-06 08:55:36 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-07 08:28:00 +0000 |
commit | 837c1e2e9cc6886e74e4f32d6296d07daf23a2e1 (patch) | |
tree | c9b0cb75379e2d70a5c1f5a159a5fda260b806f6 /sc/uiconfig | |
parent | cppcheck: noExplicitConstructor (diff) | |
download | core-837c1e2e9cc6886e74e4f32d6296d07daf23a2e1.tar.gz core-837c1e2e9cc6886e74e4f32d6296d07daf23a2e1.zip |
Move accessibility relations to .ui files, Part 7: tdf#87026
By removing unnecessary variables/strings/funciton calls,
and making proper changes in the related .ui files.
Change-Id: I059bf02bc6ea29bf1b92d21f5a10a76548ecd1fc
Reviewed-on: https://gerrit.libreoffice.org/25973
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/uiconfig')
-rw-r--r-- | sc/uiconfig/scalc/ui/solverdlg.ui | 146 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/standardfilterdialog.ui | 96 |
2 files changed, 162 insertions, 80 deletions
diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui index aa708c0c784a..8f9361c44c44 100644 --- a/sc/uiconfig/scalc/ui/solverdlg.ui +++ b/sc/uiconfig/scalc/ui/solverdlg.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="SolverDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -103,45 +104,39 @@ <object class="GtkLabel" id="targetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Target cell</property> <property name="use_underline">True</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="result"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Optimize result to</property> <property name="xalign">0</property> <property name="yalign">0.029999999329447746</property> - <property name="label" translatable="yes">Optimize result to</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> <object class="GtkLabel" id="changelabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_By changing cells</property> <property name="use_underline">True</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> @@ -161,8 +156,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -183,8 +176,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> @@ -222,8 +213,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -261,8 +250,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> @@ -333,8 +320,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -378,30 +363,27 @@ <object class="GtkLabel" id="cellreflabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Cell reference</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="oplabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Operator</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </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> @@ -409,15 +391,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">V_alue</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> <property name="width">4</property> - <property name="height">1</property> </packing> </child> <child> @@ -427,12 +408,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref1edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property> + </object> + </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> @@ -442,12 +426,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref2edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property> + </object> + </child> </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> @@ -457,12 +444,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref3edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property> + </object> + </child> </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> @@ -472,12 +462,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">20</property> + <child internal-child="accessible"> + <object class="AtkObject" id="ref4edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property> + </object> + </child> </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> @@ -489,8 +482,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> @@ -502,8 +493,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -515,8 +504,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -528,8 +515,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -545,12 +530,15 @@ <item translatable="yes">Integer</item> <item translatable="yes">Binary</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op1list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator</property> + </object> + </child> </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> @@ -566,12 +554,15 @@ <item translatable="yes">Integer</item> <item translatable="yes">Binary</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op2list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -587,12 +578,15 @@ <item translatable="yes">Integer</item> <item translatable="yes">Binary</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op3list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -608,12 +602,15 @@ <item translatable="yes">Integer</item> <item translatable="yes">Binary</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op4list-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -624,12 +621,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val1edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value</property> + </object> + </child> </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> @@ -640,12 +640,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val2edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value</property> + </object> + </child> </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> @@ -656,12 +659,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val3edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value</property> + </object> + </child> </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> @@ -672,12 +678,15 @@ <property name="hexpand">True</property> <property name="invisible_char">●</property> <property name="width_chars">15</property> + <child internal-child="accessible"> + <object class="AtkObject" id="val4edit-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value</property> + </object> + </child> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -689,8 +698,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> @@ -702,8 +709,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> @@ -715,8 +720,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> @@ -728,8 +731,6 @@ <packing> <property name="left_attach">4</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -744,8 +745,6 @@ <packing> <property name="left_attach">5</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -760,8 +759,6 @@ <packing> <property name="left_attach">5</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -776,8 +773,6 @@ <packing> <property name="left_attach">5</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -792,8 +787,6 @@ <packing> <property name="left_attach">5</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -806,7 +799,6 @@ <packing> <property name="left_attach">6</property> <property name="top_attach">1</property> - <property name="width">1</property> <property name="height">4</property> </packing> </child> diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui index b638d3057895..441c04351c6d 100644 --- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/standardfilterdialog.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"/> @@ -121,6 +121,11 @@ <accessibility> <relation type="labelled-by" target="label2"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="connect1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator 1</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -138,6 +143,11 @@ <accessibility> <relation type="labelled-by" target="label2"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="connect2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator 2</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -152,6 +162,11 @@ <item translatable="yes">AND</item> <item translatable="yes">OR</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="connect3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator 3</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -166,6 +181,11 @@ <item translatable="yes">AND</item> <item translatable="yes">OR</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="connect4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Operator 4</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> @@ -223,6 +243,11 @@ <accessibility> <relation type="labelled-by" target="label3"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Field Name 1</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -236,6 +261,11 @@ <accessibility> <relation type="labelled-by" target="label3"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Field Name 2</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -249,6 +279,11 @@ <accessibility> <relation type="labelled-by" target="label3"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="field3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Field Name 3</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -259,6 +294,11 @@ <object class="GtkComboBoxText" id="field4"> <property name="visible">True</property> <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="field4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Field Name 4</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -290,6 +330,11 @@ <accessibility> <relation type="labelled-by" target="label4"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Condition 1</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -321,6 +366,11 @@ <accessibility> <relation type="labelled-by" target="label4"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Condition 2</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -352,6 +402,11 @@ <accessibility> <relation type="labelled-by" target="label4"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="cond3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Condition 3</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -380,6 +435,11 @@ <item translatable="yes">Ends with</item> <item translatable="yes">Does not end with</item> </items> + <child internal-child="accessible"> + <object class="AtkObject" id="cond4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Condition 4</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -400,6 +460,11 @@ <accessibility> <relation type="labelled-by" target="label5"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val1-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value 1</property> + </object> + </child> </object> <packing> <property name="left_attach">3</property> @@ -420,6 +485,11 @@ <accessibility> <relation type="labelled-by" target="label5"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val2-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value 2</property> + </object> + </child> </object> <packing> <property name="left_attach">3</property> @@ -440,6 +510,11 @@ <accessibility> <relation type="labelled-by" target="label5"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="val3-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value 3</property> + </object> + </child> </object> <packing> <property name="left_attach">3</property> @@ -457,6 +532,11 @@ <property name="can_focus">False</property> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="val4-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Value 4</property> + </object> + </child> </object> <packing> <property name="left_attach">3</property> @@ -627,6 +707,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> @@ -644,6 +729,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> @@ -679,8 +769,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> @@ -692,8 +782,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> |