Commits January 2025

commits@lists.geany.org

1 participants
63 discussions

[geany/geany] 43e126: Merge pull request #4218 from techee/open_doc_warning_fix
by Jiří Techet 31 Jan '25

31 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 31 Jan 2025 21:12:49 UTC Commit: 43e12659798fabc73e1c141c84261c84b977e48f https://github.com/geany/geany/commit/43e12659798fabc73e1c141c84261c84b977e… Log Message: ----------- Merge pull request #4218 from techee/open_doc_warning_fix Re-convert filter_iter after removing/re-adding iter from/to store Modified Paths: -------------- src/sidebar.c Modified: src/sidebar.c 14 lines changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -1041,25 +1041,29 @@ void sidebar_openfiles_update(GeanyDocument *doc) { /* path has changed, so remove and re-add */ GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeSelection *treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); GtkTreeIter filter_iter; - GtkTreeSelection *treesel; gboolean sel = FALSE; gboolean have_filter_iter; have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); if (have_filter_iter) - { - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); sel = gtk_tree_selection_iter_is_selected(treesel, &filter_iter); - } openfiles_remove(doc); sidebar_openfiles_add(doc); if (sel) - gtk_tree_selection_select_iter(treesel, &filter_iter); + { + /* we need to re-convert iter->filter_iter as the original iter + * becomes invalid after removal and re-addition of doc from/to sidebar */ + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); + if (have_filter_iter) + gtk_tree_selection_select_iter(treesel, &filter_iter); + } } g_free(fname); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6b41a0: Re-convert filter_iter after removing/re-adding iter from/to store
by Jiří Techet 31 Jan '25

31 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 31 Jan 2025 19:48:24 UTC Commit: 6b41a0e6cdecf7656e290c8ae0c67bb1f7cb6915 https://github.com/geany/geany/commit/6b41a0e6cdecf7656e290c8ae0c67bb1f7cb6… Log Message: ----------- Re-convert filter_iter after removing/re-adding iter from/to store By openfiles_remove(doc); sidebar_openfiles_add(doc); doc->priv->iter (which is pointed to by iter) is re-created. This invalidates filter_iter which has to be re-converted from iter to avoid runtime warning. Modified Paths: -------------- src/sidebar.c Modified: src/sidebar.c 14 lines changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -1041,25 +1041,29 @@ void sidebar_openfiles_update(GeanyDocument *doc) { /* path has changed, so remove and re-add */ GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeSelection *treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); GtkTreeIter filter_iter; - GtkTreeSelection *treesel; gboolean sel = FALSE; gboolean have_filter_iter; have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); if (have_filter_iter) - { - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); sel = gtk_tree_selection_iter_is_selected(treesel, &filter_iter); - } openfiles_remove(doc); sidebar_openfiles_add(doc); if (sel) - gtk_tree_selection_select_iter(treesel, &filter_iter); + { + /* we need to re-convert iter->filter_iter as the original iter + * becomes invalid after removal and re-addition of doc from/to sidebar */ + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); + if (have_filter_iter) + gtk_tree_selection_select_iter(treesel, &filter_iter); + } } g_free(fname); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 85dd68: Re-save geany.glade with Glade
by Jiří Techet 31 Jan '25

31 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 21:18:10 UTC Commit: 85dd688836019b8d52594b3ea286e007e6732420 https://github.com/geany/geany/commit/85dd688836019b8d52594b3ea286e007e6732… Log Message: ----------- Re-save geany.glade with Glade Seems to always generate this set of diffs (which are possibly a result of merging some old PRs made with older Glade version). Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 33 lines changed, 16 insertions(+), 17 deletions(-) =================================================================== @@ -713,9 +713,9 @@ </object> <object class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-new</property> - <property name="icon-size">1</property> + <property name="icon_size">1</property> </object> <object class="GtkListStore" id="indent_mode_list"> <columns> @@ -3952,17 +3952,6 @@ <property name="can-focus">False</property> <property name="label-xalign">0</property> <property name="shadow-type">none</property> - <child type="label"> - <object class="GtkCheckButton" id="check_line_end"> - <property name="label" translatable="yes">Show line endings</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Shows the line ending character</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - </child> <child> <object class="GtkAlignment"> <property name="visible">True</property> @@ -3981,6 +3970,17 @@ </child> </object> </child> + <child type="label"> + <object class="GtkCheckButton" id="check_line_end"> + <property name="label" translatable="yes">Show line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows the line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -5545,7 +5545,6 @@ <property name="position">1</property> </packing> </child> - <child> <object class="GtkScrolledWindow" id="scrolledwindow8"> <property name="visible">True</property> @@ -8056,10 +8055,10 @@ <object class="GtkImageMenuItem" id="project_new_from_folder1"> <property name="label" translatable="yes">New from _Folder...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> <property name="image">image7</property> - <property name="use_stock">False</property> + <property name="use-stock">False</property> <signal name="activate" handler="on_project_new_from_folder1_activate" swapped="no"/> </object> </child> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 75cbdf: Merge pull request #4217 from techee/glade_save
by Colomban Wendling 31 Jan '25

31 Jan '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 30 Jan 2025 23:22:50 UTC Commit: 75cbdf714039eba3d02fe35dc132f5ccd1b436c4 https://github.com/geany/geany/commit/75cbdf714039eba3d02fe35dc132f5ccd1b43… Log Message: ----------- Merge pull request #4217 from techee/glade_save Re-save geany.glade with Glade Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 33 lines changed, 16 insertions(+), 17 deletions(-) =================================================================== @@ -713,9 +713,9 @@ </object> <object class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-new</property> - <property name="icon-size">1</property> + <property name="icon_size">1</property> </object> <object class="GtkListStore" id="indent_mode_list"> <columns> @@ -3952,17 +3952,6 @@ <property name="can-focus">False</property> <property name="label-xalign">0</property> <property name="shadow-type">none</property> - <child type="label"> - <object class="GtkCheckButton" id="check_line_end"> - <property name="label" translatable="yes">Show line endings</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Shows the line ending character</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - </child> <child> <object class="GtkAlignment"> <property name="visible">True</property> @@ -3981,6 +3970,17 @@ </child> </object> </child> + <child type="label"> + <object class="GtkCheckButton" id="check_line_end"> + <property name="label" translatable="yes">Show line endings</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Shows the line ending character</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -5545,7 +5545,6 @@ <property name="position">1</property> </packing> </child> - <child> <object class="GtkScrolledWindow" id="scrolledwindow8"> <property name="visible">True</property> @@ -8056,10 +8055,10 @@ <object class="GtkImageMenuItem" id="project_new_from_folder1"> <property name="label" translatable="yes">New from _Folder...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> <property name="image">image7</property> - <property name="use_stock">False</property> + <property name="use-stock">False</property> <signal name="activate" handler="on_project_new_from_folder1_activate" swapped="no"/> </object> </child> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b2e70f: Set GtkTreeModelFilter as a model for document tree
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 19 Jan 2025 19:31:07 UTC Commit: b2e70fd16b678f2954e54ed84eef0df1b7c22ad8 https://github.com/geany/geany/commit/b2e70fd16b678f2954e54ed84eef0df1b7c22… Log Message: ----------- Set GtkTreeModelFilter as a model for document tree This commit doesn't perform any filtering yet - it only uses GtkTreeModelFilter and makes sure that existing functionality works as before. The reason for the additional changes is the fact that some tree operations work on top of GtkTreeIter/GtkTreePath referring the filtered model (typically "visual" things like item selection or expanding/collapsing) while other operations work on top of the original model/store - typically insertions/deletions/modifications of the stored data. When needed, conversions from one type of iterator/path to the other were added. Modified Paths: -------------- src/document.c src/sidebar.c src/sidebar.h Modified: src/document.c 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -660,10 +660,18 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* select document in sidebar */ { - GtkTreeSelection *sel; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter filter_iter; + gboolean have_filter_iter; - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &doc->priv->iter); + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, &doc->priv->iter); + + if (have_filter_iter) + { + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + gtk_tree_selection_select_iter(sel, &filter_iter); + } } ui_document_buttons_update(); Modified: src/sidebar.c 116 lines changed, 86 insertions(+), 30 deletions(-) =================================================================== @@ -285,8 +285,8 @@ GtkTreeStore *sidebar_create_store_openfiles(void) GtkTreeStore *store; /* store the icon and the short filename to show, and the index as reference, * the colour (black/red/green) and the full name for the tooltip */ - store = gtk_tree_store_new(6, G_TYPE_ICON, G_TYPE_STRING, - G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN); + store = gtk_tree_store_new(DOCUMENTS_COLUMNS_NUM, G_TYPE_ICON, G_TYPE_STRING, + G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); /* sort opened filenames in the store_openfiles treeview */ sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store)); @@ -332,32 +332,40 @@ static void store_fold_recurse(GtkTreeView *view, } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static gboolean on_row_expand(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - GtkTreeModel *model; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter store_iter; + + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - model = gtk_tree_view_get_model(view); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, FALSE, -1); + gtk_tree_store_set(store_openfiles, &store_iter, DOCUMENTS_FOLD, FALSE, -1); return FALSE; } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static gboolean on_row_collapse(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - GtkTreeModel *model; - GtkTreeIter child_iter; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter child_iter, store_iter; gboolean valid; - model = gtk_tree_view_get_model(view); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, TRUE, -1); + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - valid = gtk_tree_model_iter_children(model, &child_iter, iter); + gtk_tree_store_set(store_openfiles, &store_iter, DOCUMENTS_FOLD, TRUE, -1); + + valid = gtk_tree_model_iter_children(model, &child_iter, &store_iter); while (valid) { store_fold_recurse(view, &child_iter, model); @@ -368,20 +376,23 @@ static gboolean on_row_collapse(GtkTreeView *view, } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static void on_row_expanded(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path_, gpointer user_data) { - GtkTreeIter child_iter; - GtkTreeModel *model; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + GtkTreeIter child_iter, store_iter; GtkTreePath *path; gboolean valid; GeanyDocument *doc; - model = gtk_tree_view_get_model(view); + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - valid = gtk_tree_model_iter_children(model, &child_iter, iter); + valid = gtk_tree_model_iter_children(model, &child_iter, &store_iter); while (valid) { gboolean fold; @@ -390,7 +401,15 @@ static void on_row_expanded(GtkTreeView *view, path = gtk_tree_model_get_path(model, &child_iter); if (!doc && !fold) - gtk_tree_view_expand_row(view, path, FALSE); + { + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + gtk_tree_view_expand_row(view, filter_path, FALSE); + + gtk_tree_path_free(filter_path); + } valid = gtk_tree_model_iter_next(model, &child_iter); gtk_tree_path_free(path); @@ -405,12 +424,17 @@ static void prepare_openfiles(void) GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; GtkTreeSelection *selection; + GtkTreeModel *filter_model; tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); sidebar_create_store_openfiles(); - gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); + filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(store_openfiles), NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(filter_model), + DOCUMENTS_VISIBLE); + gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), filter_model); + g_object_unref(filter_model); /* These two implement "remember fold state of rows when their parents are folded". Normally * GTK does not remember the fold state and can only expand all or no children when @@ -876,11 +900,18 @@ static gboolean sidebar_openfiles_add_iter(GtkTreeStore *tree, const gchar *file static void expand_iter(GtkTreeIter *iter) { - GtkTreePath *path; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreePath *path, *filter_path; path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); + filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), filter_path); + gtk_tree_path_free(path); + gtk_tree_path_free(filter_path); } @@ -995,16 +1026,26 @@ void sidebar_openfiles_update(GeanyDocument *doc) else { /* path has changed, so remove and re-add */ + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter filter_iter; GtkTreeSelection *treesel; - gboolean sel; + gboolean sel = FALSE; + gboolean have_filter_iter; - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - sel = gtk_tree_selection_iter_is_selected(treesel, &doc->priv->iter); - openfiles_remove(doc); + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); + if (have_filter_iter) + { + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + sel = gtk_tree_selection_iter_is_selected(treesel, &filter_iter); + } + + openfiles_remove(doc); sidebar_openfiles_add(doc); + if (sel) - gtk_tree_selection_select_iter(treesel, &doc->priv->iter); + gtk_tree_selection_select_iter(treesel, &filter_iter); } g_free(fname); } @@ -1270,9 +1311,17 @@ static gboolean tree_model_find_node(GtkTreeModel *model, gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); if (doc == data) { - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); - return TRUE; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + { + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), filter_path); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), filter_path, NULL, FALSE); + gtk_tree_path_free(filter_path); + return TRUE; + } } return FALSE; @@ -1477,14 +1526,21 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event { if (gtk_tree_model_iter_has_child(model, &iter)) { + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); - if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) - gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); - else - gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + if (filter_path) + { + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), filter_path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), filter_path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), filter_path, FALSE); + } gtk_tree_path_free(path); + gtk_tree_path_free(filter_path); return TRUE; } } Modified: src/sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -67,6 +67,8 @@ enum DOCUMENTS_COLOR, DOCUMENTS_FILENAME, /* full filename */ DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ + DOCUMENTS_VISIBLE, + DOCUMENTS_COLUMNS_NUM }; void sidebar_init(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7c1970: Move code for selecting document in sidebar to sidebar.c
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 19 Jan 2025 19:37:48 UTC Commit: 7c19704c186b10828be9513f320a516c5bc2c6c6 https://github.com/geany/geany/commit/7c19704c186b10828be9513f320a516c5bc2c… Log Message: ----------- Move code for selecting document in sidebar to sidebar.c This removes the internal logic from document.c and moves it to sidebar.c where it belongs. Modified Paths: -------------- src/document.c src/sidebar.c src/sidebar.h Modified: src/document.c 16 lines changed, 1 insertions(+), 15 deletions(-) =================================================================== @@ -658,21 +658,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) notebook_new_tab(doc); - /* select document in sidebar */ - { - GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); - GtkTreeIter filter_iter; - gboolean have_filter_iter; - - have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( - GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, &doc->priv->iter); - - if (have_filter_iter) - { - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &filter_iter); - } - } + sidebar_openfiles_select(doc); ui_document_buttons_update(); Modified: src/sidebar.c 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -1051,6 +1051,23 @@ void sidebar_openfiles_update(GeanyDocument *doc) } +void sidebar_openfiles_select(GeanyDocument *doc) +{ + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter filter_iter; + gboolean have_filter_iter; + + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, &doc->priv->iter); + + if (have_filter_iter) + { + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + gtk_tree_selection_select_iter(sel, &filter_iter); + } +} + + void sidebar_openfiles_update_all(void) { guint i; Modified: src/sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,8 @@ void sidebar_openfiles_add(GeanyDocument *doc); void sidebar_openfiles_update(GeanyDocument *doc); +void sidebar_openfiles_select(GeanyDocument *doc); + void sidebar_openfiles_update_all(void); void sidebar_select_openfiles_item(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1f6590: Merge pull request #4210 from techee/doc_filter
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 26 Jan 2025 21:14:00 UTC Commit: 1f6590a6c941cbd4038058778b331a4e74dcde72 https://github.com/geany/geany/commit/1f6590a6c941cbd4038058778b331a4e74dcd… Log Message: ----------- Merge pull request #4210 from techee/doc_filter Add filter for open documents sidebar item Modified Paths: -------------- data/geany.glade doc/geany.txt src/callbacks.c src/callbacks.h src/document.c src/sidebar.c src/sidebar.h Modified: data/geany.glade 40 lines changed, 35 insertions(+), 5 deletions(-) =================================================================== @@ -8399,17 +8399,47 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow7"> + <object class="GtkVBox" id="vbox47"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkEntry" id="entry_docfilter"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Filter the document list using the entered text. Separate multiple filters with a space.</property> + <property name="invisible-char">•</property> + <property name="primary-icon-stock">gtk-find</property> + <property name="secondary-icon-stock">gtk-clear</property> + <property name="primary-icon-activatable">False</property> + <signal name="activate" handler="on_entry_docfilter_activate" swapped="no"/> + <signal name="changed" handler="on_entry_docfilter_changed" swapped="no"/> + <signal name="icon-press" handler="on_entry_docfilter_icon_press" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkTreeView" id="treeview6"> + <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can-focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> + <child> + <object class="GtkTreeView" id="treeview6"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> Modified: doc/geany.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -282,6 +282,7 @@ described by that plugin documentation): * save to or reload from files * search tree based at selected file * show or hide the document paths + * filter documents based on their name similarly to the Symbols tab Command line options -------------------- Modified: src/callbacks.c 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -475,6 +475,37 @@ void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data) } +void on_entry_docfilter_changed(GtkAction *action, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + GtkEntry *filter_entry; + + if (!doc) + return; + + filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_docfilter")); + sidebar_openfiles_set_filter(gtk_entry_get_text(filter_entry)); +} + + +void on_entry_docfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data) +{ + if (event->button.button == 1) + gtk_entry_set_text(entry, ""); +} + + +void on_entry_docfilter_activate(GtkEntry *entry, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + sidebar_focus_openfiles_tab(); +} + + /* hides toolbar from toolbar popup menu */ static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data) { Modified: src/callbacks.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -78,6 +78,12 @@ void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_po void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data); +void on_entry_docfilter_changed(GtkAction *action, gpointer user_data); + +void on_entry_docfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data); + +void on_entry_docfilter_activate(GtkEntry *entry, gpointer user_data); + void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/document.c 8 lines changed, 1 insertions(+), 7 deletions(-) =================================================================== @@ -657,13 +657,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) notebook_new_tab(doc); - /* select document in sidebar */ - { - GtkTreeSelection *sel; - - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &doc->priv->iter); - } + sidebar_select_openfiles_item(doc); ui_document_buttons_update(); Modified: src/sidebar.c 184 lines changed, 153 insertions(+), 31 deletions(-) =================================================================== @@ -78,6 +78,7 @@ enum static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; +static gchar *openfiles_filter; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ @@ -285,8 +286,8 @@ GtkTreeStore *sidebar_create_store_openfiles(void) GtkTreeStore *store; /* store the icon and the short filename to show, and the index as reference, * the colour (black/red/green) and the full name for the tooltip */ - store = gtk_tree_store_new(6, G_TYPE_ICON, G_TYPE_STRING, - G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN); + store = gtk_tree_store_new(DOCUMENTS_COLUMNS_NUM, G_TYPE_ICON, G_TYPE_STRING, + G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); /* sort opened filenames in the store_openfiles treeview */ sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store)); @@ -332,32 +333,40 @@ static void store_fold_recurse(GtkTreeView *view, } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static gboolean on_row_expand(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - GtkTreeModel *model; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter store_iter; + + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - model = gtk_tree_view_get_model(view); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, FALSE, -1); + gtk_tree_store_set(store_openfiles, &store_iter, DOCUMENTS_FOLD, FALSE, -1); return FALSE; } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static gboolean on_row_collapse(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - GtkTreeModel *model; - GtkTreeIter child_iter; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter child_iter, store_iter; gboolean valid; - model = gtk_tree_view_get_model(view); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, DOCUMENTS_FOLD, TRUE, -1); + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - valid = gtk_tree_model_iter_children(model, &child_iter, iter); + gtk_tree_store_set(store_openfiles, &store_iter, DOCUMENTS_FOLD, TRUE, -1); + + valid = gtk_tree_model_iter_children(model, &child_iter, &store_iter); while (valid) { store_fold_recurse(view, &child_iter, model); @@ -368,20 +377,23 @@ static gboolean on_row_collapse(GtkTreeView *view, } +/* returns GtkTreeIter and GtkTreePath of GtkTreeModelFilter */ static void on_row_expanded(GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path_, gpointer user_data) { - GtkTreeIter child_iter; - GtkTreeModel *model; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + GtkTreeIter child_iter, store_iter; GtkTreePath *path; gboolean valid; GeanyDocument *doc; - model = gtk_tree_view_get_model(view); + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(filter_model), &store_iter, iter); - valid = gtk_tree_model_iter_children(model, &child_iter, iter); + valid = gtk_tree_model_iter_children(model, &child_iter, &store_iter); while (valid) { gboolean fold; @@ -390,7 +402,15 @@ static void on_row_expanded(GtkTreeView *view, path = gtk_tree_model_get_path(model, &child_iter); if (!doc && !fold) - gtk_tree_view_expand_row(view, path, FALSE); + { + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + gtk_tree_view_expand_row(view, filter_path, FALSE); + + gtk_tree_path_free(filter_path); + } valid = gtk_tree_model_iter_next(model, &child_iter); gtk_tree_path_free(path); @@ -405,12 +425,17 @@ static void prepare_openfiles(void) GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; GtkTreeSelection *selection; + GtkTreeModel *filter_model; tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); sidebar_create_store_openfiles(); - gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); + filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(store_openfiles), NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(filter_model), + DOCUMENTS_VISIBLE); + gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), filter_model); + g_object_unref(filter_model); /* These two implement "remember fold state of rows when their parents are folded". Normally * GTK does not remember the fold state and can only expand all or no children when @@ -574,7 +599,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte GdkColor *color; GeanyDocument *doc; GtkTreeModel *model = GTK_TREE_MODEL(tree); - gboolean fold; + gboolean fold, visible; gtk_tree_store_append(tree, new_node, parent_new); gtk_tree_model_get(model, node, @@ -584,6 +609,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, &color, DOCUMENTS_FILENAME, &filename, DOCUMENTS_FOLD, &fold, + DOCUMENTS_VISIBLE, &visible, -1); if (doc) @@ -598,6 +624,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, filename, DOCUMENTS_FOLD, fold, + DOCUMENTS_VISIBLE, visible, -1); g_free(filename); g_free(shortname); @@ -647,16 +674,21 @@ static void tree_add_new_dir(GtkTreeStore *tree, GtkTreeIter *child, GtkTreeIter { static GIcon *dir_icon = NULL; gchar *dirname = parent_dir_name(tree, parent, file); + gboolean visible = TRUE; if (!dir_icon) dir_icon = ui_get_mime_icon("inode/directory"); + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, dirname); + gtk_tree_store_append(tree, child, parent); gtk_tree_store_set(tree, child, DOCUMENTS_ICON, dir_icon, DOCUMENTS_FILENAME, file, DOCUMENTS_SHORTNAME, dirname, DOCUMENTS_FOLD, TRUE, /* GTK inserts folded by default, caller may expand */ + DOCUMENTS_VISIBLE, visible, -1); g_free(dirname); @@ -876,11 +908,18 @@ static gboolean sidebar_openfiles_add_iter(GtkTreeStore *tree, const gchar *file static void expand_iter(GtkTreeIter *iter) { - GtkTreePath *path; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreePath *path, *filter_path; path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); + filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), filter_path); + gtk_tree_path_free(path); + gtk_tree_path_free(filter_path); } @@ -896,6 +935,7 @@ void sidebar_openfiles_add(GeanyDocument *doc) const GdkColor *color = document_get_status_color(doc); static GIcon *file_icon = NULL; gboolean expand = FALSE; + gboolean visible = TRUE; if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) expand = sidebar_openfiles_add_iter(store_openfiles, filename, iter, &parent); @@ -906,11 +946,16 @@ void sidebar_openfiles_add(GeanyDocument *doc) file_icon = ui_get_mime_icon("text/plain"); basename = g_path_get_basename(filename); + + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, basename); + gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, (doc->file_type && doc->file_type->icon) ? doc->file_type->icon : file_icon, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, DOC_FILENAME(doc), DOCUMENTS_FOLD, FALSE, + DOCUMENTS_VISIBLE, visible, -1); g_free(basename); @@ -995,16 +1040,26 @@ void sidebar_openfiles_update(GeanyDocument *doc) else { /* path has changed, so remove and re-add */ + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeIter filter_iter; GtkTreeSelection *treesel; - gboolean sel; + gboolean sel = FALSE; + gboolean have_filter_iter; - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - sel = gtk_tree_selection_iter_is_selected(treesel, &doc->priv->iter); - openfiles_remove(doc); + have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( + GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, iter); + if (have_filter_iter) + { + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + sel = gtk_tree_selection_iter_is_selected(treesel, &filter_iter); + } + + openfiles_remove(doc); sidebar_openfiles_add(doc); + if (sel) - gtk_tree_selection_select_iter(treesel, &doc->priv->iter); + gtk_tree_selection_select_iter(treesel, &filter_iter); } g_free(fname); } @@ -1022,6 +1077,54 @@ void sidebar_openfiles_update_all(void) } +static gboolean update_visibility(GtkTreeStore *store, GtkTreeIter *root, gboolean visible_root) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean is_visible = FALSE; + GtkTreeIter parent; + + if (!gtk_tree_model_iter_children(model, &parent, root)) + return FALSE; + + while (TRUE) + { + gboolean visible_parent = TRUE; + gboolean visible_children; + gchar *parent_name; + + /* check if parent matches and then display *all* its children, otherwise + * check each child if the action name matches */ + gtk_tree_model_get(model, &parent, DOCUMENTS_SHORTNAME, &parent_name, -1); + if (! EMPTY(openfiles_filter)) + visible_parent = utils_utf8_substring_match(openfiles_filter, parent_name); + g_free(parent_name); + + visible_children = update_visibility(store, &parent, visible_root || visible_parent); + + if (visible_parent || visible_children) + is_visible = TRUE; + + gtk_tree_store_set(store, &parent, DOCUMENTS_VISIBLE, + visible_root || visible_parent || visible_children, -1); + + if (! gtk_tree_model_iter_next(model, &parent)) + return is_visible; + } +} + + +void sidebar_openfiles_set_filter(const gchar *filter) +{ + GeanyDocument *doc = document_get_current(); + + SETPTR(openfiles_filter, g_strdup(filter)); + update_visibility(store_openfiles, NULL, FALSE); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); + if (doc) + sidebar_select_openfiles_item(doc); +} + + void sidebar_remove_document(GeanyDocument *doc) { openfiles_remove(doc); @@ -1270,9 +1373,17 @@ static gboolean tree_model_find_node(GtkTreeModel *model, gtk_tree_model_get(model, iter, DOCUMENTS_DOCUMENT, &doc, -1); if (doc == data) { - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), path); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); - return TRUE; + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); + + if (filter_path) + { + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tv.tree_openfiles), filter_path); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), filter_path, NULL, FALSE); + gtk_tree_path_free(filter_path); + return TRUE; + } } return FALSE; @@ -1477,14 +1588,21 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event { if (gtk_tree_model_iter_has_child(model, &iter)) { + GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + GtkTreePath *filter_path = gtk_tree_model_filter_convert_child_path_to_path( + GTK_TREE_MODEL_FILTER(filter_model), path); - if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) - gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); - else - gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + if (filter_path) + { + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), filter_path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), filter_path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), filter_path, FALSE); + } gtk_tree_path_free(path); + gtk_tree_path_free(filter_path); return TRUE; } } @@ -1595,6 +1713,8 @@ void sidebar_init(void) { StashGroup *group; + openfiles_filter = g_strdup(""); + group = stash_group_new(PACKAGE); stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), main_widgets.sidebar_notebook, "page", 0); @@ -1629,6 +1749,8 @@ void sidebar_finalize(void) gtk_widget_destroy(tv.popup_taglist); if (WIDGET(openfiles_popup_menu)) gtk_widget_destroy(openfiles_popup_menu); + + g_free(openfiles_filter); } Modified: src/sidebar.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -67,6 +67,8 @@ enum DOCUMENTS_COLOR, DOCUMENTS_FILENAME, /* full filename */ DOCUMENTS_FOLD, /* fold state stored when folding parent rows */ + DOCUMENTS_VISIBLE, + DOCUMENTS_COLUMNS_NUM }; void sidebar_init(void); @@ -81,6 +83,8 @@ void sidebar_openfiles_update(GeanyDocument *doc); void sidebar_openfiles_update_all(void); +void sidebar_openfiles_set_filter(const gchar *filter); + void sidebar_select_openfiles_item(GeanyDocument *doc); void sidebar_remove_document(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f54843: Remove redundant sidebar_openfiles_select()
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 20:57:25 UTC Commit: f54843ac4f341774bb44245791e1f0e86e717cc5 https://github.com/geany/geany/commit/f54843ac4f341774bb44245791e1f0e86e717… Log Message: ----------- Remove redundant sidebar_openfiles_select() There is already sidebar_select_openfiles_item() which does more or less the same (plus tree expanding and scrolling to the given item which we probably always want). Modified Paths: -------------- src/document.c src/sidebar.c src/sidebar.h Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -658,7 +658,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) notebook_new_tab(doc); - sidebar_openfiles_select(doc); + sidebar_select_openfiles_item(doc); ui_document_buttons_update(); Modified: src/sidebar.c 19 lines changed, 1 insertions(+), 18 deletions(-) =================================================================== @@ -1065,23 +1065,6 @@ void sidebar_openfiles_update(GeanyDocument *doc) } -void sidebar_openfiles_select(GeanyDocument *doc) -{ - GtkTreeModel *filter_model = gtk_tree_view_get_model(GTK_TREE_VIEW(tv.tree_openfiles)); - GtkTreeIter filter_iter; - gboolean have_filter_iter; - - have_filter_iter = gtk_tree_model_filter_convert_child_iter_to_iter( - GTK_TREE_MODEL_FILTER(filter_model), &filter_iter, &doc->priv->iter); - - if (have_filter_iter) - { - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &filter_iter); - } -} - - void sidebar_openfiles_update_all(void) { guint i; @@ -1138,7 +1121,7 @@ void sidebar_openfiles_set_filter(const gchar *filter) update_visibility(store_openfiles, NULL, FALSE); gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); if (doc) - sidebar_openfiles_select(doc); + sidebar_select_openfiles_item(doc); } Modified: src/sidebar.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -81,8 +81,6 @@ void sidebar_openfiles_add(GeanyDocument *doc); void sidebar_openfiles_update(GeanyDocument *doc); -void sidebar_openfiles_select(GeanyDocument *doc); - void sidebar_openfiles_update_all(void); void sidebar_openfiles_set_filter(const gchar *filter); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bb6bfd: Document the filtering feature
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 20:57:25 UTC Commit: bb6bfdffaf9550a3e5da9d6a74146987c586c7f9 https://github.com/geany/geany/commit/bb6bfdffaf9550a3e5da9d6a74146987c586c… Log Message: ----------- Document the filtering feature The documentation just refers to the Symbols tab documentation which is more or less identical so there's no need of duplicated text. Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -282,6 +282,7 @@ described by that plugin documentation): * save to or reload from files * search tree based at selected file * show or hide the document paths + * filter documents based on their name similarly to the Symbols tab Command line options -------------------- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 74d3b2: Add code for filtering document tree
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 20:57:14 UTC Commit: 74d3b271fbb2e1ba63239f84e166557720f43794 https://github.com/geany/geany/commit/74d3b271fbb2e1ba63239f84e166557720f43… Log Message: ----------- Add code for filtering document tree Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h src/sidebar.c src/sidebar.h Modified: data/geany.glade 40 lines changed, 35 insertions(+), 5 deletions(-) =================================================================== @@ -8399,17 +8399,47 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow7"> + <object class="GtkVBox" id="vbox47"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkEntry" id="entry_docfilter"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Filter the document list using the entered text. Separate multiple filters with a space.</property> + <property name="invisible-char">•</property> + <property name="primary-icon-stock">gtk-find</property> + <property name="secondary-icon-stock">gtk-clear</property> + <property name="primary-icon-activatable">False</property> + <signal name="activate" handler="on_entry_docfilter_activate" swapped="no"/> + <signal name="changed" handler="on_entry_docfilter_changed" swapped="no"/> + <signal name="icon-press" handler="on_entry_docfilter_icon_press" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkTreeView" id="treeview6"> + <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can-focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> + <child> + <object class="GtkTreeView" id="treeview6"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> Modified: src/callbacks.c 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -475,6 +475,37 @@ void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data) } +void on_entry_docfilter_changed(GtkAction *action, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + GtkEntry *filter_entry; + + if (!doc) + return; + + filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_docfilter")); + sidebar_openfiles_set_filter(gtk_entry_get_text(filter_entry)); +} + + +void on_entry_docfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data) +{ + if (event->button.button == 1) + gtk_entry_set_text(entry, ""); +} + + +void on_entry_docfilter_activate(GtkEntry *entry, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + sidebar_focus_openfiles_tab(); +} + + /* hides toolbar from toolbar popup menu */ static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data) { Modified: src/callbacks.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -78,6 +78,12 @@ void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_po void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data); +void on_entry_docfilter_changed(GtkAction *action, gpointer user_data); + +void on_entry_docfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data); + +void on_entry_docfilter_activate(GtkEntry *entry, gpointer user_data); + void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/sidebar.c 68 lines changed, 67 insertions(+), 1 deletions(-) =================================================================== @@ -78,6 +78,7 @@ enum static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; +static gchar *openfiles_filter; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ @@ -598,7 +599,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte GdkColor *color; GeanyDocument *doc; GtkTreeModel *model = GTK_TREE_MODEL(tree); - gboolean fold; + gboolean fold, visible; gtk_tree_store_append(tree, new_node, parent_new); gtk_tree_model_get(model, node, @@ -608,6 +609,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, &color, DOCUMENTS_FILENAME, &filename, DOCUMENTS_FOLD, &fold, + DOCUMENTS_VISIBLE, &visible, -1); if (doc) @@ -622,6 +624,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, filename, DOCUMENTS_FOLD, fold, + DOCUMENTS_VISIBLE, visible, -1); g_free(filename); g_free(shortname); @@ -671,16 +674,21 @@ static void tree_add_new_dir(GtkTreeStore *tree, GtkTreeIter *child, GtkTreeIter { static GIcon *dir_icon = NULL; gchar *dirname = parent_dir_name(tree, parent, file); + gboolean visible = TRUE; if (!dir_icon) dir_icon = ui_get_mime_icon("inode/directory"); + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, dirname); + gtk_tree_store_append(tree, child, parent); gtk_tree_store_set(tree, child, DOCUMENTS_ICON, dir_icon, DOCUMENTS_FILENAME, file, DOCUMENTS_SHORTNAME, dirname, DOCUMENTS_FOLD, TRUE, /* GTK inserts folded by default, caller may expand */ + DOCUMENTS_VISIBLE, visible, -1); g_free(dirname); @@ -927,6 +935,7 @@ void sidebar_openfiles_add(GeanyDocument *doc) const GdkColor *color = document_get_status_color(doc); static GIcon *file_icon = NULL; gboolean expand = FALSE; + gboolean visible = TRUE; if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) expand = sidebar_openfiles_add_iter(store_openfiles, filename, iter, &parent); @@ -937,11 +946,16 @@ void sidebar_openfiles_add(GeanyDocument *doc) file_icon = ui_get_mime_icon("text/plain"); basename = g_path_get_basename(filename); + + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, basename); + gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, (doc->file_type && doc->file_type->icon) ? doc->file_type->icon : file_icon, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, DOC_FILENAME(doc), DOCUMENTS_FOLD, FALSE, + DOCUMENTS_VISIBLE, visible, -1); g_free(basename); @@ -1080,6 +1094,54 @@ void sidebar_openfiles_update_all(void) } +static gboolean update_visibility(GtkTreeStore *store, GtkTreeIter *root, gboolean visible_root) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean is_visible = FALSE; + GtkTreeIter parent; + + if (!gtk_tree_model_iter_children(model, &parent, root)) + return FALSE; + + while (TRUE) + { + gboolean visible_parent = TRUE; + gboolean visible_children; + gchar *parent_name; + + /* check if parent matches and then display *all* its children, otherwise + * check each child if the action name matches */ + gtk_tree_model_get(model, &parent, DOCUMENTS_SHORTNAME, &parent_name, -1); + if (! EMPTY(openfiles_filter)) + visible_parent = utils_utf8_substring_match(openfiles_filter, parent_name); + g_free(parent_name); + + visible_children = update_visibility(store, &parent, visible_root || visible_parent); + + if (visible_parent || visible_children) + is_visible = TRUE; + + gtk_tree_store_set(store, &parent, DOCUMENTS_VISIBLE, + visible_root || visible_parent || visible_children, -1); + + if (! gtk_tree_model_iter_next(model, &parent)) + return is_visible; + } +} + + +void sidebar_openfiles_set_filter(const gchar *filter) +{ + GeanyDocument *doc = document_get_current(); + + SETPTR(openfiles_filter, g_strdup(filter)); + update_visibility(store_openfiles, NULL, FALSE); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); + if (doc) + sidebar_openfiles_select(doc); +} + + void sidebar_remove_document(GeanyDocument *doc) { openfiles_remove(doc); @@ -1668,6 +1730,8 @@ void sidebar_init(void) { StashGroup *group; + openfiles_filter = g_strdup(""); + group = stash_group_new(PACKAGE); stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), main_widgets.sidebar_notebook, "page", 0); @@ -1702,6 +1766,8 @@ void sidebar_finalize(void) gtk_widget_destroy(tv.popup_taglist); if (WIDGET(openfiles_popup_menu)) gtk_widget_destroy(openfiles_popup_menu); + + g_free(openfiles_filter); } Modified: src/sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -85,6 +85,8 @@ void sidebar_openfiles_select(GeanyDocument *doc); void sidebar_openfiles_update_all(void); +void sidebar_openfiles_set_filter(const gchar *filter); + void sidebar_select_openfiles_item(GeanyDocument *doc); void sidebar_remove_document(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2025