Convert PAGE_DBWIZARD_AUTHENTIFICATION and PAGE_DBWIZARD_LDAP to .ui

Conflicts:
	dbaccess/source/ui/dlg/dbadminsetup.hrc
	dbaccess/source/ui/dlg/dbadminsetup.src
	dbaccess/source/ui/inc/dbu_resource.hrc

Change-Id: I71558269dd2edcc828af9633992f2d143ffefd6d

9 files changed, 390 insertions, 193 deletions

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 79724ec69cf3..6530e9666222 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/admindialog \
     dbaccess/uiconfig/ui/advancedsettingsdialog \
     dbaccess/uiconfig/ui/applycolpage \
+    dbaccess/uiconfig/ui/authentificationpage \
     dbaccess/uiconfig/ui/backuppage \
     dbaccess/uiconfig/ui/choosedatasourcedialog \
     dbaccess/uiconfig/ui/collectionviewdialog \
@@ -33,6 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/indexdesigndialog \
     dbaccess/uiconfig/ui/jdbcconnectionpage \
     dbaccess/uiconfig/ui/joindialog \
+    dbaccess/uiconfig/ui/ldapconnectionpage \
     dbaccess/uiconfig/ui/migratepage \
     dbaccess/uiconfig/ui/password \
     dbaccess/uiconfig/ui/preparepage \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 26e4e21fa21a..1d20da9c278a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -132,35 +132,32 @@ using namespace ::com::sun::star;
 
     // OLDAPPageSetup
     OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs)
-        ,m_aFTHeaderText        (this, ModuleRes(FT_LDAP_HEADERTEXT))
-        ,m_aFTHelpText          (this, ModuleRes(FT_LDAP_HELPTEXT))
-        ,m_aFTHostServer        (this, ModuleRes(FT_AUTOHOSTNAME))
-        ,m_aETHostServer        (this, ModuleRes(ET_AUTOHOSTNAME))
-        ,m_aFTBaseDN            (this, ModuleRes(FT_AUTOBASEDN))
-        ,m_aETBaseDN            (this, ModuleRes(ET_AUTOBASEDN))
-        ,m_aFTPortNumber        (this, ModuleRes(FT_AUTOPORTNUMBER))
-        ,m_aNFPortNumber        (this, ModuleRes(NF_AUTOPORTNUMBER))
-        ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
-        ,m_aCBUseSSL            (this, ModuleRes(CB_WIZ_USESSL))
-    {
-        SetControlFontWeight(&m_aFTHeaderText);
-        m_aFTDefaultPortNumber.SetText(OUString(ModuleRes(STR_LDAP_DEFAULT)));
-        m_aETHostServer.SetModifyHdl(getControlModifiedLink());
-        m_aETBaseDN.SetModifyHdl(getControlModifiedLink());
-        m_aNFPortNumber.SetModifyHdl(getControlModifiedLink());
-        m_aCBUseSSL.SetToggleHdl(getControlModifiedLink());
+        :OGenericAdministrationPage(pParent, "LDAPConnectionPage", "dbaccess/ui/ldapconnectionpage.ui",_rCoreAttrs)
+    {
+        get(m_pFTHelpText, "helpLabel");
+        get(m_pFTHostServer, "hostNameLabel");
+        get(m_pETHostServer, "hostNameEntry");
+        get(m_pFTBaseDN, "baseDNLabel");
+        get(m_pETBaseDN, "baseDNEntry");
+        get(m_pFTPortNumber, "portNumLabel");
+        get(m_pNFPortNumber, "portNumEntry");
+        get(m_pFTDefaultPortNumber, "portNumDefLabel");
+        get(m_pCBUseSSL, "useSSLCheckbutton");
+
+        m_pETHostServer->SetModifyHdl(getControlModifiedLink());
+        m_pETBaseDN->SetModifyHdl(getControlModifiedLink());
+        m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
+        m_pCBUseSSL->SetToggleHdl(getControlModifiedLink());
         SetRoadmapStateValue(false);
-        FreeResource();
     }
 
     bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
-        fillString(*_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
-        fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
+        fillString(*_rSet,m_pETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
+        fillInt32(*_rSet,m_pNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
 
-        if ( m_aETHostServer.IsValueChangedFromSaved() )
+        if ( m_pETHostServer->IsValueChangedFromSaved() )
         {
             DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet->GetItem(DSID_TYPECOLLECTION));
             ::dbaccess::ODsnTypeCollection* pCollection = NULL;
@@ -170,29 +167,29 @@ using namespace ::com::sun::star;
             if (pCollection)
             {
                 OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:"));
-                sUrl += m_aETHostServer.GetText();
+                sUrl += m_pETHostServer->GetText();
                 _rSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl));
                 bChangedSomething = true;
             }
         }
 
-        fillBool(*_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
+        fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
     void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostServer));
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETBaseDN));
-        _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
-        _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBUseSSL));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETHostServer));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETBaseDN));
+        _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber));
+        _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBUseSSL));
     }
     void OLDAPConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostServer));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTBaseDN));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostServer));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTBaseDN));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTPortNumber));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDefaultPortNumber));
     }
     void OLDAPConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
     {
@@ -205,8 +202,8 @@ using namespace ::com::sun::star;
 
         if ( bValid )
         {
-            m_aETBaseDN.SetText(pBaseDN->GetValue());
-            m_aNFPortNumber.SetValue(pPortNumber->GetValue());
+            m_pETBaseDN->SetText(pBaseDN->GetValue());
+            m_pNFPortNumber->SetValue(pPortNumber->GetValue());
         }
            OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
         callModifiedHdl();
@@ -214,7 +211,7 @@ using namespace ::com::sun::star;
 
     IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/)
     {
-        bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() ));
+        bool bRoadmapState = ((!m_pETHostServer->GetText().isEmpty() ) && ( !m_pETBaseDN->GetText().isEmpty() ) && (!m_pFTPortNumber->GetText().isEmpty() ));
         SetRoadmapStateValue(bRoadmapState);
         callModifiedHdl();
         return 0L;
@@ -676,22 +673,18 @@ using namespace ::com::sun::star;
 
 
     OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_AUTHENTIFICATION), _rCoreAttrs )
-        , m_aFTHelpText             (this, ModuleRes(FT_AUTHENTIFICATIONHELPTEXT))
-        , m_aFTHeaderText           (this, ModuleRes(FT_AUTHENTIFICATIONHEADERTEXT))
-        , m_aFTUserName             (this, ModuleRes(FT_GENERALUSERNAME))
-        , m_aETUserName             (this, ModuleRes(ET_GENERALUSERNAME))
-        , m_aCBPasswordRequired     (this, ModuleRes(CB_GENERALPASSWORDREQUIRED))
-        , m_aPBTestConnection       (this, ModuleRes(PB_TESTCONNECTION))
-    {
-
-        SetControlFontWeight(&m_aFTHeaderText);
-        m_aETUserName.SetModifyHdl(getControlModifiedLink());
-        m_aCBPasswordRequired.SetClickHdl(getControlModifiedLink());
-           m_aPBTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
-        FreeResource();
+        :OGenericAdministrationPage(pParent, "AuthentificationPage", "dbaccess/ui/authentificationpage.ui", _rCoreAttrs )
+    {
+        get(m_pFTHelpText, "helptext");
+        get(m_pFTUserName, "generalUserNameLabel");
+        get(m_pETUserName, "generalUserNameEntry");
+        get(m_pCBPasswordRequired, "passRequiredCheckbutton");
+        get(m_pPBTestConnection, "testConnectionButton");
+        m_pETUserName->SetModifyHdl(getControlModifiedLink());
+        m_pCBPasswordRequired->SetClickHdl(getControlModifiedLink());
+           m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
 
-        LayoutHelper::fitSizeRightAligned( m_aPBTestConnection );
+        LayoutHelper::fitSizeRightAligned( *m_pPBTestConnection );
     }
 
     OAuthentificationPageSetup::~OAuthentificationPageSetup()
@@ -701,15 +694,15 @@ using namespace ::com::sun::star;
 
     void OAuthentificationPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTUserName));
-        _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aPBTestConnection));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTUserName));
+        _rControlList.push_back(new ODisableWrapper<PushButton>(m_pPBTestConnection));
     }
 
     void OAuthentificationPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETUserName));
-        _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBPasswordRequired));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETUserName));
+        _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBPasswordRequired));
     }
 
     void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, bool /*_bSaveValue*/)
@@ -720,23 +713,23 @@ using namespace ::com::sun::star;
         SFX_ITEMSET_GET(_rSet, pUidItem, SfxStringItem, DSID_USER, true);
         SFX_ITEMSET_GET(_rSet, pAllowEmptyPwd, SfxBoolItem, DSID_PASSWORDREQUIRED, true);
 
-        m_aETUserName.SetText(pUidItem->GetValue());
-        m_aCBPasswordRequired.Check(pAllowEmptyPwd->GetValue());
+        m_pETUserName->SetText(pUidItem->GetValue());
+        m_pCBPasswordRequired->Check(pAllowEmptyPwd->GetValue());
 
-        m_aETUserName.ClearModifyFlag();
+        m_pETUserName->ClearModifyFlag();
     }
 
     bool OAuthentificationPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
 
-        if (m_aETUserName.IsValueChangedFromSaved())
+        if (m_pETUserName->IsValueChangedFromSaved())
         {
-            _rSet->Put(SfxStringItem(DSID_USER, m_aETUserName.GetText()));
+            _rSet->Put(SfxStringItem(DSID_USER, m_pETUserName->GetText()));
             _rSet->Put(SfxStringItem(DSID_PASSWORD, OUString()));
             bChangedSomething = true;
         }
-        fillBool(*_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+        fillBool(*_rSet,m_pCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
         return bChangedSomething;
     }
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 610798ddae07..56f1185017af 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -92,16 +92,15 @@ namespace dbaui
         DECL_LINK(OnEditModified,Edit*);
 
     private:
-        FixedText           m_aFTHeaderText;
-        FixedText           m_aFTHelpText;
-        FixedText           m_aFTHostServer;
-        Edit                m_aETHostServer;
-        FixedText           m_aFTBaseDN;
-        Edit                m_aETBaseDN;
-        FixedText           m_aFTPortNumber;
-        NumericField        m_aNFPortNumber;
-        FixedText           m_aFTDefaultPortNumber;
-        CheckBox            m_aCBUseSSL;
+        FixedText*          m_pFTHelpText;
+        FixedText*          m_pFTHostServer;
+        Edit*               m_pETHostServer;
+        FixedText*          m_pFTBaseDN;
+        Edit*               m_pETBaseDN;
+        FixedText*          m_pFTPortNumber;
+        NumericField*       m_pNFPortNumber;
+        FixedText*          m_pFTDefaultPortNumber;
+        CheckBox*           m_pCBUseSSL;
     };
 
     // MySQLNativeSetupPage
@@ -238,12 +237,11 @@ namespace dbaui
         OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
     protected:
-        FixedText   m_aFTHelpText;
-        FixedText   m_aFTHeaderText;
-        FixedText   m_aFTUserName;
-        Edit        m_aETUserName;
-        CheckBox    m_aCBPasswordRequired;
-        PushButton  m_aPBTestConnection;
+        FixedText*  m_pFTHelpText;
+        FixedText*  m_pFTUserName;
+        Edit*       m_pETUserName;
+        CheckBox*   m_pCBPasswordRequired;
+        PushButton* m_pPBTestConnection;
         virtual ~OAuthentificationPageSetup();
 
     protected:
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 7124c6308534..3cdfea205ac2 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -25,22 +25,9 @@
 #include "browserids.hxx"
 
     // FREE
-#define STR_LDAP_DEFAULT                86
-
-#define FT_LDAP_HELPTEXT                2
-#define FT_AUTHENTIFICATIONHELPTEXT     7
-#define FT_AUTHENTIFICATIONHEADERTEXT   8
-#define FT_LDAP_HEADERTEXT              9
-#define FT_GENERALUSERNAME              10
 #define FT_SETUP_WIZARD_HEADER          15
 #define FT_SETUP_WIZARD_HELP            16
 
-#define ET_GENERALUSERNAME          1
-
-#define PB_TESTCONNECTION           1
-
-#define CB_WIZ_USESSL                       1
-#define CB_GENERALPASSWORDREQUIRED          5
 
 #endif
 
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 88f2a3e33ef2..2cd1b5adeae3 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -107,63 +107,6 @@ String STR_DATABASEDEFAULTNAME
     Text[ en-US ]  = "New Database" ;
 };
 
-#define AUTHENTEDIT_X   (EDIT_X - 10)
-
-TabPage PAGE_DBWIZARD_AUTHENTIFICATION
-{
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_AUTHENTIFICATION";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    FixedText FT_AUTHENTIFICATIONHEADERTEXT
-    {
-        Pos = MAP_APPFONT ( START_X , 8 ) ;
-        Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ;
-        Text[ en-US ] = "Set up the user authentication";
-        WordBreak = TRUE;
-    };
-
-    FixedText FT_AUTHENTIFICATIONHELPTEXT\
-    {
-        Pos = MAP_APPFONT (START_X , 27 )  ;
-        Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6, 3*FIXEDTEXT_HEIGHT ) ;
-        Text[ en-US ] = "Some databases require you to enter a user name." ;\
-        WordBreak = TRUE ;
-    };
-
-    FixedText FT_GENERALUSERNAME
-    {
-        Pos = MAP_APPFONT (START_X , 62 ) ;
-        Size = MAP_APPFONT ( AUTHENTEDIT_X - START_X - 1 , FIXEDTEXT_HEIGHT ) ;
-        Text[ en-US ] = "~User name" ;
-    };
-
-    Edit ET_GENERALUSERNAME
-    {
-        Border = TRUE ;
-        HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME ;
-        Pos = MAP_APPFONT (AUTHENTEDIT_X , 60 )  ;
-        Size = MAP_APPFONT ( (WIZARD_PAGE_X - AUTHENTEDIT_X - 6), EDIT_HEIGHT ) ;
-    };
-
-    CheckBox CB_GENERALPASSWORDREQUIRED
-    {
-        HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED ;
-        Pos = MAP_APPFONT (AUTHENTEDIT_X , 76 );
-        Size = MAP_APPFONT ( 93 , CHECKBOX_HEIGHT );
-        Text[ en-US ] = "Password re~quired" ;
-    };
-
-    PushButton PB_TESTCONNECTION
-    {
-        HelpId = HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION ;
-        Pos = MAP_APPFONT (WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , WIZARD_PAGE_Y - 18 ) ;
-        Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-        Text[ en-US ] = "~Test Connection" ;
-    };
-};
 
 String STR_MYSQLJDBC_HEADERTEXT
 {
@@ -245,46 +188,6 @@ String STR_MSACCESS_HELPTEXT
     Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
 };
 
-TabPage PAGE_DBWIZARD_LDAP
-{
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    FixedText FT_LDAP_HEADERTEXT
-    {
-        Pos = MAP_APPFONT ( START_X , 8 ) ;
-        Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ;
-        Text[ en-US ] = "Set up a connection to an LDAP directory";
-        WordBreak = TRUE;
-    };
-
-    FixedText FT_LDAP_HELPTEXT
-    {
-        Pos = MAP_APPFONT (START_X , 27 )  ;
-        Size = MAP_APPFONT (WIZARD_PAGE_X - START_X - 6, 5 * FIXEDTEXT_HEIGHT ) ;
-        Text[ en-US ] = "Please enter the required information to connect to an LDAP directory.\nPlease contact your system administrator if you are unsure about the following settings." ;
-        WordBreak = TRUE ;
-    };
-    AUTO_HOSTCONTROLGROUP(  INIT_Y + 7 * FIXEDTEXT_HEIGHT +     UNRELATED_CONTROLS,                         HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER)
-    AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT +     UNRELATED_CONTROLS +     EDIT_HEIGHT +     RELATED_CONTROLS,    HID_PAGE_DBWIZARD_LDAP_ET_BASEDN)
-    AUTO_PORTCONTROLGROUP(  INIT_Y + 7 * FIXEDTEXT_HEIGHT +     UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS,    HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER)
-
-    String STR_LDAP_DEFAULT{
-        Text[ en-US ] = "Default: 389" ;
-    };
-
-    CheckBox CB_WIZ_USESSL
-    {
-        HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ;
-        Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT +        UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS )  ;
-        Size = MAP_APPFONT ( 212 , 8 ) ;
-        Text[ en-US ] = "Use ~secure connection (SSL)" ;
-    };
-};
-
 String STR_ADO_HEADERTEXT
 {
     Text[ en-US ] = "Set up a connection to an ADO database" ;
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index ab36628b9bd8..bef894c49d18 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -115,9 +115,6 @@
 #define PAGE_TABLESUBSCRIPTION          RID_PAGE_START + 28
 
     // FREE
-#define PAGE_DBWIZARD_LDAP                      RID_PAGE_START + 44
-    // FREE
-#define PAGE_DBWIZARD_AUTHENTIFICATION          RID_PAGE_START + 53
 #define PAGE_DBWIZARD_MYSQL_NATIVE              RID_PAGE_START + 57
 
 // error boxes
diff --git a/dbaccess/uiconfig/ui/authentificationpage.ui b/dbaccess/uiconfig/ui/authentificationpage.ui
new file mode 100644
index 000000000000..0e0bbf27d87b
--- /dev/null
+++ b/dbaccess/uiconfig/ui/authentificationpage.ui
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="AuthentificationPage">
+    <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>
+      <object class="GtkLabel" id="header">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="margin_bottom">12</property>
+        <property name="label" translatable="yes">Set up the user authentication</property>
+        <attributes>
+          <attribute name="weight" value="semibold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="helptext">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_bottom">6</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Some databases require you to enter a user name.</property>
+        <property name="wrap">True</property>
+        <property name="max_width_chars">60</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <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">2</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkLabel" id="generalUserNameLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">_User name</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">generalUserNameEntry</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>
+          <object class="GtkEntry" id="generalUserNameEntry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+          </object>
+          <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>
+        <child>
+          <object class="GtkCheckButton" id="passRequiredCheckbutton">
+            <property name="label" translatable="yes">Password re_quired</property>
+            <property name="use_action_appearance">False</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">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="testConnectionButton">
+        <property name="label" translatable="yes">_Test Connection</property>
+        <property name="use_action_appearance">False</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="halign">end</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/dbaccess/uiconfig/ui/connectionpage.ui b/dbaccess/uiconfig/ui/connectionpage.ui
index b32c6c48618c..81bb0aef1659 100644
--- a/dbaccess/uiconfig/ui/connectionpage.ui
+++ b/dbaccess/uiconfig/ui/connectionpage.ui
@@ -9,14 +9,13 @@
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkLabel" id="header">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">12</property>
-        <property name="label" translatable="yes"></property>
         <attributes>
           <attribute name="weight" value="semibold"/>
         </attributes>
@@ -85,6 +84,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -101,6 +101,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
new file mode 100644
index 000000000000..fdf248a7dc97
--- /dev/null
+++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="LDAPConnectionPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkLabel" id="header">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="margin_bottom">12</property>
+        <property name="label" translatable="yes">Set up a connection to an LDAP directory</property>
+        <attributes>
+          <attribute name="weight" value="semibold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="helpLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">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="max_width_chars">80</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="row_spacing">2</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="hostNameLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">_Server</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">hostNameEntry</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>
+          <object class="GtkLabel" id="portNumLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">_Port number</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">portNumEntry</property>
+          </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>
+        <child>
+          <object class="GtkEntry" id="hostNameEntry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+          </object>
+          <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>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkSpinButton" id="portNumEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="portNumDefLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Default: 389</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="baseDNLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">Base _DN</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">baseDNEntry</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>
+          <object class="GtkEntry" id="baseDNEntry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="useSSLCheckbutton">
+        <property name="label" translatable="yes">Use _secure connection (SSL)</property>
+        <property name="use_action_appearance">False</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">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>