sc/uiconfig/scalc/ui/chardialog.ui | 2
sd/source/ui/dlg/dlgchar.cxx | 14 -
sd/source/ui/func/fuchar.cxx | 2
sd/uiconfig/sdraw/ui/drawchardialog.ui | 268 +++++++++++++++++----------------
4 files changed, 154 insertions(+), 132 deletions(-)
New commits:
commit 066744b8f869f432857eb6bfa56634ef227f6d57
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Mon Jun 30 15:42:53 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon Jun 30 17:34:49 2025 +0200
Resolves tdf#167302 - Apply VT style to Character Formatting dialog
Change-Id: I5d61f26e99f05ddd311236027cc7cd2a2789261c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187197
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/uiconfig/scalc/ui/chardialog.ui
b/sc/uiconfig/scalc/ui/chardialog.ui
index f202f8219abf..053faf19696d 100644
--- a/sc/uiconfig/scalc/ui/chardialog.ui
+++ b/sc/uiconfig/scalc/ui/chardialog.ui
@@ -298,7 +298,7 @@
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">3</property>
<property name="tab-fill">False</property>
</packing>
</child>
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 665cc3739bf0..10b2c4faf522 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -38,29 +38,29 @@ SdCharDlg::SdCharDlg(weld::Window* pParent, const
SfxItemSet* pAttr,
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"RID_SVXPAGE_CHAR_NAME"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr);
- AddTabPage(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
- AddTabPage(u"RID_SVXPAGE_CHAR_POSITION"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr);
- AddTabPage(u"RID_SVXPAGE_BKG"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
+ AddTabPage(u"font"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr);
+ AddTabPage(u"fonteffects"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
+ AddTabPage(u"position"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr);
+ AddTabPage(u"background"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
}
void SdCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (rId == "RID_SVXPAGE_CHAR_NAME")
+ if (rId == "font")
{
SvxFontListItem aItem(* static_cast<const SvxFontListItem*>(
rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) );
aSet.Put (SvxFontListItem( aItem.GetFontList(),
SID_ATTR_CHAR_FONTLIST));
rPage.PageCreated(aSet);
}
- else if (rId == "RID_SVXPAGE_CHAR_EFFECTS")
+ else if (rId == "fonteffects")
{
// Opt in for character transparency.
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, SVX_ENABLE_CHAR_TRANSPARENCY));
rPage.PageCreated(aSet);
}
- else if (rId == "RID_SVXPAGE_BKG")
+ else if (rId == "background")
{
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR)));
rPage.PageCreated(aSet);
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index c9229f82934d..89573d174e88 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -69,7 +69,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
ScopedVclPtr<SfxAbstractTabDialog> pDlg(
pFact->CreateSdTabCharDialog(mrViewShell.GetFrameWeld(), &aNewAttr,
mrDoc.GetDocSh() ) );
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr);
+ pDlg->SetCurPageId(u"fonteffects"_ustr);
}
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sd/uiconfig/sdraw/ui/drawchardialog.ui
b/sd/uiconfig/sdraw/ui/drawchardialog.ui
index 27138d54ee83..a3e0522f8992 100644
--- a/sd/uiconfig/sdraw/ui/drawchardialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawchardialog.ui
@@ -94,193 +94,215 @@
<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>
+ <property name="group-name">icons</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="RID_SVXPAGE_CHAR_NAME">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="drawchardialog|RID_SVXPAGE_CHAR_NAME">Fonts</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/32/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="drawchardialog|RID_SVXPAGE_CHAR_NAME">Fonts</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="RID_SVXPAGE_CHAR_EFFECTS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="drawchardialog|RID_SVXPAGE_CHAR_EFFECTS">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/32/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="drawchardialog|RID_SVXPAGE_CHAR_EFFECTS">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="RID_SVXPAGE_CHAR_POSITION">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="drawchardialog|RID_SVXPAGE_CHAR_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/32/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="drawchardialog|RID_SVXPAGE_CHAR_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="RID_SVXPAGE_BKG">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="drawchardialog|RID_SVXPAGE_BKG">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/32/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="drawchardialog|RID_SVXPAGE_BKG">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">3</property>
- <property name="tab_fill">False</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
</object>
