icon-themes/colibre/links.txt | 12 + sw/source/ui/chrdlg/pardlg.cxx | 44 ++- sw/source/uibase/uiview/viewmdi.cxx | 6 sw/uiconfig/swriter/ui/paradialog.ui | 389 ++++++++++++++++++++++++++++++----- 4 files changed, 380 insertions(+), 71 deletions(-)
New commits: commit 112b97ebe0e31b71a23837b7757baf7d8f900d23 Author: Heiko Tietze <[email protected]> AuthorDate: Mon Jun 16 07:43:45 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Tue Jun 17 12:24:25 2025 +0200 Resolves tdf#167038 - Apply VT style to Paragraph Formatting dialog Tab labels renamed to align with templatedialog* Change-Id: I02ad8930b832575bd96e6c1e68932cbad5abc7e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186534 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 3a51d1f301e9..58dddd1bdc58 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -2852,3 +2852,15 @@ res/wrap.png cmd/lc_wrapcontour.png # res/borders.png cmd/lc_borderdialog.png # res/columns.png cmd/lc_pagecolumntype.png res/macros.png cmd/lc_choosemacro.png + +### paradialog.ui / Paragraph Formatting +# res/indents.png cmd/lc_incrementindent.png +# res/alignment.png cmd/lc_alignblock.png +# res/textflow.png cmd/lc_hyphenate.png +# res/asiantypo.png cmd/lc_defaultcharstyle.png +# res/outline.png cmd/lc_setoutline.png +# res/tabs.png cmd/lc_hangingindent.png +# res/dropcaps.png cmd/lc_smallcaps.png +# res/borders.png cmd/lc_borderdialog.png +# res/area.png cmd/lc_backgroundcolor.png +# res/transparence.png cmd/lc_graftransparence.png diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 14cf2ff599a4..ae6419fd9d6b 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -65,13 +65,13 @@ SwParaDlg::SwParaDlg(weld::Window *pParent, OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage(u"labelTP_PARA_STD"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), - pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) ); + AddTabPage(u"indents"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), + pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH)); OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!"); - AddTabPage(u"labelTP_PARA_ALIGN"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), - pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH)); + AddTabPage(u"alignment"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), + pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH)); if (!m_bDrawParaDlg && (!bHtmlMode || officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get())) { @@ -88,38 +88,38 @@ SwParaDlg::SwParaDlg(weld::Window *pParent, { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!"); - AddTabPage( u"labelTP_PARA_ASIAN"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), - pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) ); + AddTabPage(u"asiantypo"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), + pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); } else - RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr); + RemoveTabPage(u"asiantypo"_ustr); if(bHtmlMode) - RemoveTabPage(u"labelTP_TABULATOR"_ustr); + RemoveTabPage(u"tabs"_ustr); else { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); - AddTabPage( u"labelTP_TABULATOR"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); + AddTabPage( u"tabs"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); } // remove unwanted tabs for draw text box paragraph properties if (m_bDrawParaDlg) { - RemoveTabPage(u"labelTP_NUMPARA"_ustr); - RemoveTabPage(u"labelTP_DROPCAPS"_ustr); - RemoveTabPage(u"labelTP_BORDER"_ustr); + RemoveTabPage(u"outline"_ustr); + RemoveTabPage(u"dropcaps"_ustr); + RemoveTabPage(u"borders"_ustr); RemoveTabPage(u"area"_ustr); RemoveTabPage(u"transparence"_ustr); } else { if(!(nDialogMode & DLG_ENVELOP)) - AddTabPage(u"labelTP_NUMPARA"_ustr, SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); + AddTabPage(u"outline"_ustr, SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); else - RemoveTabPage(u"labelTP_NUMPARA"_ustr); + RemoveTabPage(u"outline"_ustr); - AddTabPage(u"labelTP_DROPCAPS"_ustr, SwDropCapsPage::Create, SwDropCapsPage::GetRanges); + AddTabPage(u"dropcaps"_ustr, SwDropCapsPage::Create, SwDropCapsPage::GetRanges); if(!bHtmlMode || (nHtmlMode & (HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES))) { @@ -135,11 +135,13 @@ SwParaDlg::SwParaDlg(weld::Window *pParent, OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(u"labelTP_BORDER"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); } if (!sDefPage.isEmpty()) SetCurPageId(sDefPage); + else + SetCurPageId("indents"); } SwParaDlg::~SwParaDlg() @@ -152,12 +154,12 @@ void SwParaDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); // Table borders cannot get any shade in Writer - if (rId == "labelTP_BORDER") + if (rId == "borders") { aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,static_cast<sal_uInt16>(SwBorderModes::PARA))); rPage.PageCreated(aSet); } - else if (rId == "labelTP_PARA_STD") + else if (rId == "indents") { aSet.Put(SfxUInt16Item(SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH, static_cast< sal_uInt16 >(rSh.GetAnyCurRect(CurRectType::PagePrt).Width()) )); @@ -172,7 +174,7 @@ void SwParaDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) } rPage.PageCreated(aSet); } - else if (rId == "labelTP_PARA_ALIGN") + else if (rId == "alignment") { if (!m_bDrawParaDlg) { @@ -191,11 +193,11 @@ void SwParaDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) rPage.PageCreated(aSet); } } - else if (rId == "labelTP_DROPCAPS") + else if (rId == "dropcaps") { static_cast<SwDropCapsPage&>(rPage).SetFormat(false); } - else if (rId == "labelTP_NUMPARA") + else if (rId == "outline") { SwTextFormatColl* pTmpColl = rSh.GetCurTextFormatColl(); if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() ) diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index a97b197c03e9..9421eae0bfe9 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -700,10 +700,10 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler, void ) { case RulerType::DontKnow: case RulerType::Outside: - sDefPage="labelTP_BORDER"; + sDefPage="borders"; break; case RulerType::Indent: - sDefPage="labelTP_PARA_STD"; + sDefPage="indents"; break; case RulerType::Margin1: case RulerType::Margin2: @@ -711,7 +711,7 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler, void ) sDefPage = "page"; break; default: - sDefPage = "labelTP_TABULATOR"; + sDefPage = "tabs"; } diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui index 3f12d683e6fa..e1efa3539d92 100644 --- a/sw/uiconfig/swriter/ui/paradialog.ui +++ b/sw/uiconfig/swriter/ui/paradialog.ui @@ -114,10 +114,10 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="scrollable">True</property> - <property name="enable-popup">True</property> + <property name="tab-pos">left</property> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -126,18 +126,45 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_STD"> - <property name="visible">True</property> + <object class="GtkBox" id="indents"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents & Spacing</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imParaIndent"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/indents.png</property> + <accessibility> + <relation type="labelled-by" target="lbParaIndent"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbParaIndent"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|indents">Indents & Spacing</property> + <property name="mnemonic-widget">indents</property> + <accessibility> + <relation type="label-for" target="imParaIndent"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="tab-fill">False</property> - </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -149,11 +176,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_ALIGN"> - <property name="visible">True</property> + <object class="GtkBox" id="alignment"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property> - <property name="xalign">0.5</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/alignment.png</property> + <accessibility> + <relation type="labelled-by" target="lbAlignment"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|alignment">Alignment</property> + <property name="mnemonic-widget">alignment</property> + <accessibility> + <relation type="label-for" target="imAlignment"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">1</property> @@ -162,7 +218,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -174,11 +230,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="textflow"> - <property name="visible">True</property> + <object class="GtkBox" id="textflow"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|textflow">Text Flow</property> - <property name="xalign">0.5</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imTextflow"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/textflow.png</property> + <accessibility> + <relation type="labelled-by" target="lbTextflow"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbTextflow"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|textflow">Text Flow</property> + <property name="mnemonic-widget">textflow</property> + <accessibility> + <relation type="label-for" target="imTextflow"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">2</property> @@ -187,7 +272,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -199,10 +284,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_ASIAN"> - <property name="visible">True</property> + <object class="GtkBox" id="asiantypo"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAsiantypo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/asiantypo.png</property> + <accessibility> + <relation type="labelled-by" target="lbAsiantypo"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbAsiantypo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|asiantypo">Asian Typography</property> + <property name="mnemonic-widget">asiantypo</property> + <accessibility> + <relation type="label-for" target="imAsiantypo"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">3</property> @@ -211,7 +326,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -223,11 +338,41 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_NUMPARA"> - <property name="visible">True</property> + <object class="GtkBox" id="outline"> <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes" context="paradialog|labelTP_NUMPARA">Set outline level, list style and line numbering for paragraph.</property> - <property name="label" translatable="yes" context="paradialog|labelTP_NUMPARA">Outline & List</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imOutline"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/outline.png</property> + <accessibility> + <relation type="labelled-by" target="lbOutline"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbOutline"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes" context="paradialog|outline">Set outline level, list style and line numbering for paragraph.</property> + <property name="label" translatable="yes" context="paradialog|outline">Outline & List</property> + <property name="mnemonic-widget">outline</property> + <accessibility> + <relation type="label-for" target="imOutline"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">4</property> @@ -236,7 +381,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -248,10 +393,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_TABULATOR"> - <property name="visible">True</property> + <object class="GtkBox" id="tabs"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imTabs"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/tabs.png</property> + <accessibility> + <relation type="labelled-by" target="lbTabs"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbTabs"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|tabs">Tabs</property> + <property name="mnemonic-widget">tabs</property> + <accessibility> + <relation type="label-for" target="imTabs"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">5</property> @@ -260,7 +435,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -272,10 +447,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_DROPCAPS"> - <property name="visible">True</property> + <object class="GtkBox" id="dropcaps"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_DROPCAPS">Drop Caps</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imDropcaps"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/dropcaps.png</property> + <accessibility> + <relation type="labelled-by" target="lbDropcaps"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbDropcaps"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|dropcaps">Drop Caps</property> + <property name="mnemonic-widget">dropcaps</property> + <accessibility> + <relation type="label-for" target="imDropcaps"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">6</property> @@ -284,7 +489,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -296,10 +501,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_BORDER"> - <property name="visible">True</property> + <object class="GtkBox" id="borders"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|labelTP_BORDER">Borders</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imBorders"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/borders.png</property> + <accessibility> + <relation type="labelled-by" target="lbBorders"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbBorders"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|borders">Borders</property> + <property name="mnemonic-widget">borders</property> + <accessibility> + <relation type="label-for" target="imBorders"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">7</property> @@ -308,7 +543,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -320,10 +555,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="area"> - <property name="visible">True</property> + <object class="GtkBox" id="area"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|area">Area</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imArea"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/area.png</property> + <accessibility> + <relation type="labelled-by" target="lbArea"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbArea"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|area">Area</property> + <property name="mnemonic-widget">area</property> + <accessibility> + <relation type="label-for" target="imArea"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">8</property> @@ -332,7 +597,7 @@ </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -344,10 +609,40 @@ </packing> </child> <child type="tab"> - <object class="GtkLabel" id="transparence"> - <property name="visible">True</property> + <object class="GtkBox" id="transparence"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="paradialog|transparence">Transparency</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imTransparence"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">res/transparence.png</property> + <accessibility> + <relation type="labelled-by" target="lbTransparence"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbTransparence"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="paradialog|transparence">Transparency</property> + <property name="mnemonic-widget">transparence</property> + <accessibility> + <relation type="label-for" target="imTransparence"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">9</property>
