cui/inc/strings.hrc | 3
cui/source/inc/dbregister.hxx | 37 ++--
cui/source/options/dbregister.cxx | 292 +++++++++++---------------------------
cui/uiconfig/ui/dbregisterpage.ui | 67 +++++++-
vcl/source/app/salvtables.cxx | 3
5 files changed, 166 insertions(+), 236 deletions(-)
New commits:
commit fdc44bd929f038182dda4ea951f3b70dfc67f8d1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Mar 12 16:46:56 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 13 09:53:14 2019 +0100
weld DbRegistrationOptionsPage
Change-Id: I88c1129f50d9f9cbef9970f1a9453641fc87e8fd
Reviewed-on: https://gerrit.libreoffice.org/69135
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9278d9e818b4..37dc1f719c9f 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -263,9 +263,6 @@
#define RID_SVXSTR_ERROR_TYPE_LABEL
NC_("RID_SVXSTR_ERROR_TYPE_LABEL", "Type:")
#define RID_SVXSTR_ERROR_MESSAGE_LABEL
NC_("RID_SVXSTR_ERROR_MESSAGE_LABEL", "Message:")
-#define RID_SVXSTR_TYPE NC_("RID_SVXSTR_TYPE",
"Registered name")
-#define RID_SVXSTR_PATH NC_("RID_SVXSTR_PATH",
"Database file")
-
//abbreviation for "[Load]"
#define RID_SVXSTR_HEADER1 NC_("RID_SVXSTR_HEADER1",
"[L]")
//abbreviation for "[Save]"
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b880f38e332d..4e77f06f2e13 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -38,27 +38,24 @@ namespace svx
class DbRegistrationOptionsPage : public SfxTabPage
{
private:
- VclPtr<SvSimpleTableContainer> m_pPathCtrl;
- VclPtr<PushButton> m_pNew;
- VclPtr<PushButton> m_pEdit;
- VclPtr<PushButton> m_pDelete;
-
- VclPtr<svx::OptHeaderTabListBox> m_pPathBox;
- SvTreeListEntry* m_pCurEntry;
sal_uLong m_nOldCount;
bool m_bModified;
- DECL_LINK( NewHdl, Button*, void );
- DECL_LINK( EditHdl, Button*, void );
- DECL_LINK( DeleteHdl, Button*, void );
- DECL_LINK( PathBoxDoubleClickHdl, SvTreeListBox*, bool);
+ std::unique_ptr<weld::Button> m_xNew;
+ std::unique_ptr<weld::Button> m_xEdit;
+ std::unique_ptr<weld::Button> m_xDelete;
+ std::unique_ptr<weld::TreeView> m_xPathBox;
+ std::unique_ptr<weld::TreeIter> m_xIter;
- DECL_LINK( PathSelect_Impl, SvTreeListBox*, void);
+ DECL_LINK( NewHdl, weld::Button&, void );
+ DECL_LINK( EditHdl, weld::Button&, void );
+ DECL_LINK( DeleteHdl, weld::Button&, void );
+ DECL_LINK( PathBoxDoubleClickHdl, weld::TreeView&, void);
- DECL_LINK( HeaderSelect_Impl, HeaderBar *, void );
- DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void );
- DECL_LINK( NameValidator, const OUString&, bool);
+ DECL_LINK( PathSelect_Impl, weld::TreeView&, void);
+ DECL_LINK( HeaderSelect_Impl, int, void );
+ DECL_LINK( NameValidator, const OUString&, bool);
/** inserts a new entry in the tablistbox
@param _sName
@@ -69,17 +66,17 @@ namespace svx
void insertNewEntry( const OUString& _sName,const OUString&
_sLocation, const bool bReadOnly );
/** opens the LinkDialog to create a register pair
- @param _sOldName
+ @param sOldName
The old name of the entry may be empty.
- @param _sOldLocation
+ @param sOldLocation
The old location of the entry may be empty.
- @param _pEntry
+ @param nEntry
The entry to remove if the entry will be changed
*/
- void openLinkDialog(const OUString& _sOldName,const OUString&
_sOldLocation,SvTreeListEntry const * _pEntry = nullptr);
+ void openLinkDialog(const OUString& sOldName, const OUString&
sOldLocation, int nEntry = -1);
public:
- DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet&
rSet );
+ DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet&
rSet);
virtual ~DbRegistrationOptionsPage() override;
virtual void dispose() override;
diff --git a/cui/source/options/dbregister.cxx
b/cui/source/options/dbregister.cxx
index e71fac5ccd80..557d2e04e6c0 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -45,10 +45,8 @@
#include <svx/dialogs.hrc>
#define TAB_WIDTH1 80
-#define TAB_WIDTH_MIN 10
-#define TAB_WIDTH2 1000
-#define ITEMID_TYPE 1
-#define ITEMID_PATH 2
+
+#define COL_TYPE 0
namespace svx
{
@@ -96,66 +94,36 @@ short DatabaseRegistrationDialog::Execute()
// class DbRegistrationOptionsPage
--------------------------------------------------
-DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet ) :
-
- SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
-
- m_pPathBox ( nullptr ),
- m_pCurEntry ( nullptr ),
- m_nOldCount ( 0 ),
- m_bModified ( false )
+DbRegistrationOptionsPage::DbRegistrationOptionsPage(TabPageParent pParent,
const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
+ , m_nOldCount(0)
+ , m_bModified(false)
+ , m_xNew(m_xBuilder->weld_button("new"))
+ , m_xEdit(m_xBuilder->weld_button("edit"))
+ , m_xDelete(m_xBuilder->weld_button("delete"))
+ , m_xPathBox(m_xBuilder->weld_tree_view("pathctrl"))
+ , m_xIter(m_xPathBox->make_iterator())
{
- get(m_pPathCtrl, "pathctrl");
Size aControlSize(248, 147);
aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
- m_pPathCtrl->set_width_request(aControlSize.Width());
- m_pPathCtrl->set_height_request(aControlSize.Height());
-
- get(m_pNew, "new");
- get(m_pEdit, "edit");
- get(m_pDelete, "delete");
-
- m_pNew->SetClickHdl( LINK( this, DbRegistrationOptionsPage, NewHdl ) );
- m_pEdit->SetClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
- m_pDelete->SetClickHdl( LINK( this, DbRegistrationOptionsPage, DeleteHdl )
);
-
- Size aBoxSize = m_pPathCtrl->GetOutputSizePixel();
-
- WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
- m_pPathBox = VclPtr<svx::OptHeaderTabListBox>::Create( *m_pPathCtrl, nBits
);
-
- HeaderBar &rBar = m_pPathBox->GetTheHeaderBar();
-
- rBar.SetSelectHdl( LINK( this, DbRegistrationOptionsPage,
HeaderSelect_Impl ) );
- rBar.SetEndDragHdl( LINK( this, DbRegistrationOptionsPage,
HeaderEndDrag_Impl ) );
- Size aSz;
- aSz.setWidth( TAB_WIDTH1 );
- rBar.InsertItem( ITEMID_TYPE, CuiResId( RID_SVXSTR_TYPE ),
- LogicToPixel( aSz, MapMode( MapUnit::MapAppFont )
).Width(),
- HeaderBarItemBits::LEFT |
HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
- aSz.setWidth( TAB_WIDTH2 );
- rBar.InsertItem( ITEMID_PATH, CuiResId( RID_SVXSTR_PATH ),
- LogicToPixel( aSz, MapMode( MapUnit::MapAppFont )
).Width(),
- HeaderBarItemBits::LEFT );
-
- static long aTabs[] = {0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 };
- Size aHeadSize = rBar.GetSizePixel();
-
- m_pPathBox->SetStyle( m_pPathBox->GetStyle()|nBits );
- m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage,
PathBoxDoubleClickHdl ) );
- m_pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage,
PathSelect_Impl ) );
- m_pPathBox->SetSelectionMode( SelectionMode::Single );
- m_pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ),
- Size( aBoxSize.Width(), aBoxSize.Height() -
aHeadSize.Height() ) );
- m_pPathBox->SvSimpleTable::SetTabs( SAL_N_ELEMENTS(aTabs), aTabs );
- m_pPathBox->SetHighlightRange();
-
- m_pPathBox->SetHelpId( HID_DBPATH_CTL_PATH );
- rBar.SetHelpId( HID_DBPATH_HEADERBAR );
-
- m_pPathBox->ShowTable();
-}
+ m_xPathBox->set_size_request(aControlSize.Width(), aControlSize.Height());
+
+ std::vector<int> aWidths;
+ aWidths.push_back(LogicToPixel(Size(TAB_WIDTH1, 0),
MapMode(MapUnit::MapAppFont)).Width());
+ m_xPathBox->set_column_fixed_widths(aWidths);
+
+ m_xNew->connect_clicked( LINK( this, DbRegistrationOptionsPage, NewHdl ) );
+ m_xEdit->connect_clicked( LINK( this, DbRegistrationOptionsPage, EditHdl )
);
+ m_xDelete->connect_clicked( LINK( this, DbRegistrationOptionsPage,
DeleteHdl ) );
+ m_xPathBox->connect_column_clicked(LINK(this, DbRegistrationOptionsPage,
HeaderSelect_Impl));
+
+ m_xPathBox->make_sorted();
+ m_xPathBox->connect_row_activated( LINK( this, DbRegistrationOptionsPage,
PathBoxDoubleClickHdl ) );
+ m_xPathBox->connect_changed( LINK( this, DbRegistrationOptionsPage,
PathSelect_Impl ) );
+
+ m_xPathBox->set_help_id(HID_DBPATH_CTL_PATH);
+}
DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
{
@@ -164,37 +132,29 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
void DbRegistrationOptionsPage::dispose()
{
- for ( sal_uLong i = 0; i < m_pPathBox->GetEntryCount(); ++i )
- delete static_cast< DatabaseRegistration* >(
m_pPathBox->GetEntry(i)->GetUserData() );
- m_pPathBox.disposeAndClear();
- m_pPathCtrl.clear();
- m_pNew.clear();
- m_pEdit.clear();
- m_pDelete.clear();
+ for (int i = 0, nCount = m_xPathBox->n_children(); i < nCount; ++i )
+ delete
reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(i).toInt64());
SfxTabPage::dispose();
}
-
VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
- return VclPtr<DbRegistrationOptionsPage>::Create( pParent.pParent,
*rAttrSet );
+ return VclPtr<DbRegistrationOptionsPage>::Create( pParent, *rAttrSet );
}
-
bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
{
// the settings for the single drivers
bool bModified = false;
DatabaseRegistrations aRegistrations;
- sal_uLong nCount = m_pPathBox->GetEntryCount();
- for ( sal_uLong i = 0; i < nCount; ++i )
+ int nCount = m_xPathBox->n_children();
+ for (int i = 0; i < nCount; ++i)
{
- SvTreeListEntry* pEntry = m_pPathBox->GetEntry(i);
- DatabaseRegistration* pRegistration = static_cast<
DatabaseRegistration* >( pEntry->GetUserData() );
+ DatabaseRegistration* pRegistration =
reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(i).toInt64());
if ( pRegistration && !pRegistration->sLocation.isEmpty() )
{
- OUString sName( SvTabListBox::GetEntryText( pEntry, 0 ) );
+ OUString sName(m_xPathBox->get_text(i, 0));
OFileNotation aTransformer( pRegistration->sLocation );
aRegistrations[ sName ] = DatabaseRegistration( aTransformer.get(
OFileNotation::N_URL ), pRegistration->bReadOnly );
}
@@ -208,7 +168,6 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet*
rCoreSet )
return bModified;
}
-
void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet )
{
// the settings for the single drivers
@@ -216,7 +175,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet*
rSet )
if ( !pRegistrations )
return;
- m_pPathBox->Clear();
+ m_xPathBox->clear();
const DatabaseRegistrations& rRegistrations =
pRegistrations->getRegistrations();
m_nOldCount = rRegistrations.size();
@@ -229,195 +188,119 @@ void DbRegistrationOptionsPage::Reset( const
SfxItemSet* rSet )
OUString aUserData = GetUserData();
if ( !aUserData.isEmpty() )
{
- HeaderBar &rBar = m_pPathBox->GetTheHeaderBar();
sal_Int32 nIdx {0};
// restore column width
- rBar.SetItemSize( ITEMID_TYPE, aUserData.getToken(0, ';',
nIdx).toInt32() );
- HeaderEndDrag_Impl( &rBar );
+ std::vector<int> aWidths;
+ aWidths.push_back(aUserData.getToken(0, ';', nIdx).toInt32());
+ m_xPathBox->set_column_fixed_widths(aWidths);
// restore sort direction
bool bUp = aUserData.getToken(0, ';', nIdx).toInt32() != 0;
- HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE);
-
- if ( bUp )
- {
- nBits &= ~HeaderBarItemBits::UPARROW;
- nBits |= HeaderBarItemBits::DOWNARROW;
- }
- else
- {
- nBits &= ~HeaderBarItemBits::DOWNARROW;
- nBits |= HeaderBarItemBits::UPARROW;
- }
- rBar.SetItemBits( ITEMID_TYPE, nBits );
- HeaderSelect_Impl( &rBar );
+ m_xPathBox->set_sort_order(bUp);
+ m_xPathBox->set_sort_indicator(bUp ? TRISTATE_TRUE : TRISTATE_FALSE,
COL_TYPE);
}
}
void DbRegistrationOptionsPage::FillUserData()
{
- HeaderBar &rBar = m_pPathBox->GetTheHeaderBar();
-
- OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) +
";";
- HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE );
- bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) ==
HeaderBarItemBits::UPARROW );
+ OUString aUserData = OUString::number(
m_xPathBox->get_column_width(COL_TYPE) ) + ";";
+ bool bUp = m_xPathBox->get_sort_order();
aUserData += (bUp ? OUString("1") : OUString("0"));
SetUserData( aUserData );
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, weld::Button&, void)
{
- SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
- if ( pEntry )
+ int nEntry = m_xPathBox->get_selected_index();
+ if (nEntry != -1)
{
- std::unique_ptr<weld::MessageDialog>
xQuery(Application::CreateMessageDialog(GetFrameWeld(),
+ std::unique_ptr<weld::MessageDialog>
xQuery(Application::CreateMessageDialog(GetDialogFrameWeld(),
VclMessageType::Question,
VclButtonsType::YesNo, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM)));
if (xQuery->run() == RET_YES)
- m_pPathBox->GetModel()->Remove(pEntry);
+ m_xPathBox->remove(nEntry);
}
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, Button*, void)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, weld::Button&, void)
{
openLinkDialog(OUString(),OUString());
}
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl,
SvTreeListBox*, bool)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl,
weld::TreeView&, void)
{
- EditHdl(nullptr);
- // Signal more to be done, i.e. when entry removed/inserted via
- // openLinkDialog().
- return true;
+ EditHdl(*m_xEdit);
}
-
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl, Button*, void)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl, weld::Button&, void)
{
- SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry();
- if ( !pEntry )
+ int nEntry = m_xPathBox->get_selected_index();
+ if (nEntry == -1)
return;
- DatabaseRegistration* pOldRegistration = static_cast<
DatabaseRegistration* >( pEntry->GetUserData() );
- if ( !pOldRegistration || pOldRegistration->bReadOnly )
+ DatabaseRegistration* pOldRegistration =
reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(nEntry).toInt64());
+ if (!pOldRegistration || pOldRegistration->bReadOnly)
return;
- OUString sOldName = SvTabListBox::GetEntryText(pEntry,0);
- m_pCurEntry = pEntry;
- openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry );
- m_pCurEntry = nullptr;
+ OUString sOldName = m_xPathBox->get_text(nEntry, 0);
+ openLinkDialog(sOldName, pOldRegistration->sLocation, nEntry);
}
-
-IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar,
void )
+IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, int, nCol, void )
{
- assert(pBar);
-
- if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE)
+ if (nCol != COL_TYPE)
return;
- HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
- bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) ==
HeaderBarItemBits::UPARROW );
- SvSortMode eMode = SortAscending;
+ bool bSortMode = m_xPathBox->get_sort_order();
- if ( bUp )
- {
- nBits &= ~HeaderBarItemBits::UPARROW;
- nBits |= HeaderBarItemBits::DOWNARROW;
- eMode = SortDescending;
- }
- else
- {
- nBits &= ~HeaderBarItemBits::DOWNARROW;
- nBits |= HeaderBarItemBits::UPARROW;
- }
- pBar->SetItemBits( ITEMID_TYPE, nBits );
- SvTreeList* pModel = m_pPathBox->GetModel();
- pModel->SetSortMode( eMode );
- pModel->Resort();
-}
-
-
-IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar,
void )
-{
- assert(pBar);
-
- if (!pBar || !pBar->GetCurItemId())
- return;
+ //set new arrow positions in headerbar
+ bSortMode = !bSortMode;
+ m_xPathBox->set_sort_order(bSortMode);
- if ( !pBar->IsItemMode() )
- {
- Size aSz;
- sal_uInt16 nTabs = pBar->GetItemCount();
- long nTmpSz = 0;
- long nWidth = pBar->GetItemSize(ITEMID_TYPE);
- long nBarWidth = pBar->GetSizePixel().Width();
-
- if(nWidth < TAB_WIDTH_MIN)
- pBar->SetItemSize( ITEMID_TYPE, TAB_WIDTH_MIN);
- else if ( ( nBarWidth - nWidth ) < TAB_WIDTH_MIN )
- pBar->SetItemSize( ITEMID_TYPE, nBarWidth - TAB_WIDTH_MIN );
-
- for ( sal_uInt16 i = 1; i <= nTabs; ++i )
- {
- long _nWidth = pBar->GetItemSize(i);
- aSz.setWidth( _nWidth + nTmpSz );
- nTmpSz += _nWidth;
- m_pPathBox->SetTab( i, PixelToLogic( aSz,
MapMode(MapUnit::MapAppFont) ).Width() );
- }
- }
+ //sort lists
+ m_xPathBox->set_sort_indicator(bSortMode ? TRISTATE_TRUE : TRISTATE_FALSE,
nCol);
}
-
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*,
void)
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, weld::TreeView&,
void)
{
- SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
+ DatabaseRegistration* pRegistration =
reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_selected_id().toInt64());
bool bReadOnly = true;
- if ( pEntry )
+ if (pRegistration)
{
- DatabaseRegistration* pRegistration = static_cast<
DatabaseRegistration* >( pEntry->GetUserData() );
bReadOnly = pRegistration->bReadOnly;
}
- m_pEdit->Enable( !bReadOnly );
- m_pDelete->Enable( !bReadOnly );
+ m_xEdit->set_sensitive( !bReadOnly );
+ m_xDelete->set_sensitive( !bReadOnly );
}
-void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const
OUString& _sLocation, const bool _bReadOnly )
+void DbRegistrationOptionsPage::insertNewEntry(const OUString& _sName,const
OUString& _sLocation, const bool _bReadOnly)
{
- OUString aStr = _sName + "\t" + _sLocation;
+ OUString sId(OUString::number(reinterpret_cast<sal_Int64>(new
DatabaseRegistration(_sLocation, _bReadOnly))));
+ m_xPathBox->insert(nullptr, -1, &_sName, &sId, nullptr, nullptr, nullptr,
false, m_xIter.get());
- SvTreeListEntry* pEntry = nullptr;
- if ( _bReadOnly )
- {
- Image aLocked(StockImage::Yes, RID_SVXBMP_LOCK);
- pEntry = m_pPathBox->InsertEntry( aStr, aLocked, aLocked );
- }
- else
- {
- pEntry = m_pPathBox->InsertEntry( aStr );
- }
+ if (_bReadOnly)
+ m_xPathBox->set_image(*m_xIter, RID_SVXBMP_LOCK);
- pEntry->SetUserData( new DatabaseRegistration( _sLocation, _bReadOnly ) );
+ m_xPathBox->set_text(*m_xIter, _sLocation, 1);
}
-
-void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const
OUString& _sOldLocation,SvTreeListEntry const * _pEntry)
+void DbRegistrationOptionsPage::openLinkDialog(const OUString& sOldName, const
OUString& sOldLocation, int nEntry)
{
- ODocumentLinkDialog aDlg(GetDialogFrameWeld(), _pEntry == nullptr);
+ ODocumentLinkDialog aDlg(GetDialogFrameWeld(), nEntry == -1);
- aDlg.setLink(_sOldName,_sOldLocation);
+ aDlg.setLink(sOldName, sOldLocation);
aDlg.setNameValidator(LINK( this, DbRegistrationOptionsPage, NameValidator
) );
if (aDlg.run() == RET_OK)
{
OUString sNewName,sNewLocation;
aDlg.getLink(sNewName,sNewLocation);
- if ( _pEntry == nullptr || sNewName != _sOldName || sNewLocation !=
_sOldLocation )
+ if ( nEntry == -1 || sNewName != sOldName || sNewLocation !=
sOldLocation )
{
- if ( _pEntry )
+ if (nEntry != -1)
{
- delete static_cast< DatabaseRegistration* >(
_pEntry->GetUserData() );
- m_pPathBox->GetModel()->Remove( _pEntry );
+ delete
reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(nEntry).toInt64());
+ m_xPathBox->remove(nEntry);
}
insertNewEntry( sNewName, sNewLocation, false );
m_bModified = true;
@@ -427,11 +310,10 @@ void DbRegistrationOptionsPage::openLinkDialog(const
OUString& _sOldName,const O
IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName,
bool )
{
- sal_uLong nCount = m_pPathBox->GetEntryCount();
- for ( sal_uLong i = 0; i < nCount; ++i )
+ int nCount = m_xPathBox->n_children();
+ for (int i = 0; i < nCount; ++i)
{
- SvTreeListEntry* pEntry = m_pPathBox->GetEntry(i);
- if ( (!m_pCurEntry || m_pCurEntry != pEntry) &&
SvTabListBox::GetEntryText(pEntry,0) == _rName )
+ if (m_xPathBox->get_text(i, 0) == _rName)
return false;
}
return true;
diff --git a/cui/uiconfig/ui/dbregisterpage.ui
b/cui/uiconfig/ui/dbregisterpage.ui
index 3862e2a872b3..0ba8e026c758 100644
--- a/cui/uiconfig/ui/dbregisterpage.ui
+++ b/cui/uiconfig/ui/dbregisterpage.ui
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkTreeStore" id="liststore3">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name text2 -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkGrid" id="DbRegisterPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,13 +45,56 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="svtlo-SvSimpleTableContainer" id="pathctrl">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</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="Simple Table
Container-selection1"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="pathctrl">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore3</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <property name="title" translatable="yes"
context="dbregisterpage|type">Registered name</property>
+ <property name="clickable">True</property>
+ <property name="reorderable">True</property>
+ <property name="sort_indicator">True</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <property name="title" translatable="yes"
context="dbregisterpage|path">Database file</property>
+ <property name="clickable">True</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderer2"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -56,6 +108,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="spacing">3</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="new">
@@ -124,8 +177,6 @@
<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>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 815be92d1241..3a0625c2fc05 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2266,6 +2266,9 @@ public:
virtual int get_column_width(int nColumn) const override
{
+ LclHeaderTabListBox* pHeaderBox =
dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get());
+ if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() :
nullptr)
+ return pHeaderBar->GetItemSize(pHeaderBar->GetItemId(nColumn));
// GetTab(0) gives the position of the bitmap which is automatically
inserted by the TabListBox.
// So the first text column's width is Tab(2)-Tab(1).
auto nWidthPixel = m_xTreeView->GetLogicTab(nColumn + 2) -
m_xTreeView->GetLogicTab(nColumn + 1);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
