From 96f7a855e6dbcd53d439fb522c1ce3cc2d957e95 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sun, 28 Jan 2024 02:33:46 +0100 Subject: [PATCH] gtkui: Add setting to disable column header sorting. Closes: #1133 --- src/gtkui/settings.cc | 2 ++ src/gtkui/ui_gtk.cc | 1 + src/gtkui/ui_playlist_widget.cc | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gtkui/settings.cc b/src/gtkui/settings.cc index d7e3f8ac0..a701eb2fa 100644 --- a/src/gtkui/settings.cc +++ b/src/gtkui/settings.cc @@ -43,6 +43,8 @@ static const PreferencesWidget gtkui_widgets[] = { WidgetCustomGTK (pw_col_create_chooser), WidgetCheck (N_("Show column headers"), WidgetBool ("gtkui", "playlist_headers", redisplay_playlists)), + WidgetCheck (N_("Make column headers clickable for sorting"), + WidgetBool ("gtkui", "playlist_headers_sortable", redisplay_playlists)), WidgetLabel (N_("Miscellaneous")), WidgetCheck (N_("Use symbolic icons in toolbar"), WidgetBool ("gtkui", "symbolic_icons", update_toolbar_icons)), diff --git a/src/gtkui/ui_gtk.cc b/src/gtkui/ui_gtk.cc index 1a3dc519b..0aea55161 100644 --- a/src/gtkui/ui_gtk.cc +++ b/src/gtkui/ui_gtk.cc @@ -57,6 +57,7 @@ static const char * const gtkui_defaults[] = { "autoscroll", "TRUE", "playlist_columns", "title artist album queued length", "playlist_headers", "TRUE", + "playlist_headers_sortable", "TRUE", "show_remaining_time", "FALSE", #ifdef USE_GTK3 diff --git a/src/gtkui/ui_playlist_widget.cc b/src/gtkui/ui_playlist_widget.cc index 6adbf8205..5ecd64f8a 100644 --- a/src/gtkui/ui_playlist_widget.cc +++ b/src/gtkui/ui_playlist_widget.cc @@ -423,7 +423,8 @@ GtkWidget * ui_playlist_widget_new (Playlist playlist) audgui_list_add_column (list, pw_col_label[n] ? _(pw_col_names[n]) : nullptr, i, pw_col_types[n], pw_col_min_widths[n]); - if (pw_col_sort_types[n] < Playlist::n_sort_types) + if (aud_get_bool ("gtkui", "playlist_headers_sortable") && + pw_col_sort_types[n] < Playlist::n_sort_types) { auto column = gtk_tree_view_get_column ((GtkTreeView *) list, i); auto sort_type_ptr = aud::to_ptr (pw_col_sort_types[n]);