weld ScDPSubtotalDlg

Change-Id: I33403031421a9f372c240cddea320591ac72bfc2
Reviewed-on: https://gerrit.libreoffice.org/67878
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 203 insertions, 131 deletions

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b16e1a26af5..1d6e00d26c8f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -476,11 +476,11 @@ public:
                                                                 const ScDPLabelData& rLabelData,
                                                                 const ScPivotFuncData& rFuncData ) = 0;
 
-    virtual VclPtr<AbstractScDPSubtotalDlg> CreateScDPSubtotalDlg( vcl::Window* pParent,
-                                                                ScDPObject& rDPObj,
-                                                                const ScDPLabelData& rLabelData,
-                                                                const ScPivotFuncData& rFuncData,
-                                                                const ScDPNameVec& rDataFields ) = 0;
+    virtual VclPtr<AbstractScDPSubtotalDlg> CreateScDPSubtotalDlg(weld::Window* pParent,
+                                                                  ScDPObject& rDPObj,
+                                                                  const ScDPLabelData& rLabelData,
+                                                                  const ScPivotFuncData& rFuncData,
+                                                                  const ScDPNameVec& rDataFields) = 0;
 
     virtual VclPtr<AbstractScDPNumGroupDlg> CreateScDPNumGroupDlg(weld::Window* pParent,
                                                                   const ScDPNumGroupInfo& rInfo) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index bd39b1bb7be3..e3125c60ce06 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -167,7 +167,11 @@ short AbstractScNamePasteDlg_Impl::Execute()
 
 IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl);
+
+short AbstractScDPSubtotalDlg_Impl::Execute()
+{
+    return m_xDlg->run();
+}
 
 short AbstractScDPNumGroupDlg_Impl::Execute()
 {
@@ -615,12 +619,12 @@ css::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef()
 
 PivotFunc AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
 {
-     return pDlg->GetFuncMask();
+     return m_xDlg->GetFuncMask();
 }
 
 void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) const
 {
-    pDlg->FillLabelData( rLabelData );
+    m_xDlg->FillLabelData( rLabelData );
 }
 
 ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
@@ -915,14 +919,13 @@ VclPtr<AbstractScDPFunctionDlg> ScAbstractDialogFactory_Impl::CreateScDPFunction
     return VclPtr<AbstractScDPFunctionDlg_Impl>::Create( pDlg );
 }
 
-VclPtr<AbstractScDPSubtotalDlg> ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( vcl::Window* pParent,
-                                                                ScDPObject& rDPObj,
-                                                                const ScDPLabelData& rLabelData,
-                                                                const ScPivotFuncData& rFuncData,
-                                                                const ScDPNameVec& rDataFields )
+VclPtr<AbstractScDPSubtotalDlg> ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg(weld::Window* pParent,
+                                                                                    ScDPObject& rDPObj,
+                                                                                    const ScDPLabelData& rLabelData,
+                                                                                    const ScPivotFuncData& rFuncData,
+                                                                                    const ScDPNameVec& rDataFields)
 {
-    VclPtr<ScDPSubtotalDlg> pDlg = VclPtr<ScDPSubtotalDlg>::Create( pParent, rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/ );
-    return VclPtr<AbstractScDPSubtotalDlg_Impl>::Create( pDlg );
+    return VclPtr<AbstractScDPSubtotalDlg_Impl>::Create(std::make_unique<ScDPSubtotalDlg>(pParent, rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/));
 }
 
 VclPtr<AbstractScDPNumGroupDlg> ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(weld::Window* pParent, const ScDPNumGroupInfo& rInfo)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index e1eb091553d6..1341de4450aa 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -399,7 +399,13 @@ class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg
 
 class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg
 {
-    DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg)
+    std::unique_ptr<ScDPSubtotalDlg> m_xDlg;
+public:
+    explicit AbstractScDPSubtotalDlg_Impl(std::unique_ptr<ScDPSubtotalDlg> p)
+        : m_xDlg(std::move(p))
+    {
+    }
+    virtual short           Execute() override;
     virtual PivotFunc GetFuncMask() const override;
     virtual void FillLabelData( ScDPLabelData& rLabelData ) const override;
 };
@@ -664,11 +670,11 @@ public:
                                                                 const ScDPLabelData& rLabelData,
                                                                 const ScPivotFuncData& rFuncData ) override;
 
-    virtual VclPtr<AbstractScDPSubtotalDlg> CreateScDPSubtotalDlg( vcl::Window* pParent,
-                                                                ScDPObject& rDPObj,
-                                                                const ScDPLabelData& rLabelData,
-                                                                const ScPivotFuncData& rFuncData,
-                                                                const ScDPNameVec& rDataFields ) override;
+    virtual VclPtr<AbstractScDPSubtotalDlg> CreateScDPSubtotalDlg(weld::Window* pParent,
+                                                                  ScDPObject& rDPObj,
+                                                                  const ScDPLabelData& rLabelData,
+                                                                  const ScPivotFuncData& rFuncData,
+                                                                  const ScDPNameVec& rDataFields ) override;
 
     virtual VclPtr<AbstractScDPNumGroupDlg> CreateScDPNumGroupDlg(weld::Window* pParent,
                                                                   const ScDPNumGroupInfo& rInfo) override;
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 6bfba04a1875..4b5903a7bf2e 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -57,7 +57,7 @@ bool ScPivotLayoutTreeList::DoubleClickHdl()
     mpParent->PushDataFieldNames(aDataFieldNames);
 
     ScopedVclPtr<AbstractScDPSubtotalDlg> pDialog(
-        pFactory->CreateScDPSubtotalDlg(this, mpParent->maPivotTableObject, rCurrentLabelData, rCurrentFunctionData, aDataFieldNames));
+        pFactory->CreateScDPSubtotalDlg(GetFrameWeld(), mpParent->maPivotTableObject, rCurrentLabelData, rCurrentFunctionData, aDataFieldNames));
 
     if (pDialog->Execute() == RET_OK)
     {
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index fb90a2abbd64..e75b890a8fb4 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -203,6 +203,48 @@ void ScDPFunctionListBox::FillFunctionNames()
     assert(GetEntryCount() == SAL_N_ELEMENTS(spnFunctions));
 }
 
+DPFunctionListBox::DPFunctionListBox(std::unique_ptr<weld::TreeView> xControl)
+    : m_xControl(std::move(xControl))
+{
+    FillFunctionNames();
+}
+
+void DPFunctionListBox::SetSelection( PivotFunc nFuncMask )
+{
+    if( (nFuncMask == PivotFunc::NONE) || (nFuncMask == PivotFunc::Auto) )
+        m_xControl->unselect_all();
+    else
+    {
+        for( sal_Int32 nEntry = 0, nCount = m_xControl->n_children(); nEntry < nCount; ++nEntry )
+        {
+            if (bool(nFuncMask & spnFunctions[ nEntry ]))
+                m_xControl->select(nEntry);
+            else
+                m_xControl->unselect(nEntry);
+        }
+    }
+}
+
+PivotFunc DPFunctionListBox::GetSelection() const
+{
+    PivotFunc nFuncMask = PivotFunc::NONE;
+    std::vector<int> aRows = m_xControl->get_selected_rows();
+    for (int nSel : aRows)
+        nFuncMask |= spnFunctions[nSel];
+    return nFuncMask;
+}
+
+void DPFunctionListBox::FillFunctionNames()
+{
+    OSL_ENSURE( !m_xControl->n_children(), "ScDPMultiFuncListBox::FillFunctionNames - do not add texts to resource" );
+    m_xControl->clear();
+    m_xControl->freeze();
+    for (size_t nIndex = 0; nIndex < SAL_N_ELEMENTS(SCSTR_DPFUNCLISTBOX); ++nIndex)
+        m_xControl->append_text(ScResId(SCSTR_DPFUNCLISTBOX[nIndex]));
+    m_xControl->thaw();
+    assert(m_xControl->n_children() == SAL_N_ELEMENTS(spnFunctions));
+}
+
 ScDPFunctionDlg::ScDPFunctionDlg(
         vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec,
         const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData)
@@ -433,56 +475,40 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl, ListBox&, void)
     mpBtnOk->Click();
 }
 
-ScDPSubtotalDlg::ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj,
+ScDPSubtotalDlg::ScDPSubtotalDlg(weld::Window* pParent, ScDPObject& rDPObj,
         const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData,
-        const ScDPNameVec& rDataFields, bool bEnableLayout )
-    : ModalDialog(pParent, "PivotFieldDialog",
-        "modules/scalc/ui/pivotfielddialog.ui")
+        const ScDPNameVec& rDataFields, bool bEnableLayout)
+    : GenericDialogController(pParent, "modules/scalc/ui/pivotfielddialog.ui", "PivotFieldDialog")
     , mrDPObj(rDPObj)
     , mrDataFields(rDataFields)
     , maLabelData(rLabelData)
     , mbEnableLayout(bEnableLayout)
+    , mxRbNone(m_xBuilder->weld_radio_button("none"))
+    , mxRbAuto(m_xBuilder->weld_radio_button("auto"))
+    , mxRbUser(m_xBuilder->weld_radio_button("user"))
+    , mxLbFunc(new DPFunctionListBox(m_xBuilder->weld_tree_view("functions")))
+    , mxFtName(m_xBuilder->weld_label("name"))
+    , mxCbShowAll(m_xBuilder->weld_check_button("showall"))
+    , mxBtnOk(m_xBuilder->weld_button("ok"))
+    , mxBtnOptions(m_xBuilder->weld_button("options"))
 {
-    get(mpBtnOk, "ok");
-    get(mpBtnOptions, "options");
-    get(mpCbShowAll, "showall");
-    get(mpFtName, "name");
-    get(mpLbFunc, "functions");
-    mpLbFunc->EnableMultiSelection(true);
-    mpLbFunc->set_height_request(mpLbFunc->GetTextHeight() * 8);
-    get(mpRbNone, "none");
-    get(mpRbAuto, "auto");
-    get(mpRbUser, "user");
-
-    Init( rLabelData, rFuncData );
+    mxLbFunc->set_selection_mode(SelectionMode::Multiple);
+    mxLbFunc->set_size_request(-1, mxLbFunc->get_height_rows(8));
+    Init(rLabelData, rFuncData);
 }
 
 ScDPSubtotalDlg::~ScDPSubtotalDlg()
 {
-    disposeOnce();
-}
-
-void ScDPSubtotalDlg::dispose()
-{
-    mpRbNone.clear();
-    mpRbAuto.clear();
-    mpRbUser.clear();
-    mpLbFunc.clear();
-    mpFtName.clear();
-    mpCbShowAll.clear();
-    mpBtnOk.clear();
-    mpBtnOptions.clear();
-    ModalDialog::dispose();
 }
 
 PivotFunc ScDPSubtotalDlg::GetFuncMask() const
 {
     PivotFunc nFuncMask = PivotFunc::NONE;
 
-    if( mpRbAuto->IsChecked() )
+    if (mxRbAuto->get_active())
         nFuncMask = PivotFunc::Auto;
-    else if( mpRbUser->IsChecked() )
-        nFuncMask = mpLbFunc->GetSelection();
+    else if (mxRbUser->get_active())
+        nFuncMask = mxLbFunc->GetSelection();
 
     return nFuncMask;
 }
@@ -491,7 +517,7 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 {
     rLabelData.mnFuncMask = GetFuncMask();
     rLabelData.mnUsedHier = maLabelData.mnUsedHier;
-    rLabelData.mbShowAll = mpCbShowAll->IsChecked();
+    rLabelData.mbShowAll = mxCbShowAll->get_active();
     rLabelData.maMembers = maLabelData.maMembers;
     rLabelData.maSortInfo = maLabelData.maSortInfo;
     rLabelData.maLayoutInfo = maLabelData.maLayoutInfo;
@@ -502,49 +528,49 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
 void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData )
 {
     // field name
-    mpFtName->SetText(rLabelData.getDisplayName());
+    mxFtName->set_label(rLabelData.getDisplayName());
 
     // radio buttons
-    mpRbNone->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
-    mpRbAuto->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
-    mpRbUser->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+    mxRbNone->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+    mxRbAuto->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+    mxRbUser->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
 
-    RadioButton* pRBtn = nullptr;
+    weld::RadioButton* pRBtn = nullptr;
     switch( rFuncData.mnFuncMask )
     {
-        case PivotFunc::NONE:   pRBtn = mpRbNone;  break;
-        case PivotFunc::Auto:   pRBtn = mpRbAuto;  break;
-        default:                pRBtn = mpRbUser;
+        case PivotFunc::NONE:   pRBtn = mxRbNone.get();  break;
+        case PivotFunc::Auto:   pRBtn = mxRbAuto.get();  break;
+        default:                pRBtn = mxRbUser.get();
     }
-    pRBtn->Check();
-    RadioClickHdl( pRBtn );
+    pRBtn->set_active(true);
+    RadioClickHdl(*pRBtn);
 
     // list box
-    mpLbFunc->SetSelection( rFuncData.mnFuncMask );
-    mpLbFunc->SetDoubleClickHdl( LINK( this, ScDPSubtotalDlg, DblClickHdl ) );
+    mxLbFunc->SetSelection( rFuncData.mnFuncMask );
+    mxLbFunc->connect_row_activated( LINK( this, ScDPSubtotalDlg, DblClickHdl ) );
 
     // show all
-    mpCbShowAll->Check( rLabelData.mbShowAll );
+    mxCbShowAll->set_active( rLabelData.mbShowAll );
 
     // options
-    mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
+    mxBtnOptions->connect_clicked( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
 }
 
-IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void )
+IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::Button&, rBtn, void)
 {
-    mpLbFunc->Enable( pBtn == mpRbUser );
+    mxLbFunc->set_sensitive(&rBtn == mxRbUser.get());
 }
 
-IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, ListBox&, void)
+IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl, weld::TreeView&, void)
 {
-    mpBtnOk->Click();
+    m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void )
+IMPL_LINK(ScDPSubtotalDlg, ClickHdl, weld::Button&, rBtn, void)
 {
-    if (pBtn == mpBtnOptions)
+    if (&rBtn == mxBtnOptions.get())
     {
-        ScDPSubtotalOptDlg aDlg(GetFrameWeld(), mrDPObj, maLabelData, mrDataFields, mbEnableLayout);
+        ScDPSubtotalOptDlg aDlg(m_xDialog.get(), mrDPObj, maLabelData, mrDataFields, mbEnableLayout);
         if (aDlg.run() == RET_OK)
             aDlg.FillLabelData(maLabelData);
     }
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 663ee658024d..258bf0a5349b 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -53,6 +53,25 @@ private:
     void                FillFunctionNames();
 };
 
+class DPFunctionListBox
+{
+public:
+    DPFunctionListBox(std::unique_ptr<weld::TreeView> xControl);
+
+    void                SetSelection( PivotFunc nFuncMask );
+    PivotFunc           GetSelection() const;
+
+    void set_sensitive(bool sensitive) { m_xControl->set_sensitive(sensitive); }
+    void set_selection_mode(SelectionMode eMode) { m_xControl->set_selection_mode(eMode); }
+    void connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_row_activated(rLink); }
+    int get_height_rows(int nRows) const { return m_xControl->get_height_rows(nRows); }
+    void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); }
+
+private:
+    std::unique_ptr<weld::TreeView> m_xControl;
+    void                FillFunctionNames();
+};
+
 class ScDPFunctionDlg : public ModalDialog
 {
     typedef std::unordered_map< OUString, OUString > NameMapType;
@@ -95,14 +114,13 @@ private:
     bool                 mbEmptyItem;        /// true = Empty base item in listbox.
 };
 
-class ScDPSubtotalDlg : public ModalDialog
+class ScDPSubtotalDlg : public weld::GenericDialogController
 {
 public:
-    explicit            ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj,
+    explicit            ScDPSubtotalDlg(weld::Window* pParent, ScDPObject& rDPObj,
                             const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData,
-                            const ScDPNameVec& rDataFields, bool bEnableLayout );
+                            const ScDPNameVec& rDataFields, bool bEnableLayout);
     virtual             ~ScDPSubtotalDlg() override;
-    virtual void        dispose() override;
     PivotFunc           GetFuncMask() const;
 
     void                FillLabelData( ScDPLabelData& rLabelData ) const;
@@ -110,25 +128,25 @@ public:
 private:
     void                Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData );
 
-    DECL_LINK( DblClickHdl, ListBox&, void );
-    DECL_LINK( RadioClickHdl, Button*, void );
-    DECL_LINK( ClickHdl, Button*, void );
+    DECL_LINK( DblClickHdl, weld::TreeView&, void );
+    DECL_LINK( RadioClickHdl, weld::Button&, void );
+    DECL_LINK( ClickHdl, weld::Button&, void );
 
 private:
-    VclPtr<RadioButton>         mpRbNone;
-    VclPtr<RadioButton>         mpRbAuto;
-    VclPtr<RadioButton>         mpRbUser;
-    VclPtr<ScDPFunctionListBox> mpLbFunc;
-    VclPtr<FixedText>           mpFtName;
-    VclPtr<CheckBox>            mpCbShowAll;
-    VclPtr<OKButton>            mpBtnOk;
-    VclPtr<PushButton>          mpBtnOptions;
-
     ScDPObject&          mrDPObj;            /// The DataPilot object (for member names).
     const ScDPNameVec&   mrDataFields;       /// The list of all data field names.
 
     ScDPLabelData        maLabelData;        /// Cache for sub dialog.
     bool                 mbEnableLayout;     /// true = Enable Layout mode controls.
+
+    std::unique_ptr<weld::RadioButton>   mxRbNone;
+    std::unique_ptr<weld::RadioButton>   mxRbAuto;
+    std::unique_ptr<weld::RadioButton>   mxRbUser;
+    std::unique_ptr<DPFunctionListBox>   mxLbFunc;
+    std::unique_ptr<weld::Label>         mxFtName;
+    std::unique_ptr<weld::CheckButton>   mxCbShowAll;
+    std::unique_ptr<weld::Button>        mxBtnOk;
+    std::unique_ptr<weld::Button>        mxBtnOptions;
 };
 
 class ScDPSubtotalOptDlg : public weld::GenericDialogController
diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
index 6a7edecf002e..c19205c527a1 100644
--- a/sc/uiconfig/scalc/ui/pivotfielddialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 17 11:22:49 2014 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkTreeStore" id="liststore2">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="PivotFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="pivotfielddialog|PivotFieldDialog">Data Field</property>
+    <property name="modal">True</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>
@@ -20,14 +33,12 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="options">
+                <property name="label" translatable="yes" context="pivotfielddialog|options">_Options...</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="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -36,11 +47,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-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="use_stock">True</property>
               </object>
@@ -51,10 +63,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -65,12 +78,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="options">
-                <property name="label" translatable="yes" context="pivotfielddialog|options">_Options...</property>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -133,8 +146,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -146,13 +157,11 @@
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">user</property>
+                            <property name="group">none</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -169,27 +178,47 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="scuilo-ScDPFunctionListBox" id="functions:border">
+                          <object class="GtkScrolledWindow">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="DPFunctionListBox-selection4">
-                                <property name="mode">multiple</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="functions">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="model">liststore2</property>
+                                <property name="headers_visible">False</property>
+                                <property name="search_column">1</property>
+                                <property name="show_expanders">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+                                    <property name="resizable">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderer4"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -210,8 +239,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -227,8 +254,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -240,14 +265,12 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="pivotfielddialog|label2">Name:</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -259,16 +282,12 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>