Convert 3 tabpages to .ui

I converted PAGE_DBWIZARD_MYSQL_JDBC, PAGE_DBWIZARD_ORACLE and
PAGE_DBWIZARD_JDBC to .ui.

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

Change-Id: I920183c4abf303918ac0406b5810e1b8b377a04c
Reviewed-on: https://gerrit.libreoffice.org/10608
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

10 files changed, 578 insertions, 192 deletions

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index ae211dfd0a4e..79724ec69cf3 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/generalpagewizard \
     dbaccess/uiconfig/ui/generatedvaluespage \
     dbaccess/uiconfig/ui/indexdesigndialog \
+    dbaccess/uiconfig/ui/jdbcconnectionpage \
     dbaccess/uiconfig/ui/joindialog \
     dbaccess/uiconfig/ui/migratepage \
     dbaccess/uiconfig/ui/password \
@@ -40,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/relationdialog \
     dbaccess/uiconfig/ui/rowheightdialog \
     dbaccess/uiconfig/ui/savedialog \
+    dbaccess/uiconfig/ui/specialjdbcconnectionpage \
     dbaccess/uiconfig/ui/specialsettingspage \
     dbaccess/uiconfig/ui/sortdialog \
     dbaccess/uiconfig/ui/sqlexception \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5e8c7bb456e4..26e4e21fa21a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -351,35 +351,37 @@ using namespace ::com::sun::star;
     }
 
     // OMySQLJDBCConnectionPageSetup
-    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
-        :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs)
-        ,m_aFTHelpText          (this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
-        ,m_aFTDatabasename      (this, ModuleRes(FT_AUTODATABASENAME))
-        ,m_aETDatabasename      (this, ModuleRes(ET_AUTODATABASENAME))
-        ,m_aFTHostname          (this, ModuleRes(FT_AUTOHOSTNAME))
-        ,m_aETHostname          (this, ModuleRes(ET_AUTOHOSTNAME))
-        ,m_aFTPortNumber        (this, ModuleRes(FT_AUTOPORTNUMBER))
-        ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
-        ,m_aNFPortNumber        (this, ModuleRes(NF_AUTOPORTNUMBER))
-        ,m_aFTDriverClass       (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
-        ,m_aETDriverClass       (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
-        ,m_aPBTestJavaDriver    (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
+    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
+        :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs)
         ,m_nPortId(_nPortId)
     {
-        m_aFTDriverClass.SetText(OUString(ModuleRes(_nDriverClassId)));
-
-        m_aFTDefaultPortNumber.SetText(OUString(ModuleRes(_nDefaultPortResId)));
+        get(m_pHeaderText, "header");
+        get(m_pFTHelpText, "helpLabel");
+        get(m_pFTDatabasename, "dbNameLabel");
+        get(m_pETDatabasename, "dbNameEntry");
+        get(m_pFTHostname, "hostNameLabel");
+        get(m_pETHostname, "hostNameEntry");
+        get(m_pFTPortNumber, "portNumLabel");
+        get(m_pFTDefaultPortNumber, "portNumDefLabel");
+        get(m_pNFPortNumber, "portNumEntry");
+        get(m_pFTDriverClass, "jdbcDriverLabel");
+        get(m_pETDriverClass, "jdbcDriverEntry");
+        get(m_pPBTestJavaDriver, "testDriverButton");
+
+        m_pFTDriverClass->SetText(OUString(ModuleRes(_nDriverClassId)));
+
+        m_pFTDefaultPortNumber->SetText(OUString(ModuleRes(_nDefaultPortResId)));
         OUString sHelpText = OUString(ModuleRes(_nHelpTextResId));
-        m_aFTHelpText.SetText(sHelpText);
+        m_pFTHelpText->SetText(sHelpText);
         //TODO this code snippet is redundant
-        SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderTextResId);
+        m_pHeaderText->SetText(ModuleRes(_nHeaderTextResId));
 
-        m_aETDatabasename.SetModifyHdl(getControlModifiedLink());
-        m_aETHostname.SetModifyHdl(getControlModifiedLink());
-        m_aNFPortNumber.SetModifyHdl(getControlModifiedLink());
+        m_pETDatabasename->SetModifyHdl(getControlModifiedLink());
+        m_pETHostname->SetModifyHdl(getControlModifiedLink());
+        m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
 
-        m_aETDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified));
-        m_aPBTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCConnectionPageSetup,OnTestJavaClickHdl));
+        m_pETDriverClass->SetModifyHdl(LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified));
+        m_pPBTestJavaDriver->SetClickHdl(LINK(this,OGeneralSpecialJDBCConnectionPageSetup,OnTestJavaClickHdl));
 
         SFX_ITEMSET_GET(_rCoreAttrs, pUrlItem, SfxStringItem, DSID_CONNECTURL, true);
         SFX_ITEMSET_GET(_rCoreAttrs, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, true);
@@ -390,13 +392,11 @@ using namespace ::com::sun::star;
         }
 
         SetRoadmapStateValue(false);
-        FreeResource();
     }
 
     OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
         return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
-                                                         PAGE_DBWIZARD_MYSQL_JDBC,
                                                          _rAttrSet,
                                                          DSID_MYSQL_PORTNUMBER ,
                                                          STR_MYSQL_DEFAULT,
@@ -408,7 +408,6 @@ using namespace ::com::sun::star;
     OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
         return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
-                                                          PAGE_DBWIZARD_ORACLE,
                                                           _rAttrSet,
                                                           DSID_ORACLE_PORTNUMBER,
                                                           STR_ORACLE_DEFAULT,
@@ -419,28 +418,28 @@ using namespace ::com::sun::star;
 
     void OGeneralSpecialJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDatabasename));
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDriverClass));
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostname));
-        _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDatabasename));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDriverClass));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETHostname));
+        _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber));
     }
     void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDatabasename));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber));
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDatabasename));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostname));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTPortNumber));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDefaultPortNumber));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDriverClass));
     }
 
     bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
-        fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
-        fillString(*_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething);
-        fillString(*_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething);
-        fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething );
+        fillString(*_rSet,m_pETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
+        fillString(*_rSet,m_pETHostname,DSID_CONN_HOSTNAME,bChangedSomething);
+        fillString(*_rSet,m_pETDatabasename,DSID_DATABASENAME,bChangedSomething);
+        fillInt32(*_rSet,m_pNFPortNumber,m_nPortId,bChangedSomething );
         return bChangedSomething;
     }
 
@@ -457,29 +456,29 @@ using namespace ::com::sun::star;
 
         if ( bValid )
         {
-            m_aETDatabasename.SetText(pDatabaseName->GetValue());
-            m_aETDatabasename.ClearModifyFlag();
+            m_pETDatabasename->SetText(pDatabaseName->GetValue());
+            m_pETDatabasename->ClearModifyFlag();
 
-            m_aETDriverClass.SetText(pDrvItem->GetValue());
-            m_aETDriverClass.ClearModifyFlag();
+            m_pETDriverClass->SetText(pDrvItem->GetValue());
+            m_pETDriverClass->ClearModifyFlag();
 
-            m_aETHostname.SetText(pHostName->GetValue());
-            m_aETHostname.ClearModifyFlag();
+            m_pETHostname->SetText(pHostName->GetValue());
+            m_pETHostname->ClearModifyFlag();
 
-            m_aNFPortNumber.SetValue(pPortNumber->GetValue());
-            m_aNFPortNumber.ClearModifyFlag();
+            m_pNFPortNumber->SetValue(pPortNumber->GetValue());
+            m_pNFPortNumber->ClearModifyFlag();
         }
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
 
         // to get the correct value when saveValue was called by base class
-        if ( m_aETDriverClass.GetText().trim().isEmpty() )
+        if ( m_pETDriverClass->GetText().trim().isEmpty() )
         {
-            m_aETDriverClass.SetText(m_sDefaultJdbcDriverName);
-            m_aETDriverClass.SetModifyFlag();
+            m_pETDriverClass->SetText(m_sDefaultJdbcDriverName);
+            m_pETDriverClass->SetModifyFlag();
         }
         callModifiedHdl();
 
-        bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && (!m_aETHostname.GetText().isEmpty()) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() ));
+        bool bRoadmapState = ((!m_pETDatabasename->GetText().isEmpty() ) && (!m_pETHostname->GetText().isEmpty()) && (!m_pNFPortNumber->GetText().isEmpty() ) && ( !m_pETDriverClass->GetText().isEmpty() ));
         SetRoadmapStateValue(bRoadmapState);
     }
 
@@ -491,12 +490,12 @@ using namespace ::com::sun::star;
 #if HAVE_FEATURE_JAVA
         try
         {
-            if ( !m_aETDriverClass.GetText().trim().isEmpty() )
+            if ( !m_pETDriverClass->GetText().trim().isEmpty() )
             {
 // TODO change jvmaccess
                 ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( m_pAdminDialog->getORB() );
-                m_aETDriverClass.SetText(m_aETDriverClass.GetText().trim()); // fdo#68341
-                bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText());
+                m_pETDriverClass->SetText(m_pETDriverClass->GetText().trim()); // fdo#68341
+                bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_pETDriverClass->GetText());
             }
         }
         catch(::com::sun::star::uno::Exception&)
@@ -512,9 +511,9 @@ using namespace ::com::sun::star;
 
     IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
     {
-        if ( _pEdit == &m_aETDriverClass )
-            m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().trim().isEmpty() );
-        bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && ( !m_aETHostname.GetText().isEmpty() ) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().trim().isEmpty() ));
+        if ( _pEdit == m_pETDriverClass )
+            m_pPBTestJavaDriver->Enable( !m_pETDriverClass->GetText().trim().isEmpty() );
+        bool bRoadmapState = ((!m_pETDatabasename->GetText().isEmpty() ) && ( !m_pETHostname->GetText().isEmpty() ) && (!m_pNFPortNumber->GetText().isEmpty() ) && ( !m_pETDriverClass->GetText().trim().isEmpty() ));
         SetRoadmapStateValue(bRoadmapState);
         callModifiedHdl();
         return 0L;
@@ -527,30 +526,30 @@ using namespace ::com::sun::star;
 
     // OMySQLJDBCConnectionPageSetup
     OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs)
-        :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
-        ,m_aFTDriverClass       (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
-        ,m_aETDriverClass       (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
-        ,m_aPBTestJavaDriver    (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
+        :OConnectionTabPageSetup(pParent, "JDBCConnectionPage", "dbaccess/ui/jdbcconnectionpage.ui", _rCoreAttrs,
+                                STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
     {
-        m_aETDriverClass.SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified));
-        m_aPBTestJavaDriver.SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl));
-        FreeResource();
+        get(m_pFTDriverClass, "jdbcLabel");
+        get(m_pETDriverClass, "jdbcEntry");
+        get(m_pPBTestJavaDriver, "jdbcButton");
+        m_pETDriverClass->SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified));
+        m_pPBTestJavaDriver->SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl));
     }
 
     void OJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDriverClass));
+        _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDriverClass));
     }
 
     void OJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
+        _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDriverClass));
     }
 
     bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-        fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
+        fillString(*_rSet,m_pETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
         return bChangedSomething;
     }
 
@@ -569,18 +568,18 @@ using namespace ::com::sun::star;
                 OUString sDefaultJdbcDriverName = m_pCollection->getJavaDriverClass(m_eType);
                 if ( !sDefaultJdbcDriverName.isEmpty() )
                 {
-                    m_aETDriverClass.SetText(sDefaultJdbcDriverName);
-                    m_aETDriverClass.SetModifyFlag();
+                    m_pETDriverClass->SetText(sDefaultJdbcDriverName);
+                    m_pETDriverClass->SetModifyFlag();
                 }
             }
             else
             {
-                m_aETDriverClass.SetText(pDrvItem->GetValue());
-                m_aETDriverClass.ClearModifyFlag();
+                m_pETDriverClass->SetText(pDrvItem->GetValue());
+                m_pETDriverClass->ClearModifyFlag();
             }
         }
         bool bEnable = pDrvItem->GetValue().getLength() != 0;
-        m_aPBTestJavaDriver.Enable(bEnable);
+        m_pPBTestJavaDriver->Enable(bEnable);
         OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
 
         SetRoadmapStateValue(checkTestConnection());
@@ -590,7 +589,7 @@ using namespace ::com::sun::star;
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         bool bEnableTestConnection = !m_pConnectionURL->IsVisible() || !m_pConnectionURL->GetTextNoPrefix().isEmpty();
-        bEnableTestConnection = bEnableTestConnection && (!m_aETDriverClass.GetText().isEmpty());
+        bEnableTestConnection = bEnableTestConnection && (!m_pETDriverClass->GetText().isEmpty());
         return bEnableTestConnection;
     }
 
@@ -601,12 +600,12 @@ using namespace ::com::sun::star;
 #if HAVE_FEATURE_JAVA
         try
         {
-            if ( !m_aETDriverClass.GetText().isEmpty() )
+            if ( !m_pETDriverClass->GetText().isEmpty() )
             {
 // TODO change jvmaccess
                 ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( m_pAdminDialog->getORB() );
-                m_aETDriverClass.SetText(m_aETDriverClass.GetText().trim()); // fdo#68341
-                bSuccess = xJVM.is() && ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText());
+                m_pETDriverClass->SetText(m_pETDriverClass->GetText().trim()); // fdo#68341
+                bSuccess = xJVM.is() && ::connectivity::existsJavaClassByName(xJVM,m_pETDriverClass->GetText());
             }
         }
         catch(::com::sun::star::uno::Exception&)
@@ -621,8 +620,8 @@ using namespace ::com::sun::star;
 
     IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
     {
-        if ( _pEdit == &m_aETDriverClass )
-            m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().isEmpty() );
+        if ( _pEdit == m_pETDriverClass )
+            m_pPBTestJavaDriver->Enable( !m_pETDriverClass->GetText().isEmpty() );
         SetRoadmapStateValue(checkTestConnection());
         // tell the listener we were modified
         callModifiedHdl();
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 36621f295363..610798ddae07 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -135,7 +135,6 @@ namespace dbaui
     {
     public:
         OGeneralSpecialJDBCConnectionPageSetup(   Window* pParent
-                                        , sal_uInt16 _nResId
                                         , const SfxItemSet& _rCoreAttrs
                                         , sal_uInt16 _nPortId
                                         , sal_uInt16 _nDefaultPortResId
@@ -154,18 +153,19 @@ namespace dbaui
 
         DECL_LINK(OnTestJavaClickHdl,PushButton*);
         DECL_LINK(OnEditModified,Edit*);
-        FixedText           m_aFTHelpText;
-        FixedText           m_aFTDatabasename;
-        Edit                m_aETDatabasename;
-        FixedText           m_aFTHostname;
-        Edit                m_aETHostname;
-        FixedText           m_aFTPortNumber;
-        FixedText           m_aFTDefaultPortNumber;
-        NumericField        m_aNFPortNumber;
-
-        FixedText           m_aFTDriverClass;
-        Edit                m_aETDriverClass;
-        PushButton          m_aPBTestJavaDriver;
+        FixedText*          m_pHeaderText;
+        FixedText*          m_pFTHelpText;
+        FixedText*          m_pFTDatabasename;
+        Edit*               m_pETDatabasename;
+        FixedText*          m_pFTHostname;
+        Edit*               m_pETHostname;
+        FixedText*          m_pFTPortNumber;
+        FixedText*          m_pFTDefaultPortNumber;
+        NumericField*       m_pNFPortNumber;
+
+        FixedText*          m_pFTDriverClass;
+        Edit*               m_pETDriverClass;
+        PushButton*         m_pPBTestJavaDriver;
 
         OUString              m_sDefaultJdbcDriverName;
         sal_uInt16              m_nPortId;
@@ -188,9 +188,9 @@ namespace dbaui
 
         DECL_LINK(OnTestJavaClickHdl,PushButton*);
         DECL_LINK(OnEditModified,Edit*);
-        FixedText           m_aFTDriverClass;
-        Edit                m_aETDriverClass;
-        PushButton          m_aPBTestJavaDriver;
+        FixedText*          m_pFTDriverClass;
+        Edit*               m_pETDriverClass;
+        PushButton*         m_pPBTestJavaDriver;
     };
 
     // OJDBCConnectionPageSetup
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 6571f91a25be..7124c6308534 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -25,23 +25,6 @@
 #include "browserids.hxx"
 
     // FREE
-#define STR_JDBC_HELPTEXT                   33
-#define STR_MYSQLJDBC_HELPTEXT              35
-    // FREE
-#define STR_ORACLE_HELPTEXT                 40
-    // FREE
-#define STR_JDBC_HEADERTEXT                 46
-#define STR_MYSQLJDBC_HEADERTEXT            48
-    // FREE
-#define STR_ORACLE_HEADERTEXT               54
-
-    // FREE
-
-#define STR_ORACLE_DEFAULT              67
-    // FREE
-#define STR_MYSQL_DEFAULT               83
-#define STR_ORACLE_DRIVERCLASSTEXT      84
-#define STR_MYSQL_DRIVERCLASSTEXT       85
 #define STR_LDAP_DEFAULT                86
 
 #define FT_LDAP_HELPTEXT                2
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 5f4be24e4606..88f2a3e33ef2 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -165,35 +165,24 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
     };
 };
 
-TabPage PAGE_DBWIZARD_MYSQL_JDBC
+String STR_MYSQLJDBC_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_MYSQLJDBC_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
-    };
-
-    String STR_MYSQLJDBC_HELPTEXT
-    {
-        Text[ en-US ] = "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.\nPlease contact your system administrator if you are unsure about the following settings.";
-    };
+    Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
+};
 
-    String STR_MYSQL_DRIVERCLASSTEXT
-    {
-        Text [  en-US  ] = "MySQL JDBC d~river class:";
-    };
+String STR_MYSQLJDBC_HELPTEXT
+{
+    Text[ en-US ] = "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.\nPlease contact your system administrator if you are unsure about the following settings.";
+};
 
-    String STR_MYSQL_DEFAULT
-    {
-        Text[ en-US ] = "Default: 3306";
-    };
+String STR_MYSQL_DRIVERCLASSTEXT
+{
+    Text [  en-US  ] = "MySQL JDBC d~river class:";
+};
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS)
+String STR_MYSQL_DEFAULT
+{
+    Text[ en-US ] = "Default: 3306";
 };
 
 TabPage PAGE_DBWIZARD_MYSQL_NATIVE
@@ -315,54 +304,32 @@ String STR_ODBC_HELPTEXT{
     Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
 };
 
-TabPage PAGE_DBWIZARD_JDBC
+String STR_JDBC_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_JDBC_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to a JDBC database" ;
-    };
-
-    String STR_JDBC_HELPTEXT{
-        Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
-    };
+    Text[ en-US ] = "Set up a connection to a JDBC database" ;
+};
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL)
-    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS)
+String STR_JDBC_HELPTEXT{
+    Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
 };
 
-TabPage PAGE_DBWIZARD_ORACLE
+String STR_ORACLE_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_ORACLE_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to an Oracle database";
-    };
-
-    String STR_ORACLE_DEFAULT
-    {
-        Text[ en-US ] = "Default: 1521" ;
-    };
+    Text[ en-US ] = "Set up a connection to an Oracle database";
+};
 
-    String STR_ORACLE_DRIVERCLASSTEXT{
-        Text [ en-US ] = "Oracle JDBC ~driver class";
-    };
+String STR_ORACLE_DEFAULT
+{
+    Text[ en-US ] = "Default: 1521" ;
+};
 
-    String STR_ORACLE_HELPTEXT{
-        Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
-    };
+String STR_ORACLE_DRIVERCLASSTEXT
+{
+    Text [ en-US ] = "Oracle JDBC ~driver class";
+};
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
+String STR_ORACLE_HELPTEXT{
+    Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
 };
 
 String STR_SPREADSHEET_HEADERTEXT
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 1bae53e0c359..76195eec4527 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -137,9 +137,22 @@
 #define STR_ODBC_HEADERTEXT                 RID_STR_DLG_START + 89
 #define STR_ODBC_HELPTEXT                   RID_STR_DLG_START + 90
 
+#define STR_JDBC_HEADERTEXT                 RID_STR_DLG_START + 91
+#define STR_JDBC_HELPTEXT                   RID_STR_DLG_START + 92
+
+#define STR_MYSQLJDBC_HEADERTEXT            RID_STR_DLG_START + 93
+#define STR_MYSQLJDBC_HELPTEXT              RID_STR_DLG_START + 94
+#define STR_MYSQL_DRIVERCLASSTEXT           RID_STR_DLG_START + 95
+#define STR_MYSQL_DEFAULT                   RID_STR_DLG_START + 96
+
+#define STR_ORACLE_HEADERTEXT               RID_STR_DLG_START + 97
+#define STR_ORACLE_DEFAULT                  RID_STR_DLG_START + 98
+#define STR_ORACLE_DRIVERCLASSTEXT          RID_STR_DLG_START + 99
+#define STR_ORACLE_HELPTEXT                 RID_STR_DLG_START + 100
+
 // please adjust checking before insert new strings
 
-#define LAST_STR_HERE                       RID_STR_DLG_START + 91
+#define LAST_STR_HERE                       RID_STR_DLG_START + 101
 
 #if LAST_STR_HERE > RID_STR_DLG_END
 #error Resource-Id Overflow in #file, #line
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4d5e5b1c2f6d..ab36628b9bd8 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -45,28 +45,28 @@
 #define RID_STR_CONTROL_END             RID_STR_CONTROL_START   + 30    //  40 -  69
 
 #define RID_STR_DLG_START               RID_STR_CONTROL_END
-#define RID_STR_DLG_END                 RID_STR_DLG_START       + 103    //  70 - 172
+#define RID_STR_DLG_END                 RID_STR_DLG_START       + 113    //  70 - 182
 
 #define RID_STR_MISC_START              RID_STR_DLG_END
-#define RID_STR_MISC_END                RID_STR_MISC_START      + 20    // 173 - 192
+#define RID_STR_MISC_END                RID_STR_MISC_START      + 20    // 183 - 202
 
 #define RID_STR_QRY_START               RID_STR_MISC_END
-#define RID_STR_QRY_END                 RID_STR_QRY_START       + 80    // 193 - 272
+#define RID_STR_QRY_END                 RID_STR_QRY_START       + 80    // 203 - 282
 
 #define RID_STR_TBL_START               RID_STR_QRY_END
-#define RID_STR_TBL_END                 RID_STR_TBL_START       + 80    // 273 - 352
+#define RID_STR_TBL_END                 RID_STR_TBL_START       + 80    // 283 - 362
 
 #define RID_STR_REL_START               RID_STR_TBL_END
-#define RID_STR_REL_END                 RID_STR_REL_START       + 10    // 353 - 372
+#define RID_STR_REL_END                 RID_STR_REL_START       + 10    // 363 - 382
 
 #define RID_STR_UNO_START               RID_STR_REL_END
-#define RID_STR_UNO_END                 RID_STR_UNO_START       + 20    // 373 - 392
+#define RID_STR_UNO_END                 RID_STR_UNO_START       + 20    // 383 - 402
 
 #define RID_STR_GEN_START               RID_STR_UNO_END
-#define RID_STR_GEN_END                 RID_STR_GEN_START       + 56    // 393 - 448
+#define RID_STR_GEN_END                 RID_STR_GEN_START       + 56    // 403 - 458
 
 #define RID_STR_APP_START               RID_STR_GEN_END
-#define RID_STR_APP_END                 RID_STR_APP_START       + 40    //   449 - 488
+#define RID_STR_APP_END                 RID_STR_APP_START       + 40    //   459 - 498
 
 #if RID_STR_GEN_END > RID_DBACCESS_END
 #error Resource-Id Ueberlauf in #file, #line
@@ -117,10 +117,7 @@
     // FREE
 #define PAGE_DBWIZARD_LDAP                      RID_PAGE_START + 44
     // FREE
-#define PAGE_DBWIZARD_ORACLE                    RID_PAGE_START + 48
-#define PAGE_DBWIZARD_JDBC                      RID_PAGE_START + 49
 #define PAGE_DBWIZARD_AUTHENTIFICATION          RID_PAGE_START + 53
-#define PAGE_DBWIZARD_MYSQL_JDBC                RID_PAGE_START + 54
 #define PAGE_DBWIZARD_MYSQL_NATIVE              RID_PAGE_START + 57
 
 // error boxes
diff --git a/dbaccess/uiconfig/ui/connectionpage.ui b/dbaccess/uiconfig/ui/connectionpage.ui
index 0a79549643d6..b32c6c48618c 100644
--- a/dbaccess/uiconfig/ui/connectionpage.ui
+++ b/dbaccess/uiconfig/ui/connectionpage.ui
@@ -16,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">12</property>
-        <property name="label" translatable="yes">label</property>
+        <property name="label" translatable="yes"></property>
         <attributes>
           <attribute name="weight" value="semibold"/>
         </attributes>
@@ -85,7 +85,6 @@
             <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>
@@ -102,7 +101,6 @@
             <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/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
new file mode 100644
index 000000000000..9a9f6b7725e8
--- /dev/null
+++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkBox" id="JDBCConnectionPage">
+    <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 a connection to a JDBC database</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">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>
+      </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="row_spacing">2</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="browseurllabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">Path to the dBASE files</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="dbulo-ConnectionURLEdit" id="browseurl">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="invisible_char">•</property>
+            <property name="invisible_char_set">True</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="GtkButton" id="create">
+            <property name="label" translatable="yes">_Create New</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_underline">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="GtkButton" id="browse">
+            <property name="label" translatable="yes">_Browse</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_underline">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="GtkBox" id="box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="jdbcLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">JDBC d_river class</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">jdbcEntry</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</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="GtkEntry" id="jdbcEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char_set">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="jdbcButton">
+                <property name="label" translatable="yes">_Test class</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </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/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
new file mode 100644
index 000000000000..1fe9d254b767
--- /dev/null
+++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="SpecialJDBCConnectionPage">
+    <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 connection to a MySQL database using JDBC</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 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="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="dbNameLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">_Database name</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">dbNameEntry</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="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">1</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="dbNameEntry">
+            <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="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">1</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: 3306</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>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="grid2">
+        <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="jdbcDriverLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">MySQL JDBC d_river class:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">jdbcDriverEntry</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="jdbcDriverEntry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</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="GtkButton" id="testDriverButton">
+            <property name="label" translatable="yes">_Test class</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_underline">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>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>