convert copy table page to .ui

Change-Id: Id537486dcaf0d3c6ab850a9fb50cef3d995ad51f

8 files changed, 348 insertions, 206 deletions

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index dc78eb8bcb42..4244e5547ce9 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/applycolpage \
     dbaccess/uiconfig/ui/choosedatasourcedialog \
     dbaccess/uiconfig/ui/colwidthdialog \
+    dbaccess/uiconfig/ui/copytablepage \
     dbaccess/uiconfig/ui/dbaseindexdialog \
     dbaccess/uiconfig/ui/directsqldialog  \
     dbaccess/uiconfig/ui/fielddialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 93f5d365e9f9..407c414b166c 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -104,8 +104,6 @@
 #define HID_TAB_WIZ_TYPE_SELECT                           "DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
 #define HID_TAB_NAMEMATCHING_COLS_AVAIL                   "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
 #define HID_TAB_NAMEMATCHING_COLS_ASSIGN                  "DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN"
-#define HID_TAB_WIZ_COPYTABLE                             "DBACCESS_HID_TAB_WIZ_COPYTABLE"
-#define HID_TAB_WIZ_TABLENAME_EDIT                        "DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT"
 #define HID_CTL_RELATIONTAB                               "DBACCESS_HID_CTL_RELATIONTAB"
 #define HID_RELATIONDIALOG_LEFTFIELDCELL                  "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
 #define HID_RELATIONDIALOG_RIGHTFIELDCELL                 "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 1b556eee0c3e..0c0e1ff3ea41 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -34,24 +34,22 @@ namespace dbaui
     class OCopyTable : public OWizardPage
     {
     protected:
-        FixedText                               m_ftTableName;
-        Edit                                    m_edTableName;
-        FixedLine                               m_aFL_Options;
-        RadioButton                             m_aRB_DefData;
-        RadioButton                             m_aRB_Def;
-        RadioButton                             m_aRB_View;
-        RadioButton                             m_aRB_AppendData;
-        CheckBox                                m_aCB_UseHeaderLine;
-        CheckBox                                m_aCB_PrimaryColumn;
-        FixedText                               m_aFT_KeyName;
-        Edit                                    m_edKeyName;
-        sal_Int16                               m_nOldOperation;
+        Edit*              m_pEdTableName;
+        RadioButton*       m_pRB_DefData;
+        RadioButton*       m_pRB_Def;
+        RadioButton*       m_pRB_View;
+        RadioButton*       m_pRB_AppendData;
+        CheckBox*          m_pCB_UseHeaderLine;
+        CheckBox*          m_pCB_PrimaryColumn;
+        FixedText*         m_pFT_KeyName;
+        Edit*              m_pEdKeyName;
+        sal_Int16          m_nOldOperation;
 
-        OWizColumnSelect*                       m_pPage2;
-        OWizNormalExtend*                       m_pPage3;
+        OWizColumnSelect*  m_pPage2;
+        OWizNormalExtend*  m_pPage3;
 
-        bool                                    m_bPKeyAllowed;
-        bool                                    m_bUseHeaderAllowed;
+        bool               m_bPKeyAllowed;
+        bool               m_bUseHeaderAllowed;
 
         DECL_LINK( AppendDataClickHdl, Button* );
         DECL_LINK( RadioChangeHdl, Button* );
@@ -69,22 +67,22 @@ namespace dbaui
         OCopyTable( Window * pParent );
         virtual ~OCopyTable();
 
-        inline bool IsOptionDefData()       const { return m_aRB_DefData.IsChecked(); }
-        inline bool IsOptionDef()           const { return m_aRB_Def.IsChecked(); }
-        inline bool IsOptionAppendData()    const { return m_aRB_AppendData.IsChecked(); }
-        inline bool IsOptionView()          const { return m_aRB_View.IsChecked(); }
-        inline bool UseHeaderLine()         const { return m_aCB_UseHeaderLine.IsChecked(); }
-        OUString    GetKeyName()            const { return m_edKeyName.GetText(); }
+        bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); }
+        bool IsOptionDef() const { return m_pRB_Def->IsChecked(); }
+        bool IsOptionAppendData() const { return m_pRB_AppendData->IsChecked(); }
+        bool IsOptionView() const { return m_pRB_View->IsChecked(); }
+        bool UseHeaderLine() const { return m_pCB_UseHeaderLine->IsChecked(); }
+        OUString GetKeyName() const { return m_pEdKeyName->GetText(); }
 
         void setCreateStyleAction();
         inline void disallowViews()
         {
-            m_aRB_View.Disable();
+            m_pRB_View->Disable();
         }
         inline void disallowUseHeaderLine()
         {
             m_bUseHeaderAllowed = false;
-            m_aCB_UseHeaderLine.Disable();
+            m_pCB_UseHeaderLine->Disable();
         }
 
         void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName );
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 7f6383cb328d..714d4b9f33dd 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -104,7 +104,7 @@
     // FREE
 #define TAB_WIZ_TYPE_SELECT             RID_PAGE_START + 10
 #define TAB_WIZ_NAME_MATCHING           RID_PAGE_START + 11
-#define TAB_WIZ_COPYTABLE               RID_PAGE_START + 12
+    // FREE
     // FREE
 #define PAGE_LDAP                       RID_PAGE_START + 15
 #define TAB_PAGE_USERADMIN              RID_PAGE_START + 16
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 7107d165ac90..e849e91984ed 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -51,58 +51,54 @@ using namespace ::com::sun::star::sdbcx;
 namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
 
 // Klasse OCopyTable
-OCopyTable::OCopyTable( Window * pParent )
-    :OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) )
-    ,m_ftTableName(         this, ModuleRes( FT_TABLENAME       ) )
-    ,m_edTableName(         this, ModuleRes( ET_TABLENAME       ) )
-    ,m_aFL_Options(         this, ModuleRes( FL_OPTIONS         ) )
-    ,m_aRB_DefData(         this, ModuleRes( RB_DEFDATA         ) )
-    ,m_aRB_Def(             this, ModuleRes( RB_DEF             ) )
-    ,m_aRB_View(            this, ModuleRes( RB_VIEW            ) )
-    ,m_aRB_AppendData(      this, ModuleRes( RB_APPENDDATA      ) )
-    ,m_aCB_UseHeaderLine(   this, ModuleRes( CB_USEHEADERLINE   ) )
-    ,m_aCB_PrimaryColumn(   this, ModuleRes( CB_PRIMARY_COLUMN  ) )
-    ,m_aFT_KeyName(         this, ModuleRes( FT_KEYNAME         ) )
-    ,m_edKeyName(           this, ModuleRes( ET_KEYNAME         ) )
-    ,m_nOldOperation(0)
-    ,m_pPage2(NULL)
-    ,m_pPage3(NULL)
-    ,m_bPKeyAllowed(false)
-    ,m_bUseHeaderAllowed(true)
+OCopyTable::OCopyTable(Window * pParent)
+    : OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui")
+    , m_nOldOperation(0)
+    , m_pPage2(NULL)
+    , m_pPage3(NULL)
+    , m_bPKeyAllowed(false)
+    , m_bUseHeaderAllowed(true)
 {
-
-    m_edTableName.SetMaxTextLen(EDIT_NOLIMIT);
+    get(m_pEdTableName, "name");
+    get(m_pRB_DefData, "defdata");
+    get(m_pRB_Def, "def");
+    get(m_pRB_View, "view");
+    get(m_pRB_AppendData, "data");
+    get(m_pCB_UseHeaderLine, "firstline");
+    get(m_pCB_PrimaryColumn, "primarykey");
+    get(m_pFT_KeyName, "keynamelabel");
+    get(m_pEdKeyName, "keyname");
+
+    m_pEdTableName->SetMaxTextLen(EDIT_NOLIMIT);
 
     if ( m_pParent->m_xDestConnection.is() )
     {
         if ( !m_pParent->supportsViews() )
-            m_aRB_View.Disable();
+            m_pRB_View->Disable();
 
-        m_aCB_UseHeaderLine.Check(true);
+        m_pCB_UseHeaderLine->Check(true);
         m_bPKeyAllowed = m_pParent->supportsPrimaryKey();
 
-        m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed);
+        m_pCB_PrimaryColumn->Enable(m_bPKeyAllowed);
 
-        m_aRB_AppendData.SetClickHdl(   LINK( this, OCopyTable, AppendDataClickHdl  ) );
+        m_pRB_AppendData->SetClickHdl(   LINK( this, OCopyTable, AppendDataClickHdl  ) );
 
-        m_aRB_DefData.SetClickHdl(      LINK( this, OCopyTable, RadioChangeHdl      ) );
-        m_aRB_Def.SetClickHdl(          LINK( this, OCopyTable, RadioChangeHdl      ) );
-        m_aRB_View.SetClickHdl(         LINK( this, OCopyTable, RadioChangeHdl      ) );
+        m_pRB_DefData->SetClickHdl(      LINK( this, OCopyTable, RadioChangeHdl      ) );
+        m_pRB_Def->SetClickHdl(          LINK( this, OCopyTable, RadioChangeHdl      ) );
+        m_pRB_View->SetClickHdl(         LINK( this, OCopyTable, RadioChangeHdl      ) );
 
-        m_aCB_PrimaryColumn.SetClickHdl(LINK( this, OCopyTable, KeyClickHdl         ) );
+        m_pCB_PrimaryColumn->SetClickHdl(LINK( this, OCopyTable, KeyClickHdl         ) );
 
-        m_aFT_KeyName.Enable(false);
-        m_edKeyName.Enable(false);
+        m_pFT_KeyName->Enable(false);
+        m_pEdKeyName->Enable(false);
         OUString sKeyName("ID");
         sKeyName = m_pParent->createUniqueName(sKeyName);
-        m_edKeyName.SetText(sKeyName);
+        m_pEdKeyName->SetText(sKeyName);
 
         sal_Int32 nMaxLen = m_pParent->getMaxColumnNameLength();
-        m_edKeyName.SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
+        m_pEdKeyName->SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
     }
 
-    FreeResource();
-
     SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY));
 }
 
@@ -120,20 +116,20 @@ IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
 void OCopyTable::SetAppendDataRadio()
 {
     m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,true);
-    m_aFT_KeyName.Enable(false);
-    m_aCB_PrimaryColumn.Enable(false);
-    m_edKeyName.Enable(false);
+    m_pFT_KeyName->Enable(false);
+    m_pCB_PrimaryColumn->Enable(false);
+    m_pEdKeyName->Enable(false);
     m_pParent->setOperation(CopyTableOperation::AppendData);
 }
 
 IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
 {
-    m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != &m_aRB_View);
-    bool bKey = m_bPKeyAllowed && pButton != &m_aRB_View;
-    m_aFT_KeyName.Enable(bKey && m_aCB_PrimaryColumn.IsChecked());
-    m_edKeyName.Enable(bKey && m_aCB_PrimaryColumn.IsChecked());
-    m_aCB_PrimaryColumn.Enable(bKey);
-    m_aCB_UseHeaderLine.Enable(m_bUseHeaderAllowed && IsOptionDefData());
+    m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != m_pRB_View);
+    bool bKey = m_bPKeyAllowed && pButton != m_pRB_View;
+    m_pFT_KeyName->Enable(bKey && m_pCB_PrimaryColumn->IsChecked());
+    m_pEdKeyName->Enable(bKey && m_pCB_PrimaryColumn->IsChecked());
+    m_pCB_PrimaryColumn->Enable(bKey);
+    m_pCB_UseHeaderLine->Enable(m_bUseHeaderAllowed && IsOptionDefData());
 
     // set typ what to do
     if( IsOptionDefData() )
@@ -148,16 +144,16 @@ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
 
 IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
 {
-    m_edKeyName.Enable(m_aCB_PrimaryColumn.IsChecked());
-    m_aFT_KeyName.Enable(m_aCB_PrimaryColumn.IsChecked());
+    m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
+    m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
     return 0;
 }
 
 bool OCopyTable::LeavePage()
 {
-    m_pParent->m_bCreatePrimaryKeyColumn    = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False;
-    m_pParent->m_aKeyName                   = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : OUString();
-    m_pParent->setUseHeaderLine( m_aCB_UseHeaderLine.IsChecked() );
+    m_pParent->m_bCreatePrimaryKeyColumn    = (m_bPKeyAllowed && m_pCB_PrimaryColumn->IsEnabled()) ? m_pCB_PrimaryColumn->IsChecked() : sal_False;
+    m_pParent->m_aKeyName                   = m_pParent->m_bCreatePrimaryKeyColumn ? m_pEdKeyName->GetText() : OUString();
+    m_pParent->setUseHeaderLine( m_pCB_UseHeaderLine->IsChecked() );
 
     // first check if the table already exists in the database
     if( m_pParent->getOperation() != CopyTableOperation::AppendData )
@@ -165,7 +161,7 @@ bool OCopyTable::LeavePage()
         m_pParent->clearDestColumns();
         DynamicTableOrQueryNameCheck aNameCheck( m_pParent->m_xDestConnection, CommandType::TABLE );
         SQLExceptionInfo aErrorInfo;
-        if ( !aNameCheck.isNameValid( m_edTableName.GetText(), aErrorInfo ) )
+        if ( !aNameCheck.isNameValid( m_pEdTableName->GetText(), aErrorInfo ) )
         {
             aErrorInfo.append( SQLExceptionInfo::SQL_CONTEXT, ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) );
             m_pParent->showError(aErrorInfo.get());
@@ -179,7 +175,7 @@ bool OCopyTable::LeavePage()
         OUString sSchema;
         OUString sTable;
         ::dbtools::qualifiedNameComponents( xMeta,
-                                            m_edTableName.GetText(),
+                                            m_pEdTableName->GetText(),
                                             sCatalog,
                                             sSchema,
                                             sTable,
@@ -204,7 +200,7 @@ bool OCopyTable::LeavePage()
         }
     }
 
-    if ( m_edTableName.IsValueChangedFromSaved() )
+    if ( m_pEdTableName->IsValueChangedFromSaved() )
     { // table exists and name has changed
         if ( m_pParent->getOperation() == CopyTableOperation::AppendData )
         {
@@ -213,7 +209,7 @@ bool OCopyTable::LeavePage()
         }
         else if ( m_nOldOperation == CopyTableOperation::AppendData )
         {
-            m_edTableName.SaveValue();
+            m_pEdTableName->SaveValue();
             return LeavePage();
         }
     }
@@ -225,8 +221,8 @@ bool OCopyTable::LeavePage()
                 return false;
         }
     }
-    m_pParent->m_sName = m_edTableName.GetText();
-    m_edTableName.SaveValue();
+    m_pParent->m_sName = m_pEdTableName->GetText();
+    m_pEdTableName->SaveValue();
 
     if(m_pParent->m_sName.isEmpty())
     {
@@ -242,8 +238,8 @@ void OCopyTable::ActivatePage()
 {
     m_pParent->GetOKButton().Enable( true );
     m_nOldOperation = m_pParent->getOperation();
-    m_edTableName.GrabFocus();
-    m_aCB_UseHeaderLine.Check(m_pParent->UseHeaderLine());
+    m_pEdTableName->GrabFocus();
+    m_pCB_UseHeaderLine->Check(m_pParent->UseHeaderLine());
 }
 
 OUString OCopyTable::GetTitle() const
@@ -255,8 +251,8 @@ void OCopyTable::Reset()
 {
     m_bFirstTime = false;
 
-    m_edTableName.SetText( m_pParent->m_sName );
-    m_edTableName.SaveValue();
+    m_pEdTableName->SetText( m_pParent->m_sName );
+    m_pEdTableName->SaveValue();
 }
 
 bool OCopyTable::checkAppendData()
@@ -267,7 +263,7 @@ bool OCopyTable::checkAppendData()
     Reference<XNameAccess> xTables;
     if(xSup.is())
         xTables = xSup->getTables();
-    if(xTables.is() && xTables->hasByName(m_edTableName.GetText()))
+    if(xTables.is() && xTables->hasByName(m_pEdTableName->GetText()))
     {
         const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
         const sal_uInt32 nSrcSize = pSrcColumns->size();
@@ -275,7 +271,7 @@ bool OCopyTable::checkAppendData()
         m_pParent->m_vColumnTypes.resize( nSrcSize , COLUMN_POSITION_NOT_FOUND );
 
         // set new destination
-        xTables->getByName( m_edTableName.GetText() ) >>= xTable;
+        xTables->getByName( m_pEdTableName->GetText() ) >>= xTable;
         ObjectCopySource aTableCopySource( m_pParent->m_xDestConnection, xTable );
         m_pParent->loadData( aTableCopySource, m_pParent->m_vDestColumns, m_pParent->m_aDestVec );
         const ODatabaseExport::TColumnVector* pDestColumns          = m_pParent->getDestVector();
@@ -315,11 +311,11 @@ bool OCopyTable::checkAppendData()
 void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName )
 {
     bool bCreatePK = m_bPKeyAllowed && _bDoCreate;
-    m_aCB_PrimaryColumn.Check( bCreatePK );
-    m_edKeyName.SetText( _rSuggestedName );
+    m_pCB_PrimaryColumn->Check( bCreatePK );
+    m_pEdKeyName->SetText( _rSuggestedName );
 
-    m_aFT_KeyName.Enable( bCreatePK );
-    m_edKeyName.Enable( bCreatePK );
+    m_pFT_KeyName->Enable( bCreatePK );
+    m_pEdKeyName->Enable( bCreatePK );
 }
 
 void OCopyTable::setCreateStyleAction()
@@ -328,27 +324,27 @@ void OCopyTable::setCreateStyleAction()
     switch(m_pParent->getOperation())
     {
         case CopyTableOperation::CopyDefinitionAndData:
-            m_aRB_DefData.Check(true);
-            RadioChangeHdl(&m_aRB_DefData);
+            m_pRB_DefData->Check(true);
+            RadioChangeHdl(m_pRB_DefData);
             break;
         case CopyTableOperation::CopyDefinitionOnly:
-            m_aRB_Def.Check(true);
-            RadioChangeHdl(&m_aRB_Def);
+            m_pRB_Def->Check(true);
+            RadioChangeHdl(m_pRB_Def);
             break;
         case CopyTableOperation::AppendData:
-            m_aRB_AppendData.Check(true);
+            m_pRB_AppendData->Check(true);
             SetAppendDataRadio();
             break;
         case CopyTableOperation::CreateAsView:
-            if ( m_aRB_View.IsEnabled() )
+            if ( m_pRB_View->IsEnabled() )
             {
-                m_aRB_View.Check(true);
-                RadioChangeHdl(&m_aRB_View);
+                m_pRB_View->Check(true);
+                RadioChangeHdl(m_pRB_View);
             }
             else
             {
-                m_aRB_DefData.Check(true);
-                RadioChangeHdl(&m_aRB_DefData);
+                m_pRB_DefData->Check(true);
+                RadioChangeHdl(m_pRB_DefData);
             }
     }
 }
diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc
index a4e1223a837c..b7075bfc4e97 100644
--- a/dbaccess/source/ui/misc/WizardPages.hrc
+++ b/dbaccess/source/ui/misc/WizardPages.hrc
@@ -35,25 +35,13 @@
 #define PB_NONE                 17
 
 #define ET_AUTO                 1
-#define ET_TABLENAME            2
-#define ET_KEYNAME              3
 
 #define FT_AUTO                 1
 #define FT_TABLE_LEFT           2
 #define FT_TABLE_RIGHT          3
-#define FT_TABLENAME            4
-#define FT_KEYNAME              5
 
 #define FL_COLUMN_NAME                  2
 #define FL_AUTO_TYPE                    3
-#define FL_OPTIONS                              5
-
-#define RB_DEFDATA              1
-#define RB_DEF                  2
-#define RB_VIEW                 3
-#define RB_APPENDDATA           4
-#define CB_PRIMARY_COLUMN       5
-#define CB_USEHEADERLINE        6
 
 #define CONTROL_CONTAINER       1
 // controls
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 93d3b89306dd..6ac54ee83702 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -327,99 +327,6 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
 };
 
-TabPage TAB_WIZ_COPYTABLE
-{
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
-
-    HelpId  = HID_TAB_WIZ_COPYTABLE;
-    Hide    = TRUE;
-
-    FixedText FT_TABLENAME
-    {
-        Pos                 = MAP_APPFONT ( 12 , 11) ;
-        Size                = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Ta~ble name";
-    };
-
-    Edit ET_TABLENAME
-    {
-        HelpId              = HID_TAB_WIZ_TABLENAME_EDIT;
-        Border              = TRUE ;
-        Pos                 = MAP_APPFONT ( 80 , 9) ;
-        Size                = MAP_APPFONT ( WINDOW_SIZE_X - 92 , 12 ) ;
-        TabStop             = TRUE ;
-    };
-
-    FixedLine FL_OPTIONS
-    {
-        Pos                 = MAP_APPFONT ( 6 , 24 ) ;
-        Size                = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
-        Text [ en-US ] = "Options" ;
-    };
-    RadioButton RB_DEFDATA
-    {
-        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA";
-        Pos                 = MAP_APPFONT ( 12 , 35 ) ;
-        Size                = MAP_APPFONT ( 73 , 10 ) ;
-        Text [ en-US ] = "De~finition and data" ;
-    };
-    RadioButton RB_DEF
-    {
-        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF";
-        Pos                 = MAP_APPFONT ( 12, 49 ) ;
-        Size                = MAP_APPFONT ( 73 , 10 ) ;
-        Text [ en-US ] = "Def~inition" ;
-    };
-
-    RadioButton RB_VIEW
-    {
-        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW";
-        Pos                 = MAP_APPFONT ( 12, 63 ) ;
-        Size                = MAP_APPFONT ( 73 , 10 ) ;
-        Text [ en-US ] = "A~s table view";
-    };
-
-    RadioButton RB_APPENDDATA
-    {
-        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA";
-        Pos                 = MAP_APPFONT ( 12, 77 ) ;
-        Size                = MAP_APPFONT ( 73 , 10 ) ;
-        Text [ en-US ] = "Append ~data" ;
-    };
-
-    CheckBox CB_USEHEADERLINE
-    {
-        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_USEHEADERLINE";
-        Pos                 = MAP_APPFONT ( 12, 93 ) ;
-        Size                = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ;
-        Text [ en-US ] = "Use first ~line as column names" ;
-    };
-
-    CheckBox CB_PRIMARY_COLUMN
-    {
-        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN";
-        Pos                 = MAP_APPFONT ( 12, 107 ) ;
-        Size                = MAP_APPFONT ( 90 , 10 ) ;
-        Text [ en-US ] = "Crea~te primary key";
-    };
-    FixedText FT_KEYNAME
-    {
-        Pos                 = MAP_APPFONT ( 21 , 122 ) ;
-        Size                = MAP_APPFONT ( 39 , 8 ) ;
-        Text [ en-US ] = "Name";
-    };
-
-    Edit ET_KEYNAME
-    {
-        HelpID = "dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME";
-        Pos                 = MAP_APPFONT ( 80, 120 ) ;
-        Size                = MAP_APPFONT ( 65 , 12 ) ;
-        TabStop             = TRUE ;
-        Border              = TRUE ;
-    };
-};
-
 String STR_WIZ_TABLE_COPY
 {
     Text [ en-US ] = "Copy table" ;
diff --git a/dbaccess/uiconfig/ui/copytablepage.ui b/dbaccess/uiconfig/ui/copytablepage.ui
new file mode 100644
index 000000000000..65a8c1a70682
--- /dev/null
+++ b/dbaccess/uiconfig/ui/copytablepage.ui
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkGrid" id="CopyTablePage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">6</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <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="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">6</property>
+                <child>
+                  <object class="GtkRadioButton" id="defdata">
+                    <property name="label" translatable="yes">De_finition and data</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="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">def</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="GtkRadioButton" id="def">
+                    <property name="label" translatable="yes">Def_inition</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>
+                    <property name="group">view</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="GtkRadioButton" id="view">
+                    <property name="label" translatable="yes">A_s table view</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>
+                    <property name="group">data</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="GtkRadioButton" id="data">
+                    <property name="label" translatable="yes">Append _data</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>
+                    <property name="group">defdata</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="firstline">
+                    <property name="label" translatable="yes">Use first _line as column names</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">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="primarykey">
+                    <property name="label" translatable="yes">Crea_te primary key</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">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkGrid" id="grid3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="keynamelabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Name</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">keyname</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="keyname">
+                            <property name="visible">True</property>
+                            <property name="can_focus">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>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Options</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </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="GtkGrid" id="grid2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="column_spacing">12</property>
+        <child>
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Ta_ble name</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">name</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="name">
+            <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>
+      </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>
+  </object>
+</interface>