[anjuta] document-manager: Adapt search shortcuts and add shortcut for search previous

[Johannes Schmid <jhs src gnome org>]

commit c1d5fa8afd12af9df4ad132f698f9b988c7e543d
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Feb 17 18:40:18 2011 +0100

    document-manager: Adapt search shortcuts and add shortcut for search previous

 plugins/document-manager/action-callbacks.c        |   17 +
 plugins/document-manager/action-callbacks.h        |    1 +
 .../document-manager/anjuta-document-manager.xml   |    3 +-
 plugins/document-manager/plugin.c                  |   16 +-
 plugins/search/Makefile.am                         |   50 -
 plugins/search/anjuta-search-plugin-48.png         |  Bin 3999 -> 0 bytes
 plugins/search/anjuta-search-plugin.svg            |  314 ---
 plugins/search/anjuta-search.plugin.in             |    7 -
 plugins/search/anjuta-search.ui                    |  990 ----------
 plugins/search/anjuta-search.xml                   |   19 -
 plugins/search/plugin.c                            |  165 --
 plugins/search/plugin.h                            |   46 -
 plugins/search/search-replace.c                    | 2064 --------------------
 plugins/search/search-replace.h                    |  107 -
 plugins/search/search-replace_backend.c            |  933 ---------
 plugins/search/search-replace_backend.h            |  222 ---
 16 files changed, 31 insertions(+), 4923 deletions(-)
---
diff --git a/plugins/document-manager/action-callbacks.c b/plugins/document-manager/action-callbacks.c
index 154eec9..7b3114e 100644
--- a/plugins/document-manager/action-callbacks.c
+++ b/plugins/document-manager/action-callbacks.c
@@ -887,6 +887,23 @@ on_repeat_quicksearch (GtkAction *action, gpointer user_data)
 	search_box_incremental_search (SEARCH_BOX (search_box), TRUE);
 }
 
+void
+on_search_previous (GtkAction *action, gpointer user_data)
+{
+	DocmanPlugin *plugin;
+	GtkWidget *search_box;
+
+	plugin = ANJUTA_PLUGIN_DOCMAN (user_data);
+
+	search_box = plugin->search_box;
+	if (!gtk_widget_get_parent (search_box))
+		gtk_box_pack_end (GTK_BOX (plugin->vbox), search_box, FALSE, FALSE, 0);
+
+	if (!gtk_widget_get_visible (search_box))
+		gtk_widget_show (search_box);
+	search_box_incremental_search (SEARCH_BOX (search_box), FALSE);
+}
+
 void 
 on_search_and_replace (GtkAction *action, gpointer user_data)
 {
diff --git a/plugins/document-manager/action-callbacks.h b/plugins/document-manager/action-callbacks.h
index f97af8e..91ceef0 100644
--- a/plugins/document-manager/action-callbacks.h
+++ b/plugins/document-manager/action-callbacks.h
@@ -94,6 +94,7 @@ void on_editor_remove_view_activate (GtkAction *action, gpointer user_data);
 
 void on_show_search (GtkAction *action, gpointer user_data);
 void on_repeat_quicksearch (GtkAction *action, gpointer user_data);
+void on_search_previous (GtkAction *action, gpointer user_data);
 void on_search_and_replace (GtkAction *action, gpointer user_data);
 
 void on_search_popup_case_sensitive_toggle (GtkAction *action, gpointer user_data);
diff --git a/plugins/document-manager/anjuta-document-manager.xml b/plugins/document-manager/anjuta-document-manager.xml
index b53a03e..a64359e 100644
--- a/plugins/document-manager/anjuta-document-manager.xml
+++ b/plugins/document-manager/anjuta-document-manager.xml
@@ -46,7 +46,8 @@
 						<placeholder name="PlaceholderQuickSearchMenu">
 							<menuitem name="QuickSearch" action="ActionEditSearchQuickSearch"/>
 							<menuitem name="QuickReSearch" action="ActionEditSearchQuickSearchAgain"/>
-							<menuitem name="DocmanReplace" action="ActionEditSearchDocmanReplace"/>
+							<menuitem name="QuickSearchPrevious" action="ActionEditSearchFindPrevious"/>							
+							<menuitem name="QuickReplace" action="ActionEditSearchReplace"/>
 							<separator name="separator8"/>
 						</placeholder>
 					</menu>
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index 6f0eec7..369327c 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -266,12 +266,16 @@ static GtkActionEntry actions_search[] = {
   { "ActionEditSearchQuickSearch", GTK_STOCK_FIND, N_("_Quick Search"),
 	"<control>f", N_("Quick editor embedded search"),
     G_CALLBACK (on_show_search)},
-  { "ActionEditSearchQuickSearchAgain", GTK_STOCK_FIND, N_("Search Next"),
-	"<control><shift>f", N_("Search for next appearance of term."),
+  { "ActionEditSearchQuickSearchAgain", GTK_STOCK_FIND, N_("Find _Next"),
+	"<control>g", N_("Search for next appearance of term."),
     G_CALLBACK (on_repeat_quicksearch)},
-  { "ActionEditSearchDocmanReplace", GTK_STOCK_FIND, N_("Search and Replace"),
-	"<control><shift>h", N_("Search and replace"),
+  { "ActionEditSearchReplace", GTK_STOCK_FIND, N_("Find and R_eplaceâ?¦"),
+	"<control>h", N_("Search and replace"),
     G_CALLBACK (on_search_and_replace)},
+  { "ActionEditSearchFindPrevious", GTK_STOCK_FIND, N_("Find _Previous"),
+	"<control><shift>g",
+	N_("Repeat the last Find command"),
+	G_CALLBACK (on_search_previous)},	
   { "ActionSearchboxPopupClearHighlight", GTK_STOCK_FIND, N_("Clear Highlight"),
 	NULL, N_("Clear all highlighted text"),
 	G_CALLBACK (on_search_popup_clear_highlight)}
@@ -866,9 +870,11 @@ update_document_ui_interface_items (AnjutaPlugin *plugin, IAnjutaDocument *doc)
 	g_object_set (G_OBJECT (action), "sensitive", flag, NULL);
 	action = anjuta_ui_get_action (ui,  "ActionGroupEditorSearch",
 								   "ActionEditSearchQuickSearchAgain");
+	action = anjuta_ui_get_action (ui,  "ActionGroupEditorSearch",
+								   "ActionEditSearchFindPrevious");
 	g_object_set (G_OBJECT (action), "sensitive", flag, NULL);
 	action = anjuta_ui_get_action (ui, "ActionGroupEditorSearch",
-									"ActionEditSearchDocmanReplace");
+									"ActionEditSearchReplace");
 	g_object_set (G_OBJECT (action), "sensitive", flag, NULL);
 	action = anjuta_ui_get_action (ui,  "ActionGroupEditorSearch",
 								   "ActionSearchboxPopupClearHighlight");