include/vcl/tabs.hrc | 6
sc/inc/globstr.hrc | 1
sc/source/ui/docshell/docsh.cxx | 5
sfx2/source/dialog/dinfdlg.cxx | 24 +-
sfx2/uiconfig/ui/documentpropertiesdialog.ui | 118 -------------
svx/source/form/fmtextcontroldialogs.cxx | 27 +--
svx/uiconfig/ui/textcontrolchardialog.ui | 185 ++-------------------
svx/uiconfig/ui/textcontrolparadialog.ui | 234 ++-------------------------
sw/inc/strings.hrc | 1
sw/source/uibase/app/docsh2.cxx | 6
10 files changed, 91 insertions(+), 516 deletions(-)
New commits:
commit 043a76a06abe343a5373853f03071eb57d4fc166
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Mon Aug 11 11:02:28 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon Aug 11 13:48:21 2025 +0200
Resolves tdf#167899 - Apply VT style to n<4 dialogs in svx and sfx2
Change-Id: If7f7806fd267b2b80f9fefbb54a68bad076b73a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189353
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index 0569ec62bc6e..d41ab86ebce2 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -164,6 +164,12 @@ inline constexpr TabData RID_TAB_OFA_OPTIONS{
NC_("RID_TAB_OFA_OPTIONS", "Option
inline constexpr TabData RID_TAB_OFA_LOCALIZED{ NC_("RID_TAB_OFA_LOCALIZED",
"Localized Options"), u"charmapcontrol.png"_ustr };
inline constexpr TabData RID_TAB_OFA_WORDCOMPL{ NC_("RID_TAB_OFA_WORDCOMPL",
"Word Completion"), u"autocorrectdlg.png"_ustr };
inline constexpr TabData RID_TAB_OFA_SMARTTAG{ NC_("RID_TAB_OFA_SMARTTAG",
"Smart Tags"), u"autopilotmenu.png"_ustr };
+// doc info
+inline constexpr TabData RID_TAB_DESCRIPTION{ NC_("RID_TAB_DESCRIPTION",
"Description"), u"objecttitledescription.png"_ustr };
+inline constexpr TabData RID_TAB_CUSTOM{ NC_("RID_TAB_CUSTOM", "Custom
Properties"), u"setdocumentproperties.png"_ustr };
+inline constexpr TabData RID_TAB_CMIS{ NC_("RID_TAB_CMIS", "CMIS Properties"),
u"browseview.png"_ustr };
+inline constexpr TabData RID_TAB_SECURITY{ NC_("RID_TAB_SECURITY",
"Security"), u"protect.png"_ustr };
+inline constexpr TabData RID_TAB_STATISTICS{ NC_("RID_TAB_STATISTICS",
"Statistics"), u"autosum.png"_ustr };
static OUString TabResId(TranslateId aId)
{
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f5c88c82be06..e0fddcc07a4a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -350,7 +350,6 @@
#define STR_SCATTR_PAGE_SCALE_HEIGHT
NC_("STR_SCATTR_PAGE_SCALE_HEIGHT", "Height")
#define STR_SCATTR_PAGE_SCALE_PAGES
NNC_("STR_SCATTR_PAGE_SCALE_PAGES", "One page", "%1 pages")
#define STR_SCATTR_PAGE_SCALE_AUTO
NC_("STR_SCATTR_PAGE_SCALE_AUTO", "automatic")
-#define STR_DOC_STAT NC_("STR_DOC_STAT",
"Statistics")
#define STR_LINKERROR NC_("STR_LINKERROR", "The link
could not be updated.")
#define STR_LINKERRORFILE NC_("STR_LINKERRORFILE",
"File:")
#define STR_LINKERRORTAB NC_("STR_LINKERRORTAB",
"Sheet:")
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c0fe9740f0e0..754ba1ff3e91 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -153,6 +153,8 @@
#include <svtools/sfxecode.hxx>
#include <unotools/pathoptions.hxx>
+#include <vcl/tabs.hrc>
+
using namespace com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -3161,7 +3163,8 @@ std::shared_ptr<SfxDocumentInfoDialog>
ScDocShell::CreateDocumentInfoDialog(weld
::CreateTabPage ScDocStatPageCreate =
pFact->GetTabPageCreatorFunc(SID_SC_TP_STAT);
OSL_ENSURE(ScDocStatPageCreate, "Tabpage create fail!");
xDlg->AddFontTabPage();
- xDlg->AddTabPage(u"calcstats"_ustr, ScResId(STR_DOC_STAT),
ScDocStatPageCreate);
+ xDlg->AddTabPage(u"calcstats"_ustr,
TabResId(RID_TAB_STATISTICS.aLabel),
+ ScDocStatPageCreate, RID_L +
RID_TAB_STATISTICS.sIconName);
}
return xDlg;
}
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b93213ed71c9..08588c950466 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -85,6 +85,8 @@
#include <algorithm>
+#include <vcl/tabs.hrc>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1331,20 +1333,21 @@
SfxDocumentInfoDialog::SfxDocumentInfoDialog(weld::Window* pParent, const SfxIte
m_xDialog->set_title(aTitle);
// Property Pages
- AddTabPage(u"general"_ustr, SfxDocumentPage::Create, nullptr);
- AddTabPage(u"description"_ustr, SfxDocumentDescPage::Create, nullptr);
+ AddTabPage(u"general"_ustr, TabResId(RID_TAB_ORGANIZER.aLabel),
SfxDocumentPage::Create,
+ RID_L + RID_TAB_ORGANIZER.sIconName);
+ AddTabPage(u"description"_ustr, TabResId(RID_TAB_DESCRIPTION.aLabel),
SfxDocumentDescPage::Create,
+ RID_L + RID_TAB_DESCRIPTION.sIconName);
- AddTabPage(u"customprops"_ustr, SfxCustomPropertiesPage::Create, nullptr);
+ AddTabPage(u"customprops"_ustr, TabResId(RID_TAB_CUSTOM.aLabel),
+ SfxCustomPropertiesPage::Create, RID_L +
RID_TAB_CUSTOM.sIconName);
if (rInfoItem.isCmisDocument())
- AddTabPage(u"cmisprops"_ustr, SfxCmisPropertiesPage::Create, nullptr);
- else
- RemoveTabPage(u"cmisprops"_ustr);
+ AddTabPage(u"cmisprops"_ustr, TabResId(RID_TAB_CMIS.aLabel),
+ SfxCmisPropertiesPage::Create, RID_L +
RID_TAB_CMIS.sIconName);
// Disable security page for online as not fully asynced yet
if (!comphelper::LibreOfficeKit::isActive())
- AddTabPage(u"security"_ustr, SfxSecurityPage::Create, nullptr);
- else
- RemoveTabPage(u"security"_ustr);
+ AddTabPage(u"security"_ustr, TabResId(RID_TAB_SECURITY.aLabel),
SfxSecurityPage::Create,
+ RID_L + RID_TAB_SECURITY.sIconName);
}
void SfxDocumentInfoDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
@@ -1355,7 +1358,8 @@ void SfxDocumentInfoDialog::PageCreated(const OUString&
rId, SfxTabPage &rPage)
void SfxDocumentInfoDialog::AddFontTabPage()
{
- AddTabPage(u"font"_ustr, SfxResId(STR_FONT_TABPAGE),
SfxDocumentFontsPage::Create);
+ AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel),
+ SfxDocumentFontsPage::Create, RID_L + RID_TAB_FONT.sIconName);
}
// class CustomPropertiesYesNoButton -------------------------------------
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index 5ce35fa601f8..d41a7a1eb370 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -90,123 +90,9 @@
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="tab-pos">left</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="general">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="documentpropertiesdialog|general">General </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="description">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="documentpropertiesdialog|description">Description</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="customprops">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="documentpropertiesdialog|customprops">Custom Properties</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="cmisprops">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="documentpropertiesdialog|cmisprops">CMIS Properties</property>
- </object>
- <packing>
- <property name="position">3</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">4</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="security">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="documentpropertiesdialog|security">Security</property>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/svx/source/form/fmtextcontroldialogs.cxx
b/svx/source/form/fmtextcontroldialogs.cxx
index 70e044db2d70..5daf4820a2a7 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -27,7 +27,7 @@
#include <svl/cjkoptions.hxx>
#include <utility>
-
+#include <vcl/tabs.hrc>
namespace svx
{
@@ -35,9 +35,12 @@ namespace svx
: SfxTabDialogController(pParent,
u"svx/ui/textcontrolchardialog.ui"_ustr,
u"TextControlCharacterPropertiesDialog"_ustr, &rCoreSet)
, m_aFontList(std::move(aFontList))
{
- AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
- AddTabPage(u"fonteffects"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
- AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION);
+ AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel),
RID_SVXPAGE_CHAR_NAME,
+ RID_L + RID_TAB_FONT.sIconName);
+ AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel),
+ RID_SVXPAGE_CHAR_EFFECTS, RID_L +
RID_TAB_FONTEFFECTS.sIconName);
+ AddTabPage(u"position"_ustr, TabResId(RID_TAB_POSITION.aLabel),
RID_SVXPAGE_CHAR_POSITION,
+ RID_L + RID_TAB_POSITION.sIconName);
}
void TextControlCharAttribDialog::PageCreated(const OUString& rId,
SfxTabPage& rPage)
@@ -64,15 +67,17 @@ namespace svx
TextControlParaAttribDialog::TextControlParaAttribDialog(weld::Window*
pParent, const SfxItemSet& rCoreSet)
: SfxTabDialogController(pParent,
u"svx/ui/textcontrolparadialog.ui"_ustr,
u"TextControlParagraphPropertiesDialog"_ustr, &rCoreSet)
{
- AddTabPage(u"labelTP_PARA_STD"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
- AddTabPage(u"labelTP_PARA_ALIGN"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH);
+ AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel),
RID_SVXPAGE_STD_PARAGRAPH,
+ RID_L + RID_TAB_INDENTS.sIconName);
+ AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel),
+ RID_SVXPAGE_ALIGN_PARAGRAPH, RID_L +
RID_TAB_ALIGNMENT.sIconName);
- if( SvtCJKOptions::IsAsianTypographyEnabled() )
- AddTabPage(u"labelTP_PARA_ASIAN"_ustr, RID_SVXPAGE_PARA_ASIAN);
- else
- RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr);
+ if (SvtCJKOptions::IsAsianTypographyEnabled())
+ AddTabPage(u"asian"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel),
RID_SVXPAGE_PARA_ASIAN,
+ RID_L + RID_TAB_ASIANTYPO.sIconName);
- AddTabPage(u"labelTP_TABULATOR"_ustr, RID_SVXPAGE_TABULATOR);
+ AddTabPage(u"tabs"_ustr, TabResId(RID_TAB_TABS.aLabel),
RID_SVXPAGE_TABULATOR,
+ RID_L + RID_TAB_TABS.sIconName);
}
}
diff --git a/svx/uiconfig/ui/textcontrolchardialog.ui
b/svx/uiconfig/ui/textcontrolchardialog.ui
index 07b90cc4a1c6..a13554a714b4 100644
--- a/svx/uiconfig/ui/textcontrolchardialog.ui
+++ b/svx/uiconfig/ui/textcontrolchardialog.ui
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TextControlCharacterPropertiesDialog">
- <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="textcontrolchardialog|TextControlCharacterPropertiesDialog">Character</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
+ <property name="type-hint">dialog</property>
<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>
@@ -39,10 +36,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>
@@ -55,8 +52,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>
@@ -69,8 +66,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>
@@ -84,158 +81,20 @@
<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>
- <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="font">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolchardialog|font">Font</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="fonteffects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolchardialog|fonteffects">Font Effects</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>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="position">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolchardialog|position">Position</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
+ <property name="enable-popup">True</property>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/svx/uiconfig/ui/textcontrolparadialog.ui
b/svx/uiconfig/ui/textcontrolparadialog.ui
index 232e235c0f1c..21694ab2f62a 100644
--- a/svx/uiconfig/ui/textcontrolparadialog.ui
+++ b/svx/uiconfig/ui/textcontrolparadialog.ui
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="TextControlParagraphPropertiesDialog">
- <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="textcontrolparadialog|TextControlParagraphPropertiesDialog">Paragraph</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
+ <property name="type-hint">dialog</property>
<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>
@@ -39,10 +36,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>
@@ -55,8 +52,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>
@@ -69,8 +66,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>
@@ -84,207 +81,20 @@
<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>
- <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="labelTP_PARA_STD">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolparadialog|labelTP_PARA_STD">Indents &
Spacing</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="labelTP_PARA_ALIGN">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolparadialog|labelTP_PARA_ALIGN">Alignment</property>
- <property name="xalign">0.5</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>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="labelTP_PARA_ASIAN">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolparadialog|labelTP_PARA_ASIAN">Asian Typography</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>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="labelTP_TABULATOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="textcontrolparadialog|labelTP_TABULATOR">Tabs</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
+ <property name="enable-popup">True</property>
+ <property name="group-name">icons</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index a4d0ab8e6bae..f3e942e0bb3d 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -264,7 +264,6 @@
#define STR_CAPTION_BELOW NC_("STR_CAPTION_BELOW",
"Below")
#define SW_STR_READONLY NC_("SW_STR_READONLY",
"read-only")
#define STR_READONLY_PATH NC_("STR_READONLY_PATH", "The
'AutoText' directories are read-only. Do you want to call the path settings
dialog?")
-#define STR_DOC_STAT NC_("STR_DOC_STAT",
"Statistics")
#define STR_OUTLINENUMBERING_DISABLED
NC_("STR_OUTLINENUMBERING_DISABLED","This option is disabled when heading
numbering is assigned to a paragraph style")
// Statusbar-titles
#define STR_STATSTR_W4WREAD NC_("STR_STATSTR_W4WREAD",
"Importing document...")
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 88f54ffcf072..e43c3500b657 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -122,6 +122,8 @@
#include <ndtxt.hxx>
#include <iodetect.hxx>
+#include <vcl/tabs.hrc>
+
#include <memory>
using namespace ::com::sun::star::ui::dialogs;
@@ -144,7 +146,9 @@ std::shared_ptr<SfxDocumentInfoDialog>
SwDocShell::CreateDocumentInfoDialog(weld
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
xDlg->AddFontTabPage();
- xDlg->AddTabPage(u"writerstats"_ustr, SwResId(STR_DOC_STAT),
pFact->GetTabPageCreatorFunc(RID_SW_TP_DOC_STAT));
+ xDlg->AddTabPage(u"writerstats"_ustr,
TabResId(RID_TAB_STATISTICS.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SW_TP_DOC_STAT),
+ RID_L + RID_TAB_STATISTICS.sIconName);
}
}
return xDlg;
