Commit c596955a authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder

Load splash from application. (So it can be displayed fast.)

2003-07-16  Morten Welinder  <terra@gnome.org>

	* src/io-context-gtk.c (icg_show_gui): Load splash from
	application.  (So it can be displayed fast.)
parent 31540318
2003-07-16 Morten Welinder <terra@gnome.org> 2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
application. (So it can be displayed fast.)
* src/application.c (gnumeric_application_setup_pixbufs): Add line * src/application.c (gnumeric_application_setup_pixbufs): Add line
and background patterns. and background patterns.
...@@ -3424,7 +3427,7 @@ ...@@ -3424,7 +3427,7 @@
* src/expr-name.c (cb_check_name) : ignore hidden names. * src/expr-name.c (cb_check_name) : ignore hidden names.
* src/io-context-gtk.c (icg_error_error_info) : no need to display the * src/io-context-gtk.c (icg_error_error_info) : no need to display the
splash if we ar egoing to pop up an error. Something was screwing splash if we are going to pop up an error. Something was screwing
up and I don't feel like tracing it. up and I don't feel like tracing it.
* src/expr.c (do_referenced_sheets) : fix nasty typo. * src/expr.c (do_referenced_sheets) : fix nasty typo.
......
2003-07-16 Morten Welinder <terra@gnome.org> 2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
application. (So it can be displayed fast.)
* src/application.c (gnumeric_application_setup_pixbufs): Add line * src/application.c (gnumeric_application_setup_pixbufs): Add line
and background patterns. and background patterns.
...@@ -3424,7 +3427,7 @@ ...@@ -3424,7 +3427,7 @@
* src/expr-name.c (cb_check_name) : ignore hidden names. * src/expr-name.c (cb_check_name) : ignore hidden names.
* src/io-context-gtk.c (icg_error_error_info) : no need to display the * src/io-context-gtk.c (icg_error_error_info) : no need to display the
splash if we ar egoing to pop up an error. Something was screwing splash if we are going to pop up an error. Something was screwing
up and I don't feel like tracing it. up and I don't feel like tracing it.
* src/expr.c (do_referenced_sheets) : fix nasty typo. * src/expr.c (do_referenced_sheets) : fix nasty typo.
......
2003-07-16 Morten Welinder <terra@gnome.org> 2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
application. (So it can be displayed fast.)
* src/application.c (gnumeric_application_setup_pixbufs): Add line * src/application.c (gnumeric_application_setup_pixbufs): Add line
and background patterns. and background patterns.
...@@ -3424,7 +3427,7 @@ ...@@ -3424,7 +3427,7 @@
* src/expr-name.c (cb_check_name) : ignore hidden names. * src/expr-name.c (cb_check_name) : ignore hidden names.
* src/io-context-gtk.c (icg_error_error_info) : no need to display the * src/io-context-gtk.c (icg_error_error_info) : no need to display the
splash if we ar egoing to pop up an error. Something was screwing splash if we are going to pop up an error. Something was screwing
up and I don't feel like tracing it. up and I don't feel like tracing it.
* src/expr.c (do_referenced_sheets) : fix nasty typo. * src/expr.c (do_referenced_sheets) : fix nasty typo.
......
...@@ -7,8 +7,7 @@ appicon_DATA = gnome-gnumeric.png \ ...@@ -7,8 +7,7 @@ appicon_DATA = gnome-gnumeric.png \
gnome-application-x-xls.png \ gnome-application-x-xls.png \
gnome-application-x-applix-spreadsheet.png \ gnome-application-x-applix-spreadsheet.png \
gnome-application-vnd.lotus-1-2-3.png \ gnome-application-vnd.lotus-1-2-3.png \
gnome-application-x-generic-spreadsheet.png \ gnome-application-x-generic-spreadsheet.png
gnumeric_splash.jpg
icons_DATA = \ icons_DATA = \
$(appicon_DATA) \ $(appicon_DATA) \
......
...@@ -514,9 +514,11 @@ gnumeric_application_setup_pixbufs (GnumericApplication *app) ...@@ -514,9 +514,11 @@ gnumeric_application_setup_pixbufs (GnumericApplication *app)
guchar const *scalable_data; guchar const *scalable_data;
gchar const *name; gchar const *name;
} const entry [] = { } const entry [] = {
/* Cursors */
{ gnm_cursor_cross, "cursor_cross" }, { gnm_cursor_cross, "cursor_cross" },
{ gnm_bucket, "bucket" }, { gnm_bucket, "bucket" },
{ gnm_font, "font" }, { gnm_font, "font" },
/* Patterns */
{ gp_125grey, "gp_125grey" }, { gp_125grey, "gp_125grey" },
{ gp_25grey, "gp_25grey" }, { gp_25grey, "gp_25grey" },
{ gp_50grey, "gp_50grey" }, { gp_50grey, "gp_50grey" },
...@@ -553,7 +555,9 @@ gnumeric_application_setup_pixbufs (GnumericApplication *app) ...@@ -553,7 +555,9 @@ gnumeric_application_setup_pixbufs (GnumericApplication *app)
{ line_pattern_medium_dash_dot_dot, "line_pattern_medium_dash_dot_dot" }, { line_pattern_medium_dash_dot_dot, "line_pattern_medium_dash_dot_dot" },
{ line_pattern_slant, "line_pattern_slant" }, { line_pattern_slant, "line_pattern_slant" },
{ line_pattern_thick, "line_pattern_thick" }, { line_pattern_thick, "line_pattern_thick" },
{ line_pattern_thin, "line_pattern_thin" } { line_pattern_thin, "line_pattern_thin" },
/* Stuff */
{ gnumeric_splash, "gnumeric_splash" }
}; };
unsigned int ui; unsigned int ui;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "gui-util.h" #include "gui-util.h"
#include "io-context-gtk.h" #include "io-context-gtk.h"
#include "io-context-priv.h" #include "io-context-priv.h"
#include "application.h"
#include "libgnumeric.h" #include "libgnumeric.h"
#include "dialogs.h" #include "dialogs.h"
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
...@@ -124,7 +125,7 @@ icg_show_gui (IOContextGtk *icg) ...@@ -124,7 +125,7 @@ icg_show_gui (IOContextGtk *icg)
box = GTK_BOX (gtk_vbox_new (FALSE, 0)); box = GTK_BOX (gtk_vbox_new (FALSE, 0));
gtk_box_pack_start (box, gtk_box_pack_start (box,
gnumeric_load_image ("gnumeric_splash.jpg"), gtk_image_new_from_pixbuf (application_get_pixbuf ("gnumeric_splash")),
TRUE, FALSE, 0); TRUE, FALSE, 0);
/* Don't show this unless we need it. */ /* Don't show this unless we need it. */
......
...@@ -41,6 +41,8 @@ IMAGES = @STRIP_BEGIN@ \ ...@@ -41,6 +41,8 @@ IMAGES = @STRIP_BEGIN@ \
font.xpm \ font.xpm \
expr_entry.png \ expr_entry.png \
\ \
gnumeric_splash.jpg \
\
object_arrow_24.png \ object_arrow_24.png \
object_ellipse_24.png \ object_ellipse_24.png \
object_line_24.png \ object_line_24.png \
...@@ -190,6 +192,8 @@ VARIABLES = @STRIP_BEGIN@ \ ...@@ -190,6 +192,8 @@ VARIABLES = @STRIP_BEGIN@ \
gnm_font $(srcdir)/font.xpm \ gnm_font $(srcdir)/font.xpm \
gnm_expr_entry $(srcdir)/expr_entry.png \ gnm_expr_entry $(srcdir)/expr_entry.png \
\ \
gnumeric_splash $(srcdir)/gnumeric_splash.jpg \
\
gnm_object_arrow_24 $(srcdir)/object_arrow_24.png \ gnm_object_arrow_24 $(srcdir)/object_arrow_24.png \
gnm_object_ellipse_24 $(srcdir)/object_ellipse_24.png \ gnm_object_ellipse_24 $(srcdir)/object_ellipse_24.png \
gnm_object_line_24 $(srcdir)/object_line_24.png \ gnm_object_line_24 $(srcdir)/object_line_24.png \
......
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