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

plug-ins/common/plugindetails.c plug-ins/dbbrowser/dbbrowser_utils.c 

2004-05-25  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/plugindetails.c
	* plug-ins/dbbrowser/dbbrowser_utils.c
	* plug-ins/pagecurl/pagecurl.c: HIG-ified.
This commit is contained in:
Sven Neumann 2004-05-25 13:55:42 +00:00 committed by Sven Neumann
parent 12d9a44686
commit f39cbb8483
10 changed files with 285 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-25 Sven Neumann <sven@gimp.org>
* plug-ins/common/plugindetails.c
* plug-ins/dbbrowser/dbbrowser_utils.c
* plug-ins/pagecurl/pagecurl.c: HIG-ified.
2004-05-25 Sven Neumann <sven@gimp.org>
* plug-ins/print/gimp_color_window.c

57
libgimp/gimpprocbrowserdialog.c
View File

@ -150,13 +150,14 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* hpaned : left=list ; right=description */
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, TRUE);
gtk_widget_show (vbox);
@ -198,12 +199,12 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* search entry */
searchhbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 2);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new_with_mnemonic (_("_Search:"));
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
@ -217,15 +218,16 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* right = description */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_widget_set_size_request (scrolled_window,
DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 12);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@ -333,25 +335,25 @@ dialog_select (dbbrowser_t *dbbrowser,
5, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->description), 6);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->description), 6);
/* show the name */
label = gtk_label_new (dbbrowser->selected_scheme_proc_name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Name:"), 1.0, 0.5,
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
/* show the description */
label = gtk_label_new (dbbrowser->selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -364,7 +366,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nparams)
{
label = gtk_label_new (_("In:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nparams),
GTK_FILL, GTK_FILL, 0, 0);
@ -374,7 +376,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_params[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -382,7 +384,7 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char ((dbbrowser->selected_params[i]).type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
2, 3, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -412,7 +414,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nreturn_vals)
{
label = gtk_label_new (_("Out:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nreturn_vals),
GTK_FILL, GTK_FILL, 0, 0);
@ -422,7 +424,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -430,14 +432,14 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char (dbbrowser->selected_return_vals[i].type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), 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_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
3, 4, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -461,11 +463,11 @@ dialog_select (dbbrowser_t *dbbrowser,
(strlen (dbbrowser->selected_proc_help) > 1))
{
label = gtk_label_new (dbbrowser->selected_proc_help);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -479,27 +481,27 @@ dialog_select (dbbrowser_t *dbbrowser,
/* show the author & the copyright */
label = gtk_label_new (dbbrowser->selected_proc_author);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Author:"), 1.0, 0.5,
_("Author:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_date);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Date:"), 1.0, 0.5,
_("Date:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_copyright);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Copyright:"), 1.0, 0.5,
_("Copyright:"), 0.0, 0.0,
label, 3, FALSE);
if (old_description)
@ -508,6 +510,7 @@ dialog_select (dbbrowser_t *dbbrowser,
gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox),
dbbrowser->description, FALSE, FALSE, 0);
gtk_widget_show (dbbrowser->description);
}

57
libgimp/gimpprocview.c
View File

@ -150,13 +150,14 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* hpaned : left=list ; right=description */
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, TRUE);
gtk_widget_show (vbox);
@ -198,12 +199,12 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* search entry */
searchhbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 2);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new_with_mnemonic (_("_Search:"));
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
@ -217,15 +218,16 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* right = description */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_widget_set_size_request (scrolled_window,
DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 12);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@ -333,25 +335,25 @@ dialog_select (dbbrowser_t *dbbrowser,
5, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->description), 6);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->description), 6);
/* show the name */
label = gtk_label_new (dbbrowser->selected_scheme_proc_name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Name:"), 1.0, 0.5,
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
/* show the description */
label = gtk_label_new (dbbrowser->selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -364,7 +366,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nparams)
{
label = gtk_label_new (_("In:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nparams),
GTK_FILL, GTK_FILL, 0, 0);
@ -374,7 +376,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_params[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -382,7 +384,7 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char ((dbbrowser->selected_params[i]).type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
2, 3, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -412,7 +414,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nreturn_vals)
{
label = gtk_label_new (_("Out:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nreturn_vals),
GTK_FILL, GTK_FILL, 0, 0);
@ -422,7 +424,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -430,14 +432,14 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char (dbbrowser->selected_return_vals[i].type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), 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_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
3, 4, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -461,11 +463,11 @@ dialog_select (dbbrowser_t *dbbrowser,
(strlen (dbbrowser->selected_proc_help) > 1))
{
label = gtk_label_new (dbbrowser->selected_proc_help);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -479,27 +481,27 @@ dialog_select (dbbrowser_t *dbbrowser,
/* show the author & the copyright */
label = gtk_label_new (dbbrowser->selected_proc_author);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Author:"), 1.0, 0.5,
_("Author:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_date);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Date:"), 1.0, 0.5,
_("Date:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_copyright);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Copyright:"), 1.0, 0.5,
_("Copyright:"), 0.0, 0.0,
label, 3, FALSE);
if (old_description)
@ -508,6 +510,7 @@ dialog_select (dbbrowser_t *dbbrowser,
gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox),
dbbrowser->description, FALSE, FALSE, 0);
gtk_widget_show (dbbrowser->description);
}

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

@ -49,7 +49,6 @@ typedef struct
GtkWidget *descr_scroll;
GtkWidget *info_table;
GtkWidget *paned;
GtkWidget *info_align;
gint num_plugins;
gboolean details_showing;
} PDesc;
@ -281,11 +280,9 @@ procedure_general_select_callback (PDesc *pdesc,
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
gchar *str;
GtkWidget *separator;
GtkWidget *entry;
#define ADD_SEPARATOR \
G_STMT_START \
@ -326,13 +323,13 @@ G_STMT_END
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
pdesc->info_table = gtk_table_new (10, 5, FALSE);
pdesc->info_align = gtk_alignment_new (0.5, 0.5, 0, 0);
pdesc->info_table = gtk_table_new (9, 5, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (pdesc->info_table), 12);
gtk_table_set_col_spacings (GTK_TABLE (pdesc->info_table), 6);
gtk_table_set_row_spacing (GTK_TABLE (pdesc->info_table), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (pdesc->info_table), 6);
/* Number of plugins */
@ -351,9 +348,9 @@ G_STMT_END
/* menu path */
label = gtk_label_new (format_menu_path (pinfo->menu));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Menu Path:"), 1.0, 0.5,
_("Menu Path:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -361,12 +358,12 @@ G_STMT_END
/* show the name */
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), pinfo->realname);
gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
label = gtk_label_new (pinfo->realname);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Name:"), 1.0, 0.5,
entry, 3, FALSE);
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
@ -374,9 +371,9 @@ G_STMT_END
/* show the description */
label = gtk_label_new (selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -389,7 +386,7 @@ G_STMT_END
gtk_table_set_row_spacing (GTK_TABLE (help), 0, 2);
gtk_table_set_col_spacing (GTK_TABLE (help), 0, 2);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
help, 3, FALSE);
table_row++;
@ -414,29 +411,21 @@ G_STMT_END
/* show the type */
label = gtk_label_new (gettext (proc_type_str[selected_proc_type]));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Type:"), 1.0, 0.5,
_("Type:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
/* Remove old and replace with new */
if (old_table)
gtk_widget_destroy (old_table);
if (old_align)
gtk_widget_destroy (old_align);
gtk_container_add (GTK_CONTAINER (pdesc->info_align),pdesc->info_table);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
pdesc->info_align);
pdesc->info_table);
gtk_widget_show (pdesc->info_table);
gtk_widget_show (pdesc->info_align);
if (selected_proc_blurb)
g_free (selected_proc_blurb);
@ -994,14 +983,14 @@ gimp_plugin_desc (void)
/* hbox : left=notebook ; right=description */
plugindesc->paned = hbox = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (plugindesc->paned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (plugindesc->dlg)->vbox),
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
@ -1055,11 +1044,10 @@ gimp_plugin_desc (void)
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), column);
/* g_signal_connect (plugindesc->clist, "click_column",
G_CALLBACK (clist_click_column),
NULL);
*/
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@ -1115,6 +1103,9 @@ gimp_plugin_desc (void)
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request (tree_view, DBL_LIST_WIDTH, DBL_HEIGHT);
@ -1135,9 +1126,8 @@ gimp_plugin_desc (void)
/* search entry & details button */
searchhbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, FALSE, 0);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new (_("Search:"));

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

@ -49,7 +49,6 @@ typedef struct
GtkWidget *descr_scroll;
GtkWidget *info_table;
GtkWidget *paned;
GtkWidget *info_align;
gint num_plugins;
gboolean details_showing;
} PDesc;
@ -281,11 +280,9 @@ procedure_general_select_callback (PDesc *pdesc,
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
gchar *str;
GtkWidget *separator;
GtkWidget *entry;
#define ADD_SEPARATOR \
G_STMT_START \
@ -326,13 +323,13 @@ G_STMT_END
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
pdesc->info_table = gtk_table_new (10, 5, FALSE);
pdesc->info_align = gtk_alignment_new (0.5, 0.5, 0, 0);
pdesc->info_table = gtk_table_new (9, 5, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (pdesc->info_table), 12);
gtk_table_set_col_spacings (GTK_TABLE (pdesc->info_table), 6);
gtk_table_set_row_spacing (GTK_TABLE (pdesc->info_table), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (pdesc->info_table), 6);
/* Number of plugins */
@ -351,9 +348,9 @@ G_STMT_END
/* menu path */
label = gtk_label_new (format_menu_path (pinfo->menu));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Menu Path:"), 1.0, 0.5,
_("Menu Path:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -361,12 +358,12 @@ G_STMT_END
/* show the name */
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), pinfo->realname);
gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
label = gtk_label_new (pinfo->realname);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Name:"), 1.0, 0.5,
entry, 3, FALSE);
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
@ -374,9 +371,9 @@ G_STMT_END
/* show the description */
label = gtk_label_new (selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -389,7 +386,7 @@ G_STMT_END
gtk_table_set_row_spacing (GTK_TABLE (help), 0, 2);
gtk_table_set_col_spacing (GTK_TABLE (help), 0, 2);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
help, 3, FALSE);
table_row++;
@ -414,29 +411,21 @@ G_STMT_END
/* show the type */
label = gtk_label_new (gettext (proc_type_str[selected_proc_type]));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Type:"), 1.0, 0.5,
_("Type:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
/* Remove old and replace with new */
if (old_table)
gtk_widget_destroy (old_table);
if (old_align)
gtk_widget_destroy (old_align);
gtk_container_add (GTK_CONTAINER (pdesc->info_align),pdesc->info_table);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
pdesc->info_align);
pdesc->info_table);
gtk_widget_show (pdesc->info_table);
gtk_widget_show (pdesc->info_align);
if (selected_proc_blurb)
g_free (selected_proc_blurb);
@ -994,14 +983,14 @@ gimp_plugin_desc (void)
/* hbox : left=notebook ; right=description */
plugindesc->paned = hbox = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (plugindesc->paned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (plugindesc->dlg)->vbox),
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
@ -1055,11 +1044,10 @@ gimp_plugin_desc (void)
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), column);
/* g_signal_connect (plugindesc->clist, "click_column",
G_CALLBACK (clist_click_column),
NULL);
*/
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@ -1115,6 +1103,9 @@ gimp_plugin_desc (void)
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request (tree_view, DBL_LIST_WIDTH, DBL_HEIGHT);
@ -1135,9 +1126,8 @@ gimp_plugin_desc (void)
/* search entry & details button */
searchhbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, FALSE, 0);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new (_("Search:"));

57
plug-ins/dbbrowser/dbbrowser_utils.c
View File

@ -150,13 +150,14 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* hpaned : left=list ; right=description */
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, TRUE);
gtk_widget_show (vbox);
@ -198,12 +199,12 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* search entry */
searchhbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 2);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new_with_mnemonic (_("_Search:"));
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
@ -217,15 +218,16 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* right = description */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_widget_set_size_request (scrolled_window,
DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 12);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@ -333,25 +335,25 @@ dialog_select (dbbrowser_t *dbbrowser,
5, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->description), 6);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->description), 6);
/* show the name */
label = gtk_label_new (dbbrowser->selected_scheme_proc_name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Name:"), 1.0, 0.5,
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
/* show the description */
label = gtk_label_new (dbbrowser->selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -364,7 +366,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nparams)
{
label = gtk_label_new (_("In:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nparams),
GTK_FILL, GTK_FILL, 0, 0);
@ -374,7 +376,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_params[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -382,7 +384,7 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char ((dbbrowser->selected_params[i]).type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
2, 3, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -412,7 +414,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nreturn_vals)
{
label = gtk_label_new (_("Out:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nreturn_vals),
GTK_FILL, GTK_FILL, 0, 0);
@ -422,7 +424,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -430,14 +432,14 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char (dbbrowser->selected_return_vals[i].type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), 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_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
3, 4, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -461,11 +463,11 @@ dialog_select (dbbrowser_t *dbbrowser,
(strlen (dbbrowser->selected_proc_help) > 1))
{
label = gtk_label_new (dbbrowser->selected_proc_help);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -479,27 +481,27 @@ dialog_select (dbbrowser_t *dbbrowser,
/* show the author & the copyright */
label = gtk_label_new (dbbrowser->selected_proc_author);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Author:"), 1.0, 0.5,
_("Author:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_date);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Date:"), 1.0, 0.5,
_("Date:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_copyright);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Copyright:"), 1.0, 0.5,
_("Copyright:"), 0.0, 0.0,
label, 3, FALSE);
if (old_description)
@ -508,6 +510,7 @@ dialog_select (dbbrowser_t *dbbrowser,
gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox),
dbbrowser->description, FALSE, FALSE, 0);
gtk_widget_show (dbbrowser->description);
}

57
plug-ins/dbbrowser/gimpprocbrowser.c
View File

@ -150,13 +150,14 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* hpaned : left=list ; right=description */
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, TRUE);
gtk_widget_show (vbox);
@ -198,12 +199,12 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* search entry */
searchhbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 2);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new_with_mnemonic (_("_Search:"));
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
@ -217,15 +218,16 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* right = description */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_widget_set_size_request (scrolled_window,
DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 12);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@ -333,25 +335,25 @@ dialog_select (dbbrowser_t *dbbrowser,
5, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->description), 6);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->description), 6);
/* show the name */
label = gtk_label_new (dbbrowser->selected_scheme_proc_name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Name:"), 1.0, 0.5,
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
/* show the description */
label = gtk_label_new (dbbrowser->selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -364,7 +366,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nparams)
{
label = gtk_label_new (_("In:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nparams),
GTK_FILL, GTK_FILL, 0, 0);
@ -374,7 +376,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_params[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -382,7 +384,7 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char ((dbbrowser->selected_params[i]).type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
2, 3, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -412,7 +414,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nreturn_vals)
{
label = gtk_label_new (_("Out:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nreturn_vals),
GTK_FILL, GTK_FILL, 0, 0);
@ -422,7 +424,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -430,14 +432,14 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char (dbbrowser->selected_return_vals[i].type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), 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_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
3, 4, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -461,11 +463,11 @@ dialog_select (dbbrowser_t *dbbrowser,
(strlen (dbbrowser->selected_proc_help) > 1))
{
label = gtk_label_new (dbbrowser->selected_proc_help);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -479,27 +481,27 @@ dialog_select (dbbrowser_t *dbbrowser,
/* show the author & the copyright */
label = gtk_label_new (dbbrowser->selected_proc_author);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Author:"), 1.0, 0.5,
_("Author:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_date);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Date:"), 1.0, 0.5,
_("Date:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_copyright);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Copyright:"), 1.0, 0.5,
_("Copyright:"), 0.0, 0.0,
label, 3, FALSE);
if (old_description)
@ -508,6 +510,7 @@ dialog_select (dbbrowser_t *dbbrowser,
gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox),
dbbrowser->description, FALSE, FALSE, 0);
gtk_widget_show (dbbrowser->description);
}

57
plug-ins/dbbrowser/gimpprocview.c
View File

@ -150,13 +150,14 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* hpaned : left=list ; right=description */
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dialog)->vbox),
hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, TRUE);
gtk_widget_show (vbox);
@ -198,12 +199,12 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* search entry */
searchhbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 2);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new_with_mnemonic (_("_Search:"));
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (searchhbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
dbbrowser->search_entry = gtk_entry_new ();
@ -217,15 +218,16 @@ gimp_db_browser (GimpDBBrowserApplyCallback apply_callback)
/* right = description */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_widget_set_size_request (scrolled_window,
DBL_WIDTH - DBL_LIST_WIDTH, -1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_paned_pack2 (GTK_PANED (hpaned), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 4);
dbbrowser->descr_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (dbbrowser->descr_vbox), 12);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
dbbrowser->descr_vbox);
gtk_widget_show (dbbrowser->descr_vbox);
@ -333,25 +335,25 @@ dialog_select (dbbrowser_t *dbbrowser,
5, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dbbrowser->description), 6);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (dbbrowser->description), 6);
/* show the name */
label = gtk_label_new (dbbrowser->selected_scheme_proc_name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Name:"), 1.0, 0.5,
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
/* show the description */
label = gtk_label_new (dbbrowser->selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -364,7 +366,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nparams)
{
label = gtk_label_new (_("In:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nparams),
GTK_FILL, GTK_FILL, 0, 0);
@ -374,7 +376,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_params[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -382,7 +384,7 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char ((dbbrowser->selected_params[i]).type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
2, 3, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -412,7 +414,7 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_nreturn_vals)
{
label = gtk_label_new (_("Out:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
0, 1, row, row + (dbbrowser->selected_nreturn_vals),
GTK_FILL, GTK_FILL, 0, 0);
@ -422,7 +424,7 @@ dialog_select (dbbrowser_t *dbbrowser,
{
/* name */
label = gtk_label_new ((dbbrowser->selected_return_vals[i]).name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -430,14 +432,14 @@ dialog_select (dbbrowser_t *dbbrowser,
/* type */
type = GParamType2char (dbbrowser->selected_return_vals[i].type);
label = gtk_label_new (type);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), 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_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_attach (GTK_TABLE (dbbrowser->description), label,
3, 4, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -461,11 +463,11 @@ dialog_select (dbbrowser_t *dbbrowser,
(strlen (dbbrowser->selected_proc_help) > 1))
{
label = gtk_label_new (dbbrowser->selected_proc_help);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
label, 3, FALSE);
sep = gtk_hseparator_new ();
@ -479,27 +481,27 @@ dialog_select (dbbrowser_t *dbbrowser,
/* show the author & the copyright */
label = gtk_label_new (dbbrowser->selected_proc_author);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Author:"), 1.0, 0.5,
_("Author:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_date);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Date:"), 1.0, 0.5,
_("Date:"), 0.0, 0.0,
label, 3, FALSE);
label = gtk_label_new (dbbrowser->selected_proc_copyright);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_table_set_row_spacing (GTK_TABLE (dbbrowser->description), row, 2);
gimp_table_attach_aligned (GTK_TABLE (dbbrowser->description), 0, row++,
_("Copyright:"), 1.0, 0.5,
_("Copyright:"), 0.0, 0.0,
label, 3, FALSE);
if (old_description)
@ -508,6 +510,7 @@ dialog_select (dbbrowser_t *dbbrowser,
gtk_box_pack_start (GTK_BOX (dbbrowser->descr_vbox),
dbbrowser->description, FALSE, FALSE, 0);
gtk_widget_show (dbbrowser->description);
}

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

@ -49,7 +49,6 @@ typedef struct
GtkWidget *descr_scroll;
GtkWidget *info_table;
GtkWidget *paned;
GtkWidget *info_align;
gint num_plugins;
gboolean details_showing;
} PDesc;
@ -281,11 +280,9 @@ procedure_general_select_callback (PDesc *pdesc,
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkWidget *old_table;
GtkWidget *old_align;
gint table_row = 0;
gchar *str;
GtkWidget *separator;
GtkWidget *entry;
#define ADD_SEPARATOR \
G_STMT_START \
@ -326,13 +323,13 @@ G_STMT_END
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
pdesc->info_table = gtk_table_new (10, 5, FALSE);
pdesc->info_align = gtk_alignment_new (0.5, 0.5, 0, 0);
pdesc->info_table = gtk_table_new (9, 5, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (pdesc->info_table), 12);
gtk_table_set_col_spacings (GTK_TABLE (pdesc->info_table), 6);
gtk_table_set_row_spacing (GTK_TABLE (pdesc->info_table), 0, 2);
gtk_table_set_row_spacings (GTK_TABLE (pdesc->info_table), 6);
/* Number of plugins */
@ -351,9 +348,9 @@ G_STMT_END
/* menu path */
label = gtk_label_new (format_menu_path (pinfo->menu));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Menu Path:"), 1.0, 0.5,
_("Menu Path:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -361,12 +358,12 @@ G_STMT_END
/* show the name */
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), pinfo->realname);
gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
label = gtk_label_new (pinfo->realname);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Name:"), 1.0, 0.5,
entry, 3, FALSE);
_("Name:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
@ -374,9 +371,9 @@ G_STMT_END
/* show the description */
label = gtk_label_new (selected_proc_blurb);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Blurb:"), 1.0, 0.5,
_("Blurb:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
@ -389,7 +386,7 @@ G_STMT_END
gtk_table_set_row_spacing (GTK_TABLE (help), 0, 2);
gtk_table_set_col_spacing (GTK_TABLE (help), 0, 2);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Help:"), 1.0, 0.5,
_("Help:"), 0.0, 0.0,
help, 3, FALSE);
table_row++;
@ -414,29 +411,21 @@ G_STMT_END
/* show the type */
label = gtk_label_new (gettext (proc_type_str[selected_proc_type]));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gimp_table_attach_aligned (GTK_TABLE (pdesc->info_table), 0, table_row,
_("Type:"), 1.0, 0.5,
_("Type:"), 0.0, 0.0,
label, 3, FALSE);
table_row++;
ADD_SEPARATOR;
/* Remove old and replace with new */
if (old_table)
gtk_widget_destroy (old_table);
if (old_align)
gtk_widget_destroy (old_align);
gtk_container_add (GTK_CONTAINER (pdesc->info_align),pdesc->info_table);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (pdesc->descr_scroll),
pdesc->info_align);
pdesc->info_table);
gtk_widget_show (pdesc->info_table);
gtk_widget_show (pdesc->info_align);
if (selected_proc_blurb)
g_free (selected_proc_blurb);
@ -994,14 +983,14 @@ gimp_plugin_desc (void)
/* hbox : left=notebook ; right=description */
plugindesc->paned = hbox = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (plugindesc->paned), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (plugindesc->dlg)->vbox),
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
vbox = gtk_vbox_new (FALSE, 6);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);
@ -1055,11 +1044,10 @@ gimp_plugin_desc (void)
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), column);
/* g_signal_connect (plugindesc->clist, "click_column",
G_CALLBACK (clist_click_column),
NULL);
*/
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@ -1115,6 +1103,9 @@ gimp_plugin_desc (void)
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (swindow), 2);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request (tree_view, DBL_LIST_WIDTH, DBL_HEIGHT);
@ -1135,9 +1126,8 @@ gimp_plugin_desc (void)
/* search entry & details button */
searchhbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox),
searchhbox, FALSE, FALSE, 0);
searchhbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), searchhbox, FALSE, FALSE, 0);
gtk_widget_show (searchhbox);
label = gtk_label_new (_("Search:"));

103
plug-ins/pagecurl/pagecurl.c
View File

@ -95,20 +95,20 @@ typedef struct
/***** Prototypes *****/
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void set_default_params (void);
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void set_default_params (void);
static void dialog_toggle_update (GtkWidget *widget,
gint32 value);
static void dialog_scale_update (GtkAdjustment *adjustment,
gdouble *value);
static void dialog_toggle_update (GtkWidget *widget,
gint32 value);
static void dialog_scale_update (GtkAdjustment *adjustment,
gdouble *value);
static gint do_dialog (void);
static gboolean dialog (void);
static void init_calculation (gint32 drawable_id);
static void do_curl_effect (gint32 drawable_id);
@ -261,7 +261,7 @@ run (const gchar *name,
{
case GIMP_RUN_INTERACTIVE:
/* First acquire information with a dialog */
if (!do_dialog ())
if (! dialog ())
return;
break;
@ -468,8 +468,8 @@ dialog_toggle_update (GtkWidget *widget,
curl_pixmaps[pixmapindex]);
}
static gint
do_dialog (void)
static gboolean
dialog (void)
{
/* Missing options: Color-dialogs? / own curl layer ? / transparency
to original drawable / Warp-curl (unsupported yet) */
@ -477,7 +477,6 @@ do_dialog (void)
GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *table;
GtkWidget *frame;
GtkWidget *shade_button;
@ -485,7 +484,7 @@ do_dialog (void)
GtkWidget *button;
GtkWidget *scale;
GtkObject *adjustment;
gint pixmapindex;
gint i;
gboolean run;
gimp_ui_init ("pagecurl", FALSE);
@ -499,27 +498,27 @@ do_dialog (void)
NULL);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
frame = gtk_frame_new (_("Curl Location"));
frame = gimp_frame_new (_("Curl Location"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
pixmapindex = (curl.do_lower_left + curl.do_upper_right * 2 +
curl.do_upper_left * 3 + curl.do_horizontal * 4);
i = (curl.do_lower_left + curl.do_upper_right * 2 +
curl.do_upper_left * 3 + curl.do_horizontal * 4);
if (pixmapindex < 0 || pixmapindex > 7)
pixmapindex = 0;
if (i < 0 || i > 7)
i = 0;
curl_pixmap_widget = gimp_pixmap_new (curl_pixmaps[pixmapindex]);
curl_pixmap_widget = gimp_pixmap_new (curl_pixmaps[i]);
gtk_table_attach (GTK_TABLE (table), curl_pixmap_widget, 1, 2, 1, 2,
GTK_SHRINK, GTK_SHRINK, 0, 0);
@ -562,11 +561,10 @@ do_dialog (void)
gtk_widget_show (table);
gtk_widget_show (frame);
frame = gtk_frame_new (_("Curl Orientation"));
frame = gimp_frame_new (_("Curl Orientation"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
hbox = gtk_hbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (frame), hbox);
{
@ -600,6 +598,24 @@ do_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (frame);
frame = gimp_frame_new (_("Curl Opacity"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
adjustment = gtk_adjustment_new (curl.do_curl_opacity * 100, 0.0, 100.0,
1.0, 1.0, 0.0);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (dialog_scale_update),
&(curl.do_curl_opacity));
scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment));
gtk_widget_set_size_request (GTK_WIDGET (scale), 150, 30);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
gtk_container_add (GTK_CONTAINER (frame), scale);
gtk_widget_show (scale);
shade_button = gtk_check_button_new_with_label (_("Shade under Curl"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (shade_button),
curl.do_shade_under ? TRUE : FALSE);
@ -624,29 +640,6 @@ do_dialog (void)
G_CALLBACK (dialog_toggle_update),
GINT_TO_POINTER (9));
frame = gtk_frame_new (_("Curl Opacity"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
gtk_widget_show (vbox2);
adjustment = gtk_adjustment_new (curl.do_curl_opacity * 100, 0.0, 100.0,
1.0, 1.0, 0.0);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (dialog_scale_update),
&(curl.do_curl_opacity));
scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment));
gtk_widget_set_size_request (GTK_WIDGET (scale), 150, 30);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
gtk_box_pack_start (GTK_BOX (vbox2), scale, TRUE, FALSE, 0);
gtk_widget_show (scale);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);