callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed some frames from the Script-Fu dialogs.

Browse Source 
2005-09-26  Sven Neumann  <sven@gimp.org>

	* plug-ins/script-fu/script-fu-interface.c: removed some frames
	from the Script-Fu dialogs.
This commit is contained in:
Sven Neumann
2005-09-26 11:30:10 +00:00
committed by Sven Neumann
parent ee50900279
commit cae33841df
2 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
plug-ins/script-fu/script-fu-interface.c
View File

@ -46,8 +46,8 @@ typedef struct
{
GtkWidget *dialog;
GtkWidget *args_table;
GtkWidget **args_widgets;
GtkWidget *table;
GtkWidget **widgets;
GtkWidget *progress_label;
GtkWidget *progress_bar;
@ -194,7 +194,7 @@ script_fu_interface (SFScript *script)
}
sf_interface = g_new0 (SFInterface, 1);
sf_interface->args_widgets = g_new0 (GtkWidget *, script->num_args);
sf_interface->widgets = g_new0 (GtkWidget *, script->num_args);
/* strip the first part of the menupath if it contains _("/Script-Fu/") */
tmp = strstr (gettext (script->menu_path), _("/Script-Fu/"));
@ -251,21 +251,16 @@ script_fu_interface (SFScript *script)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
/* the script arguments frame */
frame = gimp_frame_new (_("Script Arguments"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
/* The argument table */
if (script->image_based)
sf_interface->args_table = gtk_table_new (script->num_args - 1, 3, FALSE);
sf_interface->table = gtk_table_new (script->num_args - 1, 3, FALSE);
else
sf_interface->args_table = gtk_table_new (script->num_args + 1, 3, FALSE);
sf_interface->table = gtk_table_new (script->num_args + 1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (sf_interface->args_table), 6);
gtk_table_set_row_spacings (GTK_TABLE (sf_interface->args_table), 6);
gtk_container_add (GTK_CONTAINER (frame), sf_interface->args_table);
gtk_widget_show (sf_interface->args_table);
gtk_table_set_col_spacings (GTK_TABLE (sf_interface->table), 6);
gtk_table_set_row_spacings (GTK_TABLE (sf_interface->table), 6);
gtk_box_pack_start (GTK_BOX (vbox), sf_interface->table, FALSE, FALSE, 0);
gtk_widget_show (sf_interface->table);
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@ -394,7 +389,7 @@ script_fu_interface (SFScript *script)
{
case SF_SLIDER:
script->arg_values[i].sfa_adjustment.adj = (GtkAdjustment *)
gimp_scale_entry_new (GTK_TABLE (sf_interface->args_table),
gimp_scale_entry_new (GTK_TABLE (sf_interface->table),
0, row,
label_text, SLIDER_WIDTH, -1,
script->arg_values[i].sfa_adjustment.value,
@ -521,7 +516,7 @@ script_fu_interface (SFScript *script)
{
if (label_text)
{
gimp_table_attach_aligned (GTK_TABLE (sf_interface->args_table),
gimp_table_attach_aligned (GTK_TABLE (sf_interface->table),
0, row,
label_text, 0.0, label_yalign,
widget, 2, left_align);
@ -529,7 +524,7 @@ script_fu_interface (SFScript *script)
}
else
{
gtk_table_attach (GTK_TABLE (sf_interface->args_table),
gtk_table_attach (GTK_TABLE (sf_interface->table),
widget, 0, 3, row, row + 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (widget);
@ -539,14 +534,14 @@ script_fu_interface (SFScript *script)
gtk_size_group_add_widget (group, widget);
}
sf_interface->args_widgets[i] = widget;
sf_interface->widgets[i] = widget;
}
g_object_unref (group);
/* the script progress frame */
frame = gimp_frame_new (_("Script Progress"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox2 = gtk_vbox_new (FALSE, 6);
@ -589,30 +584,30 @@ script_fu_interface_quit (SFScript *script)
{
case SF_FONT:
gimp_font_select_button_close_popup
(GIMP_FONT_SELECT_BUTTON (sf_interface->args_widgets[i]));
(GIMP_FONT_SELECT_BUTTON (sf_interface->widgets[i]));
break;
case SF_PALETTE:
gimp_palette_select_widget_close (sf_interface->args_widgets[i]);
gimp_palette_select_widget_close (sf_interface->widgets[i]);
break;
case SF_PATTERN:
gimp_pattern_select_widget_close (sf_interface->args_widgets[i]);
gimp_pattern_select_widget_close (sf_interface->widgets[i]);
break;
case SF_GRADIENT:
gimp_gradient_select_widget_close (sf_interface->args_widgets[i]);
gimp_gradient_select_widget_close (sf_interface->widgets[i]);
break;
case SF_BRUSH:
gimp_brush_select_widget_close (sf_interface->args_widgets[i]);
gimp_brush_select_widget_close (sf_interface->widgets[i]);
break;
default:
break;
}
g_free (sf_interface->args_widgets);
g_free (sf_interface->widgets);
g_free (sf_interface->last_command);
g_free (sf_interface);
@ -733,7 +728,7 @@ script_fu_response (GtkWidget *widget,
break;
case GTK_RESPONSE_OK:
gtk_widget_set_sensitive (sf_interface->args_table, FALSE);
gtk_widget_set_sensitive (sf_interface->table, FALSE);
gtk_widget_set_sensitive (GTK_DIALOG (sf_interface->dialog)->action_area,
FALSE);
@ -761,7 +756,7 @@ script_fu_ok (SFScript *script)
for (i = 0; i < script->num_args; i++)
{
SFArgValue *arg_value = &script->arg_values[i];
GtkWidget *widget = sf_interface->args_widgets[i];
GtkWidget *widget = sf_interface->widgets[i];
g_string_append_c (s, ' ');
@ -897,7 +892,7 @@ script_fu_reset (SFScript *script)
for (i = 0; i < script->num_args; i++)
{
GtkWidget *widget = sf_interface->args_widgets[i];
GtkWidget *widget = sf_interface->widgets[i];
switch (script->arg_types[i])
{
@ -998,25 +993,26 @@ static void
script_fu_about (SFScript *script)
{
GtkWidget *dialog = sf_interface->about_dialog;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *label;
GtkWidget *scrolled_window;
GtkWidget *table;
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
gchar *text;
if (! dialog)
{
gchar *title = g_strdup_printf (_("About %s"), sf_interface->title);
sf_interface->about_dialog = dialog =
gimp_dialog_new (sf_interface->title, "script-fu-about",
gimp_dialog_new (title, "script-fu-about",
sf_interface->dialog, 0,
gimp_standard_help_func, sf_interface->help_id,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
g_free (title);
g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
@ -1026,26 +1022,16 @@ script_fu_about (SFScript *script)
G_CALLBACK (gtk_widget_destroyed),
&sf_interface->about_dialog);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
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 (frame);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
/* the name */
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
label = gtk_label_new (script->script_name);
gtk_misc_set_padding (GTK_MISC (label), 2, 2);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
/* the help display */
@ -1062,21 +1048,18 @@ script_fu_about (SFScript *script)
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_view), 12);
gtk_text_view_set_right_margin (GTK_TEXT_VIEW (text_view), 12);
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_view), 3);
gtk_text_view_set_right_margin (GTK_TEXT_VIEW (text_view), 3);
gtk_widget_set_size_request (text_view, 240, 120);
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
gtk_widget_show (text_view);
text = g_strconcat ("\n", script->help, "\n", NULL);
gtk_text_buffer_set_text (text_buffer, text, -1);
g_free (text);
gtk_text_buffer_set_text (text_buffer, script->help, -1);
/* author, copyright, etc. */
table = gtk_table_new (2, 4, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);