include/vcl/tabs.hrc | 2
sd/source/ui/dlg/dlgpage.cxx | 21 +++++----
sd/uiconfig/sdraw/ui/drawpagedialog.ui | 70 ---------------------------------
3 files changed, 15 insertions(+), 78 deletions(-)
New commits:
commit d72dcec424036354232e8174e565eb7330e1d0f9
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Fri Aug 8 11:56:46 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Aug 8 14:33:06 2025 +0200
Relates tdf#167862 - Apply VT style to n<4 dialogs in Draw
Change-Id: I1c149b5d0e0cfceb37e80b8471ae58a02597de43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189180
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index f572451a6bfe..e80646fedfbe 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -52,7 +52,7 @@ inline constexpr TabData RID_TAB_DROPCAPS{
NC_("RID_TAB_DROPCAPS", "Drop Caps"),
inline constexpr TabData RID_TAB_CONDITION{ NC_("RID_TAB_CONDITION",
"Condition"), u"developmenttoolsdockingwindow.png"_ustr };
inline constexpr TabData RID_TAB_HEADER{ NC_("RID_TAB_HEADER", "Header"),
u"insertheader.png"_ustr };
inline constexpr TabData RID_TAB_FOOTER{ NC_("RID_TAB_FOOTER", "Footer"),
u"insertfooter.png"_ustr };
-inline constexpr TabData RID_TAB_PAGE{ NC_("RID_TAB_PAGE", "Page"),
u"attributepagesize.png"_ustr };
+inline constexpr TabData RID_TAB_PAGE{ NC_("RID_TAB_PAGE", "Page"),
u"attributepagesize.png"_ustr }; // also Draw/Impress
inline constexpr TabData RID_TAB_COLUMNS{ NC_("RID_TAB_COLUMNS", "Columns"),
u"pagecolumntype.png"_ustr };
inline constexpr TabData RID_TAB_FOOTNOTES{ NC_("RID_TAB_FOOTNOTES",
"Footnote"), u"footnotedialog.png"_ustr };
inline constexpr TabData RID_TAB_ENDNOTES{ NC_("RID_TAB_ENDNOTES", "Endnote"),
u"insertendnote.png"_ustr };
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 1ff51bf66c3e..f549f821bf7a 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -32,6 +32,8 @@
#include <svl/eitem.hxx>
#include <svx/flagsdef.hxx>
+#include <vcl/tabs.hrc>
+
/**
* Constructor of tab dialog: appends pages to the dialog
*/
@@ -55,15 +57,16 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh,
weld::Window* pParent, const
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"RID_SVXPAGE_PAGE"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), nullptr);
- AddTabPage(u"RID_SVXPAGE_AREA"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA), nullptr);
- AddTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr,
- pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
nullptr);
-
- if (!bAreaPage) // I have to add the page before I remove it !
- {
- RemoveTabPage(u"RID_SVXPAGE_AREA"_ustr);
- RemoveTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr);
+ AddTabPage(u"RID_SVXPAGE_PAGE"_ustr, TabResId(RID_TAB_PAGE.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), RID_L +
RID_TAB_PAGE.sIconName);
+ if (bAreaPage)
+ { // I have to add the page before I remove it !
+ AddTabPage(u"RID_SVXPAGE_AREA"_ustr,
TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA),
+ RID_L + RID_TAB_BACKGROUND.sIconName);
+ AddTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr,
TabResId(RID_TAB_TRANSPARENCE.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
+ RID_L + RID_TAB_TRANSPARENCE.sIconName);
}
if (mbIsImpressDoc)
diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
index c6895a46a8ae..1885fedecc4a 100644
--- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
@@ -90,76 +90,10 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="tab-pos">left</property>
<property name="scrollable">True</property>
<property name="enable-popup">True</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="RID_SVXPAGE_PAGE">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="drawpagedialog|RID_SVXPAGE_PAGE">Page</property>
- </object>
- <packing>
- <property name="tab-fill">False</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="RID_SVXPAGE_AREA">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="drawpagedialog|RID_SVXPAGE_AREA">Background</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="drawpagedialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">False</property>
