anjuta r4645 - in trunk: . plugins/symbol-db

[mcora svn gnome org]

Author: mcora
Date: Wed Jan 28 21:06:25 2009
New Revision: 4645
URL: http://svn.gnome.org/viewvc/anjuta?rev=4645&view=rev

Log:
	* plugins/symbol-db/anjuta-symbol-db-plugin.ui:
	* plugins/symbol-db/plugin.c (on_find_symbol),
	(symbol_db_activate):
	* plugins/symbol-db/plugin.h:
	* plugins/symbol-db/symbol-db-view-search.c (sdb_view_search_init),
	(symbol_db_view_search_get_entry):
	* plugins/symbol-db/symbol-db-view-search.h:
	fixed #357275 â allow user to jump directly to Symbols / Search

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui
   trunk/plugins/symbol-db/plugin.c
   trunk/plugins/symbol-db/plugin.h
   trunk/plugins/symbol-db/symbol-db-view-search.c
   trunk/plugins/symbol-db/symbol-db-view-search.h

Modified: trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui
==============================================================================
--- trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui	(original)
+++ trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui	Wed Jan 28 21:06:25 2009
@@ -1,5 +1,16 @@
 <!--*- xml -*-->
 <ui>
+	<menubar name="MenuMain">
+		<menu name="MenuEdit" action="ActionMenuEdit">
+			<placeholder name="PlaceholderEditMenus">
+				<placeholder name="PlaceholderEditSearchMenus">			
+					<menu name="Search" action="ActionMenuEditSearch">
+						<menuitem name="FindSymbol" action="ActionEditSearchFindSymbol"/>
+					</menu>
+				</placeholder>
+			</placeholder>
+		</menu>
+	</menubar>
 	<popup name="PopupDocumentManager">
 		<menu name="Goto" action="ActionMenuGoto">
 			<menuitem name="TagDecl" action="ActionSymbolDBGotoDecl" />

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Wed Jan 28 21:06:25 2009
@@ -23,6 +23,7 @@
  */
 
 
+
 #include <config.h>
 #include <gio/gio.h>
 #include <libanjuta/anjuta-shell.h>
@@ -269,6 +270,18 @@
 	}
 }
 
+static void
+on_find_symbol (GtkAction *action, SymbolDBPlugin *sdb_plugin)
+{
+	DEBUG_PRINT ("on_find_symbol (GtkAction *action, gpointer user_data)");
+	GtkEntry * entry;
+	
+	entry = symbol_db_view_search_get_entry ( 
+					SYMBOL_DB_VIEW_SEARCH (sdb_plugin->dbv_view_tree_search));
+	gtk_notebook_set_current_page (sdb_plugin->dbv_notebook, 2);
+	gtk_widget_grab_focus (GTK_WIDGET (entry));
+}
+
 static GtkActionEntry actions[] = 
 {
 	{ "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},
@@ -290,6 +303,12 @@
 	}	
 };
 
+static GtkActionEntry actions_search[] = {
+  { "ActionEditSearchFindSymbol", GTK_STOCK_FIND, N_("_Find Symbol"),
+	"<control>l", N_("Find Symbol"),
+    G_CALLBACK (on_find_symbol)}
+};
+
 static void
 enable_view_signals (SymbolDBPlugin *sdb_plugin, gboolean enable, gboolean force)
 {
@@ -2256,11 +2275,19 @@
 	sdb_plugin->popup_action_group = 
 		anjuta_ui_add_action_group_entries (sdb_plugin->ui,
 											"ActionGroupPopupSymbolDB",
-											_("Symbol db popup actions"),
+											_("SymbolDb popup actions"),
 											actions,
 											G_N_ELEMENTS (actions),
 											GETTEXT_PACKAGE, FALSE, plugin);
 	
+	sdb_plugin->menu_action_group = 
+		anjuta_ui_add_action_group_entries (sdb_plugin->ui,
+											"ActionGroupEditSearchSymbolDB",
+											_("SymbolDb menu actions"),
+											actions_search,
+											G_N_ELEMENTS (actions_search),
+											GETTEXT_PACKAGE, FALSE, plugin);
+	
 	/* Add UI */
 	sdb_plugin->merge_id = 
 		anjuta_ui_merge (sdb_plugin->ui, UI_FILE);

Modified: trunk/plugins/symbol-db/plugin.h
==============================================================================
--- trunk/plugins/symbol-db/plugin.h	(original)
+++ trunk/plugins/symbol-db/plugin.h	Wed Jan 28 21:06:25 2009
@@ -61,6 +61,7 @@
 	
 	/* ui merge */
 	GtkActionGroup *popup_action_group;
+	GtkActionGroup *menu_action_group;	
 	gint merge_id;
 	
 	/* editor monitor */

Modified: trunk/plugins/symbol-db/symbol-db-view-search.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-search.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-view-search.c	Wed Jan 28 21:06:25 2009
@@ -445,24 +445,19 @@
 static void
 sdb_view_search_init (SymbolDBViewSearch * search)
 {
-
 	SymbolDBViewSearchPriv *priv;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	GtkWidget *frame, *list_sw;
-
 	
 	/* allocate space for a SymbolDBViewSearchPriv class. */
 	priv = g_new0 (SymbolDBViewSearchPriv, 1);
 	search->priv = priv;
 
 	priv->idle_complete = 0;
-	priv->idle_filter = 0;
-	
+	priv->idle_filter = 0;	
 	priv->completion = g_completion_new (NULL);
-
 	priv->hitlist = gtk_tree_view_new ();
-
 	
 	priv->model = GTK_TREE_MODEL (gtk_tree_store_new (COLUMN_MAX, GDK_TYPE_PIXBUF,
 				    G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT));
@@ -699,3 +694,13 @@
 	return GTK_WIDGET (search);
 }
 
+GtkEntry *
+symbol_db_view_search_get_entry (SymbolDBViewSearch *search)
+{
+	SymbolDBViewSearchPriv *priv;
+	priv = search->priv;
+
+	g_return_val_if_fail (search != NULL, NULL);
+	
+	return GTK_ENTRY (priv->entry);
+}

Modified: trunk/plugins/symbol-db/symbol-db-view-search.h
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-search.h	(original)
+++ trunk/plugins/symbol-db/symbol-db-view-search.h	Wed Jan 28 21:06:25 2009
@@ -67,6 +67,8 @@
 GtkWidget *
 symbol_db_view_search_new (SymbolDBEngine *dbe);
 
+GtkEntry *
+symbol_db_view_search_get_entry (SymbolDBViewSearch *search);
 
 G_END_DECLS