mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treelist hidden in data browser

Browse Source 
Change-Id: I1f01f4f57d9e711ead86d9d7abf9ef9c7f630fe2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102104
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-09-06 14:20:02 +01:00
parent e68febccd3
commit 0e07efb132
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbaccess/inc/helpids.h
View File

@@ -24,7 +24,6 @@
#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER" #define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER"
#define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER" #define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER"
#define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW" #define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW"
#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX"
#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN" #define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN"

6
dbaccess/source/ui/browser/unodatbr.cxx
View File

@@ -297,9 +297,9 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView(), E_TABLE); m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView(), E_TABLE);
m_pTreeView->SetHelpId(HID_TLB_TREELISTBOX);
m_pTreeView->GetWidget().connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry)); weld::TreeView& rTreeView = m_pTreeView->GetWidget();
rTreeView.connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry));
m_pTreeView->setCopyHandler(LINK(this, SbaTableQueryBrowser, OnCopyEntry)); m_pTreeView->setCopyHandler(LINK(this, SbaTableQueryBrowser, OnCopyEntry));
@@ -314,13 +314,13 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
getBrowserView()->setTreeView(m_pTreeView); getBrowserView()->setTreeView(m_pTreeView);
// fill view with data // fill view with data
weld::TreeView& rTreeView = m_pTreeView->GetWidget();
rTreeView.set_sort_order(true); rTreeView.set_sort_order(true);
rTreeView.set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){ rTreeView.set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){
return OnTreeEntryCompare(rLeft, rRight); return OnTreeEntryCompare(rLeft, rRight);
}); });
rTreeView.make_sorted(); rTreeView.make_sorted();
m_pTreeView->SetSelChangeHdl(LINK(this, SbaTableQueryBrowser, OnSelectionChange)); m_pTreeView->SetSelChangeHdl(LINK(this, SbaTableQueryBrowser, OnSelectionChange));
m_pTreeView->show_container();
// TODO // TODO
getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER); getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER);

1
dbaccess/source/ui/inc/dbtreelistbox.hxx
View File

@@ -126,6 +126,7 @@ namespace dbaui
InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType); InterimDBTreeListBox(vcl::Window* pParent, bool bSQLType);
virtual void dispose() override; virtual void dispose() override;
virtual ~InterimDBTreeListBox() override; virtual ~InterimDBTreeListBox() override;
void show_container() { m_xContainer->show(); }
protected: protected:
virtual bool DoChildKeyInput(const KeyEvent& rKEvt) override; virtual bool DoChildKeyInput(const KeyEvent& rKEvt) override;
}; };