diff --git a/ChangeLog b/ChangeLog index fef3941eee..9f5f853100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2004-12-17 Simon Budig + + * data/images/gimp-splash.png: Added new splash by + Bill Luhtala . + + * data/images/gimp-logo.png: Added new Image for the about dialog + by Philip Lafleur . + + * app/dialogs/about-dialog.c: Adjusted text colors and placement + to the new image. + + * data/images/gimp2_0_logo.png + * data/images/gimp2_0_splash.png: Added for historical reasons. + + * data/images/gimp_logo.png: Removed (renamed to gimp-logo.png) + * data/images/Makefile.am: changed accordingly. + 2004-12-16 Bill Skaggs * app/core/gimpgradient-load.c: reject .ggr files whose diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index 1a873fa03c..de26fac098 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -89,13 +89,13 @@ typedef struct PangoColor gradient[] = { - { 50372, 50372, 50115 }, + { 139 * 257, 137 * 257, 124 * 257 }, { 65535, 65535, 65535 }, - { 10000, 10000, 10000 }, + { 5000, 5000, 5000 }, }; -PangoColor foreground = { 10000, 10000, 10000 }; -PangoColor background = { 50372, 50372, 50115 }; +PangoColor foreground = { 5000, 5000, 5000 }; +PangoColor background = { 139 * 257, 137 * 257, 124 * 257 }; /* backup values */ @@ -176,16 +176,16 @@ about_dialog_create (void) if (! about_dialog_load_logo (widget)) { - gtk_widget_destroy (widget); - about_info.about_dialog = NULL; - return NULL; - } + gtk_widget_destroy (widget); + about_info.about_dialog = NULL; + return NULL; + } about_dialog_center (GTK_WINDOW (widget)); /* place the scrolltext at the bottom of the image */ about_info.textarea.width = about_info.pixmaparea.width; - about_info.textarea.height = 50; + about_info.textarea.height = 32; /* gets changed in _expose () as well */ about_info.textarea.x = 0; about_info.textarea.y = (about_info.pixmaparea.height - about_info.textarea.height); @@ -202,8 +202,8 @@ about_dialog_create (void) gtk_widget_show (widget); g_signal_connect (widget, "expose_event", - G_CALLBACK (about_dialog_logo_expose), - NULL); + G_CALLBACK (about_dialog_logo_expose), + NULL); gtk_widget_realize (widget); gdk_window_set_background (widget->window, @@ -264,7 +264,7 @@ about_dialog_create (void) static void about_dialog_destroy (GtkObject *object, - gpointer data) + gpointer data) { about_info.about_dialog = NULL; about_dialog_unmap (NULL, NULL); @@ -322,8 +322,8 @@ about_dialog_center (GtkWindow *window) static gboolean about_dialog_logo_expose (GtkWidget *widget, - GdkEventExpose *event, - gpointer data) + GdkEventExpose *event, + gpointer data) { gint width, height; @@ -364,6 +364,9 @@ about_dialog_logo_expose (GtkWidget *widget, height = mask ? (about_info.pixmaparea.height > 0) && (about_info.pixmaparea.width > 0): 0); + about_info.textarea.height = pp ? 50 : 32; + about_info.textarea.y = (about_info.pixmaparea.height - + about_info.textarea.height); } /* only operate on the region covered by the pixmap */ @@ -439,8 +442,8 @@ about_dialog_logo_expose (GtkWidget *widget, static gint about_dialog_button (GtkWidget *widget, - GdkEventButton *event, - gpointer data) + GdkEventButton *event, + gpointer data) { gtk_widget_hide (about_info.about_dialog); @@ -449,8 +452,8 @@ about_dialog_button (GtkWidget *widget, static gint about_dialog_key (GtkWidget *widget, - GdkEventKey *event, - gpointer data) + GdkEventKey *event, + gpointer data) { /* placeholder */ switch (event->keyval) @@ -975,7 +978,6 @@ about_dialog_load_logo (GtkWidget *window) gchar *filename; GdkPixbuf *pixbuf; GdkGC *gc; - gint width; PangoLayout *layout; PangoFontDescription *desc; GPL *noise; @@ -984,7 +986,7 @@ about_dialog_load_logo (GtkWidget *window) return TRUE; filename = g_build_filename (gimp_data_directory (), "images", - "gimp_logo.png", NULL); + "gimp-logo.png", NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -1026,10 +1028,8 @@ about_dialog_load_logo (GtkWidget *window) about_info.pixmaparea.height, GDK_RGB_DITHER_NORMAL, 0, 0); - pango_layout_get_pixel_size (layout, &width, NULL); - gdk_draw_layout (GDK_DRAWABLE (about_info.logo_pixmap), - gc, 222, 137, layout); + gc, 8, 39, layout); g_object_unref (pixbuf); g_object_unref (layout); diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 2bb7cfb289..26d681b297 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -3,7 +3,7 @@ imagedatadir = $(gimpdatadir)/images imagedata_DATA = \ - gimp_logo.png \ + gimp-logo.png \ gimp-splash.png \ wilber-devel-icon.png \ wilber-icon.png \ diff --git a/data/images/gimp-logo.png b/data/images/gimp-logo.png new file mode 100644 index 0000000000..8a027c58f5 Binary files /dev/null and b/data/images/gimp-logo.png differ diff --git a/data/images/gimp-splash.png b/data/images/gimp-splash.png index b112db5822..75fe1b7f70 100644 Binary files a/data/images/gimp-splash.png and b/data/images/gimp-splash.png differ diff --git a/data/images/gimp_logo.png b/data/images/gimp2_0_logo.png similarity index 100% rename from data/images/gimp_logo.png rename to data/images/gimp2_0_logo.png diff --git a/data/images/gimp2_0_splash.png b/data/images/gimp2_0_splash.png new file mode 100644 index 0000000000..c780b2c4c7 Binary files /dev/null and b/data/images/gimp2_0_splash.png differ