Commit 2b1ca5e7 authored by Morten Welinder's avatar Morten Welinder

Ditto borders.

parent c596955a
......@@ -15,10 +15,6 @@ icons_DATA = \
orient-vertical.png \
right-down.png \
down-right.png \
bottom_border diag_border left_border \
rev_diag_border right_border top_border \
inside_horiz_border inside_vert_border \
inside_border outline_border no_border \
stf-druid.png
plot_icondir = $(gnumeric_icondir)
......
......@@ -556,6 +556,18 @@ gnumeric_application_setup_pixbufs (GnumericApplication *app)
{ line_pattern_slant, "line_pattern_slant" },
{ line_pattern_thick, "line_pattern_thick" },
{ line_pattern_thin, "line_pattern_thin" },
/* Borders */
{ bottom_border, "bottom_border" },
{ diag_border, "diag_border" },
{ inside_border, "inside_border" },
{ inside_horiz_border, "inside_horiz_border" },
{ inside_vert_border, "inside_vert_border" },
{ left_border, "left_border" },
{ no_border, "no_border" },
{ outline_border, "outline_border" },
{ rev_diag_border, "rev_diag_border" },
{ right_border, "right_border" },
{ top_border, "top_border" },
/* Stuff */
{ gnumeric_splash, "gnumeric_splash" }
};
......
......@@ -409,9 +409,9 @@ init_button_image (GladeXML *gui, char const *const name)
{
GtkWidget *tmp = glade_xml_get_widget (gui, name);
if (tmp != NULL) {
GtkWidget *image = gnumeric_load_image (name);
if (image != NULL)
gtk_container_add (GTK_CONTAINER (tmp), image);
GtkWidget *image = gtk_image_new_from_pixbuf (application_get_pixbuf (name));
gtk_widget_show (image);
gtk_container_add (GTK_CONTAINER (tmp), image);
}
return tmp;
......
......@@ -58,6 +58,18 @@ IMAGES = @STRIP_BEGIN@ \
object_scrollbar_24.png \
object_spinbutton_24.png \
\
bottom_border.xpm \
diag_border.xpm \
inside_border.xpm \
inside_horiz_border.xpm \
inside_vert_border.xpm \
left_border.xpm \
no_border.xpm \
outline_border.xpm \
rev_diag_border.xpm \
right_border.xpm \
top_border.xpm \
\
gp_125grey.xpm \
gp_25grey.xpm \
gp_50grey.xpm \
......@@ -209,6 +221,18 @@ VARIABLES = @STRIP_BEGIN@ \
gnm_object_scrollbar_24 $(srcdir)/object_scrollbar_24.png \
gnm_object_spinbutton_24 $(srcdir)/object_spinbutton_24.png \
\
bottom_border $(srcdir)/bottom_border.xpm \
diag_border $(srcdir)/diag_border.xpm \
inside_border $(srcdir)/inside_border.xpm \
inside_horiz_border $(srcdir)/inside_horiz_border.xpm \
inside_vert_border $(srcdir)/inside_vert_border.xpm \
left_border $(srcdir)/left_border.xpm \
no_border $(srcdir)/no_border.xpm \
outline_border $(srcdir)/outline_border.xpm \
rev_diag_border $(srcdir)/rev_diag_border.xpm \
right_border $(srcdir)/right_border.xpm \
top_border $(srcdir)/top_border.xpm \
\
gp_125grey $(srcdir)/gp_125grey.xpm \
gp_25grey $(srcdir)/gp_25grey.xpm \
gp_50grey $(srcdir)/gp_50grey.xpm \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment