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

removed stock items which are already defined in Gtk+ (GTK_STOCK_NEW

Browse Source 
2002-01-13  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpstock.[ch]: removed stock items which are
	already defined in Gtk+ (GTK_STOCK_NEW etc.).

	* libgimpwidgets/gimpquerybox.[ch]: moved the icon code from the
	boolean query box constructor to create_query_box() so it can be
	used for all of them. New macro GIMP_QUERY_BOX_VBOX() to pack
	custom widgets into the dialogs. Will probably have to make a
	real widget out of it to get a sane API...

	* app/gui/menus.c
	* app/gui/select-commands.c
	* app/widgets/gimpbufferview.c
	* app/widgets/gimpdatafactoryview.c
	* app/widgets/gimpdocumentview.c
	* app/widgets/gimpdrawablelistview.c
	* libgimpwidgets/gimppatheditor.c
	* plug-ins/common/uniteditor.c: changed accordingly.

	* libgimpwidgets/gimpwidgets.c: register the WM icons in
	large -> small order.

	* themes/Default/Makefile.am: don't create inline pixbufs of the
	removed stock items' icons...

	* themes/Default/gtkrc: ...but simply override them here.

	* themes/Default/imagerc: removed them here too.
This commit is contained in:
Michael Natterer
2002-01-13 20:59:56 +00:00
committed by Michael Natterer
parent 957aa5934f
commit 2a2318cee8
22 changed files with 213 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
libgimpwidgets/gimpquerybox.c
View File

@ -59,6 +59,7 @@ static QueryBox * create_query_box (const gchar *title,
const gchar *help_data,
GCallback ok_callback,
GCallback cancel_callback,
const gchar *stock_id,
const gchar *message,
const gchar *ok_button,
const gchar *cancel_button,
@ -96,6 +97,7 @@ create_query_box (const gchar *title,
const gchar *help_data,
GCallback ok_callback,
GCallback cancel_callback,
const gchar *stock_id,
const gchar *message,
const gchar *ok_button,
const gchar *cancel_button,
@ -105,6 +107,7 @@ create_query_box (const gchar *title,
gpointer callback_data)
{
QueryBox *query_box;
GtkWidget *hbox = NULL;
GtkWidget *label;
/* make sure the object / signal passed are valid
@ -143,19 +146,46 @@ create_query_box (const gchar *title,
g_signal_connect_closure (G_OBJECT (object), signal, closure, FALSE);
}
if (stock_id)
{
GtkWidget *image;
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
if (image)
{
hbox = gtk_hbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox),
hbox);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
}
}
query_box->vbox = gtk_vbox_new (FALSE, 4);
g_object_set_data (G_OBJECT (query_box->qbox), "gimp-query-box-vbox",
query_box->vbox);
if (hbox)
{
gtk_box_pack_start (GTK_BOX (hbox), query_box->vbox, FALSE, FALSE, 0);
}
else
{
object = NULL;
gtk_container_set_border_width (GTK_CONTAINER (query_box->vbox), 10);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox),
query_box->vbox);
}
gtk_widget_show (query_box->vbox);
if (message)
{
query_box->vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (query_box->vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox),
query_box->vbox);
gtk_widget_show (query_box->vbox);
label = gtk_label_new (message);
gtk_box_pack_start (GTK_BOX (query_box->vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -200,6 +230,7 @@ gimp_query_string_box (const gchar *title,
query_box = create_query_box (title, help_func, help_data,
G_CALLBACK (string_query_box_ok_callback),
G_CALLBACK (query_box_cancel_callback),
GTK_STOCK_DIALOG_QUESTION,
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@ -256,6 +287,7 @@ gimp_query_int_box (const gchar *title,
query_box = create_query_box (title, help_func, help_data,
G_CALLBACK (int_query_box_ok_callback),
G_CALLBACK (query_box_cancel_callback),
GTK_STOCK_DIALOG_QUESTION,
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@ -314,6 +346,7 @@ gimp_query_double_box (const gchar *title,
query_box = create_query_box (title, help_func, help_data,
G_CALLBACK (double_query_box_ok_callback),
G_CALLBACK (query_box_cancel_callback),
GTK_STOCK_DIALOG_QUESTION,
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@ -380,6 +413,7 @@ gimp_query_size_box (const gchar *title,
query_box = create_query_box (title, help_func, help_data,
G_CALLBACK (size_query_box_ok_callback),
G_CALLBACK (query_box_cancel_callback),
GTK_STOCK_DIALOG_QUESTION,
message,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
object, signal,
@ -441,17 +475,12 @@ gimp_query_boolean_box (const gchar *title,
gpointer data)
{
QueryBox *query_box;
GtkWidget *hbox;
GtkWidget *image = NULL;
GtkWidget *label;
if (stock_id)
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
query_box = create_query_box (title, help_func, help_data,
G_CALLBACK (boolean_query_box_true_callback),
G_CALLBACK (boolean_query_box_false_callback),
image ? NULL : message,
stock_id,
message,
true_button, false_button,
object, signal,
G_CALLBACK (callback), data);
@ -459,21 +488,6 @@ gimp_query_boolean_box (const gchar *title,
if (! query_box)
return NULL;
if (! image)
return query_box->qbox;
hbox = gtk_hbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox), hbox);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
label = gtk_label_new (message);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
return query_box->qbox;
}