weld SwAssignFieldsDialog

Change-Id: I1242f89b4a2809c730b9bc7c2b6b7207edabd47f
Reviewed-on: https://gerrit.libreoffice.org/70015
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

@@ -203,9 +203,6 @@
     <glade-widget-class title="Address Preview" name="swlo-SwAddressPreview"
                         generic-name="Address Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
-    <glade-widget-class title="Assign Fields Control" name="swuilo-SwAssignFieldsControl"
-                        generic-name="Assign Fields Control" parent="GtkDrawingArea"
-                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Chart Light Button" name="chartcontrollerlo-LightButton"
                         generic-name="ChartLightButton" parent="GtkButton"
                         icon-name="widget-gtk-button"/>

sw/UIConfig_swriter.mk

@@ -94,6 +94,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/asciifilterdialog \
 	sw/uiconfig/swriter/ui/asksearchdialog \
 	sw/uiconfig/swriter/ui/assignfieldsdialog \
+	sw/uiconfig/swriter/ui/assignfragment \
 	sw/uiconfig/swriter/ui/assignstylesdialog \
 	sw/uiconfig/swriter/ui/attachnamedialog \
 	sw/uiconfig/swriter/ui/authenticationsettingsdialog \

sw/source/ui/dbui/createaddresslistdialog.cxx

@@ -54,7 +54,6 @@ using namespace ::com::sun::star::ui::dialogs;
 struct SwAddressFragment
 {
     std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Container> m_xOrigContainer;
     std::unique_ptr<weld::Label> m_xLabel;
     std::unique_ptr<weld::Entry> m_xEntry;
 

sw/source/ui/dbui/mmaddressblockpage.hxx

@@ -243,32 +243,40 @@ public:
 };
 
 class SwAssignFieldsControl;
-class SwAssignFieldsDialog : public SfxModalDialog
+class SwAssignFieldsDialog : public SfxDialogController
 {
-    VclPtr<FixedText>               m_pMatchingFI;
-    VclPtr<SwAssignFieldsControl>   m_pFieldsControl;
-
-    VclPtr<FixedText>               m_pPreviewFI;
-    VclPtr<SwAddressPreview>        m_pPreviewWIN;
-
-    VclPtr<OKButton>                m_pOK;
-
     OUString const          m_sNone;
     OUString const          m_rPreviewString;
 
     SwMailMergeConfigItem&  m_rConfigItem;
 
+    std::unique_ptr<AddressPreview> m_xPreview;
+    std::unique_ptr<weld::Label> m_xMatchingFI;
+    std::unique_ptr<weld::Label> m_xAddressTitle;
+    std::unique_ptr<weld::Label> m_xMatchTitle;
+    std::unique_ptr<weld::Label> m_xPreviewTitle;
+    std::unique_ptr<weld::Label> m_xPreviewFI;
+    std::unique_ptr<weld::Button> m_xOK;
+    std::unique_ptr<weld::CustomWeld> m_xPreviewWin;
+    std::unique_ptr<SwAssignFieldsControl> m_xFieldsControl;
+
+    std::unique_ptr<weld::SizeGroup> m_xLabelGroup;
+    std::unique_ptr<weld::SizeGroup> m_xComboGroup;
+    std::unique_ptr<weld::SizeGroup> m_xPreviewGroup;
+
     css::uno::Sequence< OUString > CreateAssignments();
-    DECL_LINK(OkHdl_Impl, Button*, void);
+    DECL_LINK(OkHdl_Impl, weld::Button&, void);
     DECL_LINK(AssignmentModifyHdl_Impl, LinkParamNone*, void);
 
 public:
-    SwAssignFieldsDialog(vcl::Window* pParent,
+    SwAssignFieldsDialog(weld::Window* pParent,
                 SwMailMergeConfigItem& rConfigItem,
                 const OUString& rPreview,
                 bool bIsAddressBlock);
+
+    void ConnectSizeGroups(int nLabelWidth, int nComboBoxWidth, int nPreviewWidth);
+
     virtual ~SwAssignFieldsDialog() override;
-    virtual void dispose() override;
 };
 #endif
 

sw/source/ui/dbui/mmgreetingspage.cxx

@@ -109,9 +109,8 @@ void SwGreetingsHandler::UpdatePreview()
 IMPL_LINK_NOARG(SwMailMergeGreetingsPage, AssignHdl_Impl, weld::Button&, void)
 {
     const OUString sPreview(m_xFemaleLB->get_active_text() + "\n" + m_xMaleLB->get_active_text());
-    ScopedVclPtr<SwAssignFieldsDialog> pDlg(
-            VclPtr<SwAssignFieldsDialog>::Create(nullptr /*TODO*/, m_rConfigItem, sPreview, false));
-    if(RET_OK == pDlg->Execute())
+    SwAssignFieldsDialog aDlg(GetFrameWeld(), m_rConfigItem, sPreview, false);
+    if (RET_OK == aDlg.run())
     {
         UpdatePreview();
         m_pWizard->UpdateRoadmap();

sw/uiconfig/swriter/ui/assignfragment.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="sw">
+  <requires lib="gtk+" version="3.18"/>
+    <object class="GtkLabel" id="label">
+      <property name="visible">True</property>
+      <property name="can_focus">False</property>
+      <property name="use_underline">True</property>
+      <property name="mnemonic_widget">combobox</property>
+      <property name="xalign">0</property>
+    </object>
+    <object class="GtkComboBoxText" id="combobox">
+      <property name="visible">True</property>
+      <property name="can_focus">False</property>
+      <property name="hexpand">True</property>
+    </object>
+    <object class="GtkLabel" id="preview">
+      <property name="visible">True</property>
+      <property name="can_focus">False</property>
+      <property name="xalign">0</property>
+    </object>
+</interface>