Commits

commits@lists.geany.org

1 participants
11738 discussions

[geany/geany] 83c1ad: Move show_wrap_search_dialog() to search.h
by Jiří Techet 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 04 Dec 2024 20:22:09 UTC Commit: 83c1ad8ae46b7b1b684176b5030109064a052491 https://github.com/geany/geany/commit/83c1ad8ae46b7b1b684176b5030109064a052… Log Message: ----------- Move show_wrap_search_dialog() to search.h This will allow the wrap dialog access search and replace dialogs in the following commits. Modified Paths: -------------- src/document.c src/search.c src/search.h Modified: src/document.c 38 lines changed, 1 insertions(+), 37 deletions(-) =================================================================== @@ -2307,42 +2307,6 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gboolea } -/* like dialogs_show_question_full() but makes the non-cancel button default */ -static gboolean show_wrap_search_dialog(GtkWidget *parent, const gchar *search_text) -{ - gboolean ret; - GtkWidget *dialog; - GtkWidget *btn; - gchar *question_text; - - if (parent == NULL && main_status.main_window_realized) - parent = main_widgets.window; - - question_text = g_strdup_printf(_("\"%s\" was not found."), search_text); - - dialog = gtk_message_dialog_new(GTK_WINDOW(parent), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, "%s", question_text); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); - gtk_window_set_icon_name(GTK_WINDOW(dialog), "geany"); - - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), - "%s", _("Wrap search and find again?")); - - gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); - btn = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_FIND, GTK_RESPONSE_YES); - gtk_widget_grab_default(btn); - - ret = gtk_dialog_run(GTK_DIALOG(dialog)); - - gtk_widget_destroy(dialog); - g_free(question_text); - - return ret == GTK_RESPONSE_YES; -} - - /* General search function, used from the find dialog. * Returns -1 on failure or the start position of the matching text. * Will skip past any selection, ignoring it. @@ -2406,7 +2370,7 @@ gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *orig /* we searched only part of the document, so ask whether to wraparound. */ if (search_prefs.always_wrap || - show_wrap_search_dialog(parent, original_text)) + search_show_wrap_dialog(parent, original_text)) { gint ret; Modified: src/search.c 37 lines changed, 36 insertions(+), 1 deletions(-) =================================================================== @@ -49,7 +49,6 @@ #include <string.h> #include <ctype.h> -#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> enum @@ -1148,6 +1147,42 @@ void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir) } +/* like dialogs_show_question_full() but makes the non-cancel button default */ +gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text) +{ + gboolean ret; + GtkWidget *dialog; + GtkWidget *btn; + gchar *question_text; + + if (parent == NULL) + parent = main_widgets.window; + + question_text = g_strdup_printf(_("\"%s\" was not found."), search_text); + + dialog = gtk_message_dialog_new(GTK_WINDOW(parent), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, "%s", question_text); + gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); + gtk_window_set_icon_name(GTK_WINDOW(dialog), "geany"); + + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + "%s", _("Wrap search and find again?")); + + gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); + btn = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_FIND, GTK_RESPONSE_YES); + gtk_widget_grab_default(btn); + + ret = gtk_dialog_run(GTK_DIALOG(dialog)); + + gtk_widget_destroy(dialog); + g_free(question_text); + + return ret == GTK_RESPONSE_YES; +} + + static void on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user_data) { Modified: src/search.h 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,7 @@ #ifndef GEANY_SEARCH_H #define GEANY_SEARCH_H 1 -#include <glib.h> +#include <gtk/gtk.h> G_BEGIN_DECLS @@ -120,6 +120,8 @@ void search_show_replace_dialog(void); void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir); +gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text); + void geany_match_info_free(GeanyMatchInfo *info); gint search_find_prev(struct _ScintillaObject *sci, const gchar *str, GeanyFindFlags flags, GeanyMatchInfo **match_); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e171d2: Hide find/replace dialogs when wrap dialog is shown
by Jiří Techet 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 05 Dec 2024 13:48:53 UTC Commit: e171d2a1d764717d0b359feadfe4b90399f9735d https://github.com/geany/geany/commit/e171d2a1d764717d0b359feadfe4b90399f97… Log Message: ----------- Hide find/replace dialogs when wrap dialog is shown These dialogs are restored once the wrap dialog is closed. In addition to a cleaner interface where two dialogs are not displayed on top of each other, once the find/replace dialog is restored, it gains focus so users can keep searching without interruption (without this patch, the editor window gets focus so users have to press Ctrl+F again to get to the search dialog again). Modified Paths: -------------- src/search.c Modified: src/search.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -1153,8 +1153,17 @@ gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text) gboolean ret; GtkWidget *dialog; GtkWidget *btn; + GtkWidget *visible_dialog = NULL; gchar *question_text; + if (find_dlg.dialog && gtk_widget_is_visible(find_dlg.dialog)) + visible_dialog = find_dlg.dialog; + else if (replace_dlg.dialog && gtk_widget_is_visible(replace_dlg.dialog)) + visible_dialog = replace_dlg.dialog; + + if (visible_dialog) + gtk_widget_hide(visible_dialog); + if (parent == NULL) parent = main_widgets.window; @@ -1179,6 +1188,9 @@ gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text) gtk_widget_destroy(dialog); g_free(question_text); + if (visible_dialog && ret == GTK_RESPONSE_YES) + gtk_widget_show(visible_dialog); + return ret == GTK_RESPONSE_YES; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4cf437: Remove parent argument from document_find_text() and search_show_wrap_dialog()
by Jiří Techet 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 05 Dec 2024 13:49:00 UTC Commit: 4cf437f31c7133786642889214c7f48b1e35c935 https://github.com/geany/geany/commit/4cf437f31c7133786642889214c7f48b1e35c… Log Message: ----------- Remove parent argument from document_find_text() and search_show_wrap_dialog() Since find/replace dialogs are hidden now when the wrap dialog is shown, the parent of the wrap dialog is always the main window and the parameter is unnecessary. Modified Paths: -------------- src/document.c src/document.h src/search.c src/search.h Modified: src/document.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -2316,7 +2316,7 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gboolea */ gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *original_text, GeanyFindFlags flags, gboolean search_backwards, GeanyMatchInfo **match_, - gboolean scroll, GtkWidget *parent) + gboolean scroll) { gint selection_end, selection_start, search_pos; @@ -2370,12 +2370,12 @@ gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *orig /* we searched only part of the document, so ask whether to wraparound. */ if (search_prefs.always_wrap || - search_show_wrap_dialog(parent, original_text)) + search_show_wrap_dialog(original_text)) { gint ret; sci_set_current_position(doc->editor->sci, (search_backwards) ? sci_len : 0, FALSE); - ret = document_find_text(doc, text, original_text, flags, search_backwards, match_, scroll, parent); + ret = document_find_text(doc, text, original_text, flags, search_backwards, match_, scroll); if (ret == -1) { /* return to original cursor position if not found */ sci_set_current_position(doc->editor->sci, selection_start, FALSE); @@ -2416,7 +2416,7 @@ gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gch if (selection_end == selection_start) { /* no selection so just find the next match */ - document_find_text(doc, find_text, original_find_text, flags, search_backwards, NULL, TRUE, NULL); + document_find_text(doc, find_text, original_find_text, flags, search_backwards, NULL, TRUE); return -1; } /* there's a selection so go to the start before finding to search through it @@ -2426,7 +2426,7 @@ gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gch else sci_goto_pos(doc->editor->sci, selection_start, TRUE); - search_pos = document_find_text(doc, find_text, original_find_text, flags, search_backwards, &match, TRUE, NULL); + search_pos = document_find_text(doc, find_text, original_find_text, flags, search_backwards, &match, TRUE); /* return if the original selected text did not match (at the start of the selection) */ if (search_pos != selection_start) { Modified: src/document.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -261,7 +261,7 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gboolea gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *original_text, GeanyFindFlags flags, gboolean search_backwards, GeanyMatchInfo **match_, - gboolean scroll, GtkWidget *parent); + gboolean scroll); gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gchar *original_find_text, const gchar *replace_text, GeanyFindFlags flags, gboolean search_backwards); Modified: src/search.c 17 lines changed, 7 insertions(+), 10 deletions(-) =================================================================== @@ -436,7 +436,7 @@ void search_find_selection(GeanyDocument *doc, gboolean search_backwards) { setup_find_next(s); /* allow find next/prev */ - if (document_find_text(doc, s, NULL, 0, search_backwards, NULL, FALSE, NULL) > -1) + if (document_find_text(doc, s, NULL, 0, search_backwards, NULL, FALSE) > -1) editor_display_current_line(doc->editor, 0.3F); g_free(s); } @@ -1148,7 +1148,7 @@ void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir) /* like dialogs_show_question_full() but makes the non-cancel button default */ -gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text) +gboolean search_show_wrap_dialog(const gchar *search_text) { gboolean ret; GtkWidget *dialog; @@ -1164,12 +1164,9 @@ gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text) if (visible_dialog) gtk_widget_hide(visible_dialog); - if (parent == NULL) - parent = main_widgets.window; - question_text = g_strdup_printf(_("\"%s\" was not found."), search_text); - dialog = gtk_message_dialog_new(GTK_WINDOW(parent), + dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", question_text); gtk_widget_set_name(dialog, "GeanyDialog"); @@ -1402,7 +1399,7 @@ on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) case GEANY_RESPONSE_FIND_PREVIOUS: { gint result = document_find_text(doc, search_data.text, search_data.original_text, search_data.flags, - (response == GEANY_RESPONSE_FIND_PREVIOUS), NULL, TRUE, GTK_WIDGET(find_dlg.dialog)); + (response == GEANY_RESPONSE_FIND_PREVIOUS), NULL, TRUE); ui_set_search_entry_background(find_dlg.entry, (result > -1)); check_close = search_prefs.hide_find_dialog; break; @@ -1560,7 +1557,7 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) search_backwards_re); if (rep != -1) document_find_text(doc, find, original_find, search_flags_re, search_backwards_re, - NULL, TRUE, NULL); + NULL, TRUE); break; } case GEANY_RESPONSE_REPLACE: @@ -1571,7 +1568,7 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) case GEANY_RESPONSE_FIND: { gint result = document_find_text(doc, find, original_find, search_flags_re, - search_backwards_re, NULL, TRUE, GTK_WIDGET(dialog)); + search_backwards_re, NULL, TRUE); ui_set_search_entry_background(replace_dlg.find_entry, (result > -1)); break; } @@ -2366,7 +2363,7 @@ void search_find_again(gboolean change_direction) { gboolean forward = ! search_data.backwards; gint result = document_find_text(doc, search_data.text, search_data.original_text, search_data.flags, - change_direction ? forward : !forward, NULL, FALSE, NULL); + change_direction ? forward : !forward, NULL, FALSE); if (result > -1) editor_display_current_line(doc->editor, 0.3F); Modified: src/search.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,7 +27,7 @@ #ifndef GEANY_SEARCH_H #define GEANY_SEARCH_H 1 -#include <gtk/gtk.h> +#include <glib.h> G_BEGIN_DECLS @@ -120,7 +120,7 @@ void search_show_replace_dialog(void); void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir); -gboolean search_show_wrap_dialog(GtkWidget *parent, const gchar *search_text); +gboolean search_show_wrap_dialog(const gchar *search_text); void geany_match_info_free(GeanyMatchInfo *info); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ddcfcb: Merge pull request #4096 from techee/search_focus
by Jiří Techet 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 04 Jan 2025 18:38:22 UTC Commit: ddcfcbd8a5217486087a26efd2fb832c76adf258 https://github.com/geany/geany/commit/ddcfcbd8a5217486087a26efd2fb832c76adf… Log Message: ----------- Merge pull request #4096 from techee/search_focus Focus the search/replace dialog after the wrap dialog is dismissed Modified Paths: -------------- src/document.c src/document.h src/search.c src/search.h Modified: src/document.c 46 lines changed, 5 insertions(+), 41 deletions(-) =================================================================== @@ -2307,42 +2307,6 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gboolea } -/* like dialogs_show_question_full() but makes the non-cancel button default */ -static gboolean show_wrap_search_dialog(GtkWidget *parent, const gchar *search_text) -{ - gboolean ret; - GtkWidget *dialog; - GtkWidget *btn; - gchar *question_text; - - if (parent == NULL && main_status.main_window_realized) - parent = main_widgets.window; - - question_text = g_strdup_printf(_("\"%s\" was not found."), search_text); - - dialog = gtk_message_dialog_new(GTK_WINDOW(parent), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, "%s", question_text); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); - gtk_window_set_icon_name(GTK_WINDOW(dialog), "geany"); - - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), - "%s", _("Wrap search and find again?")); - - gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); - btn = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_FIND, GTK_RESPONSE_YES); - gtk_widget_grab_default(btn); - - ret = gtk_dialog_run(GTK_DIALOG(dialog)); - - gtk_widget_destroy(dialog); - g_free(question_text); - - return ret == GTK_RESPONSE_YES; -} - - /* General search function, used from the find dialog. * Returns -1 on failure or the start position of the matching text. * Will skip past any selection, ignoring it. @@ -2352,7 +2316,7 @@ static gboolean show_wrap_search_dialog(GtkWidget *parent, const gchar *search_t */ gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *original_text, GeanyFindFlags flags, gboolean search_backwards, GeanyMatchInfo **match_, - gboolean scroll, GtkWidget *parent) + gboolean scroll) { gint selection_end, selection_start, search_pos; @@ -2406,12 +2370,12 @@ gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *orig /* we searched only part of the document, so ask whether to wraparound. */ if (search_prefs.always_wrap || - show_wrap_search_dialog(parent, original_text)) + search_show_wrap_dialog(original_text)) { gint ret; sci_set_current_position(doc->editor->sci, (search_backwards) ? sci_len : 0, FALSE); - ret = document_find_text(doc, text, original_text, flags, search_backwards, match_, scroll, parent); + ret = document_find_text(doc, text, original_text, flags, search_backwards, match_, scroll); if (ret == -1) { /* return to original cursor position if not found */ sci_set_current_position(doc->editor->sci, selection_start, FALSE); @@ -2452,7 +2416,7 @@ gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gch if (selection_end == selection_start) { /* no selection so just find the next match */ - document_find_text(doc, find_text, original_find_text, flags, search_backwards, NULL, TRUE, NULL); + document_find_text(doc, find_text, original_find_text, flags, search_backwards, NULL, TRUE); return -1; } /* there's a selection so go to the start before finding to search through it @@ -2462,7 +2426,7 @@ gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gch else sci_goto_pos(doc->editor->sci, selection_start, TRUE); - search_pos = document_find_text(doc, find_text, original_find_text, flags, search_backwards, &match, TRUE, NULL); + search_pos = document_find_text(doc, find_text, original_find_text, flags, search_backwards, &match, TRUE); /* return if the original selected text did not match (at the start of the selection) */ if (search_pos != selection_start) { Modified: src/document.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -261,7 +261,7 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gboolea gint document_find_text(GeanyDocument *doc, const gchar *text, const gchar *original_text, GeanyFindFlags flags, gboolean search_backwards, GeanyMatchInfo **match_, - gboolean scroll, GtkWidget *parent); + gboolean scroll); gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gchar *original_find_text, const gchar *replace_text, GeanyFindFlags flags, gboolean search_backwards); Modified: src/search.c 56 lines changed, 50 insertions(+), 6 deletions(-) =================================================================== @@ -49,7 +49,6 @@ #include <string.h> #include <ctype.h> -#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> enum @@ -437,7 +436,7 @@ void search_find_selection(GeanyDocument *doc, gboolean search_backwards) { setup_find_next(s); /* allow find next/prev */ - if (document_find_text(doc, s, NULL, 0, search_backwards, NULL, FALSE, NULL) > -1) + if (document_find_text(doc, s, NULL, 0, search_backwards, NULL, FALSE) > -1) editor_display_current_line(doc->editor, 0.3F); g_free(s); } @@ -1148,6 +1147,51 @@ void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir) } +/* like dialogs_show_question_full() but makes the non-cancel button default */ +gboolean search_show_wrap_dialog(const gchar *search_text) +{ + gboolean ret; + GtkWidget *dialog; + GtkWidget *btn; + GtkWidget *visible_dialog = NULL; + gchar *question_text; + + if (find_dlg.dialog && gtk_widget_is_visible(find_dlg.dialog)) + visible_dialog = find_dlg.dialog; + else if (replace_dlg.dialog && gtk_widget_is_visible(replace_dlg.dialog)) + visible_dialog = replace_dlg.dialog; + + if (visible_dialog) + gtk_widget_hide(visible_dialog); + + question_text = g_strdup_printf(_("\"%s\" was not found."), search_text); + + dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, "%s", question_text); + gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); + gtk_window_set_icon_name(GTK_WINDOW(dialog), "geany"); + + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + "%s", _("Wrap search and find again?")); + + gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); + btn = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_FIND, GTK_RESPONSE_YES); + gtk_widget_grab_default(btn); + + ret = gtk_dialog_run(GTK_DIALOG(dialog)); + + gtk_widget_destroy(dialog); + g_free(question_text); + + if (visible_dialog && ret == GTK_RESPONSE_YES) + gtk_widget_show(visible_dialog); + + return ret == GTK_RESPONSE_YES; +} + + static void on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user_data) { @@ -1355,7 +1399,7 @@ on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) case GEANY_RESPONSE_FIND_PREVIOUS: { gint result = document_find_text(doc, search_data.text, search_data.original_text, search_data.flags, - (response == GEANY_RESPONSE_FIND_PREVIOUS), NULL, TRUE, GTK_WIDGET(find_dlg.dialog)); + (response == GEANY_RESPONSE_FIND_PREVIOUS), NULL, TRUE); ui_set_search_entry_background(find_dlg.entry, (result > -1)); check_close = search_prefs.hide_find_dialog; break; @@ -1513,7 +1557,7 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) search_backwards_re); if (rep != -1) document_find_text(doc, find, original_find, search_flags_re, search_backwards_re, - NULL, TRUE, NULL); + NULL, TRUE); break; } case GEANY_RESPONSE_REPLACE: @@ -1524,7 +1568,7 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) case GEANY_RESPONSE_FIND: { gint result = document_find_text(doc, find, original_find, search_flags_re, - search_backwards_re, NULL, TRUE, GTK_WIDGET(dialog)); + search_backwards_re, NULL, TRUE); ui_set_search_entry_background(replace_dlg.find_entry, (result > -1)); break; } @@ -2319,7 +2363,7 @@ void search_find_again(gboolean change_direction) { gboolean forward = ! search_data.backwards; gint result = document_find_text(doc, search_data.text, search_data.original_text, search_data.flags, - change_direction ? forward : !forward, NULL, FALSE, NULL); + change_direction ? forward : !forward, NULL, FALSE); if (result > -1) editor_display_current_line(doc->editor, 0.3F); Modified: src/search.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -120,6 +120,8 @@ void search_show_replace_dialog(void); void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir); +gboolean search_show_wrap_dialog(const gchar *search_text); + void geany_match_info_free(GeanyMatchInfo *info); gint search_find_prev(struct _ScintillaObject *sci, const gchar *str, GeanyFindFlags flags, GeanyMatchInfo **match_); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] acc785: Builders: Add /windows/mingw64/bin to $PATH
by Enrico Tröger 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Jan 2025 10:02:33 UTC Commit: acc78569343363b3de173f9bc86385aa1dd7c667 https://github.com/geany/infrastructure/commit/acc78569343363b3de173f9bc863… Log Message: ----------- Builders: Add /windows/mingw64/bin to $PATH This seems necessary e.g. for the GeanyPG plugin which looks for "gpgme" library which is installed via Pacman and so in /windows/mingw64. Modified Paths: -------------- builders/Dockerfile.mingw64 Modified: builders/Dockerfile.mingw64 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -82,3 +82,5 @@ RUN set -e && \ /windows/mingw64/share/icons \ /windows/mingw64/share/locale \ /windows/mingw64/share/doc + +ENV PATH=${PATH}:/windows/mingw64/bin -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] c55db8: Builders: Do not install not directly needed libraries
by Enrico Tröger 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Jan 2025 09:57:24 UTC Commit: c55db8c3fbb5343967959b42c0c63e37b8dd3aea https://github.com/geany/infrastructure/commit/c55db8c3fbb5343967959b42c0c6… Log Message: ----------- Builders: Do not install not directly needed libraries I'm not sure why I added those once but they are not necessary any longer or get installed as indirect dependencies. Modified Paths: -------------- builders/Dockerfile.mingw64 Modified: builders/Dockerfile.mingw64 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -32,8 +32,6 @@ RUN set -ex && \ echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list && \ apt-get update && \ apt-get install --no-install-recommends --assume-yes \ - # libraries \ - libcurl3t64-gnutls libgpgme11t64 libarchive13t64 \ # common useful utilities \ wget curl less nano git gnupg2 file ca-certificates \ zip unzip xz-utils zstd \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] fbe795: Builders: Use official MSYS2 pacman mirror list
by Enrico Tröger 04 Jan '25

04 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Jan 2025 09:55:53 UTC Commit: fbe7951b6bdf01adeab9221e7713619464449f5f https://github.com/geany/infrastructure/commit/fbe7951b6bdf01adeab9221e7713… Log Message: ----------- Builders: Use official MSYS2 pacman mirror list Modified Paths: -------------- builders/mingw64/etc/pacman.d/mirrorlist.mingw64 builders/mingw64/etc/pacman.d/mirrorlist.msys Modified: builders/mingw64/etc/pacman.d/mirrorlist.mingw64 40 lines changed, 35 insertions(+), 5 deletions(-) =================================================================== @@ -1,6 +1,36 @@ -## -## 64-bit Mingw-w64 repository mirrorlist -## +# See https://www.msys2.org/dev/mirrors -Server = http://repo.msys2.org/mingw/x86_64 -Server = http://www2.futureware.at/~nickoe/msys2-mirror/mingw/x86_64 +## Primary +Server = https://mirror.msys2.org/mingw/$repo/ +Server = https://repo.msys2.org/mingw/$repo/ + +## Tier 1 +Server = https://mirror.umd.edu/msys2/mingw/$repo/ +Server = https://mirror.yandex.ru/mirrors/msys2/mingw/$repo/ +Server = https://download.nus.edu.sg/mirror/msys2/mingw/$repo/ +Server = https://mirror.accum.se/mirror/msys2.org/mingw/$repo/ +Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/$repo/ +Server = https://ftp.osuosl.org/pub/msys2/mingw/$repo/ +Server = https://mirror.internet.asn.au/pub/msys2/mingw/$repo/ +Server = https://mirror.selfnet.de/msys2/mingw/$repo/ +Server = https://mirrors.dotsrc.org/msys2/mingw/$repo/ +Server = https://mirrors.bfsu.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.ustc.edu.cn/msys2/mingw/$repo/ +Server = https://mirror.nju.edu.cn/msys2/mingw/$repo/ +Server = https://repo.extreme-ix.org/msys2/mingw/$repo/ +Server = https://mirror.clarkson.edu/msys2/mingw/$repo/ +Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/$repo/ +Server = https://mirror.archlinux.tw/MSYS2/mingw/$repo/ +Server = https://fastmirror.pp.ua/msys2/mingw/$repo/ + +## Tier 2 +Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/$repo/ +Server = https://mirror.jmu.edu/pub/msys2/mingw/$repo/ +Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/$repo/ +Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/$repo/ +Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.bit.edu.cn/msys2/mingw/$repo/ +Server = https://mirrors.aliyun.com/msys2/mingw/$repo/ +Server = https://mirror.iscas.ac.cn/msys2/mingw/$repo/ +Server = https://mirrors.cloud.tencent.com/msys2/mingw/$repo/ Modified: builders/mingw64/etc/pacman.d/mirrorlist.msys 40 lines changed, 35 insertions(+), 5 deletions(-) =================================================================== @@ -1,6 +1,36 @@ -## -## MSYS repository mirrorlist -## +# See https://www.msys2.org/dev/mirrors -Server = http://repo.msys2.org/msys/$arch/ -Server = http://www2.futureware.at/~nickoe/msys2-mirror/msys/$arch/ +## Primary +Server = https://mirror.msys2.org/msys/$arch/ +Server = https://repo.msys2.org/msys/$arch/ + +## Tier 1 +Server = https://mirror.umd.edu/msys2/msys/$arch/ +Server = https://mirror.yandex.ru/mirrors/msys2/msys/$arch/ +Server = https://download.nus.edu.sg/mirror/msys2/msys/$arch/ +Server = https://mirror.accum.se/mirror/msys2.org/msys/$arch/ +Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/msys/$arch/ +Server = https://ftp.osuosl.org/pub/msys2/msys/$arch/ +Server = https://mirror.internet.asn.au/pub/msys2/msys/$arch/ +Server = https://mirror.selfnet.de/msys2/msys/$arch/ +Server = https://mirrors.dotsrc.org/msys2/msys/$arch/ +Server = https://mirrors.bfsu.edu.cn/msys2/msys/$arch/ +Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/msys/$arch/ +Server = https://mirrors.ustc.edu.cn/msys2/msys/$arch/ +Server = https://mirror.nju.edu.cn/msys2/msys/$arch/ +Server = https://repo.extreme-ix.org/msys2/msys/$arch/ +Server = https://mirror.clarkson.edu/msys2/msys/$arch/ +Server = https://quantum-mirror.hu/mirrors/pub/msys2/msys/$arch/ +Server = https://mirror.archlinux.tw/MSYS2/msys/$arch/ +Server = https://fastmirror.pp.ua/msys2/msys/$arch/ + +## Tier 2 +Server = https://ftp.cc.uoc.gr/mirrors/msys2/msys/$arch/ +Server = https://mirror.jmu.edu/pub/msys2/msys/$arch/ +Server = https://mirrors.piconets.webwerks.in/msys2-mirror/msys/$arch/ +Server = https://www2.futureware.at/~nickoe/msys2-mirror/msys/$arch/ +Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/msys/$arch/ +Server = https://mirrors.bit.edu.cn/msys2/msys/$arch/ +Server = https://mirrors.aliyun.com/msys2/msys/$arch/ +Server = https://mirror.iscas.ac.cn/msys2/msys/$arch/ +Server = https://mirrors.cloud.tencent.com/msys2/msys/$arch/ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] d2698e: Add default font used for macOS, Windows, and linux
by Jiří Techet 01 Jan '25

01 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 01 Jan 2025 18:27:13 UTC Commit: d2698e31d661acabc11555fd2267317960382b25 https://github.com/geany/geany-osx/commit/d2698e31d661acabc11555fd226731796… Log Message: ----------- Add default font used for macOS, Windows, and linux Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ outline-width: 1px; -gtk-outline-radius: 3px; -gtk-secondary-caret-color: @color_600; + font-family: 'San Francisco', 'Segoe UI', 'Sans'; } /*(((((((((( BASE STATES )))))))))) */ Modified: Prof-Gnome/gtk-3.0/main-light.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ outline-width: 1px; -gtk-outline-radius: 3px; -gtk-secondary-caret-color: @color_600; + font-family: 'San Francisco', 'Segoe UI', 'Sans'; } /*(((((((((( BASE STATES )))))))))) */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 6391e3: Merge pull request #13 from geany/builder_use_win32_libstdcpp
by Enrico Tröger 01 Jan '25

01 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 01 Jan 2025 12:54:52 UTC Commit: 6391e35665b61c299e0875262f868714c88dddda https://github.com/geany/infrastructure/commit/6391e35665b61c299e0875262f86… Log Message: ----------- Merge pull request #13 from geany/builder_use_win32_libstdcpp Revert "Builders: Use "posix" variant of the mingw64 cross compiler" Modified Paths: -------------- builders/Dockerfile.mingw64 Modified: builders/Dockerfile.mingw64 8 lines changed, 1 insertions(+), 7 deletions(-) =================================================================== @@ -50,13 +50,7 @@ RUN set -ex && \ # install NSIS and exiftool to inspect binary metadata nsis libimage-exiftool-perl osslsigncode \ # Geany build dependencies \ - python3-lxml python3-docutils && \ - # Use the "posix" variant of the mingw64 cross compiler to have support for recent C++ features - # like "std:future", see - # https://salsa.debian.org/mingw-w64-team/gcc-mingw-w64/-/blob/master/debian/… - # and https://sourceforge.net/p/mingw-w64/bugs/959/ for details. - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix && \ - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + python3-lxml python3-docutils # copy scripts -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 24929e: Revert "Builders: Use "posix" variant of the mingw64 cross compiler"
by Enrico Tröger 01 Jan '25

01 Jan '25

Branch: refs/heads/builder_use_win32_libstdcpp Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 01 Jan 2025 12:54:01 UTC Commit: 24929e394d493a4ea37ebd3db26fa4b2b12a844a https://github.com/geany/infrastructure/commit/24929e394d493a4ea37ebd3db26f… Log Message: ----------- Revert "Builders: Use "posix" variant of the mingw64 cross compiler" This reverts commit 608f4df1e6aac75f830472ead9ad35fad9cf0f79. After upgrading the Docker base image to Debian Trixie and so using newer cross compiler toolchain versions, this hack might not be necessary any longer. Modified Paths: -------------- builders/Dockerfile.mingw64 Modified: builders/Dockerfile.mingw64 8 lines changed, 1 insertions(+), 7 deletions(-) =================================================================== @@ -50,13 +50,7 @@ RUN set -ex && \ # install NSIS and exiftool to inspect binary metadata nsis libimage-exiftool-perl osslsigncode \ # Geany build dependencies \ - python3-lxml python3-docutils && \ - # Use the "posix" variant of the mingw64 cross compiler to have support for recent C++ features - # like "std:future", see - # https://salsa.debian.org/mingw-w64-team/gcc-mingw-w64/-/blob/master/debian/… - # and https://sourceforge.net/p/mingw-w64/bugs/959/ for details. - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix && \ - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + python3-lxml python3-docutils # copy scripts -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits