convert DBase index dialog to .ui

Change-Id: I64ab68d22194ec4b6de9cd8c6c588ed7cd8d7f20

8 files changed, 412 insertions, 335 deletions

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index af9c757f1559..3103def364bf 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
     dbaccess/source/ui/dlg/dbadmin2.src \
     dbaccess/source/ui/dlg/dbadminsetup.src \
     dbaccess/source/ui/dlg/dbadmin.src \
-    dbaccess/source/ui/dlg/dbfindex.src \
     dbaccess/source/ui/dlg/directsql.src \
     dbaccess/source/ui/dlg/indexdialog.src \
     dbaccess/source/ui/dlg/paramdialog.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index ce70f561ba2e..9c46d80e2d06 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/advancedsettingsdialog \
     dbaccess/uiconfig/ui/choosedatasourcedialog \
     dbaccess/uiconfig/ui/colwidthdialog \
+    dbaccess/uiconfig/ui/dbaseindexdialog \
     dbaccess/uiconfig/ui/directsqldialog  \
     dbaccess/uiconfig/ui/fielddialog \
     dbaccess/uiconfig/ui/finalpagewizard \
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index fbf0dfba8d96..5a05141c2849 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -23,7 +23,6 @@
 #include <sfx2/app.hxx>
 #include "moduledbu.hxx"
 #include "dbu_dlg.hrc"
-#include "dbfindex.hrc"
 #include <osl/diagnose.h>
 #include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
@@ -41,45 +40,40 @@ using namespace ::svt;
 const OString aGroupIdent("dBase III");
 
 
-ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, OUString aDataSrcName )
-    : ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ),
-    aPB_OK(             this, ModuleRes( PB_OK ) ),
-    aPB_CANCEL(         this, ModuleRes( PB_CANCEL ) ),
-    aPB_HELP(           this, ModuleRes( PB_HELP ) ),
-    m_FT_Tables(        this, ModuleRes( FT_TABLES ) ),
-    aCB_Tables(         this, ModuleRes( CB_TABLES ) ),
-    m_FL_Indexes(       this, ModuleRes( FL_INDEXES ) ),
-    m_FT_TableIndexes(  this, ModuleRes( FT_TABLEINDEXES ) ),
-    aLB_TableIndexes(   this, ModuleRes( LB_TABLEINDEXES ) ),
-    m_FT_AllIndexes(    this, ModuleRes( FT_ALLINDEXES ) ),
-    aLB_FreeIndexes(    this, ModuleRes( LB_FREEINDEXES ) ),
-    aIB_Add(            this, ModuleRes( IB_ADD ) ),
-    aIB_Remove(         this, ModuleRes( IB_REMOVE ) ),
-    aIB_AddAll(         this, ModuleRes( IB_ADDALL ) ),
-    aIB_RemoveAll(      this, ModuleRes( IB_REMOVEALL ) ),
-    m_aDSN(aDataSrcName),
-    m_bCaseSensitiv(sal_True)
+ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, OUString aDataSrcName)
+    : ModalDialog(pParent, "DBaseIndexDialog", "dbaccess/ui/dbaseindexdialog.ui")
+    , m_aDSN(aDataSrcName)
+    , m_bCaseSensitiv(true)
 {
-
-    aCB_Tables.SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl) );
-    aIB_Add.SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) );
-    aIB_Remove.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveClickHdl) );
-    aIB_AddAll.SetClickHdl( LINK(this, ODbaseIndexDialog, AddAllClickHdl) );
-    aIB_RemoveAll.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveAllClickHdl) );
-    aPB_OK.SetClickHdl( LINK(this, ODbaseIndexDialog, OKClickHdl) );
-
-    aLB_FreeIndexes.SetSelectHdl( LINK(this, ODbaseIndexDialog, OnListEntrySelected) );
-    aLB_TableIndexes.SetSelectHdl( LINK(this, ODbaseIndexDialog, OnListEntrySelected) );
-
-    aCB_Tables.SetDropDownLineCount(8);
+    get(m_pPB_OK, "ok");
+    get(m_pCB_Tables, "table");
+    get(m_pIndexes, "frame");
+    get(m_pLB_TableIndexes, "tableindex");
+    get(m_pLB_FreeIndexes, "freeindex");
+    Size aSize(LogicToPixel(Size(76, 98), MAP_APPFONT));
+    m_pLB_TableIndexes->set_height_request(aSize.Height());
+    m_pLB_TableIndexes->set_width_request(aSize.Width());
+    m_pLB_FreeIndexes->set_height_request(aSize.Height());
+    m_pLB_FreeIndexes->set_width_request(aSize.Width());
+    get(m_pAdd, "add");
+    get(m_pAddAll, "addall");
+    get(m_pRemove, "remove");
+    get(m_pRemoveAll, "removeall");
+
+
+    m_pCB_Tables->SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl) );
+    m_pAdd->SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) );
+    m_pRemove->SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveClickHdl) );
+    m_pAddAll->SetClickHdl( LINK(this, ODbaseIndexDialog, AddAllClickHdl) );
+    m_pRemoveAll->SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveAllClickHdl) );
+    m_pPB_OK->SetClickHdl( LINK(this, ODbaseIndexDialog, OKClickHdl) );
+
+    m_pLB_FreeIndexes->SetSelectHdl( LINK(this, ODbaseIndexDialog, OnListEntrySelected) );
+    m_pLB_TableIndexes->SetSelectHdl( LINK(this, ODbaseIndexDialog, OnListEntrySelected) );
+
+    m_pCB_Tables->SetDropDownLineCount(8);
     Init();
     SetCtrls();
-    FreeResource();
-}
-
-ODbaseIndexDialog::~ODbaseIndexDialog()
-{
-
 }
 
 sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iterator& _rPosition)
@@ -105,11 +99,11 @@ sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iter
 
 void ODbaseIndexDialog::checkButtons()
 {
-    aIB_Add.Enable(0 != aLB_FreeIndexes.GetSelectEntryCount());
-    aIB_AddAll.Enable(0 != aLB_FreeIndexes.GetEntryCount());
+    m_pAdd->Enable(0 != m_pLB_FreeIndexes->GetSelectEntryCount());
+    m_pAddAll->Enable(0 != m_pLB_FreeIndexes->GetEntryCount());
 
-    aIB_Remove.Enable(0 != aLB_TableIndexes.GetSelectEntryCount());
-    aIB_RemoveAll.Enable(0 != aLB_TableIndexes.GetEntryCount());
+    m_pRemove->Enable(0 != m_pLB_TableIndexes->GetSelectEntryCount());
+    m_pRemoveAll->Enable(0 != m_pLB_TableIndexes->GetEntryCount());
 }
 
 OTableIndex ODbaseIndexDialog::implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist)
@@ -162,7 +156,7 @@ OTableIndex ODbaseIndexDialog::RemoveTableIndex( const OUString& _rTableName, co
     if (!GetTable(_rTableName, aTablePos))
         return aReturn;
 
-    return implRemoveIndex(_rIndexName, aTablePos->aIndexList, aLB_TableIndexes, _bMustExist);
+    return implRemoveIndex(_rIndexName, aTablePos->aIndexList, *m_pLB_TableIndexes, _bMustExist);
 }
 
 void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTableIndex& _rIndex)
@@ -171,7 +165,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa
     if (!GetTable(_rTableName, aTablePos))
         return;
 
-    implInsertIndex(_rIndex, aTablePos->aIndexList, aLB_TableIndexes);
+    implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes);
 }
 
 IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
@@ -190,8 +184,8 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
 
 IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
 {
-    OUString aSelection = aLB_FreeIndexes.GetSelectEntry();
-    OUString aTableName = aCB_Tables.GetText();
+    OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry();
+    OUString aTableName = m_pCB_Tables->GetText();
     OTableIndex aIndex = RemoveFreeIndex( aSelection, sal_True );
     InsertTableIndex( aTableName, aIndex );
 
@@ -201,8 +195,8 @@ IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
 
 IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
 {
-    OUString aSelection = aLB_TableIndexes.GetSelectEntry();
-    OUString aTableName = aCB_Tables.GetText();
+    OUString aSelection = m_pLB_TableIndexes->GetSelectEntry();
+    OUString aTableName = m_pCB_Tables->GetText();
     OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection, sal_True );
     InsertFreeIndex( aIndex );
 
@@ -212,11 +206,11 @@ IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
 
 IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
 {
-    sal_uInt16 nCnt = aLB_FreeIndexes.GetEntryCount();
-    OUString aTableName = aCB_Tables.GetText();
+    sal_uInt16 nCnt = m_pLB_FreeIndexes->GetEntryCount();
+    OUString aTableName = m_pCB_Tables->GetText();
 
     for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos )
-        InsertTableIndex( aTableName, RemoveFreeIndex( aLB_FreeIndexes.GetEntry(0), sal_True ) );
+        InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), sal_True ) );
 
     checkButtons();
     return 0;
@@ -224,11 +218,11 @@ IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
 
 IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ )
 {
-    sal_uInt16 nCnt = aLB_TableIndexes.GetEntryCount();
-    OUString aTableName = aCB_Tables.GetText();
+    sal_uInt16 nCnt = m_pLB_TableIndexes->GetEntryCount();
+    OUString aTableName = m_pCB_Tables->GetText();
 
     for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos )
-        InsertFreeIndex( RemoveTableIndex( aTableName, aLB_TableIndexes.GetEntry(0), sal_True ) );
+        InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), sal_True ) );
 
     checkButtons();
     return 0;
@@ -248,15 +242,15 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
         return 0L;
 
     // fill the listbox for the indexes
-    aLB_TableIndexes.Clear();
+    m_pLB_TableIndexes->Clear();
     for (   TableIndexList::const_iterator aLoop = aTablePos->aIndexList.begin();
             aLoop != aTablePos->aIndexList.end();
             ++aLoop
         )
-        aLB_TableIndexes.InsertEntry( aLoop->GetIndexFileName() );
+        m_pLB_TableIndexes->InsertEntry( aLoop->GetIndexFileName() );
 
     if ( aTablePos->aIndexList.size() )
-        aLB_TableIndexes.SelectEntryPos(0);
+        m_pLB_TableIndexes->SelectEntryPos(0);
 
     checkButtons();
     return 0;
@@ -264,16 +258,8 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
 
 void ODbaseIndexDialog::Init()
 {
-    aPB_OK.Disable();
-    m_FL_Indexes.Disable();
-    m_FT_TableIndexes.Disable();
-    aLB_TableIndexes.Disable();
-    m_FT_AllIndexes.Disable();
-    aLB_FreeIndexes.Disable();
-    aIB_Add.Disable();
-    aIB_Remove.Disable();
-    aIB_AddAll.Disable();
-    aIB_RemoveAll.Disable();
+    m_pPB_OK->Disable();
+    m_pIndexes->Disable();
 
     // All indices are first added to a list of free indices.
     // Afterwards, check the index of each table in the Inf-file.
@@ -371,12 +357,8 @@ void ODbaseIndexDialog::Init()
 
     if (m_aTableInfoList.size())
     {
-        aPB_OK.Enable();
-        m_FL_Indexes.Enable();
-        m_FT_TableIndexes.Enable();
-        aLB_TableIndexes.Enable();
-        m_FT_AllIndexes.Enable();
-        aLB_FreeIndexes.Enable();
+        m_pPB_OK->Enable();
+        m_pIndexes->Enable();
     }
 
     checkButtons();
@@ -389,23 +371,23 @@ void ODbaseIndexDialog::SetCtrls()
             aLoop != m_aTableInfoList.end();
             ++aLoop
         )
-        aCB_Tables.InsertEntry( aLoop->aTableName );
+        m_pCB_Tables->InsertEntry( aLoop->aTableName );
 
     // put the first dataset into Edit
     if( m_aTableInfoList.size() )
     {
         const OTableInfo& rTabInfo = m_aTableInfoList.front();
-        aCB_Tables.SetText( rTabInfo.aTableName );
+        m_pCB_Tables->SetText( rTabInfo.aTableName );
 
         // build ListBox of the table indices
         for (   TableIndexList::const_iterator aIndex = rTabInfo.aIndexList.begin();
                 aIndex != rTabInfo.aIndexList.end();
                 ++aIndex
             )
-            aLB_TableIndexes.InsertEntry( aIndex->GetIndexFileName() );
+            m_pLB_TableIndexes->InsertEntry( aIndex->GetIndexFileName() );
 
         if( rTabInfo.aIndexList.size() )
-            aLB_TableIndexes.SelectEntryPos( 0 );
+            m_pLB_TableIndexes->SelectEntryPos( 0 );
     }
 
     // ListBox of the free indices
@@ -413,12 +395,12 @@ void ODbaseIndexDialog::SetCtrls()
             aFree != m_aFreeIndexList.end();
             ++aFree
         )
-        aLB_FreeIndexes.InsertEntry( aFree->GetIndexFileName() );
+        m_pLB_FreeIndexes->InsertEntry( aFree->GetIndexFileName() );
 
     if( m_aFreeIndexList.size() )
-        aLB_FreeIndexes.SelectEntryPos( 0 );
+        m_pLB_FreeIndexes->SelectEntryPos( 0 );
 
-    TableSelectHdl(&aCB_Tables);
+    TableSelectHdl(m_pCB_Tables);
     checkButtons();
 }
 
diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc
deleted file mode 100644
index a07a4b1ee97c..000000000000
--- a/dbaccess/source/ui/dlg/dbfindex.hrc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _DBAUI_DBF_INDEXES_HRC_
-#define _DBAUI_DBF_INDEXES_HRC_
-
-#define CB_TABLES           1
-
-#define FT_TABLES           1
-#define FT_TABLEINDEXES     2
-#define FT_ALLINDEXES       3
-
-#define FL_INDEXES                      1
-
-#define LB_TABLEINDEXES     1
-#define LB_FREEINDEXES      2
-
-#define PB_OK               1
-#define PB_CANCEL           1
-#define PB_HELP             1
-
-#define IB_ADD                          1
-#define IB_REMOVE                       2
-#define IB_ADDALL                       3
-#define IB_REMOVEALL            4
-
-
-#endif //_DBAUI_DBF_INDEXES_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 6b4e0456ca1b..d3bb626d5a7a 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -23,6 +23,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 #include <list>
@@ -72,25 +73,16 @@ typedef ::std::list< OTableInfo >   TableInfoList;
 class ODbaseIndexDialog : public ModalDialog
 {
 protected:
-    OKButton        aPB_OK;
-    CancelButton    aPB_CANCEL;
-    HelpButton      aPB_HELP;
+    OKButton*       m_pPB_OK;
+    ComboBox*       m_pCB_Tables;
+    VclContainer*   m_pIndexes;
+    ListBox*        m_pLB_TableIndexes;
+    ListBox*        m_pLB_FreeIndexes;
 
-    FixedText       m_FT_Tables;
-    ComboBox        aCB_Tables;
-
-    FixedLine       m_FL_Indexes;
-
-    FixedText       m_FT_TableIndexes;
-    ListBox         aLB_TableIndexes;
-
-    FixedText       m_FT_AllIndexes;
-    ListBox         aLB_FreeIndexes;
-
-    ImageButton      aIB_Add;
-    ImageButton      aIB_Remove;
-    ImageButton      aIB_AddAll;
-    ImageButton      aIB_RemoveAll;
+    PushButton*     m_pAdd;
+    PushButton*     m_pRemove;
+    PushButton*     m_pAddAll;
+    PushButton*     m_pRemoveAll;
 
     DECL_LINK( TableSelectHdl, ComboBox* );
     DECL_LINK( AddClickHdl, PushButton* );
@@ -112,8 +104,8 @@ protected:
     OTableIndex implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist);
     void        implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay);
 
-    OTableIndex RemoveFreeIndex( const OUString& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); }
-    void        InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); }
+    OTableIndex RemoveFreeIndex( const OUString& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, *m_pLB_FreeIndexes, _bMustExist); }
+    void        InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, *m_pLB_FreeIndexes); }
     OTableIndex RemoveTableIndex( const OUString& _rTableName, const OUString& _rIndexName, sal_Bool _bMustExist );
     void        InsertTableIndex( const OUString& _rTableName, const OTableIndex& _rIndex );
 
@@ -121,7 +113,6 @@ protected:
 
 public:
     ODbaseIndexDialog( Window * pParent, OUString aDataSrcName );
-    virtual ~ODbaseIndexDialog();
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
deleted file mode 100644
index 533f95eea81b..000000000000
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dbfindex.hrc"
-#include "dbu_dlg.hrc"
-
-#define WIN_X   264
-#define WIN_Y   149
-
-ModalDialog DLG_DBASE_INDEXES
-{
-    HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
-    Text [ en-US ] = "Indexes" ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 208 , 5 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 208 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( 208 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_TABLES
-    {
-        Pos = MAP_APPFONT ( 8 , 7 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "~Table";
-    };
-    ComboBox CB_TABLES
-    {
-        HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES";
-        Border = TRUE ;
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 62 , 5 ) ;
-        Size = MAP_APPFONT ( 134 , 12 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedLine FL_INDEXES
-    {
-        Pos = MAP_APPFONT ( 6 , 22 ) ;
-        Size = MAP_APPFONT ( 196 , 8 ) ;
-        Text [ en-US ] = "Assignment" ;
-    };
-    FixedText FT_TABLEINDEXES
-    {
-        Pos = MAP_APPFONT ( 12 , 33 ) ;
-        Size = MAP_APPFONT ( 83 , 8 ) ;
-        Text [ en-US ] = "T~able indexes";
-    };
-    ListBox LB_TABLEINDEXES
-    {
-        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES";
-        Border = TRUE ;
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 76 , 98 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_ALLINDEXES
-    {
-        Pos = MAP_APPFONT ( 120 , 33 ) ;
-        Size = MAP_APPFONT ( 73 , 8 ) ;
-        Text [ en-US ] = "~Free indexes";
-    };
-    ListBox LB_FREEINDEXES
-    {
-        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES";
-        Border = TRUE ;
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 120 , 44 ) ;
-        Size = MAP_APPFONT ( 76 , 98 ) ;
-        TabStop = TRUE ;
-    };
-    ImageButton IB_ADD
-    {
-        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD";
-        Pos = MAP_APPFONT ( 94 , 60 ) ;
-        Size = MAP_APPFONT ( 20 , 14 ) ;
-        TabStop             = TRUE ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "one_left.png" ;
-            };
-            MaskColor = Color
-            {
-                Red = 0xFFFF ;
-                Green = 0x0000 ;
-                Blue = 0xFFFF ;
-            };
-        };
-    };
-    ImageButton IB_ADDALL
-    {
-        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL";
-        Pos = MAP_APPFONT ( 94 , 77 ) ;
-        Size = MAP_APPFONT ( 20 , 14 ) ;
-        TabStop             = TRUE ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "all_left.png" ;
-            };
-            MaskColor = Color
-            {
-                Red = 0xFFFF ;
-                Green = 0x0000 ;
-                Blue = 0xFFFF ;
-            };
-        };
-    };
-    ImageButton IB_REMOVE
-    {
-        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE";
-        Pos = MAP_APPFONT ( 94 , 98 ) ;
-        Size = MAP_APPFONT ( 20 , 14 ) ;
-        TabStop             = TRUE ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "one_right.png" ;
-            };
-            MaskColor = Color
-            {
-                Red = 0xFFFF ;
-                Green = 0x0000 ;
-                Blue = 0xFFFF ;
-            };
-        };
-    };
-    ImageButton IB_REMOVEALL
-    {
-        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL";
-        Pos = MAP_APPFONT ( 94, 114 ) ;
-        Size = MAP_APPFONT ( 20 , 14 ) ;
-        TabStop             = TRUE ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "all_right.png" ;
-            };
-            MaskColor = Color
-            {
-                Red = 0xFFFF ;
-                Green = 0x0000 ;
-                Blue = 0xFFFF ;
-            };
-        };
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index e766ed7d0809..e9be206cafb5 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -76,7 +76,6 @@
 //========================================================================
 // dialog ids
 
-#define DLG_DBASE_INDEXES               RID_DIALOG_START +  1
 #define DLG_SQLEXCEPTIONCHAIN           RID_DIALOG_START +  3
 #define DLG_PARAMETERS                  RID_DIALOG_START +  5
 
diff --git a/dbaccess/uiconfig/ui/dbaseindexdialog.ui b/dbaccess/uiconfig/ui/dbaseindexdialog.ui
new file mode 100644
index 000000000000..3f8ea8394e5b
--- /dev/null
+++ b/dbaccess/uiconfig/ui/dbaseindexdialog.ui
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">dbaccess/res/one_left.png</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">dbaccess/res/all_left.png</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">dbaccess/res/one_right.png</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">dbaccess/res/all_right.png</property>
+  </object>
+  <object class="GtkDialog" id="DBaseIndexDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Indexes</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">12</property>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Table</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">table</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="GtkComboBoxText" id="table">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="comboboxtext-entry">
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                  </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>
+            <child>
+              <object class="GtkFrame" id="frame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</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="top_padding">6</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="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">T_able indexes</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">tableindex:border</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="label4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Free indexes</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">freeindex:border</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkTreeView" id="tableindex:border">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection1"/>
+                            </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="GtkTreeView" id="freeindex:border">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection3"/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButtonBox" id="buttonbox1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <property name="layout_style">start</property>
+                            <child>
+                              <object class="GtkButton" id="add">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="image">image1</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="addall">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="image">image2</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="remove">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="image">image3</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="removeall">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="image">image4</property>
+                                <property name="yalign">0.49000000953674316</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </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>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Assignment</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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>