[Libreoffice-commits] .: sc/source sc/uiconfig sw/inc sw/source sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Jan 27 04:56:26 PST 2013
sc/source/ui/dbgui/tpsort.cxx | 3 -
sc/uiconfig/scalc/ui/sortoptionspage.ui | 36 ++++++++++--------
sw/inc/helpid.h | 1
sw/source/ui/frmdlg/column.cxx | 14 -------
sw/source/ui/misc/srtdlg.cxx | 8 ----
sw/uiconfig/swriter/ui/columnpage.ui | 61 +++++++++++++++++++++++++-------
sw/uiconfig/swriter/ui/sortdialog.ui | 38 +++++++++++++++++++
7 files changed, 107 insertions(+), 54 deletions(-)
New commits:
commit 6b642358640fcb060d14105991f83172e06723a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 27 08:28:34 2013 +0000
move SetAccessibleRelationLabeledBy relations into .ui and out of code
Change-Id: Ieb43e08519b72d4baebd5d004e4c9fd60daa40d4
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 78d04ac..d458597 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -530,11 +530,8 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
Init();
SetExchangeSupport();
- m_pLbOutPos->SetAccessibleRelationLabeledBy(m_pBtnCopyResult);
m_pLbOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
- m_pEdOutPos->SetAccessibleRelationLabeledBy(m_pBtnCopyResult);
m_pEdOutPos->SetAccessibleName(m_pBtnCopyResult->GetText());
- m_pLbSortUser->SetAccessibleRelationLabeledBy(m_pBtnSortUser);
m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText());
}
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ded61ac..0276e29 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -20,11 +20,9 @@
<child>
<object class="GtkCheckButton" id="case">
<property name="label" translatable="yes">Case _sensitive</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -39,11 +37,9 @@
<child>
<object class="GtkCheckButton" id="header">
<property name="label" translatable="yes">Range contains...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -57,11 +53,9 @@
<child>
<object class="GtkCheckButton" id="formats">
<property name="label" translatable="yes">Include formats</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -75,11 +69,9 @@
<child>
<object class="GtkCheckButton" id="naturalsort">
<property name="label" translatable="yes">Enable natural sort</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -93,13 +85,14 @@
<child>
<object class="GtkCheckButton" id="copyresult">
<property name="label" translatable="yes">Copy sort results to:</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="outarealb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -113,6 +106,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">20</property>
+ <accessibility>
+ <relation type="labelled-by" target="copyresult"/>
+ <relation type="label-for" target="outareaed"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -128,6 +125,9 @@
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="outarealb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -139,13 +139,14 @@
<child>
<object class="GtkCheckButton" id="sortuser">
<property name="label" translatable="yes">Custom sort order</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="sortuserlb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -159,6 +160,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">20</property>
+ <accessibility>
+ <relation type="labelled-by" target="sortuser"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -173,6 +177,8 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Language</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">language</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -187,6 +193,8 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Options</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">algorithmlb</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -264,11 +272,9 @@
<child>
<object class="GtkRadioButton" id="topdown">
<property name="label" translatable="yes">_Top to bottom (sort rows)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -285,11 +291,9 @@
<child>
<object class="GtkRadioButton" id="leftright">
<property name="label" translatable="yes">L_eft to right (sort columns)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index d5896d1..26dd338 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -423,7 +423,6 @@
#define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION"
#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE"
-#define HID_COLUMN_VALUESET "SW_HID_COLUMN_VALUESET"
#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB"
#define HID_MAIL_MERGE_SELECT "SW_HID_MAIL_MERGE_SELECT"
#define HID_MAIL_MERGE_CREATE_FROM "SW_HID_MAIL_MERGE_CREATE_FROM"
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 7c6823e..3349deb 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -453,20 +453,6 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
VclFrame *pSpacing = get<VclFrame>("spacing");
m_pBtnNext->SetAccessibleRelationMemberOf(pSpacing->get_label_widget());
- Window *pWidth = get<Window>("widthft");
- pEd1->SetAccessibleRelationLabeledBy(pWidth);
- pEd2->SetAccessibleRelationLabeledBy(pWidth);
- pEd3->SetAccessibleRelationLabeledBy(pWidth);
-
- Window *pDist = get<Window>("distft");
- pDistEd1->SetAccessibleRelationLabeledBy(pDist);
- pDistEd2->SetAccessibleRelationLabeledBy(pDist);
-
- Window *pColumn = get<Window>("columnft");
- m_pBtnBack->SetAccessibleRelationLabeledBy(pColumn);
- m_pBtnNext->SetAccessibleRelationLabeledBy(pColumn);
-
- m_pDefaultVS->SetHelpId(HID_COLUMN_VALUESET);
m_pDefaultVS->SetColCount( 5 );
for (int i = 0; i < 5; ++i)
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index d9ea0c0..a0c7aff 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -238,24 +238,16 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
m_pColEdt3->SetMax(nMax);
}
- m_pDelimEdt->SetAccessibleRelationLabeledBy(m_pDelimFreeRB);
- m_pDelimPB->SetAccessibleRelationLabeledBy(m_pDelimFreeRB);
m_pDelimPB->SetAccessibleRelationMemberOf(m_pDelimFreeRB);
m_pColEdt1->SetAccessibleRelationMemberOf(m_pKeyCB1);
- m_pColEdt1->SetAccessibleRelationLabeledBy(m_pColLbl);
m_pTypDLB1->SetAccessibleRelationMemberOf(m_pKeyCB1);
- m_pTypDLB1->SetAccessibleRelationLabeledBy(m_pTypLbl);
m_pColEdt2->SetAccessibleRelationMemberOf(m_pKeyCB2);
- m_pColEdt2->SetAccessibleRelationLabeledBy(m_pColLbl);
m_pTypDLB2->SetAccessibleRelationMemberOf(m_pKeyCB2);
- m_pTypDLB2->SetAccessibleRelationLabeledBy(m_pTypLbl);
m_pColEdt3->SetAccessibleRelationMemberOf(m_pKeyCB3);
- m_pColEdt3->SetAccessibleRelationLabeledBy(m_pColLbl);
m_pTypDLB3->SetAccessibleRelationMemberOf(m_pKeyCB3);
- m_pTypDLB3->SetAccessibleRelationLabeledBy(m_pTypLbl);
}
SwSortDlg::~SwSortDlg()
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index 1565167..e19eb61 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -33,6 +33,18 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </object>
<object class="GtkGrid" id="ColumnPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -308,6 +320,10 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Column</property>
+ <accessibility>
+ <relation type="label-for" target="back"/>
+ <relation type="label-for" target="next"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -323,6 +339,7 @@
<property name="hexpand">True</property>
<property name="label">_1</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">width1mf:0.00cm</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -338,6 +355,7 @@
<property name="hexpand">True</property>
<property name="label">_2</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">width2mf:0.00cm</property>
<attributes>
<attribute name="background" value="#ffffffffffff"/>
</attributes>
@@ -356,6 +374,7 @@
<property name="hexpand">True</property>
<property name="label">_3</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">width3mf:0.00cm</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -370,6 +389,11 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Width</property>
+ <accessibility>
+ <relation type="label-for" target="width3mf:0.00cm"/>
+ <relation type="label-for" target="width2mf:0.00cm"/>
+ <relation type="label-for" target="width1mf:0.00cm"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -388,6 +412,9 @@
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="widthft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">4</property>
@@ -406,6 +433,9 @@
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="widthft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">3</property>
@@ -424,6 +454,9 @@
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="widthft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
@@ -438,6 +471,10 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Spacing</property>
+ <accessibility>
+ <relation type="label-for" target="spacing1mf:0.00cm"/>
+ <relation type="label-for" target="spacing2mf:0.00cm"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -461,6 +498,9 @@
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="distft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -478,6 +518,9 @@
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="distft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -517,6 +560,9 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image7</property>
+ <accessibility>
+ <relation type="labelled-by" target="columnft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -531,6 +577,9 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image8</property>
+ <accessibility>
+ <relation type="labelled-by" target="columnft"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">5</property>
@@ -783,18 +832,6 @@
</packing>
</child>
</object>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
- <property name="icon-size">1</property>
- </object>
- <object class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- <property name="icon-size">1</property>
- </object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index bbf1b86..247344b 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -100,6 +100,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Column</property>
+ <accessibility>
+ <relation type="label-for" target="colsb1"/>
+ <relation type="label-for" target="colsb2"/>
+ <relation type="label-for" target="colsb3"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -113,6 +118,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Key type</property>
+ <accessibility>
+ <relation type="label-for" target="typelb1"/>
+ <relation type="label-for" target="typelb2"/>
+ <relation type="label-for" target="typelb3"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
@@ -339,6 +349,9 @@
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="column"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -355,6 +368,9 @@
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="column"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -371,6 +387,9 @@
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="column"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -385,6 +404,9 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="entry_text_column">0</property>
+ <accessibility>
+ <relation type="labelled-by" target="keytype"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
@@ -400,6 +422,9 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="button_sensitivity">off</property>
+ <accessibility>
+ <relation type="labelled-by" target="keytype"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
@@ -413,6 +438,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <accessibility>
+ <relation type="labelled-by" target="keytype"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">2</property>
@@ -572,6 +600,10 @@
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">tabs</property>
+ <accessibility>
+ <relation type="label-for" target="separator"/>
+ <relation type="label-for" target="delimpb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -592,6 +624,9 @@
<property name="invisible_char">•</property>
<property name="width_chars">1</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="character"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -606,6 +641,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="character"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
More information about the Libreoffice-commits
mailing list