diff options
| -rw-r--r-- | dbaccess/UIConfig_dbaccess.mk | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 263 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.hrc | 42 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.src | 131 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 17 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/indexdialog.hxx | 21 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/indexfieldscontrol.hxx | 4 | ||||
| -rwxr-xr-x | dbaccess/uiconfig/ui/indexdesigndialog.ui | 316 | ||||
| -rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 7 |
9 files changed, 457 insertions, 345 deletions
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk index 4244e5547ce9..89191274787f 100644 --- a/dbaccess/UIConfig_dbaccess.mk +++ b/dbaccess/UIConfig_dbaccess.mk @@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ dbaccess/uiconfig/ui/generalpagedialog \ dbaccess/uiconfig/ui/generalpagewizard \ dbaccess/uiconfig/ui/generatedvaluespage \ + dbaccess/uiconfig/ui/indexdesigndialog \ dbaccess/uiconfig/ui/joindialog \ dbaccess/uiconfig/ui/password \ dbaccess/uiconfig/ui/queryfilterdialog \ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 6857e2be5409..3c5cfacc08d2 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -24,7 +24,6 @@ #include "indexdialog.hxx" #include "dbu_dlg.hrc" #include "dbaccess_helpid.hrc" -#include "indexdialog.hrc" #include "indexfieldscontrol.hxx" #include "indexcollection.hxx" #include <vcl/msgbox.hxx> @@ -36,6 +35,13 @@ #include "browserids.hxx" #include <connectivity/dbtools.hxx> #include <osl/diagnose.h> + +const char INDEX_NEW_CMD[] = ".index:createNew"; +const char INDEX_DROP_CMD[] = ".index:dropCurrent"; +const char INDEX_RENAME_CMD[] = ".index:renameCurrent"; +const char INDEX_SAVE_CMD[] = ".index:saveCurrent"; +const char INDEX_RESET_CMD[] = ".index:resetCurrent"; + namespace dbaui { @@ -81,8 +87,8 @@ namespace dbaui } // DbaIndexList - DbaIndexList::DbaIndexList(Window* _pParent, const ResId& _rId) - :SvTreeListBox(_pParent, _rId) + DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits) + :SvTreeListBox(_pParent, nWinBits) ,m_bSuspendSelectHdl(false) { } @@ -152,43 +158,46 @@ namespace dbaui return bReturn; } + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window *pParent, VclBuilder::stringmap &) + { + return new DbaIndexList (pParent, WB_BORDER); + } + // DbaIndexDialog DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) - :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) + :ModalDialog( _pParent, "IndexDesignDialog", "dbaccess/ui/indexdesigndialog.ui") ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) - ,m_aActions (this, ModuleRes(TLB_ACTIONS)) - ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) - ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) - ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aUnique (this, ModuleRes(CB_UNIQUE)) - ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) - ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) - ,m_aClose (this, ModuleRes(PB_CLOSE)) - ,m_aHelp (this, ModuleRes(HB_HELP)) ,m_pIndexes(NULL) ,m_pPreviousSelection(NULL) ,m_bEditAgain(false) ,m_xContext(_rxContext) { + get(m_pActions, "ACTIONS"); + get(m_pIndexList, "INDEX_LIST"); + get(m_pIndexDetails, "INDEX_DETAILS"); + get(m_pDescriptionLabel, "DESC_LABEL"); + get(m_pDescription, "DESCRIPTION"); + get(m_pUnique, "UNIQUE"); + get(m_pFieldsLabel, "FIELDS_LABEL"); + get(m_pFields, "FIELDS"); + get(m_pClose, "CLOSE"); - FreeResource(); - - m_aActions.SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction)); + m_pActions->SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction)); - m_aIndexes.SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexSelected)); - m_aIndexes.SetEndEditHdl(LINK(this, DbaIndexDialog, OnEntryEdited)); - m_aIndexes.SetSelectionMode(SINGLE_SELECTION); - m_aIndexes.SetHighlightRange(); - m_aIndexes.setConnection(m_xConnection); + m_pIndexList->SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexSelected)); + m_pIndexList->SetEndEditHdl(LINK(this, DbaIndexDialog, OnEntryEdited)); + m_pIndexList->SetSelectionMode(SINGLE_SELECTION); + m_pIndexList->SetHighlightRange(); + m_pIndexList->setConnection(m_xConnection); - m_pFields->Init(_rFieldNames); + m_pFields->SetSizePixel(Size(300, 100)); + m_pFields->Init(_rFieldNames, _nMaxColumnsInIndex, ::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" )); - setToolBox(&m_aActions); + setToolBox(m_pActions); m_pIndexes = new OIndexCollection(); try @@ -206,10 +215,10 @@ namespace dbaui fillIndexList(); - m_aUnique.SetClickHdl(LINK(this, DbaIndexDialog, OnModified)); + m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModified)); m_pFields->SetModifyHdl(LINK(this, DbaIndexDialog, OnModified)); - m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); + m_pClose->SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); // if all of the indexes have an empty description, we're not interested in displaying it Indexes::const_iterator aCheck; @@ -225,82 +234,61 @@ namespace dbaui if (aCheck == m_pIndexes->end()) { - sal_Int32 nMoveUp = m_aUnique.GetPosPixel().Y() - m_aDescriptionLabel.GetPosPixel().Y(); - // hide the controls which are necessary for the description - m_aDescription.Hide(); - m_aDescriptionLabel.Hide(); - - // move other controls up - Point aPos = m_aUnique.GetPosPixel(); - aPos.Y() -= nMoveUp; - m_aUnique.SetPosPixel(aPos); - - aPos = m_aFieldsLabel.GetPosPixel(); - aPos.Y() -= nMoveUp; - m_aFieldsLabel.SetPosPixel(aPos); - - aPos = m_pFields->GetPosPixel(); - aPos.Y() -= nMoveUp; - m_pFields->SetPosPixel(aPos); - - // and enlarge the fields list - Size aSize = m_pFields->GetSizePixel(); - aSize.Height() += nMoveUp; - m_pFields->SetSizePixel(aSize); + m_pDescription->Hide(); + m_pDescriptionLabel->Hide(); } } void DbaIndexDialog::updateToolbox() { - m_aActions.EnableItem(ID_INDEX_NEW, !m_aIndexes.IsEditingActive()); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_NEW_CMD), !m_pIndexList->IsEditingActive()); - SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); bool bSelectedAnything = NULL != pSelected; if (pSelected) { // is the current entry modified? Indexes::const_iterator aSelectedPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); - m_aActions.EnableItem(ID_INDEX_SAVE, aSelectedPos->isModified() || aSelectedPos->isNew()); - m_aActions.EnableItem(ID_INDEX_RESET, aSelectedPos->isModified() || aSelectedPos->isNew()); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD), aSelectedPos->isModified() || aSelectedPos->isNew()); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD), aSelectedPos->isModified() || aSelectedPos->isNew()); bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey; } else { - m_aActions.EnableItem(ID_INDEX_SAVE, false); - m_aActions.EnableItem(ID_INDEX_RESET, false); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD), false); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD), false); } - m_aActions.EnableItem(ID_INDEX_DROP, bSelectedAnything); - m_aActions.EnableItem(ID_INDEX_RENAME, bSelectedAnything); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_DROP_CMD), bSelectedAnything); + m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RENAME_CMD), bSelectedAnything); } void DbaIndexDialog::fillIndexList() { Image aPKeyIcon(ModuleRes( IMG_PKEYICON )); // fill the list with the index names - m_aIndexes.Clear(); + m_pIndexList->Clear(); Indexes::iterator aIndexLoop = m_pIndexes->begin(); Indexes::iterator aEnd = m_pIndexes->end(); for (; aIndexLoop != aEnd; ++aIndexLoop) { SvTreeListEntry* pNewEntry = NULL; if (aIndexLoop->bPrimaryKey) - pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon); + pNewEntry = m_pIndexList->InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon); else - pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName); + pNewEntry = m_pIndexList->InsertEntry(aIndexLoop->sName); pNewEntry->SetUserData(reinterpret_cast< void* >(sal_Int32(aIndexLoop - m_pIndexes->begin()))); } - OnIndexSelected(&m_aIndexes); + OnIndexSelected(m_pIndexList); } DbaIndexDialog::~DbaIndexDialog( ) { setToolBox(NULL); delete m_pIndexes; - delete m_pFields; } @@ -333,7 +321,7 @@ namespace dbaui showError(aExceptionInfo, this, m_xContext); else { - m_aUnique.SaveValue(); + m_pUnique->SaveValue(); m_pFields->SaveValue(); } @@ -365,29 +353,29 @@ namespace dbaui return; } - SvTreeListEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName); + SvTreeListEntry* pNewEntry = m_pIndexList->InsertEntry(sNewIndexName); m_pIndexes->insert(sNewIndexName); // update the user data on the entries in the list box: // they're iterators of the index collection, and thus they have changed when removing the index - for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) + for (SvTreeListEntry* pAdjust = m_pIndexList->First(); pAdjust; pAdjust = m_pIndexList->Next(pAdjust)) { - Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust)); + Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_pIndexList->GetEntryText(pAdjust)); OSL_ENSURE(aAfterInsertPos != m_pIndexes->end(), "DbaIndexDialog::OnNewIndex: problems with on of the entries!"); pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterInsertPos - m_pIndexes->begin()))); } // select the entry and start in-place editing - m_aIndexes.SelectNoHandlerCall(pNewEntry); - OnIndexSelected(&m_aIndexes); - m_aIndexes.EditEntry(pNewEntry); + m_pIndexList->SelectNoHandlerCall(pNewEntry); + OnIndexSelected(m_pIndexList); + m_pIndexList->EditEntry(pNewEntry); updateToolbox(); } void DbaIndexDialog::OnDropIndex(bool _bConfirm) { // the selected index - SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnDropIndex: invalid call!"); if (pSelected) { @@ -395,7 +383,7 @@ namespace dbaui if (_bConfirm) { OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX)); - sConfirm = sConfirm.replaceFirst("$name$", m_aIndexes.GetEntryText(pSelected)); + sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected)); QueryBox aConfirm(this, WB_YES_NO, sConfirm); if (RET_YES != aConfirm.Execute()) return; @@ -432,17 +420,17 @@ namespace dbaui showError(aExceptionInfo, this, m_xContext); else if (bSuccess && _bRemoveFromCollection) { - SvTreeList* pModel = m_aIndexes.GetModel(); + SvTreeList* pModel = m_pIndexList->GetModel(); - m_aIndexes.disableSelectHandler(); + m_pIndexList->disableSelectHandler(); pModel->Remove(_pEntry); - m_aIndexes.enableSelectHandler(); + m_pIndexList->enableSelectHandler(); // update the user data on the entries in the list box: // they're iterators of the index collection, and thus they have changed when removing the index - for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust)) + for (SvTreeListEntry* pAdjust = m_pIndexList->First(); pAdjust; pAdjust = m_pIndexList->Next(pAdjust)) { - Indexes::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust)); + Indexes::iterator aAfterDropPos = m_pIndexes->find(m_pIndexList->GetEntryText(pAdjust)); OSL_ENSURE(aAfterDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: problems with on of the remaining entries!"); pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterDropPos - m_pIndexes->begin()))); } @@ -453,7 +441,7 @@ namespace dbaui // the Remove automatically selected another entry (if possible), but we disabled the calling of the handler // to prevent that we missed something ... call the handler directly - OnIndexSelected(&m_aIndexes); + OnIndexSelected(m_pIndexList); } return !aExceptionInfo.isValid(); @@ -462,7 +450,7 @@ namespace dbaui void DbaIndexDialog::OnRenameIndex() { // the selected index - SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnRenameIndex: invalid call!"); // save the changes made 'til here @@ -470,7 +458,7 @@ namespace dbaui // settings from the current entry implSaveModified(false); - m_aIndexes.EditEntry(pSelected); + m_pIndexList->EditEntry(pSelected); updateToolbox(); } @@ -478,7 +466,7 @@ namespace dbaui { // the selected index #if OSL_DEBUG_LEVEL > 0 - SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); OSL_ENSURE( pSelected, "DbaIndexDialog::OnSaveIndex: invalid call!" ); #endif @@ -489,7 +477,7 @@ namespace dbaui void DbaIndexDialog::OnResetIndex() { // the selected index - SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); OSL_ENSURE(pSelected, "DbaIndexDialog::OnResetIndex: invalid call!"); Indexes::iterator aResetPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); @@ -512,7 +500,7 @@ namespace dbaui if (aExceptionInfo.isValid()) showError(aExceptionInfo, this, m_xContext); else - m_aIndexes.SetEntryText(pSelected, aResetPos->sName); + m_pIndexList->SetEntryText(pSelected, aResetPos->sName); updateControls(pSelected); updateToolbox(); @@ -520,43 +508,37 @@ namespace dbaui IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { - sal_uInt16 nClicked = m_aActions.GetCurItemId(); - switch (nClicked) - { - case ID_INDEX_NEW: - OnNewIndex(); - break; - case ID_INDEX_DROP: - OnDropIndex(); - break; - case ID_INDEX_RENAME: - OnRenameIndex(); - break; - case ID_INDEX_SAVE: - OnSaveIndex(); - break; - case ID_INDEX_RESET: - OnResetIndex(); - break; - } + const OUString sClicked(m_pActions->GetItemCommand(m_pActions->GetCurItemId())); + + if(sClicked == INDEX_NEW_CMD) + OnNewIndex(); + else if(sClicked == INDEX_DROP_CMD) + OnDropIndex(); + else if(sClicked == INDEX_RENAME_CMD) + OnRenameIndex(); + else if(sClicked == INDEX_SAVE_CMD) + OnSaveIndex(); + else if(sClicked == INDEX_RESET_CMD) + OnResetIndex(); + return 0L; } IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) { - if (m_aIndexes.IsEditingActive()) + if (m_pIndexList->IsEditingActive()) { OSL_ENSURE(!m_bEditAgain, "DbaIndexDialog::OnCloseDialog: somebody was faster than hell!"); // this means somebody entered a new name, which was invalid, which cause us to posted us an event, // and before the event arrived the user clicked onto "close". VERY fast, this user .... - m_aIndexes.EndEditing(false); + m_pIndexList->EndEditing(false); if (m_bEditAgain) // could not commit the new name (started a new - asynchronous - edit trial) return 1L; } // the currently selected entry - const SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); + const SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); OSL_ENSURE(pSelected == m_pPreviousSelection, "DbaIndexDialog::OnCloseDialog: inconsistence!"); sal_Int32 nResponse = RET_NO; @@ -592,7 +574,7 @@ namespace dbaui IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) { m_bEditAgain = false; - m_aIndexes.EditEntry(_pEntry); + m_pIndexList->EditEntry(_pEntry); return 0L; } @@ -603,7 +585,7 @@ namespace dbaui OSL_ENSURE(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(), "DbaIndexDialog::OnEntryEdited: invalid entry!"); - OUString sNewName = m_aIndexes.GetEntryText(_pEntry); + OUString sNewName = m_pIndexList->GetEntryText(_pEntry); Indexes::const_iterator aSameName = m_pIndexes->find(sNewName); if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName)) @@ -649,8 +631,8 @@ namespace dbaui Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); // the unique flag - aPreviouslySelected->bUnique = m_aUnique.IsChecked(); - if (m_aUnique.GetSavedValue() != m_aUnique.GetState()) + aPreviouslySelected->bUnique = m_pUnique->IsChecked(); + if (m_pUnique->GetSavedValue() != m_pUnique->GetState()) aPreviouslySelected->setModified(true); // the fields @@ -736,57 +718,57 @@ namespace dbaui Indexes::const_iterator aSelectedIndex = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); // fill the controls - m_aUnique.Check(aSelectedIndex->bUnique); - m_aUnique.Enable(!aSelectedIndex->bPrimaryKey); - m_aUnique.SaveValue(); + m_pUnique->Check(aSelectedIndex->bUnique); + m_pUnique->Enable(!aSelectedIndex->bPrimaryKey); + m_pUnique->SaveValue(); m_pFields->initializeFrom(aSelectedIndex->aFields); m_pFields->Enable(!aSelectedIndex->bPrimaryKey); m_pFields->SaveValue(); - m_aDescription.SetText(aSelectedIndex->sDescription); - m_aDescription.Enable(!aSelectedIndex->bPrimaryKey); + m_pDescription->SetText(aSelectedIndex->sDescription); + m_pDescription->Enable(!aSelectedIndex->bPrimaryKey); - m_aDescriptionLabel.Enable(!aSelectedIndex->bPrimaryKey); + m_pDescriptionLabel->Enable(!aSelectedIndex->bPrimaryKey); } else { - m_aUnique.Check(false); + m_pUnique->Check(false); m_pFields->initializeFrom(IndexFields()); - m_aDescription.SetText(OUString()); + m_pDescription->SetText(OUString()); } } IMPL_LINK( DbaIndexDialog, OnIndexSelected, DbaIndexList*, /*NOTINTERESTEDIN*/ ) { - m_aIndexes.EndSelection(); + m_pIndexList->EndSelection(); - if (m_aIndexes.IsEditingActive()) - m_aIndexes.EndEditing(false); + if (m_pIndexList->IsEditingActive()) + m_pIndexList->EndEditing(false); // commit the old data - if (m_aIndexes.FirstSelected() != m_pPreviousSelection) + if (m_pIndexList->FirstSelected() != m_pPreviousSelection) { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) if (!implCommitPreviouslySelected()) { - m_aIndexes.SelectNoHandlerCall(m_pPreviousSelection); + m_pIndexList->SelectNoHandlerCall(m_pPreviousSelection); return 1L; } } - bool bHaveSelection = (NULL != m_aIndexes.FirstSelected()); + bool bHaveSelection = (NULL != m_pIndexList->FirstSelected()); // disable/enable the detail controls - m_aIndexDetails.Enable(bHaveSelection); - m_aUnique.Enable(bHaveSelection); - m_aDescriptionLabel.Enable(bHaveSelection); - m_aFieldsLabel.Enable(bHaveSelection); + m_pIndexDetails->Enable(bHaveSelection); + m_pUnique->Enable(bHaveSelection); + m_pDescriptionLabel->Enable(bHaveSelection); + m_pFieldsLabel->Enable(bHaveSelection); m_pFields->Enable(bHaveSelection); - SvTreeListEntry* pNewSelection = m_aIndexes.FirstSelected(); + SvTreeListEntry* pNewSelection = m_pIndexList->FirstSelected(); updateControls(pNewSelection); if (bHaveSelection) - m_aIndexes.GrabFocus(); + m_pIndexList->GrabFocus(); m_pPreviousSelection = pNewSelection; @@ -833,33 +815,6 @@ namespace dbaui } void DbaIndexDialog::resizeControls(const Size& _rDiff) { - // we use large images so we must change them - if ( _rDiff.Width() || _rDiff.Height() ) - { - Size aDlgSize = GetSizePixel(); - // adjust size of dlg - SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(), - aDlgSize.Height() + _rDiff.Height()) - ); - Size aIndexSize = m_aIndexes.GetSizePixel(); - m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() + Point(0,_rDiff.Height()), - Size(aIndexSize.Width() + _rDiff.Width(), - aIndexSize.Height())); - - //now move the rest to the left side - Point aMove(_rDiff.Width(),_rDiff.Height()); - m_aIndexDetails.SetPosPixel(m_aIndexDetails.GetPosPixel() + aMove); - m_aDescriptionLabel.SetPosPixel(m_aDescriptionLabel.GetPosPixel() + aMove); - m_aDescription.SetPosPixel(m_aDescription.GetPosPixel() + aMove); - m_aUnique.SetPosPixel(m_aUnique.GetPosPixel() + aMove); - m_aFieldsLabel.SetPosPixel(m_aFieldsLabel.GetPosPixel() + aMove); - OSL_ENSURE(m_pFields,"NO valid fields!"); - m_pFields->SetPosPixel(m_pFields->GetPosPixel() + aMove); - m_aClose.SetPosPixel(m_aClose.GetPosPixel() + aMove); - m_aHelp.SetPosPixel(m_aHelp.GetPosPixel() + aMove); - - Invalidate(); - } } } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc deleted file mode 100644 index 7e1dcf77499e..000000000000 --- a/dbaccess/source/ui/dlg/indexdialog.hrc +++ /dev/null @@ -1,42 +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_INDEXDIALOG_HRC_ -#define _DBAUI_INDEXDIALOG_HRC_ - -#define CTR_INDEXLIST 1 -#define CTR_FIELDS 2 - -#define FL_INDEXDETAILS 1 - -#define CB_UNIQUE 1 - -#define FT_FIELDS 1 -#define FT_DESC_LABEL 2 -#define FT_DESCRIPTION 3 - -#define TLB_ACTIONS 1 - -#define PB_CLOSE 1 - -#define HB_HELP 1 - -#endif // _DBAUI_INDEXDIALOG_HRC_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index 9e7478a10b8e..4c0d2697010b 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -18,140 +18,9 @@ */ #include "dbu_dlg.hrc" -#include "indexdialog.hrc" #include "browserids.hxx" #include "dbaccess_helpid.hrc" -#define DIALOG_SIZE_X 220 -#define DIALOG_SIZE_Y 140 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 - -#define LIST_WIDTH 70 - -ModalDialog DLG_INDEXDESIGN -{ - HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - Text [ en-US ] = "Indexes" ; - Moveable = TRUE ; - Closeable = TRUE ; - - ToolBox TLB_ACTIONS - { - Pos = MAP_APPFONT ( 6 , 6 ) ; - ButtonType = BUTTON_SYMBOL; - Align = BOXALIGN_TOP; - HelpId = HID_INDEX_DIALOG_ACTION_TB; - Customize = FALSE; - ItemImageList = IMG_INDEX_DLG_SC ; - - ItemList = - { - ToolBoxItem - { - Identifier = ID_INDEX_NEW; - HelpId = HID_DLGIDX_NEWINDEX; - Command = ".index:createNew"; - Text [ en-US ] = "New Index" ; - }; - ToolBoxItem - { - Identifier = ID_INDEX_DROP; - HelpId = HID_DLGIDX_DROPINDEX; - Command = ".index:dropCurrent"; - Text [ en-US ] = "Delete Current Index" ; - }; - ToolBoxItem - { - Identifier = ID_INDEX_RENAME; - HelpId = HID_DLGIDX_RENAMEINDEX; - Command = ".index:renameCurrent"; - Text [ en-US ] = "Rename Current Index" ; - }; - ToolBoxItem - { - Identifier = ID_INDEX_SAVE; - HelpId = HID_DLGIDX_SAVEINDEX; - Command = ".index:saveCurrent"; - Text [ en-US ] = "Save Current Index" ; - }; - ToolBoxItem - { - Identifier = ID_INDEX_RESET; - HelpId = HID_DLGIDX_RESETINDEX; - Command = ".index:resetCurrent"; - Text [ en-US ] = "Reset Current Index" ; - }; - }; - }; - Control CTR_INDEXLIST - { - Pos = MAP_APPFONT ( 6 , 23 ) ; - Size = MAP_APPFONT ( LIST_WIDTH , DIALOG_SIZE_Y - (BUTTON_SIZE_Y + 4) - 29 ) ; - SVLook = TRUE; - Border = TRUE; - - HelpId = HID_DLGIDX_INDEXLIST; - TabStop = TRUE ; - }; - FixedLine FL_INDEXDETAILS - { - Pos = MAP_APPFONT ( LIST_WIDTH + 16 - 3, 9 ) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ; - Text [ en-US ] = "Index details"; - }; - FixedText FT_DESC_LABEL - { - Pos = MAP_APPFONT ( LIST_WIDTH + 16, 23 ) ; - Size = MAP_APPFONT ( 50, 8 ) ; - Text [ en-US ] = "Index identifier:"; - }; - FixedText FT_DESCRIPTION - { - Pos = MAP_APPFONT ( LIST_WIDTH + 69, 23 ) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 75, 8 ) ; - }; - CheckBox CB_UNIQUE - { - HelpID = "dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE"; - Pos = MAP_APPFONT ( LIST_WIDTH + 16, 34 ) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ; - SVLook = TRUE; - Text [ en-US ] = "~Unique"; - }; - FixedText FT_FIELDS - { - Pos = MAP_APPFONT ( LIST_WIDTH + 16, 48 ) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ; - SVLook = TRUE; - Text [ en-US ] = "Fields"; - }; - Control CTR_FIELDS - { - Pos = MAP_APPFONT ( LIST_WIDTH + 16, 59 ) ; - Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, DIALOG_SIZE_Y - (BUTTON_SIZE_Y + 4) - 65 ) ; - SVLook = TRUE; - Border = TRUE; - TabStop = TRUE ; - }; - PushButton PB_CLOSE - { - HelpID = "dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE"; - Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - SVLook = TRUE; - DefButton = TRUE; - Text [ en-US ] = "~Close"; - }; - HelpButton HB_HELP - { - Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ; - Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); - }; -}; String STR_TAB_INDEX_SORTORDER { diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index f241969f605b..776d9a0192d1 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -22,6 +22,7 @@ #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" #include <vcl/settings.hxx> +#include <vcl/builder.hxx> namespace dbaui { @@ -89,19 +90,22 @@ namespace dbaui } // IndexFieldsControl - IndexFieldsControl::IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix) - :EditBrowseBox(_pParent, _rId, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, BROWSER_STANDARD_FLAGS) + IndexFieldsControl::IndexFieldsControl( Window* _pParent, WinBits nWinStyle) + :EditBrowseBox(_pParent, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS) ,m_aSeekRow(m_aFields.end()) ,m_pSortingCell(NULL) ,m_pFieldNameCell(NULL) - ,m_nMaxColumnsInIndex(_nMaxColumnsInIndex) - ,m_bAddIndexAppendix(_bAddIndexAppendix) { SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK ); GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); } + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexFieldsControl(Window *pParent, VclBuilder::stringmap &) + { + return new IndexFieldsControl (pParent, WB_BORDER | WB_NOTABSTOP); + } + IndexFieldsControl::~IndexFieldsControl() { delete m_pSortingCell; @@ -204,8 +208,11 @@ namespace dbaui return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId); } - void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields) + void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix) { + m_nMaxColumnsInIndex = _nMaxColumnsInIndex; + m_bAddIndexAppendix = _bAddIndexAppendix; + RemoveColumns(); // for the width: both columns together should be somewhat smaller than the whole window (without the scrollbar) diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index aef406f76d39..057c6a4d2f97 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -48,7 +48,7 @@ namespace dbaui bool m_bSuspendSelectHdl; public: - DbaIndexList(Window* _pParent, const ResId& _rId); + DbaIndexList(Window* _pParent, WinBits nWinBits); void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; } Link GetSelectHdl() const { return m_aSelectHdl; } @@ -85,16 +85,15 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; SvtViewOptions m_aGeometrySettings; - ToolBox m_aActions; - DbaIndexList m_aIndexes; - FixedLine m_aIndexDetails; - FixedText m_aDescriptionLabel; - FixedText m_aDescription; - CheckBox m_aUnique; - FixedText m_aFieldsLabel; - IndexFieldsControl* m_pFields; - PushButton m_aClose; - HelpButton m_aHelp; + ToolBox *m_pActions; + DbaIndexList *m_pIndexList; + FixedText *m_pIndexDetails; + FixedText *m_pDescriptionLabel; + FixedText *m_pDescription; + CheckBox *m_pUnique; + FixedText *m_pFieldsLabel; + IndexFieldsControl *m_pFields; + PushButton *m_pClose; OIndexCollection* m_pIndexes; SvTreeListEntry* m_pPreviousSelection; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 4212849efc1d..7151d6dc9b38 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -50,10 +50,10 @@ namespace dbaui bool m_bAddIndexAppendix; public: - IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); + IndexFieldsControl( Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); - void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields); + void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui b/dbaccess/uiconfig/ui/indexdesigndialog.ui new file mode 100755 index 000000000000..0c6b91d304ec --- /dev/null +++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui @@ -0,0 +1,316 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="IndexDesignDialog"> + <property name="width_request">500</property> + <property name="height_request">300</property> + <property name="can_focus">False</property> + <property name="border_width">5</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">2</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="CLOSE"> + <property name="label">gtk-cancel</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_action_appearance">False</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="HELP"> + <property name="label">gtk-help</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_action_appearance">False</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> + </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="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkToolbar" id="ACTIONS"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkToolButton" id="ID_INDEX_NEW"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="use_action_appearance">False</property> + <property name="action_name">.index:createNew</property> + <property name="label" translatable="yes">New Index</property> + <property name="use_underline">True</property> + <property name="icon_name">dbaccess/res/lc036.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ID_INDEX_DROP"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="use_action_appearance">False</property> + <property name="action_name">.index:dropCurrent</property> + <property name="label" translatable="yes">Delete Current Index</property> + <property name="use_underline">True</property> + <property name="icon_name">dbaccess/res/lc037.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ID_INDEX_RENAME"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="use_action_appearance">False</property> + <property name="action_name">.index:renameCurrent</property> + <property name="label" translatable="yes">Rename Current Index</property> + <property name="use_underline">True</property> + <property name="icon_name">dbaccess/res/lc038.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ID_INDEX_SAVE"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="use_action_appearance">False</property> + <property name="action_name">.index:saveCurrent</property> + <property name="label" translatable="yes">Save Current Index</property> + <property name="use_underline">True</property> + <property name="icon_name">dbaccess/res/lc039.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ID_INDEX_RESET"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="use_action_appearance">False</property> + <property name="action_name">.index:resetCurrent</property> + <property name="label" translatable="yes">Reset Current Index</property> + <property name="use_underline">True</property> + <property name="icon_name">dbaccess/res/lc040.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</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">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkBox" id="box2"> + <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="INDEX_DETAILS"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Index details</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="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="DESC_LABEL"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Index identifier:</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="DESCRIPTION"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</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> + <child> + <object class="GtkCheckButton" id="UNIQUE"> + <property name="label" translatable="yes">_Unique</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="FIELDS_LABEL"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Fields</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="dbulo-DbaIndexFieldsControl" id="FIELDS"> + <property name="width_request">210</property> + <property name="height_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </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> + <child> + <object class="dbulo-DbaIndexList" id="INDEX_LIST"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</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> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">CLOSE</action-widget> + <action-widget response="0">HELP</action-widget> + </action-widgets> + </object> +</interface> diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 2e393f6950df..67e1d5178b4d 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -687,6 +687,13 @@ generic-name="OTableTreeListBox" parent="GtkTreeView" icon-name="widget-gtk-treeview"/> + <glade-widget-class title="IndexFieldsControl" name="dbulo-DbaIndexFieldsControl" + generic-name="IndexFieldsControl" parent="GtkTreeView" + icon-name="widget-gtk-treeview"/> + <glade-widget-class title="DbaIndexList" name="dbulo-DbaIndexList" + generic-name="DbaIndexList" parent="GtkTreeView" + icon-name="widget-gtk-treeview"/> + <glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView" generic-name="Icon View" parent="GtkIconView" icon-name="widget-gtk-iconview"/> |