HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't auto-enable case-sensitive option when enabling regex in

Browse Source 
Find/Replace dialogs.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5695 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2011-04-05 16:16:47 +00:00
parent 4a5c07a106
commit 20bab74fd5
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
* src/templates.c:
Remove TEMPLATES_GET_FILENAME() macro.
* src/search.c:
Don't auto-enable case-sensitive option when enabling regex in
Find/Replace dialogs.
2011-04-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

21
src/search.c
View File

@ -285,7 +285,7 @@ static GtkWidget *add_find_checkboxes(GtkDialog *dialog)
ui_widget_set_tooltip_text(check_regexp, _("Use POSIX-like regular expressions. "
"For detailed information about using regular expressions, please read the documentation."));
g_signal_connect(check_regexp, "toggled",
G_CALLBACK(on_find_replace_checkbutton_toggled), GTK_WIDGET(dialog));
G_CALLBACK(on_find_replace_checkbutton_toggled), dialog);
if (dialog != GTK_DIALOG(find_dlg.dialog))
{
@ -1040,34 +1040,15 @@ on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user
gboolean regex_set = gtk_toggle_button_get_active(chk_regexp);
GtkWidget *check_word = ui_lookup_widget(dialog, "check_word");
GtkWidget *check_wordstart = ui_lookup_widget(dialog, "check_wordstart");
GtkToggleButton *check_case = GTK_TOGGLE_BUTTON(
ui_lookup_widget(dialog, "check_case"));
GtkWidget *check_escape = ui_lookup_widget(dialog, "check_escape");
gboolean replace = (dialog != find_dlg.dialog);
const char *back_button[2] = { "btn_previous" , "check_back" };
static gboolean case_state[2] = { FALSE, FALSE }; /* state before regex enabled */
/* hide options that don't apply to regex searches */
gtk_widget_set_sensitive(check_escape, ! regex_set);
gtk_widget_set_sensitive(ui_lookup_widget(dialog, back_button[replace]), ! regex_set);
gtk_widget_set_sensitive(check_word, ! regex_set);
gtk_widget_set_sensitive(check_wordstart, ! regex_set);
if (regex_set) /* regex enabled */
{
if (GTK_WIDGET_VISIBLE(dialog))
{
/* Enable case sensitive but remember original case toggle state */
case_state[replace] = gtk_toggle_button_get_active(check_case);
gtk_toggle_button_set_active(check_case, TRUE);
}
}
else /* regex disabled */
{
/* If case sensitive is still enabled, revert to what it was before we enabled it */
if (gtk_toggle_button_get_active(check_case) == TRUE)
gtk_toggle_button_set_active(check_case, case_state[replace]);
}
}
}