Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Sat, 11 Oct 2014 01:02:29 UTC Commit: bae420a768975aa1d4818121eec80098d9e0064a https://github.com/geany/geany/commit/bae420a768975aa1d4818121eec80098d9e006...
Log Message: ----------- Merge branch 'rpalli/replace1'
Closes #189
Modified Paths: -------------- doc/geany.txt src/keyfile.c src/search.c src/search.h
Modified: doc/geany.txt 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -2651,6 +2651,11 @@ extract_filetype_regex Regex to extract filetype name from file S via capture group one. **Search related** find_selection_type See `Find selection`_. 0 immediately +**Replace related** +replace_and_find_by_default Set ``Replace & Find`` button as default so false immediately + it will be activated when the Enter key is + pressed while one of the text fields has + focus. **Build Menu related** number_ft_menu_items The maximum number of menu items in the 2 on restart filetype section of the Build menu.
Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -231,6 +231,8 @@ static void init_pref_groups(void) "find_selection_type", GEANY_FIND_SEL_CURRENT_WORD); stash_group_add_string(group, &file_prefs.extract_filetype_regex, "extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX); + stash_group_add_boolean(group, &search_prefs.replace_and_find_by_default, + "replace_and_find_by_default", FALSE);
/* Note: Interface-related various prefs are in ui_init_prefs() */
Modified: src/search.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1390,7 +1390,9 @@ on_replace_find_entry_activate(GtkEntry *entry, gpointer user_data) static void on_replace_entry_activate(GtkEntry *entry, gpointer user_data) { - on_replace_dialog_response(NULL, GEANY_RESPONSE_REPLACE, NULL); + on_replace_dialog_response(NULL, + search_prefs.replace_and_find_by_default ? GEANY_RESPONSE_REPLACE_AND_FIND : GEANY_RESPONSE_REPLACE, + NULL); }
Modified: src/search.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -78,6 +78,7 @@ typedef struct GeanySearchPrefs gboolean use_current_word; /**< Use current word for default search text */ gboolean use_current_file_dir; /* find in files directory to use on showing dialog */ gboolean hide_find_dialog; /* hide the find dialog on next or previous */ + gboolean replace_and_find_by_default; /* enter in replace window performs Replace & Find instead of Replace */ enum GeanyFindSelOptions find_selection_type; } GeanySearchPrefs;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).