include/vcl/tabs.hrc | 9 ++
sc/source/ui/dbgui/sortdlg.cxx | 8 +-
sc/source/ui/dbgui/subtdlg.cxx | 16 +++--
sc/source/ui/dbgui/validate.cxx | 11 ++-
sc/uiconfig/scalc/ui/sortdialog.ui | 46 ---------------
sc/uiconfig/scalc/ui/subtotaldialog.ui | 94 -------------------------------
sc/uiconfig/scalc/ui/validationdialog.ui | 70 -----------------------
7 files changed, 40 insertions(+), 214 deletions(-)
New commits:
commit b4a65036b1530cc12ec656e3457b64153a4ee4e6
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Wed Aug 6 16:59:22 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Aug 8 16:55:13 2025 +0200
Relates tdf#167233 - Apply VT style to n<4 dialogs in Calc
Change-Id: Idf63ee361e970c324e977f31044607cd9f5397c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189153
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index e80646fedfbe..1b3b063b033d 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -103,6 +103,15 @@ 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 };
// 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 c2ecda133e0d..5683d4f64a76 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -24,11 +24,15 @@
#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, ScTabPageSortFields::Create, nullptr);
- AddTabPage(u"options"_ustr, ScTabPageSortOptions::Create, nullptr);
+ 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);
// 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 b549e5c2f33b..99699f5134c3 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -23,15 +23,21 @@
#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, 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 ) );
+ 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));
}
ScSubTotalDlg::~ScSubTotalDlg()
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index e4ed040b0a90..a5355c08eb03 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -45,6 +45,8 @@
#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. */
@@ -96,9 +98,12 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent,
const SfxItemSet* pArgSe
, m_bRefInputting(false)
, m_xHBox(m_xBuilder->weld_container(u"refinputbox"_ustr))
{
- AddTabPage(m_sValuePageId, ScTPValidationValue::Create, nullptr);
- AddTabPage(u"inputhelp"_ustr, ScTPValidationHelp::Create, nullptr);
- AddTabPage(u"erroralert"_ustr, ScTPValidationError::Create, nullptr);
+ 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);
if (isLOKMobilePhone())
{
diff --git a/sc/uiconfig/scalc/ui/sortdialog.ui
b/sc/uiconfig/scalc/ui/sortdialog.ui
index 7149b3e63425..a346e676a313 100644
--- a/sc/uiconfig/scalc/ui/sortdialog.ui
+++ b/sc/uiconfig/scalc/ui/sortdialog.ui
@@ -92,52 +92,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="criteria">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="sortdialog|criteria">Sort Criteria</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="options">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="sortdialog|options">Options</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/subtotaldialog.ui
b/sc/uiconfig/scalc/ui/subtotaldialog.ui
index f850bac550b1..f3d9d9cb45a0 100644
--- a/sc/uiconfig/scalc/ui/subtotaldialog.ui
+++ b/sc/uiconfig/scalc/ui/subtotaldialog.ui
@@ -108,100 +108,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="1stgroup">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="subtotaldialog|1stgroup">1st Group</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="2ndgroup">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="subtotaldialog|2ndgroup">2nd Group</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="3rdgroup">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="subtotaldialog|3rdgroup">3rd Group</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="options">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="subtotaldialog|options">Options</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/validationdialog.ui
b/sc/uiconfig/scalc/ui/validationdialog.ui
index 9b91467c1ec8..fe1806ed132a 100644
--- a/sc/uiconfig/scalc/ui/validationdialog.ui
+++ b/sc/uiconfig/scalc/ui/validationdialog.ui
@@ -98,76 +98,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="criteria">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="validationdialog|criteria">Criteria</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="inputhelp">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="validationdialog|inputhelp">Input Help</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="erroralert">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="validationdialog|erroralert">Error Alert</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>
