cui/source/dialogs/srchxtra.cxx | 14 cui/uiconfig/ui/searchformatdialog.ui | 603 ++++++++++++++++++---------------- 2 files changed, 331 insertions(+), 286 deletions(-)
New commits: commit 7c3ddb07e8e92c23b5b5ea1469b55806578b7f5b Author: Heiko Tietze <[email protected]> AuthorDate: Tue Jun 24 08:37:56 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Tue Jun 24 10:04:41 2025 +0200 Resolves tdf#167104 - Apply VT style to Search Format dialog Change-Id: I0543e055bd340b40bc5e64274c8ab1b7c17b87cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186867 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index efa37ecb945c..a67ac828cdcf 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -42,17 +42,17 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxIte AddTabPage(u"fonteffects"_ustr, SvxCharEffectsPage::Create, nullptr); AddTabPage(u"position"_ustr, SvxCharPositionPage::Create, nullptr); AddTabPage(u"asianlayout"_ustr, SvxCharTwoLinesPage::Create, nullptr); - AddTabPage(u"labelTP_PARA_STD"_ustr, SvxStdParagraphTabPage::Create, nullptr); - AddTabPage(u"labelTP_PARA_ALIGN"_ustr, SvxParaAlignTabPage::Create, nullptr); - AddTabPage(u"labelTP_PARA_EXT"_ustr, SvxExtParagraphTabPage::Create, nullptr); - AddTabPage(u"labelTP_PARA_ASIAN"_ustr, SvxAsianTabPage::Create, nullptr ); + AddTabPage(u"indents"_ustr, SvxStdParagraphTabPage::Create, nullptr); + AddTabPage(u"alignment"_ustr, SvxParaAlignTabPage::Create, nullptr); + AddTabPage(u"textflow"_ustr, SvxExtParagraphTabPage::Create, nullptr); + AddTabPage(u"asiantypo"_ustr, SvxAsianTabPage::Create, nullptr ); AddTabPage(u"background"_ustr, SvxBkgTabPage::Create, nullptr); // remove asian tabpages if necessary if ( !SvtCJKOptions::IsDoubleLinesEnabled() ) RemoveTabPage(u"asianlayout"_ustr); if ( !SvtCJKOptions::IsAsianTypographyEnabled() ) - RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr); + RemoveTabPage(u"asiantypo"_ustr); } SvxSearchFormatDialog::~SvxSearchFormatDialog() @@ -85,11 +85,11 @@ void SvxSearchFormatDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) SetFontList( SvxFontListItem( pList, SID_ATTR_CHAR_FONTLIST ) ); static_cast<SvxCharNamePage&>(rPage).EnableSearchMode(); } - else if (rId == "labelTP_PARA_STD") + else if (rId == "indents") { static_cast<SvxStdParagraphTabPage&>(rPage).EnableAutoFirstLine(); } - else if (rId == "labelTP_PARA_ALIGN") + else if (rId == "alignment") { static_cast<SvxParaAlignTabPage&>(rPage).EnableJustifyExt(); } diff --git a/cui/uiconfig/ui/searchformatdialog.ui b/cui/uiconfig/ui/searchformatdialog.ui index c1b05669f1eb..8e983a2c4d7c 100644 --- a/cui/uiconfig/ui/searchformatdialog.ui +++ b/cui/uiconfig/ui/searchformatdialog.ui @@ -94,435 +94,480 @@ <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="tab"> - <object class="GtkLabel" id="font"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|font">Font</property> + <object class="GtkBox" id="font"> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imFont"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_fontdialog.png</property> + <accessibility> + <relation type="labelled-by" target="lbFont"/> + </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="lbFont"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="searchformatdialog|font">Font</property> + <property name="mnemonic-widget">font</property> + <accessibility> + <relation type="label-for" target="imFont"/> + </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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">1</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="fonteffects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|fonteffects">Font Effects</property> + <object class="GtkBox" id="fonteffects"> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imFonteffects"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_color.png</property> + <accessibility> + <relation type="labelled-by" target="lbFonteffects"/> + </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="lbFonteffects"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="searchformatdialog|fonteffects">Font Effects</property> + <property name="mnemonic-widget">fonteffects</property> + <accessibility> + <relation type="label-for" target="imFonteffects"/> + </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> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">2</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="position"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|position">Position</property> + <object class="GtkBox" id="position"> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imPosition"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_fontwork.png</property> + <accessibility> + <relation type="labelled-by" target="lbPosition"/> + </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="lbPosition"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="searchformatdialog|position">Position</property> + <property name="mnemonic-widget">position</property> + <accessibility> + <relation type="label-for" target="imPosition"/> + </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> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">3</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="asianlayout"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|asianlayout">Asian Layout</property> + <object class="GtkBox" id="asianlayout"> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imAsianlayout"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_textdirectiontoptobottom.png</property> + <accessibility> + <relation type="labelled-by" target="lbAsianlayout"/> + </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="lbAsianlayout"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="searchformatdialog|asianlayout">Asian Layout</property> + <property name="mnemonic-widget">asianlayout</property> + <accessibility> + <relation type="label-for" target="imAsianlayout"/> + </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> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">4</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_STD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_STD">Indents & Spacing</property> + <object class="GtkBox" id="indents"> + <property name="can-focus">False</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">cmd/lc_paraspaceincrease.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="searchformatdialog|labelTP_PARA_STD">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">4</property> + </packing> + </child> </object> - <packing> - <property name="position">4</property> - <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">5</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_ALIGN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_ALIGN">Alignment</property> - <property name="xalign">0.5</property> + <object class="GtkBox" id="alignment"> + <property name="can-focus">False</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">cmd/lc_alignblock.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="searchformatdialog|labelTP_PARA_ALIGN">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">5</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">6</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_EXT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_EXT">Text Flow</property> - <property name="xalign">0.5</property> + <object class="GtkBox" id="textflow"> + <property name="can-focus">False</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">cmd/lc_hyphenate.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="searchformatdialog|labelTP_PARA_EXT">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">6</property> - <property name="tab_fill">False</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">7</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="labelTP_PARA_ASIAN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_ASIAN">Asian Typography</property> + <object class="GtkBox" id="asiantypo"> + <property name="can-focus">False</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">cmd/lc_defaultcharstyle.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="searchformatdialog|labelTP_PARA_ASIAN">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">7</property> - <property name="tab_fill">False</property> + <property name="position">8</property> + <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> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">8</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="background"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="searchformatdialog|background">Highlighting</property> + <object class="GtkBox" id="background"> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="imBackground"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/lc_backcolor.png</property> + <accessibility> + <relation type="labelled-by" target="lbBackground"/> + </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="lbBackground"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="searchformatdialog|background">Highlighting</property> + <property name="mnemonic-widget">background</property> + <accessibility> + <relation type="label-for" target="imBackground"/> + </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> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object>
