diff options
24 files changed, 76 insertions, 137 deletions
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index a0be598a5f43..4163afc14d8d 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -200,7 +200,6 @@ SvInsertOleDlg::SvInsertOleDlg m_pRbObjectFromfile->SetClickHdl( aLink ); m_pRbNewObject->Check( sal_True ); RadioHdl( NULL ); - m_pBtnFilepath->SetAccessibleRelationMemberOf(m_pFileFrame->get_label_widget()); } short SvInsertOleDlg::Execute() diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index de5997f3a968..a3d538789f9f 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -196,12 +196,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) m_pUserEdit->SetLast( nMax ); m_pUserEdit->SetValue( nValue ); - m_pUserEdit->SetAccessibleRelationLabeledBy(m_pUserBtn); m_pUserEdit->SetAccessibleName(m_pUserBtn->GetText()); - m_pColumnsEdit->SetAccessibleRelationLabeledBy(m_pColumnsBtn); m_pColumnsEdit->SetAccessibleName(m_pColumnsBtn->GetText()); m_pColumnsEdit->SetAccessibleRelationMemberOf(m_pColumnsBtn); - m_pBookModeChk->SetAccessibleRelationLabeledBy(m_pColumnsBtn); m_pBookModeChk->SetAccessibleRelationMemberOf(m_pColumnsBtn); const SfxPoolItem& rItem = rSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_ZOOM ) ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index d31adc9560c7..7cd9c79b4882 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -106,7 +106,7 @@ private: NumericField* m_pEdLeadZeroes; CheckBox* m_pBtnThousand; - FixedText* m_pFtEdFormat; + VclContainer* m_pFormatCodeFrame; Edit* m_pEdFormat; PushButton* m_pIbAdd; PushButton* m_pIbInfo; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index f5c6d4ac557c..4f3f0ff37646 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -379,9 +379,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC FillColorValueSets_Impl(); m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) ); - - m_pWndPosition->SetAccessibleRelationLabeledBy(m_pBtnPosition); - m_pBackgroundColorSet->SetAccessibleRelationLabeledBy(m_pBackGroundColorFrame->get_label_widget()); } //------------------------------------------------------------------------ diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9e2cb5ec0833..0969da75a600 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -246,7 +246,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent, get(m_pFtLeadZeroes, "leadzerosft"); get(m_pEdLeadZeroes, "leadzerosed"); get(m_pBtnThousand, "thousands"); - get(m_pFtEdFormat, "formatft"); + get(m_pFormatCodeFrame, "formatcode"); get(m_pEdFormat, "formated"); get(m_pIbAdd, "add"); get(m_pIbInfo, "edit"); @@ -324,13 +324,6 @@ void SvxNumberFormatTabPage::Init_Impl() { m_pLbLanguage->InsertLanguage( xLang[i] ); } - - m_pIbAdd->SetAccessibleRelationLabeledBy(m_pFtEdFormat); - m_pIbInfo->SetAccessibleRelationLabeledBy(m_pFtEdFormat); - m_pIbRemove->SetAccessibleRelationLabeledBy(m_pFtEdFormat); - m_pIbAdd->SetAccessibleRelationMemberOf(m_pIbAdd); - m_pIbInfo->SetAccessibleRelationMemberOf(m_pIbInfo); - m_pIbRemove->SetAccessibleRelationMemberOf(m_pIbRemove); } /************************************************************************* @@ -657,13 +650,7 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() m_pBtnNegRed->Enable( bEnable ); m_pBtnThousand->Enable( bEnable ); m_pFtOptions->Enable( bEnable ); - m_pFtEdFormat->Enable( bEnable ); - m_pEdFormat->Enable( bEnable ); - m_pIbAdd->Enable( bEnable ); - m_pIbRemove->Enable( bEnable ); - m_pIbInfo->Enable( bEnable ); - m_pFtComment->Enable( bEnable ); - m_pEdComment->Enable( bEnable ); + m_pFormatCodeFrame->Enable( bEnable ); m_pLbFormat->Invalidate(); // #i43322# } diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 462cb1369e31..bea099bb8a98 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -417,6 +417,9 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <accessibility> + <relation type="labelled-by" target="positionrb"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> @@ -441,6 +444,9 @@ <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">arearb</property> + <accessibility> + <relation type="label-for" target="windowpos"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index d3b7e11ff1d9..1366dd3fb33e 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -204,6 +204,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">_Decimal places</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">decimalsed</property> </object> <packing> <property name="left_attach">0</property> @@ -218,6 +219,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes">Leading _zeroes</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">leadzerosed</property> </object> <packing> <property name="left_attach">0</property> diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui index ad7042879d8f..bb978158b82e 100644 --- a/cui/uiconfig/ui/zoomdialog.ui +++ b/cui/uiconfig/ui/zoomdialog.ui @@ -24,12 +24,10 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -41,11 +39,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -57,11 +53,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -102,11 +96,9 @@ <child> <object class="GtkRadioButton" id="optimal"> <property name="label" translatable="yes">Optimal</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="active">True</property> <property name="draw_indicator">True</property> @@ -121,11 +113,9 @@ <child> <object class="GtkRadioButton" id="fitwandh"> <property name="label" translatable="yes">Fit width and height</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="active">True</property> <property name="draw_indicator">True</property> @@ -140,11 +130,9 @@ <child> <object class="GtkRadioButton" id="fitw"> <property name="label" translatable="yes">Fit width</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="active">True</property> <property name="draw_indicator">True</property> @@ -159,11 +147,9 @@ <child> <object class="GtkRadioButton" id="100pc"> <property name="label" translatable="yes">100%</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="active">True</property> <property name="draw_indicator">True</property> @@ -183,15 +169,16 @@ <child> <object class="GtkRadioButton" id="variable"> <property name="label" translatable="yes">Variable</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="active">True</property> <property name="draw_indicator">True</property> <property name="group">optimal</property> + <accessibility> + <relation type="label-for" target="zoomsb:0%"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -204,6 +191,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> + <accessibility> + <relation type="labelled-by" target="variable"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -258,11 +248,9 @@ <child> <object class="GtkRadioButton" id="automatic"> <property name="label" translatable="yes">Automatic</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="active">True</property> <property name="draw_indicator">True</property> @@ -277,11 +265,9 @@ <child> <object class="GtkRadioButton" id="singlepage"> <property name="label" translatable="yes">Single page</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="active">True</property> <property name="draw_indicator">True</property> @@ -301,15 +287,17 @@ <child> <object class="GtkRadioButton" id="columns"> <property name="label" translatable="yes">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="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">automatic</property> + <accessibility> + <relation type="label-for" target="columnssb:0"/> + <relation type="label-for" target="bookmode"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -323,6 +311,9 @@ <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="columns"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -345,13 +336,14 @@ <child> <object class="GtkCheckButton" id="bookmode"> <property name="label" translatable="yes">Book mode</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="labelled-by" target="columns"/> + </accessibility> </object> </child> </object> diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc index 928b0313d217..ffeba4730b21 100644 --- a/sw/inc/access.hrc +++ b/sw/inc/access.hrc @@ -46,7 +46,7 @@ #define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26) #define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27) #define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28) -#define STR_ACCESS_SW_CATEGORY (RC_ACCESS_BEGIN + 29) + #define STR_ACCESS_TL_GLOBAL (RC_ACCESS_BEGIN + 30) #define STR_ACCESS_TL_CONTENT (RC_ACCESS_BEGIN + 31) diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index e70f6e400148..0653aaf8bc3e 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -63,7 +63,7 @@ #define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38) -#define STR_FOOTNOTE_DIALOG_CHAR (RC_GLOBALS_BEGIN + 39) + #define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index a09ad84a5409..d5896d1e982e 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -305,7 +305,6 @@ #define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG" #define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" #define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" -#define HID_MD_GLOS_CATEGORY "SW_HID_MD_GLOS_CATEGORY" #define HID_REGION_TREE "SW_HID_REGION_TREE" #define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE" #define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE" diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index a7faf1790429..4bf680123536 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -226,11 +226,6 @@ String STR_JAVA_EDIT Text [ en-US ] = "Edit Script" ; }; -String STR_FOOTNOTE_DIALOG_CHAR -{ - Text [ en-US ] = "Character" ; -}; - String STR_REMOVE_WARNING { Text [ en-US ] = "The following characters are not valid and have been removed: "; @@ -612,11 +607,6 @@ String STR_CONVERT_TEXT_TABLE Text [ en-US ] = "Convert Text to Table" ; }; -String STR_SYMBOL -{ - Text [ en-US ] = "Symbol" ; -}; - String STR_ADD_AUTOFORMAT_TITLE { Text [ en-US ] = "Add AutoFormat" ; diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index e4e2d1bc2bc5..032bdd69eb04 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -140,7 +140,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) get(m_pPageNumBox, "pagenumcb"); get(m_pPageNumEdit, "pagenumsb"); - m_pPageNumEdit->SetAccessibleRelationLabeledBy(m_pPageNumBox); m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText()); Link aLk = LINK(this,SwBreakDlg,ClickHdl); diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 9131ac586a2d..84402a73e962 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -91,7 +91,6 @@ #define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) #define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) #define STR_FDLG_STYLE (RC_APP_BEGIN + 106) -#define STR_SYMBOL (RC_APP_BEGIN + 107) // Status bar strings #define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index c5a38aefbc12..ab833ed5d7c2 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -241,13 +241,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, if( bIsDocReadOnly ) m_pInsertBtn->Enable(sal_False); m_pNameED->GrabFocus(); - m_pCategoryBox->SetHelpId(HID_MD_GLOS_CATEGORY); m_pCategoryBox->SetStyle(m_pCategoryBox->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT); m_pCategoryBox->GetModel()->SetSortMode(SortAscending); m_pCategoryBox->SetHighlightRange(); // select over full width m_pCategoryBox->SetNodeDefaultImages( ); - m_pCategoryBox->SetAccessibleName(SW_RES(STR_ACCESS_SW_CATEGORY)); - m_pCategoryBox->SetAccessibleRelationLabeledBy(m_pInsertTipCB); Init(); } diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index b60c5a1bb372..1bd92a50f112 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -44,10 +44,6 @@ String STR_GLOSSARY { Text [ en-US ] = "AutoText :" ; }; -String STR_ACCESS_SW_CATEGORY -{ - Text [ en-US ] = "Category" ; -}; ModalDialog DLG_RENAME_GLOS { OutputSize = TRUE ; diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index e455bfe992fa..34df6450650c 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -184,10 +184,6 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, sal_Bool get(m_pPrevBT, "prev"); get(m_pNextBT, "next"); - m_pNumberCharEdit->SetAccessibleName(String(SW_RES(STR_FOOTNOTE_DIALOG_CHAR))); - m_pNumberExtChar->SetAccessibleRelationMemberOf(m_pNumberFrame->get_label_widget()); - m_pNumberCharEdit->SetAccessibleRelationLabeledBy(m_pNumberCharBtn); - m_pNumberAutoBtn->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberAutoBtnHdl)); m_pNumberExtChar->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberExtCharHdl)); m_pNumberCharBtn->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberCharHdl)); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 2beeaef07aa6..93e36241b291 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -119,9 +119,6 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) get(mpBorderCB, "bordercb"); get(mpAutoFmtBtn, "autofmt"); - mpOtherEd->SetAccessibleName(String(SW_RES(STR_SYMBOL))); - mpOtherEd->SetAccessibleRelationLabeledBy(mpOtherBtn); - if(nSaveButtonState > -1) { switch (nSaveButtonState) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 0653144b8651..656ba32d08b3 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1312,7 +1312,6 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPageCollLB->SetAccessibleRelationLabeledBy(m_pPageCollCB); m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText()); m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl)); diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui index 0925aac72449..e6fddb1a3d9a 100644 --- a/sw/uiconfig/swriter/ui/autotext.ui +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -230,6 +230,9 @@ <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="category"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -318,6 +321,14 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <accessibility> + <relation type="labelled-by" target="inserttip"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="othered-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Category</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui index 1b3e6b151e8f..8426f7c4e62b 100644 --- a/sw/uiconfig/swriter/ui/converttexttable.ui +++ b/sw/uiconfig/swriter/ui/converttexttable.ui @@ -25,12 +25,10 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -42,11 +40,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -58,11 +54,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -114,6 +108,14 @@ <property name="width_chars">1</property> <property name="text" translatable="yes">,</property> <property name="invisible_char_set">True</property> + <accessibility> + <relation type="labelled-by" target="other"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="othered-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Symbol</property> + </object> + </child> </object> <packing> <property name="left_attach">2</property> @@ -125,15 +127,16 @@ <child> <object class="GtkRadioButton" id="other"> <property name="label" translatable="yes">Other:</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="valign">end</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">tabs</property> + <accessibility> + <relation type="label-for" target="othered"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> @@ -145,12 +148,10 @@ <child> <object class="GtkRadioButton" id="semicolons"> <property name="label" translatable="yes">Semicolons</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="valign">end</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">other</property> @@ -165,12 +166,10 @@ <child> <object class="GtkRadioButton" id="paragraph"> <property name="label" translatable="yes">Paragraph</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="valign">end</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">semicolons</property> @@ -185,13 +184,11 @@ <child> <object class="GtkRadioButton" id="tabs"> <property name="label" translatable="yes">Tabs</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="halign">start</property> <property name="valign">end</property> - <property name="use_action_appearance">False</property> <property name="relief">half</property> <property name="xalign">0</property> <property name="active">True</property> @@ -208,10 +205,8 @@ <child> <object class="GtkCheckButton" id="keepcolumn"> <property name="label" translatable="yes">Equal width for all columns</property> - <property name="use_action_appearance">False</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="active">True</property> <property name="draw_indicator">True</property> @@ -264,11 +259,9 @@ <child> <object class="GtkCheckButton" id="headingcb"> <property name="label" translatable="yes">Heading</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> @@ -282,12 +275,10 @@ <child> <object class="GtkCheckButton" id="repeatheading"> <property name="label" translatable="yes">Repeat heading</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="margin_left">25</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -302,11 +293,9 @@ <child> <object class="GtkCheckButton" id="dontsplitcb"> <property name="label" translatable="yes">Don't split table</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> @@ -320,11 +309,9 @@ <child> <object class="GtkCheckButton" id="bordercb"> <property name="label" translatable="yes">Border</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="active">True</property> <property name="draw_indicator">True</property> @@ -347,6 +334,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">The first </property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">repeatheadersb</property> </object> <packing> <property name="left_attach">0</property> @@ -397,10 +386,8 @@ <child> <object class="GtkButton" id="autofmt"> <property name="label" translatable="yes">AutoFormat...</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">0</property> diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui index f69746870d2f..3cfdb2ced297 100644 --- a/sw/uiconfig/swriter/ui/insertbreak.ui +++ b/sw/uiconfig/swriter/ui/insertbreak.ui @@ -36,13 +36,11 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</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_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -54,11 +52,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -70,11 +66,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -110,11 +104,9 @@ <child> <object class="GtkRadioButton" id="linerb"> <property name="label" translatable="yes">Line break</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="active">True</property> <property name="draw_indicator">True</property> @@ -129,11 +121,9 @@ <child> <object class="GtkRadioButton" id="columnrb"> <property name="label" translatable="yes">Column break</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="active">True</property> <property name="draw_indicator">True</property> @@ -148,11 +138,9 @@ <child> <object class="GtkRadioButton" id="pagerb"> <property name="label" translatable="yes">Page break</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="active">True</property> <property name="draw_indicator">True</property> @@ -192,13 +180,14 @@ <child> <object class="GtkCheckButton" id="pagenumcb"> <property name="label" translatable="yes">Change page number</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="pagenumsb"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -217,6 +206,9 @@ <property name="invisible_char">●</property> <property name="invisible_char_set">True</property> <property name="adjustment">adjustment1</property> + <accessibility> + <relation type="labelled-by" target="pagenumcb"/> + </accessibility> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui index a4b2020c6f3d..64a787f3c4c3 100644 --- a/sw/uiconfig/swriter/ui/insertfootnote.ui +++ b/sw/uiconfig/swriter/ui/insertfootnote.ui @@ -18,13 +18,11 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</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_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -36,11 +34,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -52,11 +48,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -72,10 +66,8 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkButton" id="prev"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="image">image1</property> <property name="image_position">right</property> </object> @@ -88,10 +80,8 @@ </child> <child> <object class="GtkButton" id="next"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="image">image2</property> </object> <packing> @@ -142,11 +132,9 @@ <child> <object class="GtkRadioButton" id="automatic"> <property name="label" translatable="yes">Automatic</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="active">True</property> <property name="draw_indicator">True</property> @@ -162,14 +150,15 @@ <child> <object class="GtkRadioButton" id="character"> <property name="label" translatable="yes">Character</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> <property name="group">automatic</property> + <accessibility> + <relation type="label-for" target="characterentry"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -187,6 +176,14 @@ <property name="width_chars">2</property> <property name="progress_fraction">0.0099999997764825821</property> <property name="progress_pulse_step">0.090000003576278687</property> + <accessibility> + <relation type="labelled-by" target="character"/> + </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="characterentry-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Character</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -198,12 +195,10 @@ <child> <object class="GtkButton" id="choosecharacter"> <property name="label" translatable="yes">Choose ...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">start</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">2</property> @@ -258,11 +253,9 @@ <child> <object class="GtkRadioButton" id="footnote"> <property name="label" translatable="yes">Footnote</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="active">True</property> <property name="draw_indicator">True</property> @@ -277,11 +270,9 @@ <child> <object class="GtkRadioButton" id="endnote"> <property name="label" translatable="yes">Endnote</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> <property name="group">footnote</property> diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index 4527aa142418..b31c36a2e89c 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui @@ -204,6 +204,9 @@ <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="pagestylelb"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -248,6 +251,9 @@ <property name="can_focus">False</property> <property name="entry_text_column">0</property> <property name="id_column">1</property> + <accessibility> + <relation type="labelled-by" target="pagestyle"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> |