callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GIMP_STOCK_INFO for the tips dialog.

Browse Source 
2006-06-20  Sven Neumann  <sven@gimp.org>

	* app/dialogs/tips-dialog.c: use GIMP_STOCK_INFO for the tips
dialog.

	* data/images/Makefile.am: do not install unused wilber icons.
This commit is contained in:
Sven Neumann
2006-06-20 18:28:06 +00:00
committed by Sven Neumann
parent d537872b3e
commit 42e6b515c6
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -26,6 +26,7 @@ This file is generated from authors.xml, do not edit it directly.
Brent Burton Brent Burton
Francisco Bustamante Francisco Bustamante
Albert Cahalan Albert Cahalan
Lapo Calamandrei
George J. Carrette George J. Carrette
Sean Cier Sean Cier
Winston Chang Winston Chang
@ -123,6 +124,7 @@ This file is generated from authors.xml, do not edit it directly.
David Neary David Neary
David Necas David Necas
Sven Neumann Sven Neumann
Andreas Nilsson
Stephen Robert Norris Stephen Robert Norris
Tim Newsome Tim Newsome
Erik Nygren Erik Nygren
@ -163,6 +165,7 @@ This file is generated from authors.xml, do not edit it directly.
Jakub Steiner Jakub Steiner
Nathan Summers Nathan Summers
Mike Sweet Mike Sweet
William Szilveszter
Eiichi Takamori Eiichi Takamori
Tristan Tarrant Tristan Tarrant
Michael Taylor Michael Taylor

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-20 Sven Neumann <sven@gimp.org>
* app/dialogs/tips-dialog.c: use GIMP_STOCK_INFO for the tips dialog.
* data/images/Makefile.am: do not install unused wilber icons.
2006-06-20 Jakub Steiner <jimmac@ximian.com> 2006-06-20 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/stock-wilber-*: tweak shape a bit * themes/Default/images/stock-wilber-*: tweak shape a bit

6
app/dialogs/authors.h
View File

@ -26,6 +26,7 @@ static const gchar * const authors[] =
"Brent Burton", "Brent Burton",
"Francisco Bustamante", "Francisco Bustamante",
"Albert Cahalan", "Albert Cahalan",
"Lapo Calamandrei",
"George J. Carrette", "George J. Carrette",
"Sean Cier", "Sean Cier",
"Winston Chang", "Winston Chang",
@ -121,6 +122,7 @@ static const gchar * const authors[] =
"David Neary", "David Neary",
"David Necas", "David Necas",
"Sven Neumann", "Sven Neumann",
"Andreas Nilsson",
"Stephen Robert Norris", "Stephen Robert Norris",
"Tim Newsome", "Tim Newsome",
"Erik Nygren", "Erik Nygren",
@ -160,6 +162,7 @@ static const gchar * const authors[] =
"Jakub Steiner", "Jakub Steiner",
"Nathan Summers", "Nathan Summers",
"Mike Sweet", "Mike Sweet",
"William Szilveszter",
"Eiichi Takamori", "Eiichi Takamori",
"Tristan Tarrant", "Tristan Tarrant",
"Michael Taylor", "Michael Taylor",
@ -182,11 +185,14 @@ static const gchar * const authors[] =
static const gchar * const artists[] = static const gchar * const artists[] =
{ {
"Lapo Calamandrei",
"Tuomas Kuosmanen", "Tuomas Kuosmanen",
"Karl La Rocca", "Karl La Rocca",
"Andreas Nilsson",
"Mike Schaeffer", "Mike Schaeffer",
"Carol Spears", "Carol Spears",
"Jakub Steiner", "Jakub Steiner",
"William Szilveszter",
NULL NULL
}; };

19
app/dialogs/tips-dialog.c
View File

@ -65,8 +65,7 @@ tips_dialog_create (Gimp *gimp)
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *bbox; GtkWidget *bbox;
GtkWidget *button; GtkWidget *button;
GdkPixbuf *wilber; GtkWidget *image;
gchar *filename;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
@ -166,24 +165,12 @@ tips_dialog_create (Gimp *gimp)
gtk_widget_show (thetip_label); gtk_widget_show (thetip_label);
vbox2 = gtk_vbox_new (FALSE, 0); vbox2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
gtk_widget_show (vbox2); gtk_widget_show (vbox2);
filename = g_build_filename (gimp_data_directory (), image = gtk_image_new_from_stock (GIMP_STOCK_INFO, GTK_ICON_SIZE_DIALOG);
"images", "wilber-tips.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (wilber)
{
GtkWidget *image;
image = gtk_image_new_from_pixbuf (wilber);
g_object_unref (wilber);
gtk_box_pack_start (GTK_BOX (vbox2), image, TRUE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), image, TRUE, FALSE, 0);
gtk_widget_show (image); gtk_widget_show (image);
}
hbox = gtk_hbox_new (FALSE, 12); hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);

6
data/images/Makefile.am
View File

@ -4,10 +4,6 @@ imagedatadir = $(gimpdatadir)/images
imagedata_DATA = \ imagedata_DATA = \
gimp-logo.png \ gimp-logo.png \
gimp-splash.png \ gimp-splash.png
wilber-devel-icon.png \
wilber-icon.png \
wilber-tips.png \
wilber-wizard.png
EXTRA_DIST = $(imagedata_DATA) EXTRA_DIST = $(imagedata_DATA)