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

show the pixel size specified by the SVG file and inform the user if it 

2003-09-23  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/svg.c: show the pixel size specified by the SVG
	file and inform the user if it failed to provide one.
This commit is contained in:
Sven Neumann 2003-09-23 10:23:33 +00:00 committed by Sven Neumann
parent b38b46af5e
commit 3f70732ef0
2 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-23 Sven Neumann <sven@gimp.org>
* plug-ins/common/svg.c: show the pixel size specified by the SVG
file and inform the user if it failed to provide one.
2003-09-23 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/stock-close-12.png

63
plug-ins/common/svg.c
View File

@ -413,6 +413,8 @@ load_rsvg_pixbuf (const gchar *filename,
return pixbuf;
}
static GtkWidget *size_label = NULL;
/* This is the callback used from load_rsvg_size(). */
static void
load_get_size_callback (gint *width,
@ -425,6 +427,20 @@ load_get_size_callback (gint *width,
{
*width = SVG_DEFAULT_SIZE;
*height = SVG_DEFAULT_SIZE;
if (size_label)
gtk_label_set_text (GTK_LABEL (size_label),
_("SVG file does not\nspecify a size!"));
}
else
{
if (size_label)
{
gchar *text = g_strdup_printf (_("%d x %d"), *width, *height);
gtk_label_set_text (GTK_LABEL (size_label), text);
g_free (text);
}
}
vals->width = *width;
@ -486,6 +502,9 @@ load_rsvg_size (const gchar *filename,
g_io_channel_unref (io);
rsvg_handle_free (handle);
if (vals->width < 1) vals->width = 1;
if (vals->height < 1) vals->height = 1;
return success;
}
@ -510,8 +529,8 @@ load_dialog_ok_callback (GtkWidget *widget,
gpointer data)
{
load_vals.width = gimp_size_entry_get_refval (size, 0);
load_vals.height = gimp_size_entry_get_refval (size, 1);
load_vals.width = ROUND (gimp_size_entry_get_refval (size, 0));
load_vals.height = ROUND (gimp_size_entry_get_refval (size, 1));
load_interface.run = TRUE;
@ -567,8 +586,8 @@ load_dialog_resolution_callback (GimpSizeEntry *res,
if (!load_rsvg_size (filename, &vals, NULL))
return;
svg_width = MAX (vals.width, 1);
svg_height = MAX (vals.height, 1);
svg_width = vals.width;
svg_height = vals.height;
load_dialog_set_ratio (ratio_x, ratio_y);
}
@ -603,6 +622,7 @@ load_dialog (const gchar *filename)
GtkWidget *dialog;
GtkWidget *frame;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *image;
GdkPixbuf *preview;
GtkWidget *table;
@ -630,15 +650,6 @@ load_dialog (const gchar *filename)
return FALSE;
}
/* query the initial size */
vals.resolution = load_vals.resolution;
load_rsvg_size (filename, &vals, NULL);
svg_width = MAX (vals.width, 1);
svg_height = MAX (vals.height, 1);
gimp_ui_init ("svg", FALSE);
dialog = gimp_dialog_new (_("Open SVG"), "svg",
@ -666,14 +677,18 @@ load_dialog (const gchar *filename)
TRUE, TRUE, 0);
gtk_widget_show (frame);
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
/* The SVG preview */
abox = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), abox, FALSE, FALSE, 0);
gtk_widget_show (abox);
frame = gtk_frame_new (NULL);
@ -685,6 +700,20 @@ load_dialog (const gchar *filename)
gtk_container_add (GTK_CONTAINER (frame), image);
gtk_widget_show (image);
size_label = gtk_label_new (NULL);
gtk_label_set_justify (GTK_LABEL (size_label), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (size_label), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), size_label, TRUE, TRUE, 4);
gtk_widget_show (size_label);
/* query the initial size after the size label is created */
vals.resolution = load_vals.resolution;
load_rsvg_size (filename, &vals, NULL);
svg_width = vals.width;
svg_height = vals.height;
table = gtk_table_new (7, 3, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);