Branch: refs/heads/master Author: Roland Pallai rpallai@magex.hu Committer: Roland Pallai rpallai@magex.hu Date: Wed, 13 Nov 2013 23:53:40 UTC Commit: b63eb87599a6f9f8a44d7b94e94e31a26bbf2910 https://github.com/geany/geany/commit/b63eb87599a6f9f8a44d7b94e94e31a26bbf29...

Log Message: ----------- "Enter in replace entry does Replace & Find instead of Replace" setting in General/Misc/Search.

Modified Paths: -------------- data/geany.glade doc/geany.txt src/search.c src/search.h

Modified: data/geany.glade 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -1405,6 +1405,23 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="check_replace_entry_activates_replace_and_find"> + <property name="label" translatable="yes">Enter in replace entry does Replace &amp; Find</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Enter in replace entry does Replace &amp; Find instead of Replace</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> </object> </child> </object>

Modified: doc/geany.txt 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1891,6 +1891,9 @@ Use the current file's directory for Find in Files active file. When this option is disabled, the directory of the last use of the Find in Files dialog is used. See `Find in Files`_ for details.

+Enter in replace entry does Replace & Find instead of Replace + Select Replace & Find as default action when pressing enter in Replace dialog. + Projects ````````

Modified: src/search.c 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -192,6 +192,9 @@ static void init_prefs(void) "pref_search_always_wrap", FALSE, "check_hide_find_dialog"); stash_group_add_toggle_button(group, &search_prefs.use_current_file_dir, "pref_search_current_file_dir", TRUE, "check_fif_current_dir"); + stash_group_add_toggle_button(group, &search_prefs.replace_entry_activates_replace_and_find, + "pref_search_replace_entry_activates_replace_and_find", FALSE, + "check_replace_entry_activates_replace_and_find"); stash_group_add_boolean(group, &find_dlg.all_expanded, "find_all_expanded", FALSE); stash_group_add_boolean(group, &replace_dlg.all_expanded, "replace_all_expanded", FALSE); /* dialog positions */ @@ -1372,7 +1375,9 @@ on_find_dialog_response(GtkDialog *dialog, gint response, 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_entry_activates_replace_and_find ? GEANY_RESPONSE_REPLACE_AND_FIND : GEANY_RESPONSE_REPLACE, + NULL); }

Modified: src/search.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -61,6 +61,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_entry_activates_replace_and_find; /* enter in replace entry does Replace & Find */ enum GeanyFindSelOptions find_selection_type; } GeanySearchPrefs;

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).