mirror of https://github.com/GNOME/gimp.git
plug-ins/common/curve_bend.c ported to GtkFileChooser and HIG-ified.
2004-05-18 Sven Neumann <sven@gimp.org> * plug-ins/common/curve_bend.c * plug-ins/ifscompose/ifscompose.c: ported to GtkFileChooser and HIG-ified.
This commit is contained in:
parent
617e0cc35f
commit
6dded125ee
|
@ -1,3 +1,9 @@
|
|||
2004-05-18 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/common/curve_bend.c
|
||||
* plug-ins/ifscompose/ifscompose.c: ported to GtkFileChooser and
|
||||
HIG-ified.
|
||||
|
||||
2004-05-18 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/common/channel_mixer.c
|
||||
|
|
|
@ -148,7 +148,7 @@ struct _BenderDialog
|
|||
GtkWidget *graph;
|
||||
GtkAdjustment *rotate_data;
|
||||
GdkPixmap *pixmap;
|
||||
GtkWidget *filesel;
|
||||
GtkWidget *filechooser;
|
||||
|
||||
GdkCursor *cursor_wait;
|
||||
GdkCursor *cursor_acitve;
|
||||
|
@ -1191,7 +1191,6 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *button;
|
||||
GtkWidget *spinbutton;
|
||||
GtkWidget *label;
|
||||
GtkWidget *separator;
|
||||
GtkObject *data;
|
||||
GdkDisplay *display;
|
||||
gint i, j;
|
||||
|
@ -1201,7 +1200,7 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
cd->preview = FALSE;
|
||||
cd->curve_type = SMOOTH;
|
||||
cd->pixmap = NULL;
|
||||
cd->filesel = NULL;
|
||||
cd->filechooser = NULL;
|
||||
cd->outline = OUTLINE_UPPER;
|
||||
cd->show_progress = FALSE;
|
||||
cd->smoothing = TRUE;
|
||||
|
@ -1257,23 +1256,22 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
cd->cursor_acitve = gdk_cursor_new_for_display (display, GDK_TOP_LEFT_ARROW);
|
||||
|
||||
/* The main hbox */
|
||||
main_hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6);
|
||||
main_hbox = gtk_hbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
|
||||
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cd->shell)->vbox), main_hbox);
|
||||
gtk_widget_show (main_hbox);
|
||||
|
||||
/* Left side column */
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_add (GTK_CONTAINER (main_hbox), vbox);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
/* Preview area, top of column */
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
frame = gimp_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
vbox2 = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2);
|
||||
vbox2 = gtk_vbox_new (FALSE, 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), vbox2);
|
||||
gtk_widget_show (vbox2);
|
||||
|
||||
|
@ -1288,7 +1286,8 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
gtk_widget_show (frame);
|
||||
|
||||
cd->pv_widget = gtk_preview_new (GTK_PREVIEW_COLOR);
|
||||
gtk_preview_size (GTK_PREVIEW (cd->pv_widget), PREVIEW_SIZE_X, PREVIEW_SIZE_Y);
|
||||
gtk_preview_size (GTK_PREVIEW (cd->pv_widget),
|
||||
PREVIEW_SIZE_X, PREVIEW_SIZE_Y);
|
||||
gtk_widget_set_events (cd->pv_widget, RANGE_MASK);
|
||||
gtk_container_add (GTK_CONTAINER (frame), cd->pv_widget);
|
||||
gtk_widget_show (cd->pv_widget);
|
||||
|
@ -1297,7 +1296,7 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
G_CALLBACK (bender_pv_widget_events),
|
||||
cd);
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 4);
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_end (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
@ -1321,17 +1320,16 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
cd);
|
||||
|
||||
/* Options area, bottom of column */
|
||||
frame = gtk_frame_new (_("Options"));
|
||||
frame = gimp_frame_new (_("Options"));
|
||||
gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
|
||||
vbox = gtk_vbox_new (FALSE, 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
/* Render Options */
|
||||
hbox = gtk_hbox_new (FALSE, 4);
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
@ -1384,12 +1382,11 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
cd);
|
||||
|
||||
/* The curves graph */
|
||||
frame = gtk_frame_new (_("Modify Curves"));
|
||||
frame = gimp_frame_new (_("Modify Curves"));
|
||||
gtk_container_add (GTK_CONTAINER (main_hbox), frame);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
|
@ -1409,7 +1406,7 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
G_CALLBACK (bender_graph_events),
|
||||
cd);
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 2);
|
||||
hbox = gtk_hbox_new (FALSE, 12);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
@ -1524,11 +1521,6 @@ bender_new_dialog (GimpDrawable *drawable)
|
|||
G_CALLBACK (bender_save_callback),
|
||||
cd);
|
||||
|
||||
/* Separate file ops from pure curve ops */
|
||||
separator = gtk_hseparator_new ();
|
||||
gtk_box_pack_end (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
|
||||
gtk_widget_show (separator);
|
||||
|
||||
gtk_widget_show (main_hbox);
|
||||
|
||||
return cd;
|
||||
|
@ -2013,90 +2005,99 @@ bender_preview_update_once (GtkWidget *widget,
|
|||
}
|
||||
|
||||
static void
|
||||
p_points_save_to_file_response (GtkFileSelection *fs,
|
||||
gint response_id,
|
||||
BenderDialog *cd)
|
||||
p_points_save_to_file_response (GtkWidget *dialog,
|
||||
gint response_id,
|
||||
BenderDialog *cd)
|
||||
{
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
const gchar *filename;
|
||||
gchar *filename;
|
||||
|
||||
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
|
||||
|
||||
filename = gtk_file_selection_get_filename (fs);
|
||||
p_save_pointfile (cd, filename);
|
||||
|
||||
g_free (filename);
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (fs));
|
||||
gtk_widget_destroy (dialog);
|
||||
}
|
||||
|
||||
static void
|
||||
p_points_load_from_file_response (GtkFileSelection *fs,
|
||||
gint response_id,
|
||||
BenderDialog *cd)
|
||||
p_points_load_from_file_response (GtkWidget *dialog,
|
||||
gint response_id,
|
||||
BenderDialog *cd)
|
||||
{
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
const gchar *filename;
|
||||
gchar *filename;
|
||||
|
||||
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
|
||||
|
||||
filename = gtk_file_selection_get_filename (fs);
|
||||
p_load_pointfile (cd, filename);
|
||||
bender_update (cd, UP_ALL);
|
||||
|
||||
g_free (filename);
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (fs));
|
||||
gtk_widget_destroy (dialog);
|
||||
}
|
||||
|
||||
static void
|
||||
bender_load_callback (GtkWidget *w,
|
||||
BenderDialog *cd)
|
||||
{
|
||||
if (cd->filesel)
|
||||
if (! cd->filechooser)
|
||||
{
|
||||
gtk_window_present (GTK_WINDOW (cd->filesel));
|
||||
return;
|
||||
cd->filechooser =
|
||||
gtk_file_chooser_dialog_new (_("Load Curve Points from file"),
|
||||
GTK_WINDOW (gtk_widget_get_toplevel (w)),
|
||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
||||
|
||||
NULL);
|
||||
|
||||
g_signal_connect (cd->filechooser, "response",
|
||||
G_CALLBACK (p_points_load_from_file_response),
|
||||
cd);
|
||||
g_signal_connect (cd->filechooser, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&cd->filechooser);
|
||||
}
|
||||
|
||||
cd->filesel = gtk_file_selection_new (_("Load Curve Points from file"));
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (cd->filesel),
|
||||
GTK_WINDOW (gtk_widget_get_toplevel (w)));
|
||||
|
||||
g_signal_connect (cd->filesel, "response",
|
||||
G_CALLBACK (p_points_load_from_file_response),
|
||||
cd);
|
||||
g_signal_connect (cd->filesel, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&cd->filesel);
|
||||
|
||||
gtk_file_selection_set_filename (GTK_FILE_SELECTION (cd->filesel),
|
||||
"curve_bend.points");
|
||||
gtk_widget_show (cd->filesel);
|
||||
gtk_window_present (GTK_WINDOW (cd->filechooser));
|
||||
}
|
||||
|
||||
static void
|
||||
bender_save_callback (GtkWidget *w,
|
||||
BenderDialog *cd)
|
||||
{
|
||||
if (cd->filesel)
|
||||
if (! cd->filechooser)
|
||||
{
|
||||
gtk_window_present (GTK_WINDOW (cd->filesel));
|
||||
return;
|
||||
cd->filechooser =
|
||||
gtk_file_chooser_dialog_new (_("Save Curve Points to file"),
|
||||
GTK_WINDOW (gtk_widget_get_toplevel (w)),
|
||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
||||
|
||||
NULL);
|
||||
|
||||
g_signal_connect (cd->filechooser, "response",
|
||||
G_CALLBACK (p_points_save_to_file_response),
|
||||
cd);
|
||||
g_signal_connect (cd->filechooser, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&cd->filechooser);
|
||||
|
||||
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (cd->filechooser),
|
||||
"curve_bend.points");
|
||||
}
|
||||
|
||||
cd->filesel = gtk_file_selection_new (_("Save Curve Points to file"));
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (cd->filesel),
|
||||
GTK_WINDOW (gtk_widget_get_toplevel (w)));
|
||||
|
||||
g_signal_connect (cd->filesel, "response",
|
||||
G_CALLBACK (p_points_save_to_file_response),
|
||||
cd);
|
||||
g_signal_connect (cd->filesel, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&cd->filesel);
|
||||
|
||||
gtk_file_selection_set_filename (GTK_FILE_SELECTION (cd->filesel),
|
||||
"curve_bend.points");
|
||||
gtk_widget_show (cd->filesel);
|
||||
gtk_window_present (GTK_WINDOW (cd->filechooser));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -540,21 +540,21 @@ ifs_compose_trans_page (void)
|
|||
GtkWidget *label;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
table = gtk_table_new (3, 6, FALSE);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 6);
|
||||
gtk_table_set_col_spacing (GTK_TABLE (table), 3, 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 4);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
|
||||
gtk_table_set_col_spacing (GTK_TABLE (table), 2, 6);
|
||||
gtk_table_set_col_spacing (GTK_TABLE (table), 4, 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 12);
|
||||
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
|
||||
gtk_widget_show (table);
|
||||
|
||||
/* X */
|
||||
|
||||
label = gtk_label_new (_("X:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -568,7 +568,7 @@ ifs_compose_trans_page (void)
|
|||
/* Y */
|
||||
|
||||
label = gtk_label_new (_("Y:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -582,7 +582,7 @@ ifs_compose_trans_page (void)
|
|||
/* Scale */
|
||||
|
||||
label = gtk_label_new (_("Scale:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -610,7 +610,7 @@ ifs_compose_trans_page (void)
|
|||
/* Asym */
|
||||
|
||||
label = gtk_label_new (_("Asymmetry:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 4, 5, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -624,7 +624,7 @@ ifs_compose_trans_page (void)
|
|||
/* Shear */
|
||||
|
||||
label = gtk_label_new (_("Shear:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 4, 5, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -658,11 +658,11 @@ ifs_compose_color_page (void)
|
|||
GimpRGB color;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
table = gtk_table_new (3, 5, FALSE);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
@ -684,7 +684,7 @@ ifs_compose_color_page (void)
|
|||
gtk_widget_show (ifsD->target_cmap->hbox);
|
||||
|
||||
label = gtk_label_new (_("Scale Hue by:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -699,7 +699,7 @@ ifs_compose_color_page (void)
|
|||
gtk_widget_show (ifsD->hue_scale_pair->spin);
|
||||
|
||||
label = gtk_label_new (_("Scale Value by:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -827,14 +827,14 @@ ifs_compose_dialog (GimpDrawable *drawable)
|
|||
NULL);
|
||||
|
||||
/* The main vbox */
|
||||
main_vbox = gtk_vbox_new (FALSE, 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
|
||||
main_vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox,
|
||||
TRUE, TRUE, 0);
|
||||
|
||||
/* The design area */
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
hbox = gtk_hbox_new (FALSE, 12);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
|
||||
|
||||
aspect_frame = gtk_aspect_frame_new (NULL,
|
||||
|
@ -1002,12 +1002,11 @@ ifs_compose_dialog (GimpDrawable *drawable)
|
|||
|
||||
/* The current transformation frame */
|
||||
|
||||
ifsD->current_frame = gtk_frame_new (NULL);
|
||||
ifsD->current_frame = gimp_frame_new (NULL);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), ifsD->current_frame,
|
||||
FALSE, FALSE, 0);
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
|
||||
vbox = gtk_vbox_new (FALSE, 6);
|
||||
gtk_container_add (GTK_CONTAINER (ifsD->current_frame), vbox);
|
||||
|
||||
/* The notebook */
|
||||
|
@ -1035,7 +1034,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
|
|||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
|
||||
label = gtk_label_new (_("Relative Probability:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
||||
gtk_widget_show (label);
|
||||
|
||||
|
@ -1280,7 +1279,7 @@ ifs_options_dialog (void)
|
|||
gtk_widget_show (table);
|
||||
|
||||
label = gtk_label_new (_("Max. Memory:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -1293,7 +1292,7 @@ ifs_options_dialog (void)
|
|||
gtk_widget_show (ifsOptD->memory_pair->spin);
|
||||
|
||||
label = gtk_label_new (_("Iterations:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -1307,7 +1306,7 @@ ifs_options_dialog (void)
|
|||
gtk_widget_show (label);
|
||||
|
||||
label = gtk_label_new (_("Subdivide:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -1320,7 +1319,7 @@ ifs_options_dialog (void)
|
|||
gtk_widget_show (ifsOptD->subdivide_pair->spin);
|
||||
|
||||
label = gtk_label_new (_("Spot Radius:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (label);
|
||||
|
@ -2512,7 +2511,6 @@ ifscompose_message_dialog (GtkMessageType type,
|
|||
GtkWidget *dlg;
|
||||
|
||||
dlg = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, message);
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dlg), parent);
|
||||
|
||||
if (title)
|
||||
gtk_window_set_title (GTK_WINDOW (dlg), title);
|
||||
|
@ -2524,17 +2522,17 @@ ifscompose_message_dialog (GtkMessageType type,
|
|||
|
||||
/* save an ifs file */
|
||||
static void
|
||||
ifsfile_save_response (GtkFileSelection *file_select,
|
||||
gint response_id,
|
||||
gpointer data)
|
||||
ifsfile_save_response (GtkWidget *dialog,
|
||||
gint response_id,
|
||||
gpointer data)
|
||||
{
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
const gchar *filename;
|
||||
gchar *str;
|
||||
FILE *fh;
|
||||
gchar *filename;
|
||||
gchar *str;
|
||||
FILE *fh;
|
||||
|
||||
filename = gtk_file_selection_get_filename (file_select);
|
||||
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
|
||||
|
||||
str = ifsvals_stringify (&ifsvals, elements);
|
||||
|
||||
|
@ -2545,9 +2543,13 @@ ifsfile_save_response (GtkFileSelection *file_select,
|
|||
g_strdup_printf (_("Could not open '%s' for writing: %s"),
|
||||
gimp_filename_to_utf8 (filename),
|
||||
g_strerror (errno));
|
||||
ifscompose_message_dialog (GTK_MESSAGE_ERROR, GTK_WINDOW (file_select),
|
||||
"Save failed", message);
|
||||
|
||||
ifscompose_message_dialog (GTK_MESSAGE_ERROR, GTK_WINDOW (dialog),
|
||||
_("Save failed"), message);
|
||||
|
||||
g_free (message);
|
||||
g_free (filename);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2555,7 +2557,7 @@ ifsfile_save_response (GtkFileSelection *file_select,
|
|||
fclose (fh);
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (file_select));
|
||||
gtk_widget_destroy (dialog);
|
||||
}
|
||||
|
||||
/* replace ifsvals and elements with specified new values
|
||||
|
@ -2635,6 +2637,7 @@ ifsfile_load_response (GtkFileSelection *file_select,
|
|||
gchar *message = g_strdup_printf (_("File '%s' doesn't seem to be "
|
||||
"an IFS Compose file."),
|
||||
gimp_filename_to_utf8 (filename));
|
||||
|
||||
ifscompose_message_dialog (GTK_MESSAGE_ERROR,
|
||||
GTK_WINDOW (file_select),
|
||||
_("Open failed"), message);
|
||||
|
@ -2668,51 +2671,61 @@ ifsfile_load_response (GtkFileSelection *file_select,
|
|||
static void
|
||||
ifs_compose_save (GtkWidget *parent)
|
||||
{
|
||||
static GtkWidget *file_select = NULL;
|
||||
static GtkWidget *dialog = NULL;
|
||||
|
||||
if (! file_select)
|
||||
if (! dialog)
|
||||
{
|
||||
file_select = gtk_file_selection_new (_("Save as IFS file"));
|
||||
dialog =
|
||||
gtk_file_chooser_dialog_new (_("Save as IFS file"),
|
||||
GTK_WINDOW (parent),
|
||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (file_select),
|
||||
GTK_WINDOW (parent));
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
||||
|
||||
gimp_help_connect (file_select, gimp_standard_help_func, HELP_ID, NULL);
|
||||
NULL);
|
||||
|
||||
g_signal_connect (file_select, "destroy",
|
||||
gimp_help_connect (dialog, gimp_standard_help_func, HELP_ID, NULL);
|
||||
|
||||
g_signal_connect (dialog, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&file_select);
|
||||
g_signal_connect (file_select, "response",
|
||||
&dialog);
|
||||
g_signal_connect (dialog, "response",
|
||||
G_CALLBACK (ifsfile_save_response),
|
||||
NULL);
|
||||
}
|
||||
|
||||
gtk_window_present (GTK_WINDOW (file_select));
|
||||
gtk_window_present (GTK_WINDOW (dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
ifs_compose_load (GtkWidget *parent)
|
||||
{
|
||||
static GtkWidget *file_select = NULL;
|
||||
static GtkWidget *dialog = NULL;
|
||||
|
||||
if (! file_select)
|
||||
if (! dialog)
|
||||
{
|
||||
file_select = gtk_file_selection_new (_("Open IFS file"));
|
||||
dialog =
|
||||
gtk_file_chooser_dialog_new (_("Open IFS file"),
|
||||
GTK_WINDOW (parent),
|
||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW (file_select),
|
||||
GTK_WINDOW (parent));
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
|
||||
|
||||
gimp_help_connect (file_select, gimp_standard_help_func, HELP_ID, NULL);
|
||||
NULL);
|
||||
|
||||
g_signal_connect (file_select, "destroy",
|
||||
gimp_help_connect (dialog, gimp_standard_help_func, HELP_ID, NULL);
|
||||
|
||||
g_signal_connect (dialog, "destroy",
|
||||
G_CALLBACK (gtk_widget_destroyed),
|
||||
&file_select);
|
||||
g_signal_connect (file_select, "response",
|
||||
&dialog);
|
||||
g_signal_connect (dialog, "response",
|
||||
G_CALLBACK (ifsfile_load_response),
|
||||
NULL);
|
||||
}
|
||||
|
||||
gtk_window_present (GTK_WINDOW (file_select));
|
||||
gtk_window_present (GTK_WINDOW (dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue