include/vcl/tabs.hrc | 17 --
sc/source/ui/dbgui/sortdlg.cxx | 8 -
sc/source/ui/dbgui/subtdlg.cxx | 16 --
sc/source/ui/dbgui/validate.cxx | 11 -
sc/source/ui/inc/hfedtdlg.hxx | 14 +
sc/source/ui/pagedlg/hfedtdlg.cxx | 146 ++++++++----------
sc/uiconfig/scalc/ui/allheaderfooterdialog.ui | 94 +++++++++++-
sc/uiconfig/scalc/ui/footerdialog.ui | 185 ++++++++++++++++++++----
sc/uiconfig/scalc/ui/headerdialog.ui | 185 ++++++++++++++++++++----
sc/uiconfig/scalc/ui/headerfooterdialog.ui | 46 +++++
sc/uiconfig/scalc/ui/leftfooterdialog.ui | 22 ++
sc/uiconfig/scalc/ui/leftheaderdialog.ui | 22 ++
sc/uiconfig/scalc/ui/rightfooterdialog.ui | 22 ++
sc/uiconfig/scalc/ui/rightheaderdialog.ui | 22 ++
sc/uiconfig/scalc/ui/sharedfirstfooterdialog.ui | 141 +++++++++++++++---
sc/uiconfig/scalc/ui/sharedfirstheaderdialog.ui | 141 +++++++++++++++---
sc/uiconfig/scalc/ui/sharedfooterdialog.ui | 70 ++++++++-
sc/uiconfig/scalc/ui/sharedheaderdialog.ui | 70 ++++++++-
sc/uiconfig/scalc/ui/sharedleftfooterdialog.ui | 137 ++++++++++++++---
sc/uiconfig/scalc/ui/sharedleftheaderdialog.ui | 137 ++++++++++++++---
sc/uiconfig/scalc/ui/sortdialog.ui | 46 +++++
sc/uiconfig/scalc/ui/subtotaldialog.ui | 94 +++++++++++-
sc/uiconfig/scalc/ui/validationdialog.ui | 70 ++++++++-
23 files changed, 1424 insertions(+), 292 deletions(-)
New commits:
commit 2e585589ffecece61fcd0b9d9dfaac5cd4f92117
Author: Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Thu Aug 7 16:22:00 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Aug 7 19:56:29 2025 +0200
Revert "Resolves tdf#167233 - Apply VT style to n<4 dialogs in Calc"
This reverts commit 354ecf49234fca40ac4e48def83be51dc4d9ff71.
Reason for revert: Split Header/Footer UIs from other dialogs
Change-Id: I3d48e07365542405c47e95f1af00fef4d45e73aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189101
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index 470309451f9e..f572451a6bfe 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -103,23 +103,6 @@ inline constexpr TabData RID_TAB_BULLETS{
NC_("RID_TAB_BULLETS", "Bullets"), u"d
// calc
inline constexpr TabData RID_TAB_SHEET{ NC_("RID_TAB_SHEET", "Sheet"),
u"printersetup.png"_ustr };
inline constexpr TabData RID_TAB_PROTECTION{ NC_("RID_TAB_PROTECTION", "Cell
Protection"), u"protect.png"_ustr };
-inline constexpr TabData RID_TAB_SORT{ NC_("RID_TAB_SORT", "Sort Criteria"),
u"sortascending.png"_ustr };
-inline constexpr TabData RID_TAB_SORTOPTIONS{ NC_("RID_TAB_SORTOPTIONS",
"Options"), u"showdependents.png"_ustr };
-inline constexpr TabData RID_TAB_VALIDITY_CRITERIA{
NC_("RID_TAB_VALIDITY_CRITERIA", "Criteria"), u"showinvalid.png"_ustr };
-inline constexpr TabData RID_TAB_VALIDITY_INPUT{ NC_("RID_TAB_VALIDITY_INPUT",
"Input Help"), u"calloutshapes.png"_ustr };
-inline constexpr TabData RID_TAB_VALIDITY_ERROR{ NC_("RID_TAB_VALIDITY_ERROR",
"Error Alert"), u"showerrors.png"_ustr };
-inline constexpr TabData RID_TAB_SUBTOTAL_1ST{ NC_("RID_TAB_SUBTOTAL_1ST",
"1st Group"), u"starshapes.star4.png"_ustr };
-inline constexpr TabData RID_TAB_SUBTOTAL_2ND{ NC_("RID_TAB_SUBTOTAL_2ND",
"2nd Group"), u"starshapes.star5.png"_ustr };
-inline constexpr TabData RID_TAB_SUBTOTAL_3RD{ NC_("RID_TAB_SUBTOTAL_3RD",
"3rd Group"), u"starshapes.star6.png"_ustr };
-inline constexpr TabData RID_TAB_SUBTOTAL_OPTIONS{
NC_("RID_TAB_SUBTOTAL_OPTIONS", "Options"), u"sortascending.png"_ustr };
-
-inline constexpr TabData RID_TAB_HEADER_FIRST{ NC_("RID_TAB_HEADER_FIRST",
"Header (first)"), u"insertheader.png"_ustr };
-inline constexpr TabData RID_TAB_HEADER_LEFT{ NC_("RID_TAB_HEADER_LEFT",
"Header (left)"), u"insertheader.png"_ustr };
-inline constexpr TabData RID_TAB_HEADER_RIGHT{ NC_("RID_TAB_HEADER_RIGHT",
"Header (right)"), u"insertheader.png"_ustr };
-inline constexpr TabData RID_TAB_FOOTER_FIRST{ NC_("RID_TAB_FOOTER_FIRST",
"Footer (first)"), u"insertfooter.png"_ustr };
-inline constexpr TabData RID_TAB_FOOTER_LEFT{ NC_("RID_TAB_FOOTER_LEFT",
"Footer (left)"), u"insertfooter.png"_ustr };
-inline constexpr TabData RID_TAB_FOOTER_RIGHT{ NC_("RID_TAB_FOOTER_RIGHT",
"Footer (right)"), u"insertfooter.png"_ustr };
-
// picture/frame formatting
inline constexpr TabData RID_TAB_POSSIZE{ NC_("RID_TAB_POSSIZE", "Position and
Size"), u"transformdialog.png"_ustr };
inline constexpr TabData RID_TAB_HYPERLINK{ NC_("RID_TAB_HYPERLINK",
"Hyperlink"), u"inserthyperlink.png"_ustr };
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 5683d4f64a76..c2ecda133e0d 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -24,15 +24,11 @@
#include <sortdlg.hxx>
#include <unotools/viewoptions.hxx>
-#include <vcl/tabs.hrc>
-
ScSortDlg::ScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
: SfxTabDialogController(pParent, u"modules/scalc/ui/sortdialog.ui"_ustr,
u"SortDialog"_ustr, pArgSet)
{
- AddTabPage(u"criteria"_ustr, TabResId(RID_TAB_SORT.aLabel),
ScTabPageSortFields::Create,
- RID_L + RID_TAB_SORT.sIconName);
- AddTabPage(u"options"_ustr, TabResId(RID_TAB_SORTOPTIONS.aLabel),
ScTabPageSortOptions::Create,
- RID_L + RID_TAB_SORTOPTIONS.sIconName);
+ AddTabPage(u"criteria"_ustr, ScTabPageSortFields::Create, nullptr);
+ AddTabPage(u"options"_ustr, ScTabPageSortOptions::Create, nullptr);
// restore dialog size
SvtViewOptions aDlgOpt(EViewType::Dialog, u"SortDialog"_ustr);
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 99699f5134c3..b549e5c2f33b 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -23,21 +23,15 @@
#include <subtdlg.hxx>
#include <scui_def.hxx>
-#include <vcl/tabs.hrc>
-
ScSubTotalDlg::ScSubTotalDlg(weld::Window* pParent, const SfxItemSet& rArgSet)
: SfxTabDialogController(pParent,
u"modules/scalc/ui/subtotaldialog.ui"_ustr, u"SubTotalDialog"_ustr, &rArgSet)
, m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr))
{
- AddTabPage(u"1stgroup"_ustr, TabResId(RID_TAB_SUBTOTAL_1ST.aLabel),
ScTpSubTotalGroup1::Create,
- RID_L + RID_TAB_SUBTOTAL_1ST.sIconName);
- AddTabPage(u"2ndgroup"_ustr, TabResId(RID_TAB_SUBTOTAL_2ND.aLabel),
ScTpSubTotalGroup2::Create,
- RID_L + RID_TAB_SUBTOTAL_2ND.sIconName);
- AddTabPage(u"3rdgroup"_ustr, TabResId(RID_TAB_SUBTOTAL_3RD.aLabel),
ScTpSubTotalGroup3::Create,
- RID_L + RID_TAB_SUBTOTAL_3RD.sIconName);
- AddTabPage(u"options"_ustr, TabResId(RID_TAB_SUBTOTAL_OPTIONS.aLabel),
- ScTpSubTotalOptions::Create, RID_L +
RID_TAB_SUBTOTAL_OPTIONS.sIconName);
- m_xBtnRemove->connect_clicked(LINK(this, ScSubTotalDlg, RemoveHdl));
+ AddTabPage(u"1stgroup"_ustr, ScTpSubTotalGroup1::Create, nullptr);
+ AddTabPage(u"2ndgroup"_ustr, ScTpSubTotalGroup2::Create, nullptr);
+ AddTabPage(u"3rdgroup"_ustr, ScTpSubTotalGroup3::Create, nullptr);
+ AddTabPage(u"options"_ustr, ScTpSubTotalOptions::Create, nullptr);
+ m_xBtnRemove->connect_clicked( LINK( this, ScSubTotalDlg, RemoveHdl ) );
}
ScSubTotalDlg::~ScSubTotalDlg()
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index a5355c08eb03..e4ed040b0a90 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -45,8 +45,6 @@
#include <reffact.hxx>
#include <comphelper/lok.hxx>
-#include <vcl/tabs.hrc>
-
/* Position indexes for "Allow" list box.
They do not map directly to ScValidationMode and can safely be modified to
change the order of the list box entries. */
@@ -98,12 +96,9 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent,
const SfxItemSet* pArgSe
, m_bRefInputting(false)
, m_xHBox(m_xBuilder->weld_container(u"refinputbox"_ustr))
{
- AddTabPage(m_sValuePageId, TabResId(RID_TAB_VALIDITY_CRITERIA.aLabel),
- ScTPValidationValue::Create, RID_L +
RID_TAB_VALIDITY_CRITERIA.sIconName);
- AddTabPage(u"inputhelp"_ustr, TabResId(RID_TAB_VALIDITY_INPUT.aLabel),
- ScTPValidationHelp::Create, RID_L +
RID_TAB_VALIDITY_INPUT.sIconName);
- AddTabPage(u"erroralert"_ustr, TabResId(RID_TAB_VALIDITY_ERROR.aLabel),
- ScTPValidationError::Create, RID_L +
RID_TAB_VALIDITY_ERROR.sIconName);
+ AddTabPage(m_sValuePageId, ScTPValidationValue::Create, nullptr);
+ AddTabPage(u"inputhelp"_ustr, ScTPValidationHelp::Create, nullptr);
+ AddTabPage(u"erroralert"_ustr, ScTPValidationError::Create, nullptr);
if (isLOKMobilePhone())
{
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index a075d20fef62..6bec2d995858 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -79,6 +79,13 @@ public:
const SfxItemSet& rCoreSet, std::u16string_view rPageStyle);
};
+class ScHFEditFirstHeaderDlg : public ScHFEditDlg
+{
+public:
+ ScHFEditFirstHeaderDlg(weld::Window* pParent,
+ const SfxItemSet& rCoreSet, std::u16string_view rPageStyle);
+};
+
class ScHFEditLeftHeaderDlg : public ScHFEditDlg
{
public:
@@ -93,6 +100,13 @@ public:
const SfxItemSet& rCoreSet, std::u16string_view rPageStyle);
};
+class ScHFEditFirstFooterDlg : public ScHFEditDlg
+{
+public:
+ ScHFEditFirstFooterDlg(weld::Window* pParent,
+ const SfxItemSet& rCoreSet, std::u16string_view rPageStyle);
+};
+
class ScHFEditLeftFooterDlg : public ScHFEditDlg
{
public:
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx
b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 16268b787118..de8879f5652a 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -29,8 +29,6 @@
#include <svx/svxids.hrc>
#include <svx/pageitem.hxx>
-#include <vcl/tabs.hrc>
-
ScHFEditDlg::ScHFEditDlg(weld::Window* pParent,
const SfxItemSet& rCoreSet,
std::u16string_view rPageStyle,
@@ -53,12 +51,9 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/headerdialog.ui"_ustr, u"HeaderDialog"_ustr)
{
- AddTabPage(u"headerfirst"_ustr, TabResId(RID_TAB_HEADER_FIRST.aLabel),
- ScFirstHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_FIRST.sIconName);
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
- AddTabPage(u"headerleft"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
+ AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr);
}
ScHFEditFooterDlg::ScHFEditFooterDlg(
@@ -68,12 +63,9 @@ ScHFEditFooterDlg::ScHFEditFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/footerdialog.ui"_ustr, u"FooterDialog"_ustr )
{
- AddTabPage(u"footerfirst"_ustr, TabResId(RID_TAB_FOOTER_FIRST.aLabel),
- ScFirstFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_FIRST.sIconName);
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
- AddTabPage(u"footerleft"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
ScHFEditSharedFirstHeaderDlg::ScHFEditSharedFirstHeaderDlg(
@@ -83,10 +75,8 @@ ScHFEditSharedFirstHeaderDlg::ScHFEditSharedFirstHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedfirstheaderdialog.ui"_ustr,
u"SharedFirstHeaderDialog"_ustr )
{
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
- AddTabPage(u"headerleft"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr);
}
ScHFEditSharedFirstFooterDlg::ScHFEditSharedFirstFooterDlg(
@@ -96,10 +86,8 @@ ScHFEditSharedFirstFooterDlg::ScHFEditSharedFirstFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedfirstfooterdialog.ui"_ustr,
u"SharedFirstFooterDialog"_ustr )
{
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
- AddTabPage(u"footerleft"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
ScHFEditSharedLeftHeaderDlg::ScHFEditSharedLeftHeaderDlg(
@@ -109,10 +97,8 @@ ScHFEditSharedLeftHeaderDlg::ScHFEditSharedLeftHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedleftheaderdialog.ui"_ustr,
u"SharedLeftHeaderDialog"_ustr )
{
- AddTabPage(u"headerfirst"_ustr, TabResId(RID_TAB_HEADER_FIRST.aLabel),
- ScFirstHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_FIRST.sIconName);
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
+ AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
}
ScHFEditSharedLeftFooterDlg::ScHFEditSharedLeftFooterDlg(
@@ -122,10 +108,18 @@ ScHFEditSharedLeftFooterDlg::ScHFEditSharedLeftFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedleftfooterdialog.ui"_ustr,
u"SharedLeftFooterDialog"_ustr )
{
- AddTabPage(u"footerfirst"_ustr, TabResId(RID_TAB_FOOTER_FIRST.aLabel),
- ScFirstFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_FIRST.sIconName);
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
+}
+
+ScHFEditFirstHeaderDlg::ScHFEditFirstHeaderDlg(
+ weld::Window* pParent,
+ const SfxItemSet& rCoreSet,
+ std::u16string_view rPageStyle)
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
+ u"modules/scalc/ui/firstheaderdialog.ui"_ustr,
u"FirstHeaderDialog"_ustr )
+{
+ AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr);
}
ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg(
@@ -135,8 +129,7 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/leftheaderdialog.ui"_ustr, u"LeftHeaderDialog"_ustr
)
{
- AddTabPage(u"headerleft"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
+ AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr);
}
ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg(
@@ -146,8 +139,17 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/rightheaderdialog.ui"_ustr,
u"RightHeaderDialog"_ustr )
{
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
+}
+
+ScHFEditFirstFooterDlg::ScHFEditFirstFooterDlg(
+ weld::Window* pParent,
+ const SfxItemSet& rCoreSet,
+ std::u16string_view rPageStyle)
+ : ScHFEditDlg( pParent, rCoreSet, rPageStyle,
+ u"modules/scalc/ui/firstfooterdialog.ui"_ustr,
u"FirstFooterDialog"_ustr )
+{
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
}
ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg(
@@ -157,8 +159,7 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/leftfooterdialog.ui"_ustr, u"LeftFooterDialog"_ustr
)
{
- AddTabPage(u"footerleft"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
ScHFEditRightFooterDlg::ScHFEditRightFooterDlg(
@@ -168,8 +169,7 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/rightfooterdialog.ui"_ustr,
u"RightFooterDialog"_ustr )
{
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
}
ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
@@ -179,16 +179,11 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedheaderdialog.ui"_ustr,
u"SharedHeaderDialog"_ustr )
{
- AddTabPage(u"headerfirst"_ustr, TabResId(RID_TAB_HEADER_FIRST.aLabel),
- ScFirstHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_FIRST.sIconName);
- AddTabPage(u"header"_ustr, TabResId(RID_TAB_HEADER.aLabel),
ScRightHeaderEditPage::Create,
- RID_L + RID_TAB_HEADER.sIconName);
- AddTabPage(u"footerfirst"_ustr, TabResId(RID_TAB_FOOTER_FIRST.aLabel),
- ScFirstFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_FIRST.sIconName);
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
- AddTabPage(u"footerleft"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr);
+ AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
@@ -198,16 +193,11 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/sharedfooterdialog.ui"_ustr,
u"SharedFooterDialog"_ustr )
{
- AddTabPage(u"headerfirst"_ustr, TabResId(RID_TAB_HEADER_FIRST.aLabel),
- ScFirstHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_FIRST.sIconName);
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
- AddTabPage(u"headerleft"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
- AddTabPage(u"footerfirst"_ustr, TabResId(RID_TAB_FOOTER_FIRST.aLabel),
- ScFirstFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_FIRST.sIconName);
- AddTabPage(u"footer"_ustr, TabResId(RID_TAB_FOOTER.aLabel),
ScRightFooterEditPage::Create,
- RID_L + RID_TAB_FOOTER.sIconName);
+ AddTabPage(u"headerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr);
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr);
}
ScHFEditAllDlg::ScHFEditAllDlg(
@@ -217,18 +207,12 @@ ScHFEditAllDlg::ScHFEditAllDlg(
: ScHFEditDlg( pParent, rCoreSet, rPageStyle,
u"modules/scalc/ui/allheaderfooterdialog.ui"_ustr,
u"AllHeaderFooterDialog"_ustr )
{
- AddTabPage(u"headerfirst"_ustr, TabResId(RID_TAB_HEADER_FIRST.aLabel),
- ScFirstHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_FIRST.sIconName);
- AddTabPage(u"headerright"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
- AddTabPage(u"headerleft"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
- AddTabPage(u"footerfirst"_ustr, TabResId(RID_TAB_FOOTER_FIRST.aLabel),
- ScFirstFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_FIRST.sIconName);
- AddTabPage(u"footerright"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
- AddTabPage(u"footerleft"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr);
+ AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr);
+ AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
ScHFEditActiveDlg::ScHFEditActiveDlg(
@@ -246,10 +230,8 @@ ScHFEditActiveDlg::ScHFEditActiveDlg(
if ( bRightPage )
{
- AddTabPage(u"header"_ustr, TabResId(RID_TAB_HEADER.aLabel),
ScRightHeaderEditPage::Create,
- RID_L + RID_TAB_HEADER.sIconName);
- AddTabPage(u"footer"_ustr, TabResId(RID_TAB_FOOTER.aLabel),
ScRightFooterEditPage::Create,
- RID_L + RID_TAB_FOOTER.sIconName);
+ AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr);
+ AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr);
}
else
{
@@ -257,21 +239,17 @@ ScHFEditActiveDlg::ScHFEditActiveDlg(
bool bShareHeader = rCoreSet.Get(ATTR_PAGE_HEADERSET).GetItemSet().
Get(ATTR_PAGE_SHARED).GetValue();
- if (bShareHeader)
- AddTabPage(u"header"_ustr, TabResId(RID_TAB_HEADER_RIGHT.aLabel),
- ScRightHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_RIGHT.sIconName);
+ if ( bShareHeader )
+ AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr);
else
- AddTabPage(u"header"_ustr, TabResId(RID_TAB_HEADER_LEFT.aLabel),
- ScLeftHeaderEditPage::Create, RID_L +
RID_TAB_HEADER_LEFT.sIconName);
+ AddTabPage(u"header"_ustr, ScLeftHeaderEditPage::Create, nullptr);
bool bShareFooter = rCoreSet.Get(ATTR_PAGE_FOOTERSET).GetItemSet().
Get(ATTR_PAGE_SHARED).GetValue();
- if (bShareFooter)
- AddTabPage(u"footer"_ustr, TabResId(RID_TAB_FOOTER_RIGHT.aLabel),
- ScRightFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_RIGHT.sIconName);
+ if ( bShareFooter )
+ AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr);
else
- AddTabPage(u"footer"_ustr, TabResId(RID_TAB_FOOTER_LEFT.aLabel),
- ScLeftFooterEditPage::Create, RID_L +
RID_TAB_FOOTER_LEFT.sIconName);
+ AddTabPage(u"footer"_ustr, ScLeftFooterEditPage::Create, nullptr);
}
}
diff --git a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
index 193be704cad1..f80bae61bacd 100644
--- a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
@@ -93,10 +93,100 @@
<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>
- <property name="group-name">icons</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="headerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="allheaderfooterdialog|headerright">Header (right)</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="headerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="allheaderfooterdialog|headerleft">Header (left)</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="footerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="allheaderfooterdialog|footerright">Footer (right)</property>
+ </object>
+ <packing>
+ <property name="position">2</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">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="footerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="allheaderfooterdialog|footerleft">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/footerdialog.ui
b/sc/uiconfig/scalc/ui/footerdialog.ui
index dd1d9263a697..4d009c4cc9b7 100644
--- a/sc/uiconfig/scalc/ui/footerdialog.ui
+++ b/sc/uiconfig/scalc/ui/footerdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="FooterDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="footerdialog|FooterDialog">Footers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,154 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="footerfirst">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="footerdialog|footerfirst">Footer (first)</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>
+ <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="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="footerdialog|footerright">Footer (right)</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>
+ <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="footerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="footerdialog|footerleft">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/headerdialog.ui
b/sc/uiconfig/scalc/ui/headerdialog.ui
index 17258b1f2407..d5668c12d29b 100644
--- a/sc/uiconfig/scalc/ui/headerdialog.ui
+++ b/sc/uiconfig/scalc/ui/headerdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="HeaderDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="headerdialog|HeaderDialog">Headers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,154 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="headerfirst">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="headerdialog|headerfirst">Header (first)</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>
+ <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="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="headerdialog|headerright">Header (right)</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>
+ <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="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="headerdialog|headerleft">Header (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/headerfooterdialog.ui
b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
index 4da2c4a036b8..f928d7e598bd 100644
--- a/sc/uiconfig/scalc/ui/headerfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
@@ -93,10 +93,52 @@
<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>
- <property name="group-name">icons</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="header">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="headerfooterdialog|header">Header</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="footer">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="headerfooterdialog|footer">Footer</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/leftfooterdialog.ui
b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
index c0ed768afe14..b48ce782f30c 100644
--- a/sc/uiconfig/scalc/ui/leftfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
@@ -93,10 +93,28 @@
<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>
- <property name="group-name">icons</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="footerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="leftfooterdialog|footerleft">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/leftheaderdialog.ui
b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
index 688a70a10bae..779f4028a999 100644
--- a/sc/uiconfig/scalc/ui/leftheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
@@ -93,10 +93,28 @@
<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>
- <property name="group-name">icons</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="headerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="leftheaderdialog|headerleft">Header (left)</property>
+ </object>
+ <packing>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/rightfooterdialog.ui
b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
index e34a73d3e452..02502e8cfefd 100644
--- a/sc/uiconfig/scalc/ui/rightfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
@@ -93,10 +93,28 @@
<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>
- <property name="group-name">icons</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="footerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="rightfooterdialog|footerright">Footer (right)</property>
+ </object>
+ <packing>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/rightheaderdialog.ui
b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
index 7441d73df5c3..340df22acdc2 100644
--- a/sc/uiconfig/scalc/ui/rightheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
@@ -93,10 +93,28 @@
<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>
- <property name="group-name">icons</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="headerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="rightheaderdialog|headerright">Header (right)</property>
+ </object>
+ <packing>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedfirstfooterdialog.ui
b/sc/uiconfig/scalc/ui/sharedfirstfooterdialog.ui
index 15353b463fa3..dd716a7f8a8d 100644
--- a/sc/uiconfig/scalc/ui/sharedfirstfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedfirstfooterdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="SharedFirstFooterDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="sharedfirstfooterdialog|SharedFirstFooterDialog">Footers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,110 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfirstfooterdialog|footerright">Footer (right)</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>
+ <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="footerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfirstfooterdialog|footerleft">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedfirstheaderdialog.ui
b/sc/uiconfig/scalc/ui/sharedfirstheaderdialog.ui
index 2ac7f9287836..1d23a12f320a 100644
--- a/sc/uiconfig/scalc/ui/sharedfirstheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedfirstheaderdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="SharedFirstHeaderDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="sharedfirstheaderdialog|SharedFirstHeaderDialog">Headers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,110 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfirstheaderdialog|headerright">Header (right)</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>
+ <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="headerleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfirstheaderdialog|headerleft">Header (left)</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
index 5fc3889b9e3f..6ef6701102a2 100644
--- a/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
@@ -93,10 +93,76 @@
<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>
- <property name="group-name">icons</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="headerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfooterdialog|headerright">Header (right)</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="headerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfooterdialog|headerleft">Header (left)</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="footer">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedfooterdialog|footer">Footer</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
index 0d9ba867110b..2a68d9814bb5 100644
--- a/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
@@ -93,10 +93,76 @@
<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>
- <property name="group-name">icons</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="header">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedheaderdialog|header">Header</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="footerright">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedheaderdialog|footerright">Footer (right)</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="footerleft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sharedheaderdialog|footerleft">Footer (left)</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab-fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedleftfooterdialog.ui
b/sc/uiconfig/scalc/ui/sharedleftfooterdialog.ui
index d428da49b897..3875e35eaaa5 100644
--- a/sc/uiconfig/scalc/ui/sharedleftfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedleftfooterdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="SharedLeftFooterDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="sharedleftfooterdialog|SharedLeftFooterDialog">Footers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,106 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="footerfirst">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedleftfooterdialog|footerfirst">Footer (first)</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>
+ <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="footerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedleftfooterdialog|footerright">Footer (rest)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sharedleftheaderdialog.ui
b/sc/uiconfig/scalc/ui/sharedleftheaderdialog.ui
index 30c8a32cff62..305767acebcb 100644
--- a/sc/uiconfig/scalc/ui/sharedleftheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedleftheaderdialog.ui
@@ -1,31 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="SharedLeftHeaderDialog">
- <property name="can-focus">False</property>
- <property name="border-width">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes"
context="sharedleftheaderdialog|SharedLeftHeaderDialog">Headers</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default-width">0</property>
- <property name="default-height">0</property>
- <property name="type-hint">dialog</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -38,10 +41,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</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="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-underline">True</property>
</object>
<packing>
@@ -54,8 +57,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -68,8 +71,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -83,20 +86,106 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <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>
- <property name="group-name">icons</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>
+ <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="headerfirst">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedleftheaderdialog|headerfirst">Header (first)</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>
+ <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="headerright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sharedleftheaderdialog|headerright">Header (rest)</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/sortdialog.ui
b/sc/uiconfig/scalc/ui/sortdialog.ui
index a346e676a313..7149b3e63425 100644
--- a/sc/uiconfig/scalc/ui/sortdialog.ui
+++ b/sc/uiconfig/scalc/ui/sortdialog.ui
@@ -92,10 +92,52 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
-e
... etc. - the rest is truncated
