dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed a crash on Cancel that occured due to bad list handling 

* app/gdisplay_color_ui.c: fixed a crash on Cancel that occured
        due to bad list handling

        * app/module_db.c: indentation madness, no changes

        * app/nav_window.c: set the zoom label and slider first, then
        update the preview. Gives better user feedback. This is now what
        bugreport #3354 suggest, but it comes close.

        * plug-ins/common/plugindetails.c: tried to fix the strange resizing
        of the dialog. Should fix bug #3352.

--Sven
This commit is contained in:
Sven Neumann 1999-11-06 03:03:26 +00:00
parent 558271ff3b
commit 3333ca348d
13 changed files with 686 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Sat Nov 6 03:57:20 MET 1999 Sven Neumann <sven@gimp.org>
* app/gdisplay_color_ui.c: fixed a crash on Cancel that occured
due to bad list handling
* app/module_db.c: indentation madness, no changes
* app/nav_window.c: set the zoom label and slider first, then
update the preview. Gives better user feedback. This is now what
bugreport #3354 suggest, but it comes close.
* plug-ins/common/plugindetails.c: tried to fix the strange resizing
of the dialog. Should fix bug #3352.
Fri Nov 5 15:32:15 MET 1999 Sven Neumann <sven@gimp.org>
* app/edit_selection.c: when moving layers/masks freeze the undo

144
app/dialogs/module-dialog.c
View File

@ -47,10 +47,10 @@
char *module_db_load_inhibit = NULL;
typedef enum {
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_UNLOADED_OK /* callback arrived, module not in memory anymore */
} module_state;
@ -65,10 +65,13 @@ static const char * const statename[] = {
#ifdef __EMX__
extern void gimp_color_selector_register();
extern void gimp_color_selector_unregister();
static struct main_funcs_struc {
gchar *name;
void (*func)();
} gimp_main_funcs[] = {
}
gimp_main_funcs[] = {
{ "gimp_color_selector_register", gimp_color_selector_register },
{ "gimp_color_selector_unregister", gimp_color_selector_unregister },
{ NULL, NULL }
@ -78,15 +81,15 @@ static struct main_funcs_struc {
/* one of these objects is kept per-module */
typedef struct {
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
gchar *last_module_error;
GimpModuleInitFunc *init;
GimpModuleUnloadFunc *unload;
@ -94,21 +97,21 @@ typedef struct {
static guint module_info_get_type (void);
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define IS_MODULE_INFO(obj) GTK_CHECK_TYPE (obj, MODULE_INFO_TYPE)
#define NUM_INFO_LINES 7
typedef struct {
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
module_info *last_update;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
} browser_st;
/* global set of module_info pointers */
@ -134,27 +137,26 @@ static gboolean need_to_rewrite_modulerc = FALSE;
/* prototypes */
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
#ifdef DUMP_DB
static void print_module_info (gpointer data, gpointer user_data);
static void print_module_info (gpointer data, gpointer user_data);
#endif
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_load_unload_callback (GtkWidget *widget, gpointer data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
@ -184,7 +186,8 @@ module_db_init (void)
}
static void
free_a_single_module (gpointer data, gpointer user_data)
free_a_single_module (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -195,7 +198,8 @@ free_a_single_module (gpointer data, gpointer user_data)
}
static void
add_to_inhibit_string (gpointer data, gpointer user_data)
add_to_inhibit_string (gpointer data,
gpointer user_data)
{
module_info *mod = data;
GString *str = user_data;
@ -475,7 +479,8 @@ valid_module_name (const char *filename)
static gboolean
module_inhibited (const char *fullpath, const char *inhibit_list)
module_inhibited (const char *fullpath,
const char *inhibit_list)
{
char *p;
int pathlen;
@ -559,7 +564,8 @@ module_initialize (char *filename)
}
static void
mod_load (module_info *mod, gboolean verbose)
mod_load (module_info *mod,
gboolean verbose)
{
gpointer symbol;
@ -649,7 +655,8 @@ mod_unload_completed_callback (void *data)
}
static void
mod_unload (module_info *mod, gboolean verbose)
mod_unload (module_info *mod,
gboolean verbose)
{
g_return_if_fail (mod->module != NULL);
g_return_if_fail (mod->unload != NULL);
@ -673,7 +680,8 @@ mod_unload (module_info *mod, gboolean verbose)
#ifdef DUMP_DB
static void
print_module_info (gpointer data, gpointer user_data)
print_module_info (gpointer data,
gpointer user_data)
{
module_info *i = data;
@ -703,20 +711,23 @@ print_module_info (gpointer data, gpointer user_data)
/* UI functions */
static void
browser_popdown_callback (GtkWidget *w, gpointer client_data)
browser_popdown_callback (GtkWidget *w,
gpointer client_data)
{
gtk_widget_destroy (GTK_WIDGET (client_data));
}
static void
browser_destroy_callback (GtkWidget *w, gpointer client_data)
browser_destroy_callback (GtkWidget *w,
gpointer client_data)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (modules), client_data);
g_free (client_data);
}
static void
browser_load_inhibit_callback (GtkWidget *w, gpointer data)
browser_load_inhibit_callback (GtkWidget *w,
gpointer data)
{
browser_st *st = data;
gboolean new_value;
@ -735,7 +746,8 @@ browser_load_inhibit_callback (GtkWidget *w, gpointer data)
}
static void
browser_info_update (module_info *mod, browser_st *st)
browser_info_update (module_info *mod,
browser_st *st)
{
int i;
const char *text[NUM_INFO_LINES - 1];
@ -818,7 +830,8 @@ browser_info_update (module_info *mod, browser_st *st)
}
static void
browser_info_init (browser_st *st, GtkWidget *table)
browser_info_init (browser_st *st,
GtkWidget *table)
{
GtkWidget *label;
int i;
@ -858,7 +871,8 @@ browser_info_init (browser_st *st, GtkWidget *table)
}
static void
browser_select_callback (GtkWidget *widget, GtkWidget *child)
browser_select_callback (GtkWidget *widget,
GtkWidget *child)
{
module_info *i;
browser_st *st;
@ -876,7 +890,8 @@ browser_select_callback (GtkWidget *widget, GtkWidget *child)
static void
browser_load_unload_callback (GtkWidget *widget, gpointer data)
browser_load_unload_callback (GtkWidget *widget,
gpointer data)
{
browser_st *st = data;
@ -890,7 +905,8 @@ browser_load_unload_callback (GtkWidget *widget, gpointer data)
static void
make_list_item (gpointer data, gpointer user_data)
make_list_item (gpointer data,
gpointer user_data)
{
module_info *info = data;
browser_st *st = user_data;
@ -909,14 +925,18 @@ make_list_item (gpointer data, gpointer user_data)
static void
browser_info_add (GimpSet *set, module_info *mod, browser_st *st)
browser_info_add (GimpSet *set,
module_info *mod,
browser_st *st)
{
make_list_item (mod, st);
}
static void
browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
browser_info_remove (GimpSet *set,
module_info *mod,
browser_st *st)
{
GList *dlist, *free_list;
GtkWidget *list_item;
@ -949,7 +969,8 @@ browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
static void
module_db_module_ondisk (gpointer data, gpointer user_data)
module_db_module_ondisk (gpointer data,
gpointer user_data)
{
module_info *mod = data;
struct stat statbuf;
@ -977,7 +998,8 @@ module_db_module_ondisk (gpointer data, gpointer user_data)
static void
module_db_module_remove (gpointer data, gpointer user_data)
module_db_module_remove (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -989,12 +1011,13 @@ module_db_module_remove (gpointer data, gpointer user_data)
typedef struct {
const char *search_key;
const char *search_key;
module_info *found;
} find_by_path_closure;
static void
module_db_path_cmp (gpointer data, gpointer user_data)
module_db_path_cmp (gpointer data,
gpointer user_data)
{
module_info *mod = data;
find_by_path_closure *cl = user_data;
@ -1019,7 +1042,8 @@ module_find_by_path (const char *fullpath)
static void
browser_refresh_callback (GtkWidget *widget, gpointer data)
browser_refresh_callback (GtkWidget *widget,
gpointer data)
{
GSList *kill_list = NULL;

5
app/display/gimpdisplayshell-filter-dialog.c
View File

@ -211,6 +211,7 @@ color_display_cancel_callback (GtkWidget *widget,
gpointer data)
{
GList *list;
GList *next;
gtk_widget_hide (GTK_WIDGET (data));
@ -221,10 +222,12 @@ color_display_cancel_callback (GtkWidget *widget,
while (list)
{
next = list->next;
if (!g_list_find (cdd.old_nodes, list->data))
gdisplay_color_detach_destroy (cdd.gdisp, list->data);
list = list->next;
list = next;
}
}

81
app/display/gimpnavigationeditor.c
View File

@ -31,6 +31,7 @@
#include "gimpui.h"
#include "gximage.h"
#include "interface.h"
#include "nav_window.h"
#include "scroll.h"
#include "scale.h"
@ -100,46 +101,20 @@ struct _NavWinData
};
static gint
nav_window_preview_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint
nav_window_expose_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint nav_window_preview_events (GtkWidget *, GdkEvent *, gpointer *);
static gint nav_window_expose_events (GtkWidget *, GdkEvent *, gpointer *);
static void nav_window_update_preview (NavWinData *);
static void nav_window_update_preview_blank (NavWinData *iwd);
static void destroy_preview_widget (NavWinData *);
static void create_preview_widget (NavWinData *);
static void nav_window_draw_sqr (NavWinData *, gboolean,
gint, gint, gint, gint );
static void set_size_data (NavWinData *);
static gint nav_preview_update_do_timer (NavWinData *);
static void
nav_window_update_preview (NavWinData *);
static void
nav_window_update_preview_blank (NavWinData *iwd);
static void
destroy_preview_widget (NavWinData *);
static void
create_preview_widget (NavWinData *);
void
nav_window_update_window_marker (InfoDialog *);
static void
nav_window_draw_sqr(NavWinData *,
gboolean,
gint ,
gint ,
gint ,
gint );
static void
set_size_data(NavWinData *);
static gint
nav_preview_update_do_timer (NavWinData *);
static void
nav_window_destroy_callback (GtkWidget *widget,
gpointer client_data)
{
@ -972,7 +947,7 @@ nav_preview_update_do (NavWinData *iwd)
{
nav_window_update_preview(iwd);
nav_window_disp_area(iwd,iwd->gdisp_ptr);
gtk_widget_draw(iwd->preview, NULL);
gtk_widget_queue_draw(iwd->preview);
iwd->installedDirtyTimer = FALSE;
return FALSE;
}
@ -1309,26 +1284,26 @@ nav_window_update_window_marker (InfoDialog *info_win)
iwd->block_window_marker == TRUE)
return;
update_zoom_label (iwd);
update_zoom_adjustment (iwd);
/* Undraw old size */
nav_window_draw_sqr(iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
/* Update to new size */
nav_window_disp_area(iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr(iwd,
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
update_zoom_label(iwd);
iwd->dispwidth, iwd->dispheight);
update_zoom_adjustment(iwd);
/* Update to new size */
nav_window_disp_area (iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth, iwd->dispheight);
}
void

81
app/display/gimpnavigationview.c
View File

@ -31,6 +31,7 @@
#include "gimpui.h"
#include "gximage.h"
#include "interface.h"
#include "nav_window.h"
#include "scroll.h"
#include "scale.h"
@ -100,46 +101,20 @@ struct _NavWinData
};
static gint
nav_window_preview_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint
nav_window_expose_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint nav_window_preview_events (GtkWidget *, GdkEvent *, gpointer *);
static gint nav_window_expose_events (GtkWidget *, GdkEvent *, gpointer *);
static void nav_window_update_preview (NavWinData *);
static void nav_window_update_preview_blank (NavWinData *iwd);
static void destroy_preview_widget (NavWinData *);
static void create_preview_widget (NavWinData *);
static void nav_window_draw_sqr (NavWinData *, gboolean,
gint, gint, gint, gint );
static void set_size_data (NavWinData *);
static gint nav_preview_update_do_timer (NavWinData *);
static void
nav_window_update_preview (NavWinData *);
static void
nav_window_update_preview_blank (NavWinData *iwd);
static void
destroy_preview_widget (NavWinData *);
static void
create_preview_widget (NavWinData *);
void
nav_window_update_window_marker (InfoDialog *);
static void
nav_window_draw_sqr(NavWinData *,
gboolean,
gint ,
gint ,
gint ,
gint );
static void
set_size_data(NavWinData *);
static gint
nav_preview_update_do_timer (NavWinData *);
static void
nav_window_destroy_callback (GtkWidget *widget,
gpointer client_data)
{
@ -972,7 +947,7 @@ nav_preview_update_do (NavWinData *iwd)
{
nav_window_update_preview(iwd);
nav_window_disp_area(iwd,iwd->gdisp_ptr);
gtk_widget_draw(iwd->preview, NULL);
gtk_widget_queue_draw(iwd->preview);
iwd->installedDirtyTimer = FALSE;
return FALSE;
}
@ -1309,26 +1284,26 @@ nav_window_update_window_marker (InfoDialog *info_win)
iwd->block_window_marker == TRUE)
return;
update_zoom_label (iwd);
update_zoom_adjustment (iwd);
/* Undraw old size */
nav_window_draw_sqr(iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
/* Update to new size */
nav_window_disp_area(iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr(iwd,
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
update_zoom_label(iwd);
iwd->dispwidth, iwd->dispheight);
update_zoom_adjustment(iwd);
/* Update to new size */
nav_window_disp_area (iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth, iwd->dispheight);
}
void

5
app/gdisplay_color_ui.c
View File

@ -211,6 +211,7 @@ color_display_cancel_callback (GtkWidget *widget,
gpointer data)
{
GList *list;
GList *next;
gtk_widget_hide (GTK_WIDGET (data));
@ -221,10 +222,12 @@ color_display_cancel_callback (GtkWidget *widget,
while (list)
{
next = list->next;
if (!g_list_find (cdd.old_nodes, list->data))
gdisplay_color_detach_destroy (cdd.gdisp, list->data);
list = list->next;
list = next;
}
}

144
app/gui/module-browser.c
View File

@ -47,10 +47,10 @@
char *module_db_load_inhibit = NULL;
typedef enum {
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_UNLOADED_OK /* callback arrived, module not in memory anymore */
} module_state;
@ -65,10 +65,13 @@ static const char * const statename[] = {
#ifdef __EMX__
extern void gimp_color_selector_register();
extern void gimp_color_selector_unregister();
static struct main_funcs_struc {
gchar *name;
void (*func)();
} gimp_main_funcs[] = {
}
gimp_main_funcs[] = {
{ "gimp_color_selector_register", gimp_color_selector_register },
{ "gimp_color_selector_unregister", gimp_color_selector_unregister },
{ NULL, NULL }
@ -78,15 +81,15 @@ static struct main_funcs_struc {
/* one of these objects is kept per-module */
typedef struct {
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
gchar *last_module_error;
GimpModuleInitFunc *init;
GimpModuleUnloadFunc *unload;
@ -94,21 +97,21 @@ typedef struct {
static guint module_info_get_type (void);
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define IS_MODULE_INFO(obj) GTK_CHECK_TYPE (obj, MODULE_INFO_TYPE)
#define NUM_INFO_LINES 7
typedef struct {
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
module_info *last_update;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
} browser_st;
/* global set of module_info pointers */
@ -134,27 +137,26 @@ static gboolean need_to_rewrite_modulerc = FALSE;
/* prototypes */
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
#ifdef DUMP_DB
static void print_module_info (gpointer data, gpointer user_data);
static void print_module_info (gpointer data, gpointer user_data);
#endif
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_load_unload_callback (GtkWidget *widget, gpointer data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
@ -184,7 +186,8 @@ module_db_init (void)
}
static void
free_a_single_module (gpointer data, gpointer user_data)
free_a_single_module (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -195,7 +198,8 @@ free_a_single_module (gpointer data, gpointer user_data)
}
static void
add_to_inhibit_string (gpointer data, gpointer user_data)
add_to_inhibit_string (gpointer data,
gpointer user_data)
{
module_info *mod = data;
GString *str = user_data;
@ -475,7 +479,8 @@ valid_module_name (const char *filename)
static gboolean
module_inhibited (const char *fullpath, const char *inhibit_list)
module_inhibited (const char *fullpath,
const char *inhibit_list)
{
char *p;
int pathlen;
@ -559,7 +564,8 @@ module_initialize (char *filename)
}
static void
mod_load (module_info *mod, gboolean verbose)
mod_load (module_info *mod,
gboolean verbose)
{
gpointer symbol;
@ -649,7 +655,8 @@ mod_unload_completed_callback (void *data)
}
static void
mod_unload (module_info *mod, gboolean verbose)
mod_unload (module_info *mod,
gboolean verbose)
{
g_return_if_fail (mod->module != NULL);
g_return_if_fail (mod->unload != NULL);
@ -673,7 +680,8 @@ mod_unload (module_info *mod, gboolean verbose)
#ifdef DUMP_DB
static void
print_module_info (gpointer data, gpointer user_data)
print_module_info (gpointer data,
gpointer user_data)
{
module_info *i = data;
@ -703,20 +711,23 @@ print_module_info (gpointer data, gpointer user_data)
/* UI functions */
static void
browser_popdown_callback (GtkWidget *w, gpointer client_data)
browser_popdown_callback (GtkWidget *w,
gpointer client_data)
{
gtk_widget_destroy (GTK_WIDGET (client_data));
}
static void
browser_destroy_callback (GtkWidget *w, gpointer client_data)
browser_destroy_callback (GtkWidget *w,
gpointer client_data)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (modules), client_data);
g_free (client_data);
}
static void
browser_load_inhibit_callback (GtkWidget *w, gpointer data)
browser_load_inhibit_callback (GtkWidget *w,
gpointer data)
{
browser_st *st = data;
gboolean new_value;
@ -735,7 +746,8 @@ browser_load_inhibit_callback (GtkWidget *w, gpointer data)
}
static void
browser_info_update (module_info *mod, browser_st *st)
browser_info_update (module_info *mod,
browser_st *st)
{
int i;
const char *text[NUM_INFO_LINES - 1];
@ -818,7 +830,8 @@ browser_info_update (module_info *mod, browser_st *st)
}
static void
browser_info_init (browser_st *st, GtkWidget *table)
browser_info_init (browser_st *st,
GtkWidget *table)
{
GtkWidget *label;
int i;
@ -858,7 +871,8 @@ browser_info_init (browser_st *st, GtkWidget *table)
}
static void
browser_select_callback (GtkWidget *widget, GtkWidget *child)
browser_select_callback (GtkWidget *widget,
GtkWidget *child)
{
module_info *i;
browser_st *st;
@ -876,7 +890,8 @@ browser_select_callback (GtkWidget *widget, GtkWidget *child)
static void
browser_load_unload_callback (GtkWidget *widget, gpointer data)
browser_load_unload_callback (GtkWidget *widget,
gpointer data)
{
browser_st *st = data;
@ -890,7 +905,8 @@ browser_load_unload_callback (GtkWidget *widget, gpointer data)
static void
make_list_item (gpointer data, gpointer user_data)
make_list_item (gpointer data,
gpointer user_data)
{
module_info *info = data;
browser_st *st = user_data;
@ -909,14 +925,18 @@ make_list_item (gpointer data, gpointer user_data)
static void
browser_info_add (GimpSet *set, module_info *mod, browser_st *st)
browser_info_add (GimpSet *set,
module_info *mod,
browser_st *st)
{
make_list_item (mod, st);
}
static void
browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
browser_info_remove (GimpSet *set,
module_info *mod,
browser_st *st)
{
GList *dlist, *free_list;
GtkWidget *list_item;
@ -949,7 +969,8 @@ browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
static void
module_db_module_ondisk (gpointer data, gpointer user_data)
module_db_module_ondisk (gpointer data,
gpointer user_data)
{
module_info *mod = data;
struct stat statbuf;
@ -977,7 +998,8 @@ module_db_module_ondisk (gpointer data, gpointer user_data)
static void
module_db_module_remove (gpointer data, gpointer user_data)
module_db_module_remove (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -989,12 +1011,13 @@ module_db_module_remove (gpointer data, gpointer user_data)
typedef struct {
const char *search_key;
const char *search_key;
module_info *found;
} find_by_path_closure;
static void
module_db_path_cmp (gpointer data, gpointer user_data)
module_db_path_cmp (gpointer data,
gpointer user_data)
{
module_info *mod = data;
find_by_path_closure *cl = user_data;
@ -1019,7 +1042,8 @@ module_find_by_path (const char *fullpath)
static void
browser_refresh_callback (GtkWidget *widget, gpointer data)
browser_refresh_callback (GtkWidget *widget,
gpointer data)
{
GSList *kill_list = NULL;

144
app/module_db.c
View File

@ -47,10 +47,10 @@
char *module_db_load_inhibit = NULL;
typedef enum {
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_MODULE_ERROR, /* missing module_load function or other error */
ST_LOADED_OK, /* happy and running (normal state of affairs) */
ST_LOAD_FAILED, /* module_load returned GIMP_MODULE_UNLOAD */
ST_UNLOAD_REQUESTED, /* sent unload request, waiting for callback */
ST_UNLOADED_OK /* callback arrived, module not in memory anymore */
} module_state;
@ -65,10 +65,13 @@ static const char * const statename[] = {
#ifdef __EMX__
extern void gimp_color_selector_register();
extern void gimp_color_selector_unregister();
static struct main_funcs_struc {
gchar *name;
void (*func)();
} gimp_main_funcs[] = {
}
gimp_main_funcs[] = {
{ "gimp_color_selector_register", gimp_color_selector_register },
{ "gimp_color_selector_unregister", gimp_color_selector_unregister },
{ NULL, NULL }
@ -78,15 +81,15 @@ static struct main_funcs_struc {
/* one of these objects is kept per-module */
typedef struct {
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
GtkObject object;
gchar *fullpath; /* path to the module */
module_state state; /* what's happened to the module */
gboolean ondisk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gint refs; /* how many time we're running in the module */
/* stuff from now on may be NULL depending on the state the module is in */
GimpModuleInfo *info; /* returned values from module_init */
GModule *module; /* handle on the module */
gchar *last_module_error;
GimpModuleInitFunc *init;
GimpModuleUnloadFunc *unload;
@ -94,21 +97,21 @@ typedef struct {
static guint module_info_get_type (void);
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define MODULE_INFO_TYPE module_info_get_type()
#define MODULE_INFO(obj) GTK_CHECK_CAST (obj, MODULE_INFO_TYPE, module_info)
#define IS_MODULE_INFO(obj) GTK_CHECK_TYPE (obj, MODULE_INFO_TYPE)
#define NUM_INFO_LINES 7
typedef struct {
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
GtkWidget *table;
GtkWidget *label[NUM_INFO_LINES];
GtkWidget *button_label;
module_info *last_update;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
GtkWidget *button;
GtkWidget *list;
GtkWidget *load_inhibit_check;
} browser_st;
/* global set of module_info pointers */
@ -134,27 +137,26 @@ static gboolean need_to_rewrite_modulerc = FALSE;
/* prototypes */
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
static void module_initialize (char *filename);
static void mod_load (module_info *mod, gboolean verbose);
static void mod_unload (module_info *mod, gboolean verbose);
static module_info *module_find_by_path (const char *fullpath);
#ifdef DUMP_DB
static void print_module_info (gpointer data, gpointer user_data);
static void print_module_info (gpointer data, gpointer user_data);
#endif
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_popdown_callback (GtkWidget *w, gpointer client_data);
static void browser_destroy_callback (GtkWidget *w, gpointer client_data);
static void browser_info_update (module_info *, browser_st *);
static void browser_info_add (GimpSet *, module_info *, browser_st *);
static void browser_info_remove (GimpSet *, module_info *, browser_st *);
static void browser_info_init (browser_st *st, GtkWidget *table);
static void browser_select_callback (GtkWidget *widget, GtkWidget *child);
static void browser_load_unload_callback (GtkWidget *widget, gpointer data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void browser_refresh_callback (GtkWidget *widget, gpointer data);
static void make_list_item (gpointer data, gpointer user_data);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
static void gimp_module_ref (module_info *mod);
static void gimp_module_unref (module_info *mod);
@ -184,7 +186,8 @@ module_db_init (void)
}
static void
free_a_single_module (gpointer data, gpointer user_data)
free_a_single_module (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -195,7 +198,8 @@ free_a_single_module (gpointer data, gpointer user_data)
}
static void
add_to_inhibit_string (gpointer data, gpointer user_data)
add_to_inhibit_string (gpointer data,
gpointer user_data)
{
module_info *mod = data;
GString *str = user_data;
@ -475,7 +479,8 @@ valid_module_name (const char *filename)
static gboolean
module_inhibited (const char *fullpath, const char *inhibit_list)
module_inhibited (const char *fullpath,
const char *inhibit_list)
{
char *p;
int pathlen;
@ -559,7 +564,8 @@ module_initialize (char *filename)
}
static void
mod_load (module_info *mod, gboolean verbose)
mod_load (module_info *mod,
gboolean verbose)
{
gpointer symbol;
@ -649,7 +655,8 @@ mod_unload_completed_callback (void *data)
}
static void
mod_unload (module_info *mod, gboolean verbose)
mod_unload (module_info *mod,
gboolean verbose)
{
g_return_if_fail (mod->module != NULL);
g_return_if_fail (mod->unload != NULL);
@ -673,7 +680,8 @@ mod_unload (module_info *mod, gboolean verbose)
#ifdef DUMP_DB
static void
print_module_info (gpointer data, gpointer user_data)
print_module_info (gpointer data,
gpointer user_data)
{
module_info *i = data;
@ -703,20 +711,23 @@ print_module_info (gpointer data, gpointer user_data)
/* UI functions */
static void
browser_popdown_callback (GtkWidget *w, gpointer client_data)
browser_popdown_callback (GtkWidget *w,
gpointer client_data)
{
gtk_widget_destroy (GTK_WIDGET (client_data));
}
static void
browser_destroy_callback (GtkWidget *w, gpointer client_data)
browser_destroy_callback (GtkWidget *w,
gpointer client_data)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (modules), client_data);
g_free (client_data);
}
static void
browser_load_inhibit_callback (GtkWidget *w, gpointer data)
browser_load_inhibit_callback (GtkWidget *w,
gpointer data)
{
browser_st *st = data;
gboolean new_value;
@ -735,7 +746,8 @@ browser_load_inhibit_callback (GtkWidget *w, gpointer data)
}
static void
browser_info_update (module_info *mod, browser_st *st)
browser_info_update (module_info *mod,
browser_st *st)
{
int i;
const char *text[NUM_INFO_LINES - 1];
@ -818,7 +830,8 @@ browser_info_update (module_info *mod, browser_st *st)
}
static void
browser_info_init (browser_st *st, GtkWidget *table)
browser_info_init (browser_st *st,
GtkWidget *table)
{
GtkWidget *label;
int i;
@ -858,7 +871,8 @@ browser_info_init (browser_st *st, GtkWidget *table)
}
static void
browser_select_callback (GtkWidget *widget, GtkWidget *child)
browser_select_callback (GtkWidget *widget,
GtkWidget *child)
{
module_info *i;
browser_st *st;
@ -876,7 +890,8 @@ browser_select_callback (GtkWidget *widget, GtkWidget *child)
static void
browser_load_unload_callback (GtkWidget *widget, gpointer data)
browser_load_unload_callback (GtkWidget *widget,
gpointer data)
{
browser_st *st = data;
@ -890,7 +905,8 @@ browser_load_unload_callback (GtkWidget *widget, gpointer data)
static void
make_list_item (gpointer data, gpointer user_data)
make_list_item (gpointer data,
gpointer user_data)
{
module_info *info = data;
browser_st *st = user_data;
@ -909,14 +925,18 @@ make_list_item (gpointer data, gpointer user_data)
static void
browser_info_add (GimpSet *set, module_info *mod, browser_st *st)
browser_info_add (GimpSet *set,
module_info *mod,
browser_st *st)
{
make_list_item (mod, st);
}
static void
browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
browser_info_remove (GimpSet *set,
module_info *mod,
browser_st *st)
{
GList *dlist, *free_list;
GtkWidget *list_item;
@ -949,7 +969,8 @@ browser_info_remove (GimpSet *set, module_info *mod, browser_st *st)
static void
module_db_module_ondisk (gpointer data, gpointer user_data)
module_db_module_ondisk (gpointer data,
gpointer user_data)
{
module_info *mod = data;
struct stat statbuf;
@ -977,7 +998,8 @@ module_db_module_ondisk (gpointer data, gpointer user_data)
static void
module_db_module_remove (gpointer data, gpointer user_data)
module_db_module_remove (gpointer data,
gpointer user_data)
{
module_info *mod = data;
@ -989,12 +1011,13 @@ module_db_module_remove (gpointer data, gpointer user_data)
typedef struct {
const char *search_key;
const char *search_key;
module_info *found;
} find_by_path_closure;
static void
module_db_path_cmp (gpointer data, gpointer user_data)
module_db_path_cmp (gpointer data,
gpointer user_data)
{
module_info *mod = data;
find_by_path_closure *cl = user_data;
@ -1019,7 +1042,8 @@ module_find_by_path (const char *fullpath)
static void
browser_refresh_callback (GtkWidget *widget, gpointer data)
browser_refresh_callback (GtkWidget *widget,
gpointer data)
{
GSList *kill_list = NULL;

81
app/nav_window.c
View File

@ -31,6 +31,7 @@
#include "gimpui.h"
#include "gximage.h"
#include "interface.h"
#include "nav_window.h"
#include "scroll.h"
#include "scale.h"
@ -100,46 +101,20 @@ struct _NavWinData
};
static gint
nav_window_preview_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint
nav_window_expose_events (GtkWidget *,
GdkEvent *,
gpointer *);
static gint nav_window_preview_events (GtkWidget *, GdkEvent *, gpointer *);
static gint nav_window_expose_events (GtkWidget *, GdkEvent *, gpointer *);
static void nav_window_update_preview (NavWinData *);
static void nav_window_update_preview_blank (NavWinData *iwd);
static void destroy_preview_widget (NavWinData *);
static void create_preview_widget (NavWinData *);
static void nav_window_draw_sqr (NavWinData *, gboolean,
gint, gint, gint, gint );
static void set_size_data (NavWinData *);
static gint nav_preview_update_do_timer (NavWinData *);
static void
nav_window_update_preview (NavWinData *);
static void
nav_window_update_preview_blank (NavWinData *iwd);
static void
destroy_preview_widget (NavWinData *);
static void
create_preview_widget (NavWinData *);
void
nav_window_update_window_marker (InfoDialog *);
static void
nav_window_draw_sqr(NavWinData *,
gboolean,
gint ,
gint ,
gint ,
gint );
static void
set_size_data(NavWinData *);
static gint
nav_preview_update_do_timer (NavWinData *);
static void
nav_window_destroy_callback (GtkWidget *widget,
gpointer client_data)
{
@ -972,7 +947,7 @@ nav_preview_update_do (NavWinData *iwd)
{
nav_window_update_preview(iwd);
nav_window_disp_area(iwd,iwd->gdisp_ptr);
gtk_widget_draw(iwd->preview, NULL);
gtk_widget_queue_draw(iwd->preview);
iwd->installedDirtyTimer = FALSE;
return FALSE;
}
@ -1309,26 +1284,26 @@ nav_window_update_window_marker (InfoDialog *info_win)
iwd->block_window_marker == TRUE)
return;
update_zoom_label (iwd);
update_zoom_adjustment (iwd);
/* Undraw old size */
nav_window_draw_sqr(iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
/* Update to new size */
nav_window_disp_area(iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr(iwd,
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth,iwd->dispheight);
update_zoom_label(iwd);
iwd->dispwidth, iwd->dispheight);
update_zoom_adjustment(iwd);
/* Update to new size */
nav_window_disp_area (iwd,iwd->gdisp_ptr);
/* and redraw */
nav_window_draw_sqr (iwd,
FALSE,
iwd->dispx,
iwd->dispy,
iwd->dispwidth, iwd->dispheight);
}
void

5
app/widgets/gimpcolordisplayeditor.c
View File

@ -211,6 +211,7 @@ color_display_cancel_callback (GtkWidget *widget,
gpointer data)
{
GList *list;
GList *next;
gtk_widget_hide (GTK_WIDGET (data));
@ -221,10 +222,12 @@ color_display_cancel_callback (GtkWidget *widget,
while (list)
{
next = list->next;
if (!g_list_find (cdd.old_nodes, list->data))
gdisplay_color_detach_destroy (cdd.gdisp, list->data);
list = list->next;
list = next;
}
}

198
plug-ins/common/plugin-browser.c
View File

@ -28,9 +28,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH DBL_LIST_WIDTH+450
#define DBL_HEIGHT 200
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH (DBL_LIST_WIDTH + 300)
#define DBL_HEIGHT 200
static char *proc_type_str[] =
{
@ -146,9 +146,9 @@ typedef struct
gint clist_row;
gint c1size;
gboolean details_showing;
} PLUGINDESC,*PLUGINDESCP;
} PDesc;
PLUGINDESCP plugindesc = NULL;
PDesc *plugindesc = NULL;
typedef struct
{
@ -158,14 +158,14 @@ typedef struct
gchar *types;
gchar *realname;
gint instime;
} PINFO, *PINFOP;
} PInfo;
static void
dialog_close_callback (GtkWidget *widget,
gpointer data)
/* end of the dialog */
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
gtk_widget_destroy(pdesc->dlg);
gtk_main_quit ();
}
@ -176,16 +176,31 @@ static void
details_callback (GtkWidget *widget,
gpointer data)
{
/* Show or hide the details window */
PLUGINDESCP pdesc = data;
/* Show or hide the details window */
PDesc *pdesc = data;
GtkLabel *lab = GTK_LABEL(GTK_BIN (widget)->child);
/* This is a lame hack:
We add the description on the right on the first details_callback.
Otherwise the window reacts quite weird on resizes */
if (pdesc->descr_scroll == NULL)
{
pdesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE);
gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1);
}
if(pdesc->details_showing == FALSE)
{
GTK_PANED(pdesc->paned)->child1_resize=FALSE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),10);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),6);
gtk_label_set_text(lab,"Details <<<");
gtk_label_set_text(lab," Details <<< ");
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
}
@ -196,7 +211,7 @@ details_callback (GtkWidget *widget,
GTK_PANED(pdesc->paned)->child2_resize=TRUE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),0);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),0);
gtk_label_set_text(lab,"Details >>>");
gtk_label_set_text(lab," Details >>> ");
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position(GTK_PANED(pdesc->paned),p->allocation.width);/*plugindesc->c1size);*/
pdesc->details_showing = FALSE;
@ -222,8 +237,8 @@ format_menu_path(gchar *s)
}
static gint
procedure_general_select_callback (PLUGINDESCP pdesc,
PINFOP pinfo)
procedure_general_select_callback (PDesc *pdesc,
PInfo *pinfo)
{
gchar *selected_proc_blurb;
gchar *selected_proc_help;
@ -247,6 +262,9 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
g_return_val_if_fail (pinfo != NULL, FALSE);
if (pdesc->descr_scroll == NULL)
return FALSE;
selected_proc_blurb = NULL;
selected_proc_help = NULL;
selected_proc_author = NULL;
@ -460,29 +478,30 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
}
static void
expand_to(PLUGINDESCP pdesc,GtkCTreeNode * parent)
expand_to (PDesc *pdesc,
GtkCTreeNode *parent)
{
if(parent)
{
expand_to(pdesc,(GTK_CTREE_ROW(parent))->parent);
gtk_ctree_expand(GTK_CTREE(pdesc->ctree),parent);
expand_to (pdesc, (GTK_CTREE_ROW (parent))->parent);
gtk_ctree_expand (GTK_CTREE (pdesc->ctree), parent);
}
}
static gint
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton * bevent,
gpointer data)
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
PINFOP pinfo;
PInfo *pinfo;
GtkCTreeNode * found_node;
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
g_return_val_if_fail (pdesc != NULL, FALSE);
pinfo = (PINFOP)gtk_clist_get_row_data (GTK_CLIST (widget), row);
pinfo = (PInfo *)gtk_clist_get_row_data (GTK_CLIST (widget), row);
if(!pinfo)
return FALSE;
@ -546,9 +565,9 @@ static gint
page_select_callback (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num,
gpointer data)
gpointer data)
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
if(page_num == 0)
{
@ -556,7 +575,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->clist),
pdesc->clist_row,
0,
0.5,0.5);
0.5, 0.0);
}
else
{
@ -564,7 +583,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->ctree),
pdesc->ctree_row,
0,
0.5,0.5);
0.5, 0.0);
}
return FALSE;
}
@ -572,13 +591,13 @@ page_select_callback (GtkNotebook *notebook,
static gint
procedure_ctree_select_callback (GtkWidget *widget,
GtkWidget *row,
gint column,
gpointer data)
gint column,
gpointer data)
{
PINFOP pinfo;
PLUGINDESCP pdesc;
gboolean is_leaf;
gint sel_row;
PInfo *pinfo;
PDesc *pdesc;
gboolean is_leaf;
gint sel_row;
/* row is not a leaf the we have no interest in it */
@ -593,14 +612,12 @@ procedure_ctree_select_callback (GtkWidget *widget,
&is_leaf,
NULL);
if(!is_leaf)
{
return FALSE;
}
if (!is_leaf)
return FALSE;
pdesc = data;
pinfo = (PINFOP)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
pinfo = (PInfo *)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
/* Must set clist to this one */
@ -623,9 +640,9 @@ procedure_ctree_select_callback (GtkWidget *widget,
}
static void
pinfo_free(gpointer p)
pinfo_free (gpointer p)
{
PINFOP pinfo = p;
PInfo *pinfo = p;
g_free(pinfo->menu);
@ -637,7 +654,9 @@ pinfo_free(gpointer p)
}
static GtkCTreeNode*
get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
get_parent (PDesc *pdesc,
GHashTable *ghash,
gchar *mpath)
{
GtkCTreeNode *parent;
GtkCTreeNode *last_parent;
@ -702,12 +721,13 @@ get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
}
static void
insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable * ghash,
PINFOP pinfo)
insert_into_ctree (PDesc *pdesc,
gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable *ghash,
PInfo *pinfo)
{
gchar *labels[3];
gchar *str_ptr;
@ -757,7 +777,8 @@ insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
}
static void
get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
get_plugin_info (PDesc *pdesc,
gchar *search_text)
{
GParam *return_vals;
int nreturn_vals;
@ -792,7 +813,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
for (loop = 0; loop < return_vals[1].data.d_int32; loop++)
{
PINFOP pinfo;
PInfo *pinfo;
gchar *labels[4];
gchar *name;
gchar xtimestr[50];
@ -807,7 +828,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
else
name = menu_strs[loop];
pinfo = g_new0(PINFO,1);
pinfo = g_new0 (PInfo, 1);
tx = time_ints[loop];
if(tx)
@ -831,11 +852,10 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
labels[2] = g_strdup(menu_strs[loop]);
labels[3] = g_strdup(types_strs[loop]);
gtk_clist_insert (GTK_CLIST (GTK_CLIST(pdesc->clist)), row_count,
labels);
gtk_clist_insert (GTK_CLIST(pdesc->clist), row_count, labels);
gtk_clist_set_row_data_full(GTK_CLIST(pdesc->clist), row_count,
pinfo,pinfo_free);
gtk_clist_set_row_data_full (GTK_CLIST (pdesc->clist), row_count,
pinfo, pinfo_free);
row_count++;
@ -857,8 +877,8 @@ static void
dialog_search_callback (GtkWidget *widget,
gpointer data)
{
PLUGINDESCP pdesc = data;
gchar *search_text = NULL;
PDesc *pdesc = data;
gchar *search_text = NULL;
if(widget != NULL)
{
@ -871,7 +891,7 @@ dialog_search_callback (GtkWidget *widget,
gtk_clist_freeze(GTK_CLIST(pdesc->clist));
gtk_clist_clear(GTK_CLIST(pdesc->clist));
get_plugin_info(pdesc,search_text);
get_plugin_info (pdesc,search_text);
gtk_clist_columns_autosize(GTK_CLIST(plugindesc->clist));
@ -882,16 +902,16 @@ dialog_search_callback (GtkWidget *widget,
}
static gint
date_sort(GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
date_sort (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
{
GtkCListRow *row1 = (GtkCListRow *) ptr1;
GtkCListRow *row2 = (GtkCListRow *) ptr2;
/* Get the data for the row */
PINFOP row1_pinfo = row1->data;
PINFOP row2_pinfo = row2->data;
PInfo *row1_pinfo = row1->data;
PInfo *row2_pinfo = row2->data;
/* Want to sort on the date field */
@ -909,7 +929,9 @@ date_sort(GtkCList *clist,
}
static void
clist_click_column (GtkCList *clist, gint column, gpointer data)
clist_click_column (GtkCList *clist,
gint column,
gpointer data)
{
if (column == 1)
{
@ -935,7 +957,7 @@ clist_click_column (GtkCList *clist, gint column, gpointer data)
static GtkWidget *
gimp_plugin_desc()
gimp_plugin_desc ()
{
GtkWidget *button;
GtkWidget *hbox,*searchhbox,*vbox;
@ -951,7 +973,7 @@ gimp_plugin_desc()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
plugindesc = g_new0(PLUGINDESC,1);
plugindesc = g_new0 (PDesc, 1);
/* the dialog box */
@ -963,7 +985,7 @@ gimp_plugin_desc()
gtk_signal_connect (GTK_OBJECT (plugindesc->dlg), "destroy",
(GtkSignalFunc) dialog_close_callback,
plugindesc);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg),TRUE,TRUE,TRUE);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg), FALSE, TRUE, TRUE);
/* hbox : left=notebook ; right=description */
@ -978,10 +1000,10 @@ gimp_plugin_desc()
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new( FALSE, 0 );
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_add1 (GTK_PANED (hbox),vbox);
gtk_widget_show(vbox);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
/* left = notebook */
@ -1005,16 +1027,16 @@ gimp_plugin_desc()
gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist),
GTK_SELECTION_BROWSE);
gtk_widget_set_usize(plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row",
(GtkSignalFunc) procedure_clist_select_callback,
plugindesc);
label = gtk_label_new("List view");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),swindow,label);
label = gtk_label_new ("List view");
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), swindow, label);
gtk_container_add (GTK_CONTAINER (swindow), plugindesc->clist);
gtk_widget_show(plugindesc->clist);
gtk_widget_show(swindow);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (swindow);
/* notebook->ctree */
clabels[0] = g_strdup("Menu Path/Name");
@ -1048,13 +1070,13 @@ gimp_plugin_desc()
searchhbox = gtk_hbox_new(FALSE,0);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, TRUE, 0);
searchhbox, FALSE, FALSE, 0);
gtk_widget_show(searchhbox);
label = gtk_label_new("Search :");
label = gtk_label_new("Search : ");
gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (searchhbox),
label, TRUE, TRUE, 0);
label, FALSE, FALSE, 0);
gtk_widget_show(label);
plugindesc->search_entry = gtk_entry_new();
@ -1062,23 +1084,16 @@ gimp_plugin_desc()
plugindesc->search_entry, TRUE, TRUE, 0);
gtk_widget_show(plugindesc->search_entry);
button = gtk_button_new_with_label ("Details >>>");
button = gtk_button_new_with_label (" Details >>> ");
gtk_widget_show(button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) details_callback, plugindesc);
gtk_box_pack_start (GTK_BOX (searchhbox),
button, TRUE, TRUE, 0);
button, FALSE, FALSE, 0);
/* right = description */
plugindesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (plugindesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_paned_add2 (GTK_PANED (hbox), plugindesc->descr_scroll);
gtk_widget_set_usize (plugindesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, 0);
/* the right description is build on first click of the Details button */
/* buttons in dlg->action_area */
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(plugindesc->dlg)->action_area), 0);
@ -1102,10 +1117,13 @@ gimp_plugin_desc()
/* now build the list */
dialog_search_callback( NULL, (gpointer)plugindesc);
dialog_search_callback (NULL, (gpointer)plugindesc);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (plugindesc->dlg);
gtk_clist_select_row (GTK_CLIST (plugindesc->clist), 0, 0);
gtk_clist_moveto (GTK_CLIST (plugindesc->clist), 0, 0, 0.0, 0.0);
plugindesc->c1size = GTK_PANED(plugindesc->paned)->child1_size;
GTK_PANED(plugindesc->paned)->child1_resize=TRUE;

198
plug-ins/common/plugindetails.c
View File

@ -28,9 +28,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH DBL_LIST_WIDTH+450
#define DBL_HEIGHT 200
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH (DBL_LIST_WIDTH + 300)
#define DBL_HEIGHT 200
static char *proc_type_str[] =
{
@ -146,9 +146,9 @@ typedef struct
gint clist_row;
gint c1size;
gboolean details_showing;
} PLUGINDESC,*PLUGINDESCP;
} PDesc;
PLUGINDESCP plugindesc = NULL;
PDesc *plugindesc = NULL;
typedef struct
{
@ -158,14 +158,14 @@ typedef struct
gchar *types;
gchar *realname;
gint instime;
} PINFO, *PINFOP;
} PInfo;
static void
dialog_close_callback (GtkWidget *widget,
gpointer data)
/* end of the dialog */
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
gtk_widget_destroy(pdesc->dlg);
gtk_main_quit ();
}
@ -176,16 +176,31 @@ static void
details_callback (GtkWidget *widget,
gpointer data)
{
/* Show or hide the details window */
PLUGINDESCP pdesc = data;
/* Show or hide the details window */
PDesc *pdesc = data;
GtkLabel *lab = GTK_LABEL(GTK_BIN (widget)->child);
/* This is a lame hack:
We add the description on the right on the first details_callback.
Otherwise the window reacts quite weird on resizes */
if (pdesc->descr_scroll == NULL)
{
pdesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE);
gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1);
}
if(pdesc->details_showing == FALSE)
{
GTK_PANED(pdesc->paned)->child1_resize=FALSE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),10);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),6);
gtk_label_set_text(lab,"Details <<<");
gtk_label_set_text(lab," Details <<< ");
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
}
@ -196,7 +211,7 @@ details_callback (GtkWidget *widget,
GTK_PANED(pdesc->paned)->child2_resize=TRUE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),0);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),0);
gtk_label_set_text(lab,"Details >>>");
gtk_label_set_text(lab," Details >>> ");
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position(GTK_PANED(pdesc->paned),p->allocation.width);/*plugindesc->c1size);*/
pdesc->details_showing = FALSE;
@ -222,8 +237,8 @@ format_menu_path(gchar *s)
}
static gint
procedure_general_select_callback (PLUGINDESCP pdesc,
PINFOP pinfo)
procedure_general_select_callback (PDesc *pdesc,
PInfo *pinfo)
{
gchar *selected_proc_blurb;
gchar *selected_proc_help;
@ -247,6 +262,9 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
g_return_val_if_fail (pinfo != NULL, FALSE);
if (pdesc->descr_scroll == NULL)
return FALSE;
selected_proc_blurb = NULL;
selected_proc_help = NULL;
selected_proc_author = NULL;
@ -460,29 +478,30 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
}
static void
expand_to(PLUGINDESCP pdesc,GtkCTreeNode * parent)
expand_to (PDesc *pdesc,
GtkCTreeNode *parent)
{
if(parent)
{
expand_to(pdesc,(GTK_CTREE_ROW(parent))->parent);
gtk_ctree_expand(GTK_CTREE(pdesc->ctree),parent);
expand_to (pdesc, (GTK_CTREE_ROW (parent))->parent);
gtk_ctree_expand (GTK_CTREE (pdesc->ctree), parent);
}
}
static gint
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton * bevent,
gpointer data)
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
PINFOP pinfo;
PInfo *pinfo;
GtkCTreeNode * found_node;
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
g_return_val_if_fail (pdesc != NULL, FALSE);
pinfo = (PINFOP)gtk_clist_get_row_data (GTK_CLIST (widget), row);
pinfo = (PInfo *)gtk_clist_get_row_data (GTK_CLIST (widget), row);
if(!pinfo)
return FALSE;
@ -546,9 +565,9 @@ static gint
page_select_callback (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num,
gpointer data)
gpointer data)
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
if(page_num == 0)
{
@ -556,7 +575,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->clist),
pdesc->clist_row,
0,
0.5,0.5);
0.5, 0.0);
}
else
{
@ -564,7 +583,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->ctree),
pdesc->ctree_row,
0,
0.5,0.5);
0.5, 0.0);
}
return FALSE;
}
@ -572,13 +591,13 @@ page_select_callback (GtkNotebook *notebook,
static gint
procedure_ctree_select_callback (GtkWidget *widget,
GtkWidget *row,
gint column,
gpointer data)
gint column,
gpointer data)
{
PINFOP pinfo;
PLUGINDESCP pdesc;
gboolean is_leaf;
gint sel_row;
PInfo *pinfo;
PDesc *pdesc;
gboolean is_leaf;
gint sel_row;
/* row is not a leaf the we have no interest in it */
@ -593,14 +612,12 @@ procedure_ctree_select_callback (GtkWidget *widget,
&is_leaf,
NULL);
if(!is_leaf)
{
return FALSE;
}
if (!is_leaf)
return FALSE;
pdesc = data;
pinfo = (PINFOP)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
pinfo = (PInfo *)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
/* Must set clist to this one */
@ -623,9 +640,9 @@ procedure_ctree_select_callback (GtkWidget *widget,
}
static void
pinfo_free(gpointer p)
pinfo_free (gpointer p)
{
PINFOP pinfo = p;
PInfo *pinfo = p;
g_free(pinfo->menu);
@ -637,7 +654,9 @@ pinfo_free(gpointer p)
}
static GtkCTreeNode*
get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
get_parent (PDesc *pdesc,
GHashTable *ghash,
gchar *mpath)
{
GtkCTreeNode *parent;
GtkCTreeNode *last_parent;
@ -702,12 +721,13 @@ get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
}
static void
insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable * ghash,
PINFOP pinfo)
insert_into_ctree (PDesc *pdesc,
gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable *ghash,
PInfo *pinfo)
{
gchar *labels[3];
gchar *str_ptr;
@ -757,7 +777,8 @@ insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
}
static void
get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
get_plugin_info (PDesc *pdesc,
gchar *search_text)
{
GParam *return_vals;
int nreturn_vals;
@ -792,7 +813,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
for (loop = 0; loop < return_vals[1].data.d_int32; loop++)
{
PINFOP pinfo;
PInfo *pinfo;
gchar *labels[4];
gchar *name;
gchar xtimestr[50];
@ -807,7 +828,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
else
name = menu_strs[loop];
pinfo = g_new0(PINFO,1);
pinfo = g_new0 (PInfo, 1);
tx = time_ints[loop];
if(tx)
@ -831,11 +852,10 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
labels[2] = g_strdup(menu_strs[loop]);
labels[3] = g_strdup(types_strs[loop]);
gtk_clist_insert (GTK_CLIST (GTK_CLIST(pdesc->clist)), row_count,
labels);
gtk_clist_insert (GTK_CLIST(pdesc->clist), row_count, labels);
gtk_clist_set_row_data_full(GTK_CLIST(pdesc->clist), row_count,
pinfo,pinfo_free);
gtk_clist_set_row_data_full (GTK_CLIST (pdesc->clist), row_count,
pinfo, pinfo_free);
row_count++;
@ -857,8 +877,8 @@ static void
dialog_search_callback (GtkWidget *widget,
gpointer data)
{
PLUGINDESCP pdesc = data;
gchar *search_text = NULL;
PDesc *pdesc = data;
gchar *search_text = NULL;
if(widget != NULL)
{
@ -871,7 +891,7 @@ dialog_search_callback (GtkWidget *widget,
gtk_clist_freeze(GTK_CLIST(pdesc->clist));
gtk_clist_clear(GTK_CLIST(pdesc->clist));
get_plugin_info(pdesc,search_text);
get_plugin_info (pdesc,search_text);
gtk_clist_columns_autosize(GTK_CLIST(plugindesc->clist));
@ -882,16 +902,16 @@ dialog_search_callback (GtkWidget *widget,
}
static gint
date_sort(GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
date_sort (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
{
GtkCListRow *row1 = (GtkCListRow *) ptr1;
GtkCListRow *row2 = (GtkCListRow *) ptr2;
/* Get the data for the row */
PINFOP row1_pinfo = row1->data;
PINFOP row2_pinfo = row2->data;
PInfo *row1_pinfo = row1->data;
PInfo *row2_pinfo = row2->data;
/* Want to sort on the date field */
@ -909,7 +929,9 @@ date_sort(GtkCList *clist,
}
static void
clist_click_column (GtkCList *clist, gint column, gpointer data)
clist_click_column (GtkCList *clist,
gint column,
gpointer data)
{
if (column == 1)
{
@ -935,7 +957,7 @@ clist_click_column (GtkCList *clist, gint column, gpointer data)
static GtkWidget *
gimp_plugin_desc()
gimp_plugin_desc ()
{
GtkWidget *button;
GtkWidget *hbox,*searchhbox,*vbox;
@ -951,7 +973,7 @@ gimp_plugin_desc()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
plugindesc = g_new0(PLUGINDESC,1);
plugindesc = g_new0 (PDesc, 1);
/* the dialog box */
@ -963,7 +985,7 @@ gimp_plugin_desc()
gtk_signal_connect (GTK_OBJECT (plugindesc->dlg), "destroy",
(GtkSignalFunc) dialog_close_callback,
plugindesc);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg),TRUE,TRUE,TRUE);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg), FALSE, TRUE, TRUE);
/* hbox : left=notebook ; right=description */
@ -978,10 +1000,10 @@ gimp_plugin_desc()
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new( FALSE, 0 );
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_add1 (GTK_PANED (hbox),vbox);
gtk_widget_show(vbox);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
/* left = notebook */
@ -1005,16 +1027,16 @@ gimp_plugin_desc()
gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist),
GTK_SELECTION_BROWSE);
gtk_widget_set_usize(plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row",
(GtkSignalFunc) procedure_clist_select_callback,
plugindesc);
label = gtk_label_new("List view");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),swindow,label);
label = gtk_label_new ("List view");
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), swindow, label);
gtk_container_add (GTK_CONTAINER (swindow), plugindesc->clist);
gtk_widget_show(plugindesc->clist);
gtk_widget_show(swindow);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (swindow);
/* notebook->ctree */
clabels[0] = g_strdup("Menu Path/Name");
@ -1048,13 +1070,13 @@ gimp_plugin_desc()
searchhbox = gtk_hbox_new(FALSE,0);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, TRUE, 0);
searchhbox, FALSE, FALSE, 0);
gtk_widget_show(searchhbox);
label = gtk_label_new("Search :");
label = gtk_label_new("Search : ");
gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (searchhbox),
label, TRUE, TRUE, 0);
label, FALSE, FALSE, 0);
gtk_widget_show(label);
plugindesc->search_entry = gtk_entry_new();
@ -1062,23 +1084,16 @@ gimp_plugin_desc()
plugindesc->search_entry, TRUE, TRUE, 0);
gtk_widget_show(plugindesc->search_entry);
button = gtk_button_new_with_label ("Details >>>");
button = gtk_button_new_with_label (" Details >>> ");
gtk_widget_show(button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) details_callback, plugindesc);
gtk_box_pack_start (GTK_BOX (searchhbox),
button, TRUE, TRUE, 0);
button, FALSE, FALSE, 0);
/* right = description */
plugindesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (plugindesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_paned_add2 (GTK_PANED (hbox), plugindesc->descr_scroll);
gtk_widget_set_usize (plugindesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, 0);
/* the right description is build on first click of the Details button */
/* buttons in dlg->action_area */
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(plugindesc->dlg)->action_area), 0);
@ -1102,10 +1117,13 @@ gimp_plugin_desc()
/* now build the list */
dialog_search_callback( NULL, (gpointer)plugindesc);
dialog_search_callback (NULL, (gpointer)plugindesc);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (plugindesc->dlg);
gtk_clist_select_row (GTK_CLIST (plugindesc->clist), 0, 0);
gtk_clist_moveto (GTK_CLIST (plugindesc->clist), 0, 0, 0.0, 0.0);
plugindesc->c1size = GTK_PANED(plugindesc->paned)->child1_size;
GTK_PANED(plugindesc->paned)->child1_resize=TRUE;

198
plug-ins/dbbrowser/plugin-browser.c
View File

@ -28,9 +28,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH DBL_LIST_WIDTH+450
#define DBL_HEIGHT 200
#define DBL_LIST_WIDTH 250
#define DBL_WIDTH (DBL_LIST_WIDTH + 300)
#define DBL_HEIGHT 200
static char *proc_type_str[] =
{
@ -146,9 +146,9 @@ typedef struct
gint clist_row;
gint c1size;
gboolean details_showing;
} PLUGINDESC,*PLUGINDESCP;
} PDesc;
PLUGINDESCP plugindesc = NULL;
PDesc *plugindesc = NULL;
typedef struct
{
@ -158,14 +158,14 @@ typedef struct
gchar *types;
gchar *realname;
gint instime;
} PINFO, *PINFOP;
} PInfo;
static void
dialog_close_callback (GtkWidget *widget,
gpointer data)
/* end of the dialog */
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
gtk_widget_destroy(pdesc->dlg);
gtk_main_quit ();
}
@ -176,16 +176,31 @@ static void
details_callback (GtkWidget *widget,
gpointer data)
{
/* Show or hide the details window */
PLUGINDESCP pdesc = data;
/* Show or hide the details window */
PDesc *pdesc = data;
GtkLabel *lab = GTK_LABEL(GTK_BIN (widget)->child);
/* This is a lame hack:
We add the description on the right on the first details_callback.
Otherwise the window reacts quite weird on resizes */
if (pdesc->descr_scroll == NULL)
{
pdesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE);
gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1);
}
if(pdesc->details_showing == FALSE)
{
GTK_PANED(pdesc->paned)->child1_resize=FALSE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),10);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),6);
gtk_label_set_text(lab,"Details <<<");
gtk_label_set_text(lab," Details <<< ");
gtk_widget_show (pdesc->descr_scroll);
pdesc->details_showing = TRUE;
}
@ -196,7 +211,7 @@ details_callback (GtkWidget *widget,
GTK_PANED(pdesc->paned)->child2_resize=TRUE;
gtk_paned_set_handle_size(GTK_PANED(pdesc->paned),0);
gtk_paned_set_gutter_size(GTK_PANED(pdesc->paned),0);
gtk_label_set_text(lab,"Details >>>");
gtk_label_set_text(lab," Details >>> ");
gtk_widget_hide (pdesc->descr_scroll);
gtk_paned_set_position(GTK_PANED(pdesc->paned),p->allocation.width);/*plugindesc->c1size);*/
pdesc->details_showing = FALSE;
@ -222,8 +237,8 @@ format_menu_path(gchar *s)
}
static gint
procedure_general_select_callback (PLUGINDESCP pdesc,
PINFOP pinfo)
procedure_general_select_callback (PDesc *pdesc,
PInfo *pinfo)
{
gchar *selected_proc_blurb;
gchar *selected_proc_help;
@ -247,6 +262,9 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
g_return_val_if_fail (pinfo != NULL, FALSE);
if (pdesc->descr_scroll == NULL)
return FALSE;
selected_proc_blurb = NULL;
selected_proc_help = NULL;
selected_proc_author = NULL;
@ -460,29 +478,30 @@ procedure_general_select_callback (PLUGINDESCP pdesc,
}
static void
expand_to(PLUGINDESCP pdesc,GtkCTreeNode * parent)
expand_to (PDesc *pdesc,
GtkCTreeNode *parent)
{
if(parent)
{
expand_to(pdesc,(GTK_CTREE_ROW(parent))->parent);
gtk_ctree_expand(GTK_CTREE(pdesc->ctree),parent);
expand_to (pdesc, (GTK_CTREE_ROW (parent))->parent);
gtk_ctree_expand (GTK_CTREE (pdesc->ctree), parent);
}
}
static gint
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton * bevent,
gpointer data)
procedure_clist_select_callback (GtkWidget *widget,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
PINFOP pinfo;
PInfo *pinfo;
GtkCTreeNode * found_node;
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
g_return_val_if_fail (pdesc != NULL, FALSE);
pinfo = (PINFOP)gtk_clist_get_row_data (GTK_CLIST (widget), row);
pinfo = (PInfo *)gtk_clist_get_row_data (GTK_CLIST (widget), row);
if(!pinfo)
return FALSE;
@ -546,9 +565,9 @@ static gint
page_select_callback (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num,
gpointer data)
gpointer data)
{
PLUGINDESCP pdesc = data;
PDesc *pdesc = data;
if(page_num == 0)
{
@ -556,7 +575,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->clist),
pdesc->clist_row,
0,
0.5,0.5);
0.5, 0.0);
}
else
{
@ -564,7 +583,7 @@ page_select_callback (GtkNotebook *notebook,
gtk_clist_moveto(GTK_CLIST(pdesc->ctree),
pdesc->ctree_row,
0,
0.5,0.5);
0.5, 0.0);
}
return FALSE;
}
@ -572,13 +591,13 @@ page_select_callback (GtkNotebook *notebook,
static gint
procedure_ctree_select_callback (GtkWidget *widget,
GtkWidget *row,
gint column,
gpointer data)
gint column,
gpointer data)
{
PINFOP pinfo;
PLUGINDESCP pdesc;
gboolean is_leaf;
gint sel_row;
PInfo *pinfo;
PDesc *pdesc;
gboolean is_leaf;
gint sel_row;
/* row is not a leaf the we have no interest in it */
@ -593,14 +612,12 @@ procedure_ctree_select_callback (GtkWidget *widget,
&is_leaf,
NULL);
if(!is_leaf)
{
return FALSE;
}
if (!is_leaf)
return FALSE;
pdesc = data;
pinfo = (PINFOP)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
pinfo = (PInfo *)gtk_ctree_node_get_row_data (GTK_CTREE(widget),GTK_CTREE_NODE(row));
/* Must set clist to this one */
@ -623,9 +640,9 @@ procedure_ctree_select_callback (GtkWidget *widget,
}
static void
pinfo_free(gpointer p)
pinfo_free (gpointer p)
{
PINFOP pinfo = p;
PInfo *pinfo = p;
g_free(pinfo->menu);
@ -637,7 +654,9 @@ pinfo_free(gpointer p)
}
static GtkCTreeNode*
get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
get_parent (PDesc *pdesc,
GHashTable *ghash,
gchar *mpath)
{
GtkCTreeNode *parent;
GtkCTreeNode *last_parent;
@ -702,12 +721,13 @@ get_parent(PLUGINDESCP pdesc,GHashTable * ghash,gchar *mpath)
}
static void
insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable * ghash,
PINFOP pinfo)
insert_into_ctree (PDesc *pdesc,
gchar *name,
gchar *xtimestr,
gchar *menu_str,
gchar *types_str,
GHashTable *ghash,
PInfo *pinfo)
{
gchar *labels[3];
gchar *str_ptr;
@ -757,7 +777,8 @@ insert_into_ctree(PLUGINDESCP pdesc,gchar *name,
}
static void
get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
get_plugin_info (PDesc *pdesc,
gchar *search_text)
{
GParam *return_vals;
int nreturn_vals;
@ -792,7 +813,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
for (loop = 0; loop < return_vals[1].data.d_int32; loop++)
{
PINFOP pinfo;
PInfo *pinfo;
gchar *labels[4];
gchar *name;
gchar xtimestr[50];
@ -807,7 +828,7 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
else
name = menu_strs[loop];
pinfo = g_new0(PINFO,1);
pinfo = g_new0 (PInfo, 1);
tx = time_ints[loop];
if(tx)
@ -831,11 +852,10 @@ get_plugin_info(PLUGINDESCP pdesc,gchar *search_text)
labels[2] = g_strdup(menu_strs[loop]);
labels[3] = g_strdup(types_strs[loop]);
gtk_clist_insert (GTK_CLIST (GTK_CLIST(pdesc->clist)), row_count,
labels);
gtk_clist_insert (GTK_CLIST(pdesc->clist), row_count, labels);
gtk_clist_set_row_data_full(GTK_CLIST(pdesc->clist), row_count,
pinfo,pinfo_free);
gtk_clist_set_row_data_full (GTK_CLIST (pdesc->clist), row_count,
pinfo, pinfo_free);
row_count++;
@ -857,8 +877,8 @@ static void
dialog_search_callback (GtkWidget *widget,
gpointer data)
{
PLUGINDESCP pdesc = data;
gchar *search_text = NULL;
PDesc *pdesc = data;
gchar *search_text = NULL;
if(widget != NULL)
{
@ -871,7 +891,7 @@ dialog_search_callback (GtkWidget *widget,
gtk_clist_freeze(GTK_CLIST(pdesc->clist));
gtk_clist_clear(GTK_CLIST(pdesc->clist));
get_plugin_info(pdesc,search_text);
get_plugin_info (pdesc,search_text);
gtk_clist_columns_autosize(GTK_CLIST(plugindesc->clist));
@ -882,16 +902,16 @@ dialog_search_callback (GtkWidget *widget,
}
static gint
date_sort(GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
date_sort (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2)
{
GtkCListRow *row1 = (GtkCListRow *) ptr1;
GtkCListRow *row2 = (GtkCListRow *) ptr2;
/* Get the data for the row */
PINFOP row1_pinfo = row1->data;
PINFOP row2_pinfo = row2->data;
PInfo *row1_pinfo = row1->data;
PInfo *row2_pinfo = row2->data;
/* Want to sort on the date field */
@ -909,7 +929,9 @@ date_sort(GtkCList *clist,
}
static void
clist_click_column (GtkCList *clist, gint column, gpointer data)
clist_click_column (GtkCList *clist,
gint column,
gpointer data)
{
if (column == 1)
{
@ -935,7 +957,7 @@ clist_click_column (GtkCList *clist, gint column, gpointer data)
static GtkWidget *
gimp_plugin_desc()
gimp_plugin_desc ()
{
GtkWidget *button;
GtkWidget *hbox,*searchhbox,*vbox;
@ -951,7 +973,7 @@ gimp_plugin_desc()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
plugindesc = g_new0(PLUGINDESC,1);
plugindesc = g_new0 (PDesc, 1);
/* the dialog box */
@ -963,7 +985,7 @@ gimp_plugin_desc()
gtk_signal_connect (GTK_OBJECT (plugindesc->dlg), "destroy",
(GtkSignalFunc) dialog_close_callback,
plugindesc);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg),TRUE,TRUE,TRUE);
gtk_window_set_policy(GTK_WINDOW (plugindesc->dlg), FALSE, TRUE, TRUE);
/* hbox : left=notebook ; right=description */
@ -978,10 +1000,10 @@ gimp_plugin_desc()
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new( FALSE, 0 );
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_add1 (GTK_PANED (hbox),vbox);
gtk_widget_show(vbox);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
/* left = notebook */
@ -1005,16 +1027,16 @@ gimp_plugin_desc()
gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist),
GTK_SELECTION_BROWSE);
gtk_widget_set_usize(plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT);
gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row",
(GtkSignalFunc) procedure_clist_select_callback,
plugindesc);
label = gtk_label_new("List view");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),swindow,label);
label = gtk_label_new ("List view");
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), swindow, label);
gtk_container_add (GTK_CONTAINER (swindow), plugindesc->clist);
gtk_widget_show(plugindesc->clist);
gtk_widget_show(swindow);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (swindow);
/* notebook->ctree */
clabels[0] = g_strdup("Menu Path/Name");
@ -1048,13 +1070,13 @@ gimp_plugin_desc()
searchhbox = gtk_hbox_new(FALSE,0);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, TRUE, 0);
searchhbox, FALSE, FALSE, 0);
gtk_widget_show(searchhbox);
label = gtk_label_new("Search :");
label = gtk_label_new("Search : ");
gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (searchhbox),
label, TRUE, TRUE, 0);
label, FALSE, FALSE, 0);
gtk_widget_show(label);
plugindesc->search_entry = gtk_entry_new();
@ -1062,23 +1084,16 @@ gimp_plugin_desc()
plugindesc->search_entry, TRUE, TRUE, 0);
gtk_widget_show(plugindesc->search_entry);
button = gtk_button_new_with_label ("Details >>>");
button = gtk_button_new_with_label (" Details >>> ");
gtk_widget_show(button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) details_callback, plugindesc);
gtk_box_pack_start (GTK_BOX (searchhbox),
button, TRUE, TRUE, 0);
button, FALSE, FALSE, 0);
/* right = description */
plugindesc->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (plugindesc->descr_scroll),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS
);
gtk_paned_add2 (GTK_PANED (hbox), plugindesc->descr_scroll);
gtk_widget_set_usize (plugindesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, 0);
/* the right description is build on first click of the Details button */
/* buttons in dlg->action_area */
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(plugindesc->dlg)->action_area), 0);
@ -1102,10 +1117,13 @@ gimp_plugin_desc()
/* now build the list */
dialog_search_callback( NULL, (gpointer)plugindesc);
dialog_search_callback (NULL, (gpointer)plugindesc);
gtk_widget_show (plugindesc->clist);
gtk_widget_show (plugindesc->dlg);
gtk_clist_select_row (GTK_CLIST (plugindesc->clist), 0, 0);
gtk_clist_moveto (GTK_CLIST (plugindesc->clist), 0, 0, 0.0, 0.0);
plugindesc->c1size = GTK_PANED(plugindesc->paned)->child1_size;
GTK_PANED(plugindesc->paned)->child1_resize=TRUE;