weld ODbTypeWizDialogSetup

split up RoadmapWizard to sit its wizard logic on top of a a native GtkAssistant

a) awkwardly GtkAssistant is not a GtkDialog, but derives directly from
GtkWindow so some shuffling around required due to that

b) hidden/unused pages are shuffled to the end of the list of pages and
their titles turned off in order to hide them from the roadmap

c) some nonstandard hackery required to get the gtk roadmap titles to wrap

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

21 files changed, 178 insertions, 171 deletions

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eacb9eb112c2..ff79be062c22 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/colwidthdialog \
     dbaccess/uiconfig/ui/connectionpage \
     dbaccess/uiconfig/ui/copytablepage \
+    dbaccess/uiconfig/ui/databasewizard \
     dbaccess/uiconfig/ui/dbaseindexdialog \
     dbaccess/uiconfig/ui/dbasepage \
     dbaccess/uiconfig/ui/dbwizconnectionpage \
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index e0599f5f1517..3672e247de5c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -64,8 +64,10 @@ namespace dbaui
         , m_pAdminDialog(nullptr)
         , m_pItemSetHelper(nullptr)
     {
-
         SetExchangeSupport();
+
+        Size aSize(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapMode(MapUnit::MapAppFont)));
+        m_xContainer->set_size_request(aSize.Width(), aSize.Height());
     }
 
     DeactivateRC OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 97cdfdb5e609..e878a7d611eb 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -99,12 +99,12 @@ using namespace ::comphelper;
 using namespace ::cppu;
 
 // ODbTypeWizDialogSetup
-ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
+ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(weld::Window* _pParent
                                ,SfxItemSet const * _pItems
                                ,const Reference< XComponentContext >& _rxORB
                                ,const css::uno::Any& _aDataSourceName
                                )
-    :vcl::RoadmapWizard( _pParent )
+    : vcl::RoadmapWizardMachine( _pParent )
 
     , m_bIsConnectable( false)
     , m_sRM_IntroText( DBA_RES( STR_PAGETITLE_INTROPAGE ) )
@@ -135,14 +135,13 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
 
     OSL_ENSURE(m_pCollection, "ODbTypeWizDialogSetup::ODbTypeWizDialogSetup : really need a DSN type collection !");
 
-    m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,GetFrameWeld(),_pParent ? _pParent->GetFrameWeld() : nullptr, this));
+    m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB, m_xAssistant.get(), _pParent, this));
     m_pImpl->setDataSourceOrName(_aDataSourceName);
     Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
     m_pOutSet.reset( new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ) );
 
     m_pImpl->translateProperties(xDatasource, *m_pOutSet);
 
-    SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapMode(MapUnit::MapAppFont)));
     defaultButton(WizardButtonFlags::NEXT);
     enableButtons(WizardButtonFlags::FINISH, true);
     enableAutomaticNextButtonState();
@@ -165,13 +164,13 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
     aPath.push_back(PAGE_DBSETUPWIZARD_INTRO);
     declarePath( static_cast<PathId>(m_pCollection->size()+1), aPath);
 
-    m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
-    m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
-    m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
-    m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
-    SetRoadmapInteractive( true );
+    m_xPrevPage->set_help_id(HID_DBWIZ_PREVIOUS);
+    m_xNextPage->set_help_id(HID_DBWIZ_NEXT);
+    m_xCancel->set_help_id(HID_DBWIZ_CANCEL);
+    m_xFinish->set_help_id(HID_DBWIZ_FINISH);
     ActivatePage();
     setTitleBase(DBA_RES(STR_DBWIZARDTITLE));
+    m_xAssistant->set_current_page(0);
 }
 
 void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const vcl::RoadmapWizardTypes::WizardPath& _rPaths)
@@ -188,7 +187,7 @@ void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _n
     }
 
     // call base method
-    ::vcl::RoadmapWizard::declarePath( _nPathId, aPath );
+    ::vcl::RoadmapWizardMachine::declarePath( _nPathId, aPath );
 }
 
 OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
@@ -256,16 +255,6 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
 
 ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup()
 {
-    disposeOnce();
-}
-
-void ODbTypeWizDialogSetup::dispose()
-{
-    m_pOutSet.reset();
-    m_pGeneralPage.clear();
-    m_pMySQLIntroPage.clear();
-    m_pFinalPage.clear();
-    vcl::RoadmapWizard::dispose();
 }
 
 IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void)
@@ -458,10 +447,16 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
 {
     VclPtr<SfxTabPage> pFirstPage;
     VclPtr<OGenericAdministrationPage> pPage;
+
+    OString sIdent(OString::number(_nState));
+    weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
+    // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
+    TabPageParent aParent(pPageContainer, this);
+
     switch(_nState)
     {
         case PAGE_DBSETUPWIZARD_INTRO:
-            pFirstPage = VclPtr<OGeneralPageWizard>::Create(this,*m_pOutSet);
+            pFirstPage = VclPtr<OGeneralPageWizard>::Create(aParent,*m_pOutSet);
             pPage = static_cast<OGenericAdministrationPage*> (pFirstPage.get());
             m_pGeneralPage = static_cast<OGeneralPageWizard*>(pFirstPage.get());
             m_pGeneralPage->SetTypeSelectHandler(LINK(this, ODbTypeWizDialogSetup, OnTypeSelected));
@@ -471,70 +466,70 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
             break;
 
         case PAGE_DBSETUPWIZARD_DBASE:
-            pPage = OConnectionTabPageSetup::CreateDbaseTabPage(this,*m_pOutSet);
+            pPage = OConnectionTabPageSetup::CreateDbaseTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_ADO:
-            pPage = OConnectionTabPageSetup::CreateADOTabPage( this, *m_pOutSet);
+            pPage = OConnectionTabPageSetup::CreateADOTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_TEXT:
-            pPage = OTextConnectionPageSetup::CreateTextTabPage(this,*m_pOutSet);
+            pPage = OTextConnectionPageSetup::CreateTextTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_ODBC:
-            pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
+            pPage = OConnectionTabPageSetup::CreateODBCTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_JDBC:
-            pPage = OJDBCConnectionPageSetup::CreateJDBCTabPage( this, *m_pOutSet);
+            pPage = OJDBCConnectionPageSetup::CreateJDBCTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_MYSQL_ODBC:
             m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:odbc:")));
-            pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
+            pPage = OConnectionTabPageSetup::CreateODBCTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_MYSQL_JDBC:
             m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:jdbc:")));
-            pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet);
+            pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage(aParent, *m_pOutSet);
             break;
         case PAGE_DBSETUPWIZARD_MYSQL_NATIVE:
             m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:mysqlc:")));
-            pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet);
+            pPage = MySQLNativeSetupPage::Create(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_ORACLE:
-            pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( this, *m_pOutSet);
+            pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_LDAP:
-            pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet);
+            pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_DOCUMENT_OR_SPREADSHEET:
-            pPage = OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(this,*m_pOutSet);
+            pPage = OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_MSACCESS:
-            pPage  = OConnectionTabPageSetup::CreateMSAccessTabPage(this,*m_pOutSet);
+            pPage  = OConnectionTabPageSetup::CreateMSAccessTabPage(aParent, *m_pOutSet);
             break;
         case PAGE_DBSETUPWIZARD_MYSQL_INTRO:
-            m_pMySQLIntroPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(this,*m_pOutSet);
+            m_pMySQLIntroPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(aParent, *m_pOutSet);
             m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, ImplClickHdl ) );
             pPage = m_pMySQLIntroPage;
             break;
 
         case PAGE_DBSETUPWIZARD_AUTHENTIFICATION:
-            pPage = OAuthentificationPageSetup::CreateAuthentificationTabPage(this,*m_pOutSet);
+            pPage = OAuthentificationPageSetup::CreateAuthentificationTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_USERDEFINED:
-            pPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(this,*m_pOutSet);
+            pPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(aParent, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_FINAL:
-            pPage = OFinalDBPageSetup::CreateFinalDBTabPageSetup(this,*m_pOutSet);
+            pPage = OFinalDBPageSetup::CreateFinalDBTabPageSetup(aParent, *m_pOutSet);
             m_pFinalPage = static_cast<OFinalDBPageSetup*> (pPage.get());
             break;
     }
@@ -553,6 +548,8 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
         enableButtons( WizardButtonFlags::FINISH, _nState == PAGE_DBSETUPWIZARD_FINAL );
         enableButtons( WizardButtonFlags::NEXT, _nState != PAGE_DBSETUPWIZARD_FINAL );
         pPage->Show();
+
+        m_xAssistant->set_page_title(sIdent, getStateDisplayName(_nState));
     }
     return pPage;
 }
@@ -606,7 +603,7 @@ IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizar
 void ODbTypeWizDialogSetup::enterState(WizardState _nState)
 {
     m_sURL = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet);
-    RoadmapWizard::enterState(_nState);
+    RoadmapWizardMachine::enterState(_nState);
     switch(_nState)
     {
         case PAGE_DBSETUPWIZARD_INTRO:
@@ -622,7 +619,7 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState)
 
 void ODbTypeWizDialogSetup::saveDatasource()
 {
-    SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState()));
+    SfxTabPage* pPage = static_cast<SfxTabPage*>(GetPage(getCurrentState()));
     if ( pPage )
         pPage->FillItemSet(m_pOutSet.get());
 }
@@ -635,14 +632,13 @@ bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
     {
         resetPages(m_pImpl->getCurrentDataSource());
     }
-    SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState));
+    SfxTabPage* pPage = static_cast<SfxTabPage*>(GetPage(_nState));
     return pPage && pPage->DeactivatePage(m_pOutSet.get()) != DeactivateRC::KeepPage;
 }
 
-void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/)
+void ODbTypeWizDialogSetup::setTitle(const OUString& _sTitle)
 {
-    OSL_FAIL( "ODbTypeWizDialogSetup::setTitle: not implemented!" );
-        // why?
+    m_xAssistant->set_title(_sTitle);
 }
 
 void ODbTypeWizDialogSetup::enableConfirmSettings( bool /*_bEnable*/ )
@@ -779,7 +775,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
         bool bRet = false;
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
-                FileDialogFlags::NONE, GetFrameWeld());
+                FileDialogFlags::NONE, m_xAssistant.get());
         std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter();
         if ( pFilter )
         {
@@ -971,7 +967,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             // wants us to load could be a non-database document. Instead, we asynchronously
             // open the selected document. Thus, the wizard's return value is RET_CANCEL,
             // which means to not continue loading the database document
-            if ( !OWizardMachine::Finish() )
+            if ( !WizardMachine::Finish() )
                 return false;
 
             try
@@ -993,7 +989,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             skipUntil(PAGE_DBSETUPWIZARD_FINAL);
         }
         if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
-            return SaveDatabaseDocument() && OWizardMachine::onFinish();
+            return SaveDatabaseDocument() && WizardMachine::onFinish();
         else
         {
             enableButtons( WizardButtonFlags::FINISH, false );
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 2ed044a43795..5fe9655c37e9 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -239,6 +239,7 @@ namespace dbaui
         {
             implSetCurrentType( dbaccess::ODsnTypeCollection::getEmbeddedDatabase() );
             sDisplayName = m_pCollection->getTypeDisplayName( m_eCurrentSelection );
+            onTypeSelected(m_eCurrentSelection);
         }
 
         // select the correct datasource type
@@ -451,6 +452,7 @@ namespace dbaui
         , m_xFT_EmbeddedDBLabel(m_xBuilder->weld_label("embeddeddbLabel"))
         , m_xEmbeddedDBType(m_xBuilder->weld_combo_box("embeddeddbList"))
         , m_xFT_DocListLabel(m_xBuilder->weld_label("docListLabel"))
+        , m_xFT_HelpText(m_xBuilder->weld_label("helpText"))
         , m_xLB_DocumentList(new OpenDocumentListBox(m_xBuilder->weld_combo_box("documentList"), "com.sun.star.sdb.OfficeDatabaseDocument"))
         , m_xPB_OpenDatabase(new OpenDocumentButton(m_xBuilder->weld_button("openDatabase"), "com.sun.star.sdb.OfficeDatabaseDocument"))
         , m_eOriginalCreationMode(eCreateNew)
@@ -482,7 +484,7 @@ namespace dbaui
 
         // do some knittings
         m_xEmbeddedDBType->connect_changed(LINK(this, OGeneralPageWizard, OnEmbeddedDBTypeSelected));
-        m_xRB_CreateDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnCreateDatabaseModeSelected ) );
+        m_xRB_CreateDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
         m_xRB_ConnectDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
         m_xRB_OpenExistingDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
         m_xLB_DocumentList->connect_changed( LINK( this, OGeneralPageWizard, OnDocumentSelected ) );
@@ -532,18 +534,13 @@ namespace dbaui
             m_xFT_DocListLabel->set_sensitive( false );
             m_xLB_DocumentList->set_sensitive( false );
         }
-        else
-        {
-            m_xDatasourceType->set_sensitive( false );
-            m_xPB_OpenDatabase->set_sensitive( false );
-            m_xFT_DocListLabel->set_sensitive( false );
-            m_xLB_DocumentList->set_sensitive( false );
-        }
 
         if (m_xLB_DocumentList->get_count())
             m_xLB_DocumentList->set_active(0);
 
         m_eOriginalCreationMode = GetDatabaseCreationMode();
+
+        SetupModeSelected();
     }
 
     OUString OGeneralPageWizard::getDatasourceName(const SfxItemSet& _rSet)
@@ -620,12 +617,8 @@ namespace dbaui
             return m_xLB_DocumentList->GetSelectedDocumentURL();
     }
 
-    IMPL_LINK_NOARG( OGeneralPageWizard, OnCreateDatabaseModeSelected, weld::Button&, void )
+    void OGeneralPageWizard::EnableControls()
     {
-        m_aCreationModeHandler.Call( *this );
-
-        OnEmbeddedDBTypeSelected( *m_xEmbeddedDBType );
-
         bool bValid, bReadonly;
         getFlags( GetItemSet(), bValid, bReadonly );
         if ( bValid && !bReadonly )
@@ -639,22 +632,21 @@ namespace dbaui
         }
     }
 
-    IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, weld::Button&, void )
+    void OGeneralPageWizard::SetupModeSelected()
     {
         m_aCreationModeHandler.Call( *this );
-        OnDatasourceTypeSelected(*m_xDatasourceType);
 
-        bool bValid, bReadonly;
-        getFlags( GetItemSet(), bValid, bReadonly );
-        if ( bValid && !bReadonly )
-        {
-            m_xEmbeddedDBType->set_sensitive(m_xRB_CreateDatabase->get_active());
-            m_xFT_EmbeddedDBLabel->set_sensitive(m_xRB_CreateDatabase->get_active());
-            m_xDatasourceType->set_sensitive(m_xRB_ConnectDatabase->get_active());
-            m_xPB_OpenDatabase->set_sensitive(m_xRB_OpenExistingDatabase->get_active());
-            m_xFT_DocListLabel->set_sensitive(m_xRB_OpenExistingDatabase->get_active());
-            m_xLB_DocumentList->set_sensitive(m_xRB_OpenExistingDatabase->get_active());
-        }
+        if (m_xRB_CreateDatabase->get_active())
+            OnEmbeddedDBTypeSelected(*m_xEmbeddedDBType);
+        else
+            OnDatasourceTypeSelected(*m_xDatasourceType);
+
+        EnableControls();
+    }
+
+    IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, weld::Button&, void )
+    {
+        SetupModeSelected();
     }
 
     IMPL_LINK_NOARG( OGeneralPageWizard, OnDocumentSelected, weld::ComboBox&, void )
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 359ed6641f82..63d8736ea38b 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -137,6 +137,7 @@ namespace dbaui
         std::unique_ptr<weld::ComboBox> m_xEmbeddedDBType;
 
         std::unique_ptr<weld::Label> m_xFT_DocListLabel;
+        std::unique_ptr<weld::Label> m_xFT_HelpText;
         std::unique_ptr<OpenDocumentListBox> m_xLB_DocumentList;
         std::unique_ptr<OpenDocumentButton> m_xPB_OpenDatabase;
 
@@ -151,6 +152,8 @@ namespace dbaui
         bool                    m_bInitEmbeddedDBList : 1;
         void                    insertEmbeddedDBTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
 
+        void                    EnableControls();
+
     public:
         void                    SetCreationModeHandler( const Link<OGeneralPageWizard&,void>& _rHandler ) { m_aCreationModeHandler = _rHandler; }
         CreationMode            GetDatabaseCreationMode() const;
@@ -174,8 +177,9 @@ namespace dbaui
         OUString getEmbeddedDBName( const SfxItemSet& _rSet );
         void initializeEmbeddedDBList();
 
+        void SetupModeSelected();
+
         DECL_LINK( OnEmbeddedDBTypeSelected, weld::ComboBox&, void );
-        DECL_LINK( OnCreateDatabaseModeSelected, weld::Button&, void );
         DECL_LINK( OnSetupModeSelected, weld::Button&, void );
         DECL_LINK( OnDocumentSelected, weld::ComboBox&, void );
         DECL_LINK( OnOpenDocument, weld::Button&, void );
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f4e4204d9c4c..3bcb10c4ebcd 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -509,7 +509,7 @@ void OSQLMessageBox::impl_addDetailsButton()
     if ( bMoreDetailsAvailable )
     {
         m_xDialog->add_button(Button::GetStandardText(StandardButtonType::More), RET_MORE);
-        m_xMoreButton.reset(m_xDialog->get_widget_for_response(RET_MORE));
+        m_xMoreButton.reset(m_xDialog->weld_widget_for_response(RET_MORE));
         m_xMoreButton->connect_clicked(LINK(this, OSQLMessageBox, ButtonClickHdl));
     }
 }
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 25001361b3f5..16969b467ee3 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -54,7 +54,7 @@ class ODbDataSourceAdministrationHelper;
 class OMySQLIntroPageSetup;
 class OFinalDBPageSetup;
 
-class ODbTypeWizDialogSetup final : public vcl::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbTypeWizDialogSetup final : public vcl::RoadmapWizardMachine, public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
@@ -89,13 +89,12 @@ public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
         after the dialog has been destroyed
     */
-    ODbTypeWizDialogSetup(vcl::Window* pParent
+    ODbTypeWizDialogSetup(weld::Window* pParent
         ,SfxItemSet const * _pItems
         ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB
         ,const css::uno::Any& _aDataSourceName
         );
     virtual ~ODbTypeWizDialogSetup() override;
-    virtual void dispose() override;
 
     virtual const SfxItemSet* getOutputSet() const override;
     virtual SfxItemSet* getWriteOutputSet() override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index f8d021055730..8361a2325cea 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace dbaui;
 
@@ -108,14 +108,14 @@ Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo(
 
 svt::OGenericUnoDialog::Dialog ODBTypeWizDialogSetup::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
 {
-    return svt::OGenericUnoDialog::Dialog(VclPtr<ODbTypeWizDialogSetup>::Create(VCLUnoHelper::GetWindow(rParent), m_pDatasourceItems.get(), m_aContext, m_aInitialSelection));
+    return svt::OGenericUnoDialog::Dialog(std::make_unique<ODbTypeWizDialogSetup>(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext, m_aInitialSelection));
 }
 
 void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult)
 {
     if ( _nExecutionResult == RET_OK )
     {
-        const ODbTypeWizDialogSetup* pDialog = static_cast<ODbTypeWizDialogSetup*>(m_aDialog.m_xVclDialog.get());
+        const ODbTypeWizDialogSetup* pDialog = static_cast<ODbTypeWizDialogSetup*>(m_aDialog.m_xWeldDialog.get());
         m_bOpenDatabase = pDialog->IsDatabaseDocumentToBeOpened();
         m_bStartTableWizard = pDialog->IsTableWizardToBeStarted();
     }
diff --git a/dbaccess/uiconfig/ui/authentificationpage.ui b/dbaccess/uiconfig/ui/authentificationpage.ui
index 0c1a6a44a3b0..3515cb813f6b 100644
--- a/dbaccess/uiconfig/ui/authentificationpage.ui
+++ b/dbaccess/uiconfig/ui/authentificationpage.ui
@@ -34,8 +34,8 @@
         <property name="margin_bottom">6</property>
         <property name="label" translatable="yes" context="authentificationpage|helptext">Some databases require you to enter a user name.</property>
         <property name="wrap">True</property>
-        <property name="width_chars">60</property>
-        <property name="max_width_chars">60</property>
+        <property name="width_chars">72</property>
+        <property name="max_width_chars">72</property>
         <property name="xalign">0</property>
       </object>
       <packing>
diff --git a/dbaccess/uiconfig/ui/databasewizard.ui b/dbaccess/uiconfig/ui/databasewizard.ui
new file mode 100644
index 000000000000..5f07332a825e
--- /dev/null
+++ b/dbaccess/uiconfig/ui/databasewizard.ui
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="dba">
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkAssistant" id="DatabaseWizard">
+    <property name="can_focus">True</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes" context="databasewizard|DatabaseWizard">Database Wizard</property>
+    <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
+    <property name="type_hint">dialog</property>
+    <property name="use_header_bar">0</property>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>
diff --git a/dbaccess/uiconfig/ui/dbasepage.ui b/dbaccess/uiconfig/ui/dbasepage.ui
index dfe64734364e..244b754d48bc 100644
--- a/dbaccess/uiconfig/ui/dbasepage.ui
+++ b/dbaccess/uiconfig/ui/dbasepage.ui
@@ -120,8 +120,8 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes" context="dbasepage|specMessageLabel">Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source.</property>
                     <property name="wrap">True</property>
-                    <property name="width_chars">60</property>
-                    <property name="max_width_chars">60</property>
+                    <property name="width_chars">72</property>
+                    <property name="max_width_chars">72</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
index 3d022c5307e7..81249794875d 100644
--- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
@@ -33,7 +33,8 @@
         <property name="margin_bottom">6</property>
         <property name="label" translatable="yes" context="dbwizconnectionpage|helptext">label</property>
         <property name="wrap">True</property>
-        <property name="max_width_chars">60</property>
+        <property name="width_chars">72</property>
+        <property name="max_width_chars">72</property>
         <property name="xalign">0</property>
       </object>
       <packing>
@@ -46,6 +47,7 @@
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="row_spacing">6</property>
         <property name="column_spacing">12</property>
         <child>
@@ -92,6 +94,7 @@
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="GtkEntry" id="browseurl">
                 <property name="visible">True</property>
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
index 8f1d39966b27..224f17189da2 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
@@ -23,7 +23,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -37,8 +36,8 @@
                     <property name="label" translatable="yes" context="dbwizmysqlintropage|label2">You can connect to a MySQL database using either ODBC or JDBC.
 Please contact your system administrator if you are unsure about the following settings.</property>
                     <property name="wrap">True</property>
-                    <property name="width_chars">100</property>
-                    <property name="max_width_chars">100</property>
+                    <property name="width_chars">72</property>
+                    <property name="max_width_chars">72</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
index 4eaa3ce7b4c1..5d2b38c6ecf4 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkBox" id="DBWizMysqlNativePage">
@@ -25,7 +25,6 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -37,10 +36,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="dbwizmysqlnativepage|helptext">Please enter the required information to connect to a MySQL database.</property>
                     <property name="wrap">True</property>
-                    <property name="max_width_chars">100</property>
+                    <property name="width_chars">72</property>
+                    <property name="max_width_chars">72</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
index 2dbe3dd2eb6b..ed65d12b29dc 100644
--- a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
@@ -6,7 +6,6 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
@@ -24,7 +23,6 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -40,7 +38,8 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="wrap">True</property>
-                    <property name="max_width_chars">100</property>
+                    <property name="width_chars">72</property>
+                    <property name="max_width_chars">72</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -100,10 +99,12 @@
                       <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <child>
                           <object class="GtkEntry" id="browseurl">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                             <property name="activates_default">True</property>
                           </object>
                           <packing>
@@ -127,6 +128,22 @@
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="passwordrequired">
+                        <property name="label" translatable="yes" context="dbwizspreadsheetpage|passwordrequired">_Password required</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">3</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -154,21 +171,5 @@
         <property name="position">0</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkCheckButton" id="passwordrequired">
-        <property name="label" translatable="yes" context="dbwizspreadsheetpage|passwordrequired">_Password required</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_underline">True</property>
-        <property name="xalign">0</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
   </object>
 </interface>
diff --git a/dbaccess/uiconfig/ui/dbwiztextpage.ui b/dbaccess/uiconfig/ui/dbwiztextpage.ui
index bbb6600d4232..24b4e57a787f 100644
--- a/dbaccess/uiconfig/ui/dbwiztextpage.ui
+++ b/dbaccess/uiconfig/ui/dbwiztextpage.ui
@@ -24,7 +24,6 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -40,7 +39,8 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="wrap">True</property>
-                    <property name="max_width_chars">100</property>
+                    <property name="width_chars">72</property>
+                    <property name="max_width_chars">72</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -100,10 +100,12 @@
                       <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <child>
                           <object class="GtkEntry" id="browseurl">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -158,8 +160,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="border_width">6</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui
index 919421029fa1..8e065ea1faa0 100644
--- a/dbaccess/uiconfig/ui/finalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/finalpagewizard.ui
@@ -2,28 +2,28 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkBox" id="PageFinal">
-    <property name="width_request">400</property>
+  <object class="GtkGrid" id="PageFinal">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">8</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">12</property>
+    <property name="row_spacing">12</property>
     <child>
       <object class="GtkLabel" id="headerText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="finalpagewizard|headerText">Decide How to Proceed After Saving the Database</property>
-        <property name="wrap">True</property>
+        <property name="single_line_mode">True</property>
         <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -42,7 +42,6 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="finalpagewizard|helpText">Do you want the wizard to register the database in %PRODUCTNAME?</property>
                 <property name="wrap">True</property>
-                <property name="wrap_mode">word-char</property>
                 <property name="width_chars">72</property>
                 <property name="max_width_chars">72</property>
                 <property name="xalign">0</property>
@@ -103,6 +102,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="finalpagewizard|additionalText">After the database file has been saved, what do you want to do?</property>
                 <property name="wrap">True</property>
+                <property name="width_chars">72</property>
                 <property name="max_width_chars">72</property>
                 <property name="xalign">0</property>
               </object>
@@ -163,9 +163,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
   </object>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 8413935a4a34..32a666a71db9 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -2,34 +2,35 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkBox" id="PageGeneral">
-    <property name="width_request">400</property>
+  <object class="GtkGrid" id="PageGeneral">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">8</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="row_spacing">6</property>
     <child>
       <object class="GtkLabel" id="headerText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="generalpagewizard|headerText">Welcome to the %PRODUCTNAME Database Wizard</property>
-        <property name="wrap">True</property>
+        <property name="single_line_mode">True</property>
         <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="helpText">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="label" translatable="yes" context="generalpagewizard|helpText">Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server.</property>
         <property name="wrap">True</property>
         <property name="width_chars">72</property>
@@ -37,9 +38,8 @@
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
@@ -51,9 +51,8 @@
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -69,9 +68,8 @@
         <property name="draw_indicator">True</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
@@ -108,9 +106,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">4</property>
       </packing>
     </child>
     <child>
@@ -127,9 +124,8 @@
         <property name="group">createDatabase</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">5</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
@@ -167,9 +163,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">6</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">6</property>
       </packing>
     </child>
     <child>
@@ -183,9 +178,8 @@
         <property name="always_show_image">True</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">7</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
@@ -202,9 +196,8 @@
         <property name="group">createDatabase</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">8</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
@@ -215,9 +208,8 @@
         <property name="margin_left">24</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">9</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">9</property>
       </packing>
     </child>
     <child>
@@ -226,9 +218,8 @@
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">10</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">10</property>
       </packing>
     </child>
   </object>
diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
index 0df26ed00151..9e55d4e0e7ae 100644
--- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
@@ -33,7 +33,8 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="jdbcconnectionpage|helptext">Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings.</property>
         <property name="wrap">True</property>
-        <property name="max_width_chars">60</property>
+        <property name="width_chars">72</property>
+        <property name="max_width_chars">72</property>
         <property name="xalign">0</property>
       </object>
       <packing>
diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
index e386c06102d2..a64373d9d43e 100644
--- a/dbaccess/uiconfig/ui/ldapconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
@@ -37,8 +37,8 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="ldapconnectionpage|helpLabel">Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings.</property>
         <property name="wrap">True</property>
-        <property name="width_chars">80</property>
-        <property name="max_width_chars">80</property>
+        <property name="width_chars">72</property>
+        <property name="max_width_chars">72</property>
         <property name="xalign">0</property>
       </object>
       <packing>
diff --git a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
index 8fa89c34d21c..c63f6a2c03e4 100644
--- a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
@@ -38,8 +38,8 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="specialjdbcconnectionpage|helpLabel">Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. </property>
         <property name="wrap">True</property>
-        <property name="width_chars">80</property>
-        <property name="max_width_chars">80</property>
+        <property name="width_chars">72</property>
+        <property name="max_width_chars">72</property>
         <property name="xalign">0</property>
       </object>
       <packing>
@@ -133,6 +133,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
+                <property name="activates_default">True</property>
                 <property name="adjustment">adjustment1</property>
               </object>
               <packing>