diff options
| author | TingPing <tingping@tingping.se> | 2013-07-24 20:47:01 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-09-15 02:51:35 -0400 |
| commit | b0b8f40791de39eb6a7ee301d2edada80ad32338 (patch) | |
| tree | be583b2313d19eba71cd8582dab664e2c4da4736 /src/fe-gtk/menu.c | |
| parent | aa37686bbd69a6fab9dea6492a2f6a8b818845f0 (diff) | |
Replace search window with a searchbar
Diffstat (limited to 'src/fe-gtk/menu.c')
| -rw-r--r-- | src/fe-gtk/menu.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 58c28e51..dd3223a1 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1237,41 +1237,19 @@ menu_quit (GtkWidget * wid, gpointer none) static void menu_search () { - search_open (current_sess); + mg_search_toggle (current_sess); } static void -menu_search_next () +menu_search_next (GtkWidget *wid) { - GtkXText *xtext = GTK_XTEXT (current_sess->gui->xtext); - xtext_buffer *buf = xtext->buffer; - - if (!gtk_xtext_search (xtext, buf->search_text, - (buf->search_flags & (case_match | follow | regexp)), NULL)) - { - fe_message (_("Search hit end, not found."), FE_MSG_ERROR); - } + mg_search_handle_next(wid, current_sess); } static void -menu_search_prev () +menu_search_prev (GtkWidget *wid) { - GtkXText *xtext = GTK_XTEXT (current_sess->gui->xtext); - xtext_buffer *buf = xtext->buffer; - - if (!gtk_xtext_search(xtext, buf->search_text, - (buf->search_flags & (case_match | follow | regexp)) | backward, NULL)) - { - fe_message (_("Search hit end, not found."), FE_MSG_ERROR); - } -} - -static void -menu_search_reset () -{ - GtkXText *xtext = GTK_XTEXT (current_sess->gui->xtext); - - gtk_xtext_search (xtext, "", 0, NULL); + mg_search_handle_previous(wid, current_sess); } static void @@ -1732,7 +1710,6 @@ static struct mymenu mymenu[] = { #define SEARCH_OFFSET 68 {N_("Search"), 0, GTK_STOCK_JUSTIFY_LEFT, M_MENUSUB, 0, 0, 1}, {N_("Search Text..."), menu_search, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_f}, - {N_("Reset Search"), menu_search_reset, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_F}, {N_("Search Next" ), menu_search_next, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_g}, {N_("Search Previous" ), menu_search_prev, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_G}, {0, 0, 0, M_END, 0, 0, 0}, |