I've patched dbbrowser to use labels (with line wrapping) for all
the text, instead of having uneditable text fields for the proc name
and help text. The result looks better (to me). There's no internal
functional difference at all, so it's safe to use, but externally you
can no longer copy text from the proc name field. Don't know whether
this is important or not. I've also made the required mods for 1.2,
removed some unused variables, and pulled out chunks of common code
into a couple of small static procedures, which makes the code tidier
and easier to change.
I wanted to improve the layout some more, but can't work out how
to have a scrolling window that only scrolls vertically. The width
interactions between the scroll window, the table, and the line wrap
in the labels are wierd. Maybe some gtk guru can sort this out.
The enclosed patches are against 1.1.25.
--
David Hodson -- hodsond@xxxxxxxxxxxxxx -- this night wounds time
--- dbbrowser_utils.c-orig Tue Sep 5 13:01:57 2000
+++ dbbrowser_utils.c Tue Sep 5 20:49:33 2000
@@ -21,6 +21,9 @@
* 0.08 26th sept 97 by Thomas NOEL <thomas@xxxxxxxxx>
*
* 98/12/13 Sven Neumann <sven@xxxxxxxx> : added help display
+ * 5th Sep 2000 David Hodson <hodsond@xxxxxxx> :
+ * redesigned layout
+ * mods for Gimp 1.2 release
*/
#include "config.h"
@@ -44,24 +47,25 @@
typedef struct
{
- gchar *label;
- gchar *func;
-} ListEntry_t;
-
-typedef struct
-{
GtkWidget *dlg;
GtkWidget *search_entry;
GtkWidget *name_button;
GtkWidget *blurb_button;
+ GtkWidget *descr_box;
GtkWidget *descr_scroll;
GtkWidget *descr_table;
GtkWidget *clist;
GtkWidget *scrolled_win;
+ int row;
+ int num_rows;
+ int col;
+ int num_cols;
+ int label_rows;
+
/* the currently selected procedure */
gchar *selected_proc_name;
gchar *selected_scheme_proc_name;
@@ -107,9 +111,28 @@
static void dialog_close_callback (GtkWidget *widget,
gpointer data);
static void convert_string (gchar *str);
-static gchar * GParamType2char (GParamType t);
+static gchar *GimpPDBArgType2char (GimpPDBArgType t);
+
+/* build and fill the info table */
+
+static void dialog_init (dbbrowser_t *dbbrowser);
+static void dialog_add_text (dbbrowser_t *dbbrowser,
+ const char *text,
+ float horz_align,
+ float vert_align,
+ gboolean to_end,
+ int vert_span);
+static void dialog_add_label_text (dbbrowser_t *dbbrowser,
+ const char *text,
+ int vert_span);
+static void dialog_add_data_text (dbbrowser_t *dbbrowser,
+ const char *text);
+static void dialog_next_row (dbbrowser_t *dbbrowser);
+static void dialog_add_remaining_text (dbbrowser_t *dbbrowser,
+ const char *text);
+static void dialog_add_separator (dbbrowser_t *dbbrowser);
+static void dialog_finish (dbbrowser_t *dbbrowser);
-GList * proc_table = NULL;
/* create the dialog box
* console_entry != NULL => called from the script-fu-console
@@ -128,7 +151,7 @@
GimpParamDef *params,
GimpParamDef *return_vals))
{
- dbbrowser_t* dbbrowser;
+ dbbrowser_t *dbbrowser;
GtkWidget *hbox;
GtkWidget *searchhbox;
@@ -185,6 +208,7 @@
/* hbox : left=list ; right=description */
hbox = gtk_hbox_new (FALSE, 0);
+ dbbrowser->descr_box = hbox;
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->vbox),
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
@@ -237,7 +261,7 @@
dbbrowser->descr_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
- GTK_POLICY_ALWAYS,
+ GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (hbox),
dbbrowser->descr_scroll, TRUE, TRUE, 0);
@@ -290,17 +314,110 @@
return FALSE;
}
+/*
+ * These procedures create and fill the db table
+ */
+
+static void
+dialog_init (dbbrowser_t *dbbrowser)
+{
+ int in_outs = dbbrowser->selected_nparams + dbbrowser->selected_nreturn_vals;
+ dbbrowser->row = 0;
+ dbbrowser->num_rows = 10 + in_outs;
+ dbbrowser->col = 0;
+ dbbrowser->num_cols = 6;
+ dbbrowser->label_rows = 0;
+ dbbrowser->descr_table = gtk_table_new (dbbrowser->num_rows,
+ dbbrowser->num_cols,
+ FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->descr_table), 0);
+ gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->descr_table), 0);
+}
+
+static void
+dialog_add_text (dbbrowser_t *dbbrowser,
+ const char *text,
+ float horz_align, float vert_align,
+ gboolean to_end, int vert_span)
+{
+ GtkWidget *label;
+ int next_col;
+
+ label = gtk_label_new (text);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (label), horz_align, vert_align);
+
+ next_col = to_end ? dbbrowser->num_cols : (dbbrowser->col + 1);
+
+ gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
+ dbbrowser->col, next_col,
+ dbbrowser->row, dbbrowser->row + vert_span,
+ GTK_FILL | GTK_EXPAND, GTK_FILL, 4, 1);
+
+ dbbrowser->col = next_col;
+ /* gtk_widget_show (label); */
+}
+
+static void
+dialog_add_label_text (dbbrowser_t *dbbrowser,
+ const char *text,
+ int vert_span)
+{
+ dialog_add_text (dbbrowser, text, 1.0, 0.5, FALSE, vert_span);
+ dbbrowser->label_rows = vert_span;
+}
+
+static void
+dialog_add_data_text (dbbrowser_t *dbbrowser,
+ const char *text)
+{
+ dialog_add_text (dbbrowser, text, 0.5, 0.0, FALSE, 1);
+}
+
+static void
+dialog_next_row (dbbrowser_t *dbbrowser)
+{
+ ++dbbrowser->row;
+ --dbbrowser->label_rows;
+ dbbrowser->col = (dbbrowser->label_rows > 0) ? 1 : 0;
+}
+
+static void
+dialog_add_remaining_text (dbbrowser_t *dbbrowser,
+ const char *text)
+{
+ dialog_add_text (dbbrowser, text, 0.0, 0.0, TRUE, 1);
+ dialog_next_row (dbbrowser);
+}
+
+static void
+dialog_add_separator (dbbrowser_t *dbbrowser)
+{
+ GtkWidget *sep;
+ sep = gtk_hseparator_new ();
+ gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), sep,
+ 0, dbbrowser->num_cols,
+ dbbrowser->row, dbbrowser->row + 1,
+ GTK_FILL | GTK_EXPAND, GTK_FILL, 10, 2);
+ /* gtk_widget_show (sep); */
+ dialog_next_row (dbbrowser);
+}
+
+static void
+dialog_finish (dbbrowser_t *dbbrowser)
+{
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
+ dbbrowser->descr_table);
+ gtk_widget_show_all (dbbrowser->descr_table);
+}
+
/* update the description box (right) */
static void
dialog_select (dbbrowser_t *dbbrowser,
gchar *proc_name)
{
- GtkWidget *label;
GtkWidget *old_table;
- GtkWidget *help;
- GtkWidget *text = NULL;
- GtkWidget *vscrollbar;
- gint i, row = 0;
+ gint i = 0;
g_free (dbbrowser->selected_proc_name);
dbbrowser->selected_proc_name = g_strdup (proc_name);
@@ -332,248 +449,82 @@
/* save the "old" table */
old_table = dbbrowser->descr_table;
- dbbrowser->descr_table = gtk_table_new
- (10 + dbbrowser->selected_nparams + dbbrowser->selected_nreturn_vals,
- 5, FALSE);
-
- gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->descr_table), 4);
+ dialog_init (dbbrowser);
/* show the name */
- label = gtk_label_new (_("Name:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 6);
- gtk_widget_show (label);
-
- label = gtk_entry_new ();
- gtk_entry_set_text (GTK_ENTRY (label), dbbrowser->selected_scheme_proc_name);
- gtk_entry_set_editable (GTK_ENTRY (label), FALSE);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 4, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
+ dialog_add_label_text (dbbrowser, _("Name:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_scheme_proc_name);
/* show the description */
- label = gtk_label_new (_("Blurb:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
+ dialog_add_label_text (dbbrowser, _("Blurb:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_proc_blurb);
- label = gtk_label_new (dbbrowser->selected_proc_blurb);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 4, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
-
- label = gtk_hseparator_new (); /* ok, not really a label ... :) */
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 4, row, row+1, GTK_FILL, GTK_FILL, 3, 6);
- gtk_widget_show (label);
- row++;
+ dialog_add_separator (dbbrowser);
/* in parameters */
if (dbbrowser->selected_nparams)
{
- label = gtk_label_new (_("In:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+(dbbrowser->selected_nparams),
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
+ dialog_add_label_text (dbbrowser, _("In:"), dbbrowser->selected_nparams);
for (i = 0; i < dbbrowser->selected_nparams; i++)
{
- /* name */
- label = gtk_label_new ((dbbrowser->selected_params[i]).name);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
-
- /* type */
- label = gtk_label_new (GParamType2char ((dbbrowser->selected_params[i]).type));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 2, 3, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
-
- /* description */
- label = gtk_label_new ((dbbrowser->selected_params[i]).description);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 3, 4, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
-
- row++;
+ dialog_add_data_text (dbbrowser, dbbrowser->selected_params[i].name);
+ dialog_add_data_text (dbbrowser,
+ GimpPDBArgType2char (dbbrowser->selected_params[i].type));
+ dialog_add_remaining_text (dbbrowser,
+ dbbrowser->selected_params[i].description);
}
}
if ((dbbrowser->selected_nparams) &&
(dbbrowser->selected_nreturn_vals))
{
- label = gtk_hseparator_new (); /* ok, not really a label ... :) */
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 4, row, row+1,
- GTK_FILL, GTK_FILL, 3, 6);
- gtk_widget_show (label);
- row++;
+ dialog_add_separator (dbbrowser);
}
/* out parameters */
if (dbbrowser->selected_nreturn_vals)
{
- label = gtk_label_new (_("Out:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+(dbbrowser->selected_nreturn_vals),
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
+ dialog_add_label_text (dbbrowser, _("Out:"), dbbrowser->selected_nreturn_vals);
for (i = 0; i < dbbrowser->selected_nreturn_vals; i++)
{
- /* name */
- label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 2, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
-
- /* type */
- label = gtk_label_new (GParamType2char((dbbrowser->selected_return_vals[i]).type));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 2, 3, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
-
- /* description */
- label = gtk_label_new ((dbbrowser->selected_return_vals[i]).description);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 3, 4, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
+ dialog_add_data_text (dbbrowser, dbbrowser->selected_return_vals[i].name);
+ dialog_add_data_text (dbbrowser,
+ GimpPDBArgType2char (dbbrowser->selected_return_vals[i].type));
+ dialog_add_remaining_text (dbbrowser,
+ dbbrowser->selected_return_vals[i].description);
}
}
if ((dbbrowser->selected_nparams) ||
(dbbrowser->selected_nreturn_vals))
{
- label = gtk_hseparator_new (); /* ok, not really a label ... :) */
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 4, row, row+1,
- GTK_FILL, GTK_FILL, 3, 6);
- gtk_widget_show (label);
- row++;
- }
+ dialog_add_separator (dbbrowser);
+ }
/* show the help */
if ((dbbrowser->selected_proc_help) &&
(strlen (dbbrowser->selected_proc_help) > 1))
{
- label = gtk_label_new (_("Help:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1,
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
-
- help = gtk_table_new (2, 2, FALSE);
- gtk_table_set_row_spacing (GTK_TABLE (help), 0, 2);
- gtk_table_set_col_spacing (GTK_TABLE (help), 0, 2);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), help,
- 1, 4, row, row+1, GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (help);
- row++;
-
- text = gtk_text_new (NULL, NULL);
- gtk_text_set_editable (GTK_TEXT (text), FALSE);
- gtk_text_set_word_wrap (GTK_TEXT (text), TRUE);
- gtk_widget_set_usize (text, -1, 60);
- gtk_table_attach (GTK_TABLE (help), text, 0, 1, 0, 1,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL,
- GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
- gtk_widget_show (text);
-
- vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
- gtk_table_attach (GTK_TABLE (help), vscrollbar, 1, 2, 0, 1,
- GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
- gtk_widget_show (vscrollbar);
-
- label = gtk_hseparator_new (); /* ok, not really a label ... :) */
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 4, row, row+1, GTK_FILL, GTK_FILL, 3, 6);
- gtk_widget_show (label);
- row++;
+ dialog_add_label_text (dbbrowser, _("Help:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_proc_help);
+ dialog_add_separator (dbbrowser);
}
/* show the author & the copyright */
- label = gtk_label_new (_("Author:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1,
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
-
- label = gtk_label_new (dbbrowser->selected_proc_author);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 4, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
-
- label = gtk_label_new (_("Date:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1,
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
-
- label = gtk_label_new (dbbrowser->selected_proc_date);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 4, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
-
- label = gtk_label_new (_("Copyright:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 0, 1, row, row+1,
- GTK_FILL, GTK_FILL, 3, 0);
- gtk_widget_show (label);
-
- label = gtk_label_new (dbbrowser->selected_proc_copyright);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label,
- 1, 4, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show (label);
- row++;
+ dialog_add_label_text (dbbrowser, _("Author:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_proc_author);
+ dialog_add_label_text (dbbrowser, _("Date:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_proc_date);
+ dialog_add_label_text (dbbrowser, _("Copyright:"), 1);
+ dialog_add_remaining_text (dbbrowser, dbbrowser->selected_proc_copyright);
if (old_table)
gtk_widget_destroy (old_table);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll),
- dbbrowser->descr_table);
-
- /* now after the table is added to a window add the text */
- if (text != NULL)
- {
- gtk_widget_realize (text);
- gtk_text_freeze (GTK_TEXT (text));
- gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
- dbbrowser->selected_proc_help, -1);
- gtk_text_thaw (GTK_TEXT (text));
- }
- gtk_widget_show (dbbrowser->descr_table);
+ dialog_finish (dbbrowser);
}
/* end of the dialog */
@@ -755,33 +706,33 @@
}
static gchar *
-GParamType2char (GParamType t)
+GimpPDBArgType2char (GimpPDBArgType t)
{
switch (t)
{
- case PARAM_INT32: return "INT32";
- case PARAM_INT16: return "INT16";
- case PARAM_INT8: return "INT8";
- case PARAM_FLOAT: return "FLOAT";
- case PARAM_STRING: return "STRING";
- case PARAM_INT32ARRAY: return "INT32ARRAY";
- case PARAM_INT16ARRAY: return "INT16ARRAY";
- case PARAM_INT8ARRAY: return "INT8ARRAY";
- case PARAM_FLOATARRAY: return "FLOATARRAY";
- case PARAM_STRINGARRAY: return "STRINGARRAY";
- case PARAM_COLOR: return "COLOR";
- case PARAM_REGION: return "REGION";
- case PARAM_DISPLAY: return "DISPLAY";
- case PARAM_IMAGE: return "IMAGE";
- case PARAM_LAYER: return "LAYER";
- case PARAM_CHANNEL: return "CHANNEL";
- case PARAM_DRAWABLE: return "DRAWABLE";
- case PARAM_SELECTION: return "SELECTION";
- case PARAM_BOUNDARY: return "BOUNDARY";
- case PARAM_PATH: return "PATH";
- case PARAM_PARASITE: return "PARASITE";
- case PARAM_STATUS: return "STATUS";
- case PARAM_END: return "END";
+ case GIMP_PDB_INT32: return "INT32";
+ case GIMP_PDB_INT16: return "INT16";
+ case GIMP_PDB_INT8: return "INT8";
+ case GIMP_PDB_FLOAT: return "FLOAT";
+ case GIMP_PDB_STRING: return "STRING";
+ case GIMP_PDB_INT32ARRAY: return "INT32ARRAY";
+ case GIMP_PDB_INT16ARRAY: return "INT16ARRAY";
+ case GIMP_PDB_INT8ARRAY: return "INT8ARRAY";
+ case GIMP_PDB_FLOATARRAY: return "FLOATARRAY";
+ case GIMP_PDB_STRINGARRAY: return "STRINGARRAY";
+ case GIMP_PDB_COLOR: return "COLOR";
+ case GIMP_PDB_REGION: return "REGION";
+ case GIMP_PDB_DISPLAY: return "DISPLAY";
+ case GIMP_PDB_IMAGE: return "IMAGE";
+ case GIMP_PDB_LAYER: return "LAYER";
+ case GIMP_PDB_CHANNEL: return "CHANNEL";
+ case GIMP_PDB_DRAWABLE: return "DRAWABLE";
+ case GIMP_PDB_SELECTION: return "SELECTION";
+ case GIMP_PDB_BOUNDARY: return "BOUNDARY";
+ case GIMP_PDB_PATH: return "PATH";
+ case GIMP_PDB_PARASITE: return "PARASITE";
+ case GIMP_PDB_STATUS: return "STATUS";
+ case GIMP_PDB_END: return "END";
default: return "UNKNOWN?";
}
}
--- dbbrowser.c-orig Tue Sep 5 20:44:13 2000
+++ dbbrowser.c Tue Sep 5 20:48:30 2000
@@ -77,7 +77,7 @@
{
static GParamDef args[] =
{
- { PARAM_INT32, "run_mode", "Interactive, [non-interactive]" }
+ { GIMP_PDB_INT32, "run_mode", "Interactive, [non-interactive]" }
};
static gint nargs = sizeof (args) / sizeof (args[0]);
@@ -89,7 +89,7 @@
"23th june 1997",
N_("<Toolbox>/Xtns/DB Browser..."),
"",
- PROC_EXTENSION,
+ GIMP_EXTENSION,
nargs, 0,
args, NULL);
}
@@ -102,18 +102,18 @@
GParam **return_vals)
{
static GParam values[1];
- GRunModeType run_mode;
+ GimpRunModeType run_mode;
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
- values[0].type = PARAM_STATUS;
- values[0].data.d_status = STATUS_SUCCESS;
+ values[0].type = GIMP_PDB_STATUS;
+ values[0].data.d_status = GIMP_PDB_SUCCESS;
switch (run_mode)
{
- case RUN_INTERACTIVE:
+ case GIMP_RUN_INTERACTIVE:
{
INIT_I18N_UI();
@@ -126,10 +126,10 @@
}
break;
- case RUN_WITH_LAST_VALS:
- case RUN_NONINTERACTIVE:
+ case GIMP_RUN_WITH_LAST_VALS:
+ case GIMP_RUN_NONINTERACTIVE:
g_warning ("dbbrowser allows only interactive invocation");
- values[0].data.d_status = STATUS_CALLING_ERROR;
+ values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
break;
default:
