weld SwGlossaryGroupDlg

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

extras/source/glade/libreoffice-catalog.xml.in

@@ -256,18 +256,12 @@
     <glade-widget-class title="Chart Light Button" name="chartcontrollerlo-LightButton"
                         generic-name="ChartLightButton" parent="GtkButton"
                         icon-name="widget-gtk-button"/>
-    <glade-widget-class title="Category Edit" name="swuilo-FEdit"
-                        generic-name="CategoryEdit" parent="GtkEntry"
-                        icon-name="widget-gtk-textentry"/>
     <glade-widget-class title="Ruby Edit" name="svxlo-RubyEdit"
                         generic-name="RubyEdit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
     <glade-widget-class title="Dictionary Edit" name="cuilo-SvxDictEdit"
                         generic-name="SvxDictEdit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
-    <glade-widget-class title="Glossary List" name="swuilo-SwGlossaryGroupTLB"
-                        generic-name="Glossary List" parent="GtkTreeView"
-                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="Extended Macro Library" name="basctllo-ExtTreeListBox"
                         generic-name="Extended Macro Library List" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>

solenv/bin/native-code.py

@@ -422,7 +422,6 @@ custom_widgets = [
     'EmojiView',
     'ExtBoxWithBtns',
     'ExtensionBox',
-    'FEdit',
     'FontNameBox',
     'FontSizeBox',
     'FontStyleBox',
@@ -513,7 +512,6 @@ custom_widgets = [
     'SwCaptionPreview',
     'SwFieldRefTreeListBox',
     'SwGlTreeListBox',
-    'SwGlossaryGroupTLB',
     'SwIdxTreeListBox',
     'SwMarkPreview',
     'SwNavHelpToolBox',

sw/source/ui/misc/glossary.cxx

@@ -632,12 +632,12 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl, Button*, void)
         if(bIsWritable)
         {
 
-            ScopedVclPtrInstance< SwGlossaryGroupDlg > pDlg( this, pGloss->GetPathArray(), pGlossaryHdl );
-            if ( RET_OK == pDlg->Execute() )
+            SwGlossaryGroupDlg aDlg(GetFrameWeld(), pGloss->GetPathArray(), pGlossaryHdl);
+            if (aDlg.run() == RET_OK)
             {
                 Init();
                 //if new groups were created - select one of them
-                const OUString sNewGroup = pDlg->GetCreatedGroupName();
+                const OUString sNewGroup = aDlg.GetCreatedGroupName();
                 SvTreeListEntry* pEntry = m_pCategoryBox->First();
                 while (!sNewGroup.isEmpty() && pEntry)
                 {

sw/source/uibase/inc/glosbib.hxx

@@ -20,31 +20,14 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
 
-#include <vcl/edit.hxx>
-#include <svx/stddlg.hxx>
-
-#include <vcl/lstbox.hxx>
-#include <vcl/svtabbx.hxx>
-
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
+#include <sfx2/basedlgs.hxx>
 #include <rtl/ustring.hxx>
+#include <vcl/weld.hxx>
 
 #include <vector>
 
 class SwGlossaryHdl;
 
-class FEdit : public Edit
-{
-public:
-    FEdit(vcl::Window* pParent)
-        : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
-    {
-    }
-
-    virtual void KeyInput( const KeyEvent& rKEvent ) override;
-};
-
 struct GlosBibUserData
 {
     OUString sPath;
@@ -52,51 +35,43 @@ struct GlosBibUserData
     OUString sGroupTitle;
 };
 
-class SwGlossaryGroupTLB : public SvTabListBox
-{
-public:
-    SwGlossaryGroupTLB(vcl::Window* pParent)
-        : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT)
-    {
-    }
-
-    virtual void RequestHelp( const HelpEvent& rHEvt ) override;
-};
-
-class SwGlossaryGroupDlg final : public SvxStandardDialog
+class SwGlossaryGroupDlg final : public SfxDialogController
 {
-    VclPtr<FEdit>              m_pNameED;
-    VclPtr<ListBox>            m_pPathLB;
-    VclPtr<SwGlossaryGroupTLB> m_pGroupTLB;
-
-    VclPtr<PushButton>     m_pNewPB;
-    VclPtr<PushButton>     m_pDelPB;
-    VclPtr<PushButton>     m_pRenamePB;
-
     std::vector<OUString> m_RemovedArr;
     std::vector<OUString> m_InsertedArr;
     std::vector<OUString> m_RenamedArr;
 
-    SwGlossaryHdl   *pGlosHdl;
+    weld::Window* m_pParent;
+    SwGlossaryHdl* pGlosHdl;
 
     OUString        sCreatedGroup;
 
-    bool            IsDeleteAllowed(const OUString &rGroup);
+    std::unique_ptr<weld::Entry> m_xNameED;
+    std::unique_ptr<weld::ComboBox> m_xPathLB;
+    std::unique_ptr<weld::TreeView> m_xGroupTLB;
+
+    std::unique_ptr<weld::Button> m_xNewPB;
+    std::unique_ptr<weld::Button> m_xDelPB;
+    std::unique_ptr<weld::Button> m_xRenamePB;
+
+    bool IsDeleteAllowed(const OUString &rGroup);
 
-    virtual void Apply() override;
-    DECL_LINK( SelectHdl, SvTreeListBox*, void );
-    DECL_LINK( NewHdl, Button *, void );
-    DECL_LINK( DeleteHdl, Button*, void  );
-    DECL_LINK( ModifyHdl, Edit&, void );
-    DECL_LINK( ModifyListBoxHdl, ListBox&, void );
-    DECL_LINK( RenameHdl, Button *, void );
+    void Apply();
+    DECL_LINK(SelectHdl, weld::TreeView&, void);
+    DECL_LINK(NewHdl, weld::Button&, void);
+    DECL_LINK(DeleteHdl, weld::Button&, void);
+    DECL_LINK(ModifyHdl, weld::Entry&, void);
+    DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void);
+    DECL_LINK(RenameHdl, weld::Button&, void);
+    DECL_STATIC_LINK(SwGlossaryGroupDlg, EditInsertTextHdl, OUString&, bool);
+    DECL_LINK(EntrySizeAllocHdl, const Size&, void);
 
 public:
-    SwGlossaryGroupDlg(vcl::Window * pParent,
-                        std::vector<OUString> const& rPathArr,
-                        SwGlossaryHdl *pGlosHdl);
+    SwGlossaryGroupDlg(weld::Window* pParent,
+                       std::vector<OUString> const& rPathArr,
+                       SwGlossaryHdl *pGlosHdl);
+    virtual short run() override;
     virtual ~SwGlossaryGroupDlg() override;
-    virtual void dispose() override;
 
     const OUString&     GetCreatedGroupName() const {return sCreatedGroup;}
 };

vcl/source/app/salvtables.cxx

@@ -1862,6 +1862,8 @@ public:
             for (size_t i = 0; i < rWidths.size(); ++i)
                 pHeaderBar->SetItemSize(pHeaderBar->GetItemId(i), rWidths[i]);
         }
+        // call Resize to recalculate based on the new tabs
+        m_xTreeView->Resize();
     }
 
     virtual OUString get_column_title(int nColumn) const override
@@ -1933,7 +1935,7 @@ public:
     {
         for (SvTreeListEntry* pEntry = m_xTreeView->First(); pEntry; pEntry = m_xTreeView->Next(pEntry))
         {
-            if (m_xTreeView->GetEntryText(pEntry) == rText)
+            if (SvTabListBox::GetEntryText(pEntry, 0) == rText)
                 return m_xTreeView->GetAbsPos(pEntry);
         }
         return -1;
@@ -2245,7 +2247,7 @@ public:
     virtual OUString get_text(const weld::TreeIter& rIter) const override
     {
         const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter);
-        return m_xTreeView->GetEntryText(rVclIter.iter);
+        return SvTabListBox::GetEntryText(rVclIter.iter, 0);
     }
 
     virtual OUString get_id(const weld::TreeIter& rIter) const override
@@ -2283,6 +2285,7 @@ public:
     virtual void make_sorted() override
     {
         m_xTreeView->SetStyle(m_xTreeView->GetStyle() | WB_SORT);
+        m_xTreeView->GetModel()->Resort();
     }
 
     SvTabListBox& getTreeView()