plug-ins/dbbrowser/Makefile.am removed again...

2005-05-19  Michael Natterer  <mitch@gimp.org>

	* plug-ins/dbbrowser/Makefile.am
	* plug-ins/dbbrowser/gimpbrowser.[ch]: removed again...

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/gimpwidgetstypes.h
	* libgimpwidgets/gimpwidgets.h
	* libgimpwidgets/gimpwidgetsmarshal.list
	* libgimpwidgets/gimpwidgets.def
	* libgimpwidgets/gimpbrowser.[ch]: ...and added here.

	* plug-ins/dbbrowser/gimpprocbrowser.c
	* plug-ins/dbbrowser/plugin-browser.c: changed accordingly.

	* plug-ins/dbbrowser/gimpprocbrowser.c: fixed searching by help.
This commit is contained in:
Michael Natterer
2005-05-18 23:48:47 +00:00
committed by Michael Natterer
parent 9aa2efcb32
commit 73e3f6f13b
13 changed files with 113 additions and 73 deletions

View File

@ -32,7 +32,6 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#include "gimpbrowser.h"
#include "gimpprocbrowser.h"
#include "gimpprocview.h"
@ -102,6 +101,7 @@ static void browser_row_activated (GtkTreeView *treeview,
static void browser_show_procedure (GimpDBBrowser *browser,
gchar *proc_name);
static void browser_search (GimpBrowser *browser,
const gchar *query_text,
gint search_type,
GimpDBBrowser *db_browser);
static void browser_response (GtkWidget *widget,
@ -231,7 +231,8 @@ gimp_proc_browser_dialog_new (gboolean scheme_names,
browser->return_vals = NULL;
/* first search (all procedures) */
browser_search (GIMP_BROWSER (browser->browser), SEARCH_TYPE_ALL, browser);
browser_search (GIMP_BROWSER (browser->browser), "", SEARCH_TYPE_ALL,
browser);
return browser->dialog;
}
@ -314,15 +315,13 @@ browser_show_procedure (GimpDBBrowser *browser,
static void
browser_search (GimpBrowser *gimp_browser,
const gchar *query_text,
gint search_type,
GimpDBBrowser *browser)
{
const gchar *query_text;
gchar **proc_list;
gint num_procs;
gchar *str;
query_text = gtk_entry_get_text (GTK_ENTRY (gimp_browser->search_entry));
gchar **proc_list;
gint num_procs;
gchar *str;
if (search_type == SEARCH_TYPE_NAME)
{
@ -356,6 +355,14 @@ browser_search (GimpBrowser *gimp_browser,
gimp_procedural_db_query (".*", query_text, ".*", ".*", ".*", ".*", ".*",
&num_procs, &proc_list);
}
else if (search_type == SEARCH_TYPE_HELP)
{
gimp_browser_show_message (GIMP_BROWSER (browser->browser),
_("Searching by help - please wait"));
gimp_procedural_db_query (".*", ".*", query_text, ".*", ".*", ".*", ".*",
&num_procs, &proc_list);
}
else if (search_type == SEARCH_TYPE_AUTHOR)
{
gimp_browser_show_message (GIMP_BROWSER (browser->browser),