ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

weld: Rename TreeView *_column_clicked methods to *_column_header_clicked

Browse Source 
Rename weld::TreeView::connect_column_clicked
and weld::TreeView::signal_column_clicked to make
clear that they are not about a click anywhere in a
column, but about the column *header* being clicked.

The GTK 4 doc for the corresponding
GtkTreeViewColumn::clicked signal [1] by which the API
was apparently inspired is clear about this:

> Emitted when the column’s header has been clicked.

[1] https://docs.gtk.org/gtk4/signal.TreeViewColumn.clicked.html

Change-Id: I0b4b337b5ca938bb1526d9857ed2b0b244daf23c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207591
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-07-03 22:26:00 +02:00
parent 50040ef1d6
commit 2dca1c0f02
19 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/source/dialogs/widgettestdlg.cxx
+1 -1
View File
@@ -23,7 +23,7 @@ WidgetTestDialog::WidgetTestDialog(weld::Window* pParent)
m_xOKButton->connect_clicked(LINK(this, WidgetTestDialog, OkHdl));
m_xCancelButton->connect_clicked(LINK(this, WidgetTestDialog, CancelHdl));
m_xTreeView2->connect_column_clicked(LINK(this, WidgetTestDialog, HeaderBarClick));
m_xTreeView2->connect_column_header_clicked(LINK(this, WidgetTestDialog, HeaderBarClick));
FillTreeView();
}
cui/source/options/dbregister.cxx
+2 -1
View File
@@ -113,7 +113,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage(weld::Container* pPage, wel
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->connect_column_header_clicked(
LINK(this, DbRegistrationOptionsPage, HeaderSelect_Impl));
m_xPathBox->make_sorted();
m_xPathBox->connect_item_activated(
cui/source/options/fontsubs.cxx
+1 -1
View File
@@ -76,7 +76,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage, weld::DialogCon
Link<weld::Button&,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
m_xCheckLB->connect_selection_changed(LINK(this, SvxFontSubstTabPage, TreeListBoxSelectHdl));
m_xCheckLB->connect_column_clicked(LINK(this, SvxFontSubstTabPage, HeaderBarClick));
m_xCheckLB->connect_column_header_clicked(LINK(this, SvxFontSubstTabPage, HeaderBarClick));
m_xUseTableCB->connect_toggled(LINK(this, SvxFontSubstTabPage, ToggleHdl));
m_xFont1CB->connect_changed(aLink2);
m_xFont2CB->connect_changed(aLink2);
cui/source/options/optaboutconfig.cxx
+1 -1
View File
@@ -112,7 +112,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage(weld::Window* pParent)
{
m_xPrefBox->set_size_request(m_xPrefBox->get_approximate_digit_width() * 100,
m_xPrefBox->get_height_rows(23));
m_xPrefBox->connect_column_clicked(LINK(this, CuiAboutConfigTabPage, HeaderBarClick));
m_xPrefBox->connect_column_header_clicked(LINK(this, CuiAboutConfigTabPage, HeaderBarClick));
m_xEditBtn->connect_clicked(LINK(this, CuiAboutConfigTabPage, StandardHdl_Impl));
m_xResetBtn->connect_clicked(LINK(this, CuiAboutConfigTabPage, ResetBtnHdl_Impl));
cui/source/options/optpath.cxx
+1 -1
View File
@@ -195,7 +195,7 @@ SvxPathTabPage::SvxPathTabPage(weld::Container* pPage, weld::DialogController* p
m_xPathBox->get_height_rows(20));
m_xPathBox->connect_item_activated(LINK(this, SvxPathTabPage, DoubleClickPathHdl_Impl));
m_xPathBox->connect_column_clicked(LINK(this, SvxPathTabPage, HeaderBarClick));
m_xPathBox->connect_column_header_clicked(LINK(this, SvxPathTabPage, HeaderBarClick));
m_xPathBox->connect_selection_changed(LINK(this, SvxPathTabPage, PathSelect_Impl));
m_xPathBox->set_selection_mode(SelectionMode::Multiple);
cui/source/options/webconninfo.cxx
+2 -1
View File
@@ -52,7 +52,8 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(weld::Window* pParent)
m_xPasswordsLB->set_size_request(m_xPasswordsLB->get_approximate_digit_width() * 70,
m_xPasswordsLB->get_height_rows(8));
m_xPasswordsLB->connect_column_clicked(LINK(this, WebConnectionInfoDialog, HeaderBarClickedHdl));
m_xPasswordsLB->connect_column_header_clicked(
LINK(this, WebConnectionInfoDialog, HeaderBarClickedHdl));
FillPasswordList();
fpicker/source/office/fileview.cxx
+1 -1
View File
@@ -817,7 +817,7 @@ SvtFileView::SvtFileView(weld::Window* pTopLevel,
mpImpl.reset(new SvtFileView_Impl(this, pTopLevel, std::move(xTreeView), std::move(xIconView), xCmdEnv, nFlags, bOnlyFolder));
weld::TreeView* pView = mpImpl->mxView->getWidget();
pView->connect_column_clicked(LINK(this, SvtFileView, HeaderSelect_Impl));
pView->connect_column_header_clicked(LINK(this, SvtFileView, HeaderSelect_Impl));
}
void SvtFileView::grab_focus()
include/vcl/weld/TreeView.hxx
+6 -3
View File
@@ -65,7 +65,7 @@ public:
render_args;
private:
Link<int, void> m_aColumnClickedHdl;
Link<int, void> m_aColumnHeaderClickedHdl;
Link<const iter_col&, void> m_aRadioToggleHdl;
Link<const TreeIter&, bool> m_aEditingStartedHdl;
Link<const IterColText&, bool> m_aEditingDoneHdl;
@@ -83,7 +83,7 @@ protected:
std::function<int(const weld::TreeIter&, const weld::TreeIter&)> m_aCustomSort;
protected:
void signal_column_clicked(int nColumn) { m_aColumnClickedHdl.Call(nColumn); }
void signal_column_header_clicked(int nColumn) { m_aColumnHeaderClickedHdl.Call(nColumn); }
bool signal_expanding(const TreeIter& rIter)
{
return !m_aExpandingHdl.IsSet() || m_aExpandingHdl.Call(rIter);
@@ -217,7 +217,10 @@ public:
// Argument is a pair of iter, col describing the toggled node
void connect_toggled(const Link<const iter_col&, void>& rLink) { m_aRadioToggleHdl = rLink; }
void connect_column_clicked(const Link<int, void>& rLink) { m_aColumnClickedHdl = rLink; }
void connect_column_header_clicked(const Link<int, void>& rLink)
{
m_aColumnHeaderClickedHdl = rLink;
}
void connect_model_changed(const Link<TreeView&, void>& rLink) { m_aModelChangedHdl = rLink; }
/**
sc/source/ui/dialogs/searchresults.cxx
+1 -1
View File
@@ -41,7 +41,7 @@ SearchResultsDlg::SearchResultsDlg(SfxBindings* _pBindings, weld::Window* pParen
};
mxList->set_column_fixed_widths(aWidths);
mxList->connect_selection_changed(LINK(this, SearchResultsDlg, ListSelectHdl));
mxList->connect_column_clicked(LINK(this, SearchResultsDlg, HeaderBarClick));
mxList->connect_column_header_clicked(LINK(this, SearchResultsDlg, HeaderBarClick));
}
SearchResultsDlg::~SearchResultsDlg()
sfx2/source/control/listview.cxx
+1 -1
View File
@@ -64,7 +64,7 @@ ListView::ListView(std::unique_ptr<weld::TreeView> xTreeView)
mxTreeView->set_column_fixed_widths(aWidths);
mxTreeView->set_selection_mode(SelectionMode::Multiple);
mxTreeView->connect_query_tooltip(LINK(this, ListView, QueryTooltipHdl));
mxTreeView->connect_column_clicked(LINK(this, ListView, ColumnClickedHdl));
mxTreeView->connect_column_header_clicked(LINK(this, ListView, ColumnClickedHdl));
}
ListView::~ListView() {}
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+4 -4
View File
@@ -971,13 +971,13 @@ ObjectInspectorTreeHandler::ObjectInspectorTreeHandler(
setSortFunction(mpObjectInspectorWidgets->mpPropertiesTreeView);
setSortFunction(mpObjectInspectorWidgets->mpMethodsTreeView);
mpObjectInspectorWidgets->mpInterfacesTreeView->connect_column_clicked(
mpObjectInspectorWidgets->mpInterfacesTreeView->connect_column_header_clicked(
LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
mpObjectInspectorWidgets->mpServicesTreeView->connect_column_clicked(
mpObjectInspectorWidgets->mpServicesTreeView->connect_column_header_clicked(
LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
mpObjectInspectorWidgets->mpPropertiesTreeView->connect_column_clicked(
mpObjectInspectorWidgets->mpPropertiesTreeView->connect_column_header_clicked(
LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
mpObjectInspectorWidgets->mpMethodsTreeView->connect_column_clicked(
mpObjectInspectorWidgets->mpMethodsTreeView->connect_column_header_clicked(
LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
mpObjectInspectorWidgets->mpToolbar->connect_clicked(
svx/source/dialog/ctredlin.cxx
+3 -2
View File
@@ -71,7 +71,8 @@ SvxRedlineTable::SvxRedlineTable(std::unique_ptr<weld::TreeView> xWriterControl,
if (m_xWriterTreeView)
{
m_xWriterTreeView->set_size_request(-1, m_xWriterTreeView->get_height_rows(8));
m_xWriterTreeView->connect_column_clicked(LINK(this, SvxRedlineTable, HeaderBarClick));
m_xWriterTreeView->connect_column_header_clicked(
LINK(this, SvxRedlineTable, HeaderBarClick));
m_xWriterTreeView->set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){
return ColCompare(rLeft, rRight);
});
@@ -80,7 +81,7 @@ SvxRedlineTable::SvxRedlineTable(std::unique_ptr<weld::TreeView> xWriterControl,
if (m_xCalcTreeView)
{
m_xCalcTreeView->set_size_request(-1, m_xCalcTreeView->get_height_rows(8));
m_xCalcTreeView->connect_column_clicked(LINK(this, SvxRedlineTable, HeaderBarClick));
m_xCalcTreeView->connect_column_header_clicked(LINK(this, SvxRedlineTable, HeaderBarClick));
m_xCalcTreeView->set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){
return ColCompare(rLeft, rRight);
});
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+4 -2
View File
@@ -384,8 +384,10 @@ ChineseDictionaryDialog::ChineseDictionaryDialog(weld::Window* pParent)
initDictionaryControl(m_xCT_DictionaryToTraditional.get(), xDictionary_To_Traditional);
//set hdl
m_xCT_DictionaryToSimplified->connect_column_clicked(LINK(this, ChineseDictionaryDialog, ToSimplifiedHeaderBarClick));
m_xCT_DictionaryToTraditional->connect_column_clicked(LINK(this, ChineseDictionaryDialog, ToTraditionalHeaderBarClick));
m_xCT_DictionaryToSimplified->connect_column_header_clicked(
LINK(this, ChineseDictionaryDialog, ToSimplifiedHeaderBarClick));
m_xCT_DictionaryToTraditional->connect_column_header_clicked(
LINK(this, ChineseDictionaryDialog, ToTraditionalHeaderBarClick));
updateAfterDirectionChange();
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+4 -1
View File
@@ -79,7 +79,10 @@ public:
{
m_xControl->connect_selection_changed(rLink);
}
void connect_column_clicked(const Link<int, void>& rLink) { m_xControl->connect_column_clicked(rLink); }
void connect_column_header_clicked(const Link<int, void>& rLink)
{
m_xControl->connect_column_header_clicked(rLink);
}
bool get_sort_order() const { return m_xControl->get_sort_order(); }
void set_sort_order(bool bAscending) { return m_xControl->set_sort_order(bAscending); }
void set_sort_column(int nColumn) { return m_xControl->set_sort_column(nColumn); }
sw/source/ui/inc/bookmark.hxx
+2 -2
View File
@@ -67,9 +67,9 @@ public:
{
m_xControl->connect_item_activated(rLink);
}
void connect_column_clicked(const Link<int, void>& rLink)
void connect_column_header_clicked(const Link<int, void>& rLink)
{
m_xControl->connect_column_clicked(rLink);
m_xControl->connect_column_header_clicked(rLink);
}
void connect_editing(const Link<const weld::TreeIter&, bool>& rStartLink,
const Link<const weld::TreeView::IterColText&, bool>& rEndLink)
sw/source/ui/index/cnttab.cxx
+1 -1
View File
@@ -529,7 +529,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(weld::Window* pParent,
m_xHeaderTree->connect_size_allocate(LINK(this, SwAddStylesDlg_Impl, TreeSizeAllocHdl));
m_xHeaderTree->set_toggle_button_type(weld::ColumnToggleType::Radio);
m_xHeaderTree->connect_toggled(LINK(this, SwAddStylesDlg_Impl, RadioToggleOnHdl));
m_xHeaderTree->connect_column_clicked(LINK(this, SwAddStylesDlg_Impl, HeaderBarClick));
m_xHeaderTree->connect_column_header_clicked(LINK(this, SwAddStylesDlg_Impl, HeaderBarClick));
std::vector<int> aWidths
{
sw/source/ui/misc/bookmark.cxx
+1 -1
View File
@@ -391,7 +391,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS,
{
m_xBookmarksBox->connect_changed(LINK(this, SwInsertBookmarkDlg, SelectionChangedHdl));
m_xBookmarksBox->connect_item_activated(LINK(this, SwInsertBookmarkDlg, DoubleClickHdl));
m_xBookmarksBox->connect_column_clicked(LINK(this, SwInsertBookmarkDlg, HeaderBarClick));
m_xBookmarksBox->connect_column_header_clicked(LINK(this, SwInsertBookmarkDlg, HeaderBarClick));
m_xBookmarksBox->connect_editing(LINK(this, SwInsertBookmarkDlg, EditingHdl),
LINK(this, SwInsertBookmarkDlg, EditedHdl));
m_xEditBox->connect_changed(LINK(this, SwInsertBookmarkDlg, ModifyHdl));
vcl/source/app/salvtables.cxx
+1 -1
View File
@@ -4973,7 +4973,7 @@ IMPL_LINK(SalInstanceTreeView, HeaderBarClickedHdl, HeaderBar*, pHeaderBar, void
sal_uInt16 nId = pHeaderBar->GetCurItemId();
if (!(pHeaderBar->GetItemBits(nId) & HeaderBarItemBits::CLICKABLE))
return;
signal_column_clicked(pHeaderBar->GetItemPos(nId));
signal_column_header_clicked(pHeaderBar->GetItemPos(nId));
}
IMPL_LINK_NOARG(SalInstanceTreeView, ExpandingHdl, SvTreeListBox*, bool)
vcl/unx/gtk3/gtkinst.cxx
+1 -1
View File
@@ -14251,7 +14251,7 @@ private:
GtkTreeViewColumn* pColumn = GTK_TREE_VIEW_COLUMN(pEntry->data);
if (pColumn == pClickedColumn)
{
TreeView::signal_column_clicked(nIndex);
signal_column_header_clicked(nIndex);
break;
}
++nIndex;