weld SdPresLayoutDlg

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

8 files changed, 111 insertions, 91 deletions

diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 7576c5bf70ea..152ceb9dc556 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -183,7 +183,7 @@ public:
                                                                      const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
     virtual VclPtr<VclAbstractDialog>          CreateRemoteDialog( vcl::Window* pWindow ) = 0;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
-    virtual VclPtr<AbstractSdPresLayoutDlg>    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0;
+    virtual VclPtr<AbstractSdPresLayoutDlg>    CreateSdPresLayoutDlg(weld::Window* pParent, ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0;
     virtual VclPtr<SfxAbstractDialog>          CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
     virtual VclPtr<AbstractSdVectorizeDlg>     CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 71f4c742537b..fd863c973eb0 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -482,7 +482,9 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
         case 16:
         {
             // CreateSdPresLayoutDlg(::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) override;
+            auto const parent = Application::GetDefDialogParent();
             pRetval = getSdAbstractDialogFactory()->CreateSdPresLayoutDlg(
+                parent == nullptr ? nullptr : parent->GetFrameWeld(),
                 getDocShell(),
                 getEmptySfxItemSet());
             break;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 6c43e082bdef..1bf725bdce25 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -94,7 +94,11 @@ short AbstractSdStartPresDlg_Impl::Execute()
     return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl);
+short AbstractSdPresLayoutDlg_Impl::Execute()
+{
+    return m_xDlg->run();
+}
+
 IMPL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl);
 
 short AbstractSdVectorizeDlg_Impl::Execute()
@@ -344,12 +348,12 @@ bool AbstractMorphDlg_Impl::IsOrientationFade() const
 
 void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
 {
-    m_xDlg->GetAttr( rOutAttrs );
+    m_xDlg->GetAttr(rOutAttrs);
 }
 
 void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
 {
-    pDlg->GetAttr( rOutAttrs );
+    m_xDlg->GetAttr(rOutAttrs);
 }
 
 const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const
@@ -457,9 +461,9 @@ VclPtr<SfxAbstractTabDialog>  SdAbstractDialogFactory_Impl::CreateSdPresLayoutTe
     return VclPtr<SdPresLayoutTemplateDlg_Impl>::Create( VclPtr<SdPresLayoutTemplateDlg>::Create( pDocSh, pParent, bBackgroundDlg, rStyleBase, ePO, pSSPool ) );
 }
 
-VclPtr<AbstractSdPresLayoutDlg>  SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(  ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs)
+VclPtr<AbstractSdPresLayoutDlg> SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(weld::Window* pParent, ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs)
 {
-    return VclPtr<AbstractSdPresLayoutDlg_Impl>::Create( VclPtr<SdPresLayoutDlg>::Create( pDocShell, nullptr, rInAttrs ) );
+    return VclPtr<AbstractSdPresLayoutDlg_Impl>::Create(o3tl::make_unique<SdPresLayoutDlg>(pDocShell, pParent, rInAttrs));
 }
 
 VclPtr<SfxAbstractTabDialog>  SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 4571aa29248c..99ad415871e5 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -277,7 +277,14 @@ public:
 class SdPresLayoutDlg;
 class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
 {
-    DECL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl,SdPresLayoutDlg)
+private:
+    std::unique_ptr<SdPresLayoutDlg> m_xDlg;
+public:
+    AbstractSdPresLayoutDlg_Impl(std::unique_ptr<SdPresLayoutDlg> pDlg)
+        : m_xDlg(std::move(pDlg))
+    {
+    }
+    virtual short   Execute() override;
     virtual void    GetAttr(SfxItemSet& rOutAttrs) override;
 };
 
@@ -337,7 +344,7 @@ public:
                                                                      const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override;
     virtual VclPtr<VclAbstractDialog>          CreateRemoteDialog( vcl::Window* pWindow ) override; // ad for RemoteDialog
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) override;
-    virtual VclPtr<AbstractSdPresLayoutDlg>    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) override;
+    virtual VclPtr<AbstractSdPresLayoutDlg>    CreateSdPresLayoutDlg(weld::Window* pParent, ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) override;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override;
     virtual VclPtr<SfxAbstractDialog>          CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override;
     virtual VclPtr<AbstractSdVectorizeDlg>     CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) override;
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index c4d16cd7037e..9e1c983c6070 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -32,39 +32,28 @@
 #include <memory>
 
 SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
-    vcl::Window* pWindow, const SfxItemSet& rInAttrs)
-    : ModalDialog(pWindow, "SlideDesignDialog",
-        "modules/simpress/ui/slidedesigndialog.ui")
+    weld::Window* pWindow, const SfxItemSet& rInAttrs)
+    : GenericDialogController(pWindow, "modules/simpress/ui/slidedesigndialog.ui", "SlideDesignDialog")
     , mpDocSh(pDocShell)
     , mrOutAttrs(rInAttrs)
     , maStrNone(SdResId(STR_NULL))
+    , m_xCbxMasterPage(m_xBuilder->weld_check_button("masterpage"))
+    , m_xCbxCheckMasters(m_xBuilder->weld_check_button("checkmasters"))
+    , m_xBtnLoad(m_xBuilder->weld_button("load"))
+    , m_xVS(new SvtValueSet(m_xBuilder->weld_scrolled_window("selectwin")))
+    , m_xVSWin(new weld::CustomWeld(*m_xBuilder, "select", *m_xVS))
 {
-    get(m_pVS, "select");
-    Size aPref(LogicToPixel(Size(144 , 141), MapMode(MapUnit::MapAppFont)));
-    m_pVS->set_width_request(aPref.Width());
-    m_pVS->set_height_request(aPref.Height());
-    get(m_pCbxMasterPage, "masterpage");
-    get(m_pCbxCheckMasters, "checkmasters");
-    get(m_pBtnLoad, "load");
+    m_xVSWin->set_size_request(m_xBtnLoad->get_approximate_digit_width() * 60,
+                               m_xBtnLoad->get_text_height() * 20);
 
-    m_pVS->SetDoubleClickHdl(LINK(this, SdPresLayoutDlg, ClickLayoutHdl));
-    m_pBtnLoad->SetClickHdl(LINK(this, SdPresLayoutDlg, ClickLoadHdl));
+    m_xVS->SetDoubleClickHdl(LINK(this, SdPresLayoutDlg, ClickLayoutHdl));
+    m_xBtnLoad->connect_clicked(LINK(this, SdPresLayoutDlg, ClickLoadHdl));
 
     Reset();
 }
 
 SdPresLayoutDlg::~SdPresLayoutDlg()
 {
-    disposeOnce();
-}
-
-void SdPresLayoutDlg::dispose()
-{
-    m_pVS.clear();
-    m_pCbxMasterPage.clear();
-    m_pCbxCheckMasters.clear();
-    m_pBtnLoad.clear();
-    ModalDialog::dispose();
 }
 
 /**
@@ -79,12 +68,12 @@ void SdPresLayoutDlg::Reset()
     if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, false, &pPoolItem ) == SfxItemState::SET )
     {
         bool bMasterPage = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
-        m_pCbxMasterPage->Enable( !bMasterPage );
-        m_pCbxMasterPage->Check( bMasterPage );
+        m_xCbxMasterPage->set_sensitive( !bMasterPage );
+        m_xCbxMasterPage->set_active( bMasterPage );
     }
 
     // remove not used master pages
-    m_pCbxCheckMasters->Check(false);
+    m_xCbxCheckMasters->set_active(false);
 
     if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, true, &pPoolItem) == SfxItemState::SET)
         maName = static_cast<const SfxStringItem*>(pPoolItem)->GetValue();
@@ -101,7 +90,7 @@ void SdPresLayoutDlg::Reset()
     }
     DBG_ASSERT(nName < mnLayoutCount, "Layout not found");
 
-    m_pVS->SelectItem(static_cast<sal_uInt16>(nName) + 1);  // Indices of the ValueSets start at 1
+    m_xVS->SelectItem(static_cast<sal_uInt16>(nName) + 1);  // Indices of the ValueSets start at 1
 
 }
 
@@ -110,7 +99,7 @@ void SdPresLayoutDlg::Reset()
  */
 void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
 {
-    short nId = m_pVS->GetSelectedItemId();
+    short nId = m_xVS->GetSelectedItemId();
     bool bLoad = nId > mnLayoutCount;
     rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) );
 
@@ -128,8 +117,8 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
     }
 
     rOutAttrs.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aLayoutName ) );
-    rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_MASTER_PAGE, m_pCbxMasterPage->IsChecked() ) );
-    rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, m_pCbxCheckMasters->IsChecked() ) );
+    rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_MASTER_PAGE, m_xCbxMasterPage->get_active() ) );
+    rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, m_xCbxCheckMasters->get_active() ) );
 }
 
 /**
@@ -137,12 +126,12 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
  */
 void SdPresLayoutDlg::FillValueSet()
 {
-    m_pVS->SetStyle(m_pVS->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER
+    m_xVS->SetStyle(m_xVS->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER
                                       | WB_VSCROLL | WB_NAMEFIELD);
 
-    m_pVS->SetColCount(2);
-    m_pVS->SetLineCount(2);
-    m_pVS->SetExtraSpacing(2);
+    m_xVS->SetColCount(2);
+    m_xVS->SetLineCount(2);
+    m_xVS->SetExtraSpacing(2);
 
     SdDrawDocument* pDoc = mpDocSh->GetDoc();
 
@@ -158,35 +147,29 @@ void SdPresLayoutDlg::FillValueSet()
             maLayoutNames.push_back(aLayoutName);
 
             Image aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster));
-            m_pVS->InsertItem(static_cast<sal_uInt16>(maLayoutNames.size()), aBitmap, aLayoutName);
+            m_xVS->InsertItem(static_cast<sal_uInt16>(maLayoutNames.size()), aBitmap, aLayoutName);
         }
     }
 
-    m_pVS->Show();
+    m_xVS->Show();
 }
 
 /**
  * DoubleClick handler
  */
-IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
+IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, SvtValueSet*, void)
 {
-    EndDialog(RET_OK);
+    m_xDialog->response(RET_OK);
 }
 
 /**
  * Click handler for load button
  */
-IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
+IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, weld::Button&, void)
 {
-    SfxNewFileDialog aDlg(GetFrameWeld(), SfxNewFileDialogMode::Preview);
+    SfxNewFileDialog aDlg(m_xDialog.get(), SfxNewFileDialogMode::Preview);
     aDlg.set_title(SdResId(STR_LOAD_PRESENTATION_LAYOUT));
-
-    if(!IsReallyVisible())
-        return;
-
     sal_uInt16 nResult = aDlg.run();
-    // Inserted update to force repaint
-    Update();
 
     bool   bCancel = false;
 
@@ -226,7 +209,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
             {
                 bExists = true;
                 // select template
-                m_pVS->SelectItem( aPos + 1 );
+                m_xVS->SelectItem( aPos + 1 );
             }
         }
 
@@ -255,7 +238,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
                             maLayoutNames.push_back(aLayoutName);
 
                             Image aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster));
-                            m_pVS->InsertItem(static_cast<sal_uInt16>(maLayoutNames.size()), aBitmap, aLayoutName);
+                            m_xVS->InsertItem(static_cast<sal_uInt16>(maLayoutNames.size()), aBitmap, aLayoutName);
                         }
                     }
                 }
@@ -270,14 +253,14 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
             {
                 // empty layout
                 maLayoutNames.push_back(maStrNone);
-                m_pVS->InsertItem( static_cast<sal_uInt16>(maLayoutNames.size()),
+                m_xVS->InsertItem( static_cast<sal_uInt16>(maLayoutNames.size()),
                         Image(BMP_FOIL_NONE), maStrNone );
             }
 
             if (!bCancel)
             {
                 // select template
-                m_pVS->SelectItem( static_cast<sal_uInt16>(maLayoutNames.size()) );
+                m_xVS->SelectItem( static_cast<sal_uInt16>(maLayoutNames.size()) );
             }
         }
     }
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 8f3aaca436c7..e6822e7f7be3 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -170,7 +170,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
     else
     {
         SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSdPresLayoutDlg> pDlg( pFact->CreateSdPresLayoutDlg(mpDocSh, aSet ) );
+        ScopedVclPtr<AbstractSdPresLayoutDlg> pDlg(pFact->CreateSdPresLayoutDlg(rReq.GetFrameWeld(), mpDocSh, aSet));
 
         sal_uInt16 nResult = pDlg->Execute();
 
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 548b2c604aea..2360493a0a0a 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -22,8 +22,8 @@
 
 #include <vector>
 
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
+#include <vcl/customweld.hxx>
+#include <vcl/weld.hxx>
 #include <svtools/valueset.hxx>
 
 class SfxItemSet;
@@ -33,27 +33,22 @@ class DrawDocShell;
 }
 
 class SdPresLayoutDlg
-    : public ModalDialog
+    : public weld::GenericDialogController
 {
 public:
     SdPresLayoutDlg(
         ::sd::DrawDocShell* pDocShell,
-        vcl::Window* pWindow,
+        weld::Window* pWindow,
         const SfxItemSet& rInAttrs);
     virtual ~SdPresLayoutDlg() override;
-    virtual void dispose() override;
 
     void                GetAttr(SfxItemSet& rOutAttrs);
 
-    DECL_LINK(ClickLayoutHdl, ValueSet*, void);
-    DECL_LINK(ClickLoadHdl, Button*, void);
+    DECL_LINK(ClickLayoutHdl, SvtValueSet*, void);
+    DECL_LINK(ClickLoadHdl, weld::Button&, void);
 
 private:
     ::sd::DrawDocShell* mpDocSh;
-    VclPtr<ValueSet>           m_pVS;
-    VclPtr<CheckBox>           m_pCbxMasterPage;
-    VclPtr<CheckBox>           m_pCbxCheckMasters;
-    VclPtr<PushButton>         m_pBtnLoad;
 
     const SfxItemSet&   mrOutAttrs;
 
@@ -63,6 +58,12 @@ private:
     long                mnLayoutCount;   ///< number of master pages in the document
     const OUString      maStrNone;
 
+    std::unique_ptr<weld::CheckButton> m_xCbxMasterPage;
+    std::unique_ptr<weld::CheckButton> m_xCbxCheckMasters;
+    std::unique_ptr<weld::Button> m_xBtnLoad;
+    std::unique_ptr<SvtValueSet> m_xVS;
+    std::unique_ptr<weld::CustomWeld> m_xVSWin;
+
     void                FillValueSet();
     void                Reset();
 };
diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
index f27b4d6beae3..01559519b050 100644
--- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui
+++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SlideDesignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="slidedesigndialog|SlideDesignDialog">Slide Design</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="visible">True</property>
@@ -20,14 +25,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="load">
+                <property name="label" translatable="yes" context="slidedesigndialog|load">_Load...</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,10 +39,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>
@@ -50,32 +55,32 @@
               </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">False</property>
-                <property name="receives_default">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">2</property>
-                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="load">
-                <property name="label" translatable="yes" context="slidedesigndialog|load">_Load...</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="can_focus">False</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">3</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
           </object>
@@ -136,11 +141,29 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo-ValueSet" id="select:border">
+                      <object class="GtkScrolledWindow" id="selectwin">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">never</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkViewport" id="selectwi">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkDrawingArea" id="select">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -171,10 +194,10 @@
       </object>
     </child>
     <action-widgets>
+      <action-widget response="101">load</action-widget>
       <action-widget response="-5">ok</action-widget>
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
-      <action-widget response="0">load</action-widget>
     </action-widgets>
   </object>
 </interface>