sw/source/ui/fldui/flddinf.cxx | 112 +++++++++++++++++++------------
sw/source/ui/fldui/flddinf.hxx | 4 -
sw/uiconfig/swriter/ui/flddocinfopage.ui | 110 ++++++++++++++++++++++++------
3 files changed, 160 insertions(+), 66 deletions(-)
New commits:
commit 5edb3c0b866a3c0169ed492e3807af5bad90b486
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 22 22:03:44 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 23 17:09:05 2022 +0200
tdf#104278 have separate treeviews for expander and no-expander cases
have two tree views, one with expander and one without, the one with is
only used when there are custom properties which use the expander, so
the common case of no custom properties doesn't have an 'unexplained'
expander margin
Change-Id: I6d0c97beeaf8a361ae264cdd1dacf4b06f251a08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141675
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index c96cfbc0c575..45f97bdaa1a7 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -54,19 +54,26 @@ SwFieldDokInfPage::SwFieldDokInfPage(weld::Container*
pPage, weld::DialogControl
: SwFieldPage(pPage, pController, "modules/swriter/ui/flddocinfopage.ui",
"FieldDocInfoPage", pCoreSet)
, nOldSel(0)
, nOldFormat(0)
- , m_xTypeTLB(m_xBuilder->weld_tree_view("type"))
+ , m_xTypeList(m_xBuilder->weld_tree_view("type-list"))
+ , m_xTypeTree(m_xBuilder->weld_tree_view("type-tree"))
+ // tdf#104278 have two tree views, one with expander and one without, the
one with is only used
+ // when there are custom properties which use the expander, so the common
case of no custom
+ // properties doesn't have an 'unexplained' expander margin
+ , m_pTypeView(m_xTypeTree.get())
, m_xSelection(m_xBuilder->weld_widget("selectframe"))
, m_xSelectionLB(m_xBuilder->weld_tree_view("select"))
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
, m_xFormatLB(new
SwNumFormatTreeView(m_xBuilder->weld_tree_view("format")))
, m_xFixedCB(m_xBuilder->weld_check_button("fixed"))
{
- m_xTypeTLB->make_sorted();
+ m_xTypeList->make_sorted();
+ m_xTypeTree->make_sorted();
FillFieldSelect(*m_xSelectionLB);
- auto nWidth = m_xTypeTLB->get_approximate_digit_width() *
FIELD_COLUMN_WIDTH;
- auto nHeight = m_xTypeTLB->get_height_rows(10);
- m_xTypeTLB->set_size_request(nWidth, nHeight);
+ auto nWidth = m_pTypeView->get_approximate_digit_width() *
FIELD_COLUMN_WIDTH;
+ auto nHeight = m_pTypeView->get_height_rows(10);
+ m_xTypeTree->set_size_request(nWidth, nHeight);
+ m_xTypeList->set_size_request(nWidth, nHeight);
m_xFormatLB->get_widget().set_size_request(nWidth * 2, nHeight);
m_xSelectionLB->set_size_request(nWidth, nHeight);
@@ -80,7 +87,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage,
weld::DialogControl
pItem->GetValue() >>= xCustomPropertySet;
// uitests
- m_xTypeTLB->set_buildable_name(m_xTypeTLB->get_buildable_name() +
"-docinf");
+ m_pTypeView->set_buildable_name("type-docinf");
m_xSelectionLB->set_buildable_name(m_xSelectionLB->get_buildable_name() +
"-docinf");
m_xFormatLB->set_buildable_name(m_xFormatLB->get_buildable_name() +
"-docinf");
}
@@ -93,9 +100,33 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
{
Init(); // general initialisation
+ uno::Sequence<beans::Property> aCustomProperties;
+ if (xCustomPropertySet.is())
+ {
+ uno::Reference<beans::XPropertySetInfo> xSetInfo =
xCustomPropertySet->getPropertySetInfo();
+ aCustomProperties = xSetInfo->getProperties();
+ }
+
+ if (aCustomProperties.hasElements())
+ {
+ m_xTypeList->hide();
+ m_xTypeList->set_buildable_name("type-list");
+ m_xTypeTree->show();
+ m_pTypeView = m_xTypeTree.get();
+ }
+ else
+ {
+ m_xTypeTree->hide();
+ m_xTypeTree->set_buildable_name("type-tree");
+ m_xTypeList->show();
+ m_pTypeView = m_xTypeList.get();
+ }
+
+ m_pTypeView->set_buildable_name("type-docinf");
+
// initialise TypeListBox
- m_xTypeTLB->freeze();
- m_xTypeTLB->clear();
+ m_pTypeView->freeze();
+ m_pTypeView->clear();
m_xSelEntry.reset();
// display SubTypes in TypeLB
@@ -131,7 +162,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
std::vector<OUString> aLst;
GetFieldMgr().GetSubTypes(SwFieldTypesEnum::DocumentInfo, aLst);
- std::unique_ptr<weld::TreeIter> xEntry(m_xTypeTLB->make_iterator());
+ std::unique_ptr<weld::TreeIter> xEntry(m_pTypeView->make_iterator());
std::unique_ptr<weld::TreeIter> xExpandEntry;
for(size_t i = 0; i < aLst.size(); ++i)
{
@@ -142,27 +173,24 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
{
if(xCustomPropertySet.is() )
{
- uno::Reference< beans::XPropertySetInfo > xSetInfo =
xCustomPropertySet->getPropertySetInfo();
- const uno::Sequence< beans::Property > rProperties =
xSetInfo->getProperties();
-
- if( rProperties.hasElements() )
+ if (aCustomProperties.hasElements())
{
- std::unique_ptr<weld::TreeIter>
xInfo(m_xTypeTLB->make_iterator());
+ std::unique_ptr<weld::TreeIter>
xInfo(m_pTypeView->make_iterator());
OUString sText(SwResId(STR_CUSTOM_FIELD));
OUString sEntryId(OUString::number(USHRT_MAX));
- m_xTypeTLB->insert(nullptr, -1, &sText, &sEntryId,
nullptr,
- nullptr, false, xInfo.get());
- for (const auto& rProperty : rProperties)
+ m_pTypeView->insert(nullptr, -1, &sText, &sEntryId,
nullptr,
+ nullptr, false, xInfo.get());
+ for (const auto& rProperty : aCustomProperties)
{
const OUString sEntry = rProperty.Name;
- m_xTypeTLB->insert(xInfo.get(), -1, &sEntry, &sId,
+ m_pTypeView->insert(xInfo.get(), -1, &sEntry, &sId,
nullptr, nullptr, false,
xEntry.get());
if (m_sOldCustomFieldName == sEntry)
{
- m_xSelEntry =
m_xTypeTLB->make_iterator(xEntry.get());
- xExpandEntry =
m_xTypeTLB->make_iterator(xInfo.get());
+ m_xSelEntry =
m_pTypeView->make_iterator(xEntry.get());
+ xExpandEntry =
m_pTypeView->make_iterator(xInfo.get());
}
}
}
@@ -172,8 +200,8 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
{
if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_SUBJECT
|| i == DI_PRINT)))
{
- m_xTypeTLB->insert(nullptr, -1, &aLst[i], &sId,
- nullptr, nullptr, false, xEntry.get());
+ m_pTypeView->insert(nullptr, -1, &aLst[i], &sId,
+ nullptr, nullptr, false, xEntry.get());
}
}
if (static_cast<size_t>(nSelEntryData) == i)
@@ -181,32 +209,32 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
}
}
- m_xTypeTLB->thaw();
+ m_pTypeView->thaw();
if (xExpandEntry)
- m_xTypeTLB->expand_row(*xExpandEntry);
+ m_pTypeView->expand_row(*xExpandEntry);
// select old Pos
if (m_xSelEntry)
{
- m_xTypeTLB->select(*m_xSelEntry);
- nSubType = m_xTypeTLB->get_id(*m_xSelEntry).toUInt32();
+ m_pTypeView->select(*m_xSelEntry);
+ nSubType = m_pTypeView->get_id(*m_xSelEntry).toUInt32();
}
else
{
- m_xSelEntry = m_xTypeTLB->make_iterator();
- if (m_xTypeTLB->get_iter_first(*m_xSelEntry))
- nSubType = m_xTypeTLB->get_id(*m_xSelEntry).toUInt32();
+ m_xSelEntry = m_pTypeView->make_iterator();
+ if (m_pTypeView->get_iter_first(*m_xSelEntry))
+ nSubType = m_pTypeView->get_id(*m_xSelEntry).toUInt32();
else
m_xSelEntry.reset();
}
FillSelectionLB(nSubType);
if (m_xSelEntry)
- TypeHdl(*m_xTypeTLB);
+ TypeHdl(*m_pTypeView);
- m_xTypeTLB->connect_changed(LINK(this, SwFieldDokInfPage, TypeHdl));
- m_xTypeTLB->connect_row_activated(LINK(this, SwFieldDokInfPage,
TreeViewInsertHdl));
+ m_pTypeView->connect_changed(LINK(this, SwFieldDokInfPage, TypeHdl));
+ m_pTypeView->connect_row_activated(LINK(this, SwFieldDokInfPage,
TreeViewInsertHdl));
m_xSelectionLB->connect_changed(LINK(this, SwFieldDokInfPage, SubTypeHdl));
m_xSelectionLB->connect_row_activated(LINK(this, SwFieldDokInfPage,
TreeViewInsertHdl));
m_xFormatLB->connect_row_activated(LINK(this, SwFieldDokInfPage,
TreeViewInsertHdl));
@@ -222,18 +250,18 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, weld::TreeView&, void)
{
// current ListBoxPos
- if (!m_xTypeTLB->get_selected(m_xSelEntry.get()) &&
- m_xTypeTLB->get_iter_first(*m_xSelEntry))
+ if (!m_pTypeView->get_selected(m_xSelEntry.get()) &&
+ m_pTypeView->get_iter_first(*m_xSelEntry))
{
- m_xTypeTLB->select(*m_xSelEntry);
+ m_pTypeView->select(*m_xSelEntry);
}
- FillSelectionLB(m_xTypeTLB->get_id(*m_xSelEntry).toUInt32());
+ FillSelectionLB(m_pTypeView->get_id(*m_xSelEntry).toUInt32());
SubTypeHdl(*m_xSelectionLB);
}
IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, weld::TreeView&, void)
{
- sal_uInt16 nSubType = m_xTypeTLB->get_id(*m_xSelEntry).toUInt32();
+ sal_uInt16 nSubType = m_pTypeView->get_id(*m_xSelEntry).toUInt32();
sal_Int32 nPos = m_xSelectionLB->get_selected_index();
sal_uInt16 nExtSubType;
SvNumFormatType nNewType = SvNumFormatType::ALL;
@@ -249,7 +277,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl,
weld::TreeView&, void)
if( nSubType == DI_CUSTOM )
{
//find out which type the custom field has - for a start
set to DATE format
- const OUString sName = m_xTypeTLB->get_text(*m_xSelEntry);
+ const OUString sName = m_pTypeView->get_text(*m_xSelEntry);
try
{
uno::Any aVal = xCustomPropertySet->getPropertyValue(
sName );
@@ -429,7 +457,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
if (!m_xSelEntry)
return false;
- sal_uInt16 nSubType = m_xTypeTLB->get_id(*m_xSelEntry).toUInt32();
+ sal_uInt16 nSubType = m_pTypeView->get_id(*m_xSelEntry).toUInt32();
if (nSubType == USHRT_MAX)
return false;
@@ -439,7 +467,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
OUString aName;
if (DI_CUSTOM == nSubType)
- aName = m_xTypeTLB->get_text(*m_xSelEntry);
+ aName = m_pTypeView->get_text(*m_xSelEntry);
if (nPos != -1)
nSubType |= m_xSelectionLB->get_id(nPos).toUInt32();
@@ -475,8 +503,8 @@ sal_uInt16 SwFieldDokInfPage::GetGroup()
void SwFieldDokInfPage::FillUserData()
{
- int nEntry = m_xTypeTLB->get_selected_index();
- sal_uInt16 nTypeSel = nEntry != -1 ? m_xTypeTLB->get_id(nEntry).toUInt32()
: USHRT_MAX;
+ int nEntry = m_pTypeView->get_selected_index();
+ sal_uInt16 nTypeSel = nEntry != -1 ?
m_pTypeView->get_id(nEntry).toUInt32() : USHRT_MAX;
SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
}
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index fb6fffff8036..391f5a346288 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -34,7 +34,9 @@ class SwFieldDokInfPage : public SwFieldPage
sal_uLong nOldFormat;
OUString m_sOldCustomFieldName;
- std::unique_ptr<weld::TreeView> m_xTypeTLB;
+ std::unique_ptr<weld::TreeView> m_xTypeList;
+ std::unique_ptr<weld::TreeView> m_xTypeTree;
+ weld::TreeView* m_pTypeView;
std::unique_ptr<weld::Widget> m_xSelection;
std::unique_ptr<weld::TreeView> m_xSelectionLB;
std::unique_ptr<weld::Widget> m_xFormat;
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui
b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index f797013cd087..7c3af9b72152 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -26,6 +26,14 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkTreeStore" id="liststore4">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkBox" id="FieldDocInfoPage">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -41,42 +49,97 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="margin-top">6</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow-type">in</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkTreeView" id="type">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers-visible">False</property>
- <property name="headers-clickable">False</property>
- <property name="search-column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
+ <property name="shadow-type">in</property>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <object class="GtkTreeView" id="type-list">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="headers-clickable">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-list-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
+ </object>
</child>
</object>
</child>
- <child internal-child="accessible">
- <object class="AtkObject" id="type-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkTreeView" id="type-tree">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore4</property>
+ <property name="headers-visible">False</property>
+ <property name="headers-clickable">False</property>
+ <property name="search-column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="type-tree-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="flddocinfopage|extended_tip|type">Lists the
available field types. To add a field to your document, click a field type,
click a field in the Select list, and then click Insert.</property>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -272,7 +335,8 @@
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
- <widget name="type"/>
+ <widget name="type-list"/>
+ <widget name="type-tree"/>
<widget name="select"/>
<widget name="format"/>
</widgets>
