dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,3 +1,33 @@
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.
2002-01-12 Manish Singh <yosh@gimp.org>
* plug-ins/dbbrowser/dbbrowser_utils.c: use GtkTreeView and multiline

11
app/actions/select-commands.c
View File

@ -158,9 +158,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDisplay *gdisp;
GtkWidget *edge_lock;
GtkWidget *shrink_dialog;
GList *children;
GtkWidget *edge_lock;
return_if_no_display (gdisp, data);
shrink_dialog =
@ -178,12 +177,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
/* eeek */
children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (shrink_dialog)->vbox));
gtk_box_pack_start (GTK_BOX (children->data), edge_lock, FALSE, FALSE, 0);
g_list_free (children);
gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (shrink_dialog)), edge_lock,
FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (shrink_dialog), "edge_lock_toggle", edge_lock);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edge_lock),

68
app/gui/menus.c
View File

@ -606,7 +606,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/View/New View"), NULL,
view_new_view_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"view/new_view.html", NULL },
{ { N_("/View/Shrink Wrap"), "<control>E",
@ -673,22 +673,22 @@ static GimpItemFactoryEntry image_entries[] =
"layers/stack/stack.html#next_layer", NULL },
{ { N_("/Layer/Stack/Raise Layer"), "<shift>Prior",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"layers/stack/stack.html#raise_layer", NULL },
{ { N_("/Layer/Stack/Lower Layer"), "<shift>Next",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"layers/stack/stack.html#lower_layer", NULL },
{ { N_("/Layer/Stack/Layer to Top"), "<control>Prior",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"layers/stack/stack.html#layer_to_top", NULL },
{ { N_("/Layer/Stack/Layer to Bottom"), "<control>Next",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"layers/stack/stack.html#layer_to_bottom", NULL },
@ -696,7 +696,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Layer/New Layer..."), NULL,
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"layers/dialogs/new_layer.html", NULL },
{ { N_("/Layer/Duplicate Layer"), NULL,
@ -711,7 +711,7 @@ static GimpItemFactoryEntry image_entries[] =
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_layer.html", NULL },
@ -996,28 +996,28 @@ static GimpItemFactoryEntry layers_entries[] =
{
{ { N_("/New Layer..."), "<control>N",
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_layer.html", NULL },
{ { N_("/Raise Layer"), "<control>F",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"stack/stack.html#raise_layer", NULL },
{ { N_("/Layer to Top"), "<control><shift>F",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"stack/stack.html#later_to_top", NULL },
{ { N_("/Lower Layer"), "<control>B",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"stack/stack.html#lower_layer", NULL },
{ { N_("/Layer to Bottom"), "<control><shift>B",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"stack/stack.html#layer_to_bottom", NULL },
@ -1033,7 +1033,7 @@ static GimpItemFactoryEntry layers_entries[] =
"anchor_layer.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_layer.html", NULL },
@ -1114,17 +1114,17 @@ static GimpItemFactoryEntry channels_entries[] =
{
{ { N_("/New Channel..."), "<control>N",
channels_new_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_channel.html", NULL },
{ { N_("/Raise Channel"), "<control>F",
channels_raise_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"raise_channel.html", NULL },
{ { N_("/Lower Channel"), "<control>B",
channels_lower_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"lower_channel.html", NULL },
{ { N_("/Duplicate Channel"), "<control>C",
@ -1160,7 +1160,7 @@ static GimpItemFactoryEntry channels_entries[] =
{ { N_("/Delete Channel"), "<control>X",
channels_delete_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_channel.html", NULL },
@ -1180,7 +1180,7 @@ static GimpItemFactoryEntry paths_entries[] =
{
{ { N_("/New Path"), "<control>N",
paths_dialog_new_path_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"new_path.html", NULL },
{ { N_("/Duplicate Path"), "<control>U",
@ -1205,7 +1205,7 @@ static GimpItemFactoryEntry paths_entries[] =
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
paths_dialog_delete_path_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_path.html", NULL },
@ -1334,7 +1334,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{
{ { N_("/New Brush"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Brush"), NULL,
@ -1349,7 +1349,7 @@ static GimpItemFactoryEntry brushes_entries[] =
NULL, NULL },
{ { N_("/Delete Brush..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1357,7 +1357,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{ { N_("/Refresh Brushes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
@ -1369,7 +1369,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{
{ { N_("/New Pattern"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Pattern"), NULL,
@ -1384,7 +1384,7 @@ static GimpItemFactoryEntry patterns_entries[] =
NULL, NULL },
{ { N_("/Delete Pattern..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1392,7 +1392,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{ { N_("/Refresh Patterns"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
@ -1620,7 +1620,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{
{ { N_("/New Gradient"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Gradient"), NULL,
@ -1635,7 +1635,7 @@ static GimpItemFactoryEntry gradients_entries[] =
NULL, NULL },
{ { N_("/Delete Gradient..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1643,7 +1643,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{ { N_("/Refresh Gradients"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
@ -1663,7 +1663,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{
{ { N_("/New Palette"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Palette"), NULL,
@ -1678,7 +1678,7 @@ static GimpItemFactoryEntry palettes_entries[] =
NULL, NULL },
{ { N_("/Delete Palette..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1686,7 +1686,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{ { N_("/Refresh Palettes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
@ -1725,7 +1725,7 @@ static GimpItemFactoryEntry buffers_entries[] =
NULL, NULL },
{ { N_("/Delete Buffer"), NULL,
buffers_delete_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL }
};
@ -1752,7 +1752,7 @@ static GimpItemFactoryEntry documents_entries[] =
NULL, NULL },
{ { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1760,7 +1760,7 @@ static GimpItemFactoryEntry documents_entries[] =
{ { N_("/Refresh History"), NULL,
documents_refresh_documents_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};

11
app/gui/select-commands.c
View File

@ -158,9 +158,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDisplay *gdisp;
GtkWidget *edge_lock;
GtkWidget *shrink_dialog;
GList *children;
GtkWidget *edge_lock;
return_if_no_display (gdisp, data);
shrink_dialog =
@ -178,12 +177,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
/* eeek */
children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (shrink_dialog)->vbox));
gtk_box_pack_start (GTK_BOX (children->data), edge_lock, FALSE, FALSE, 0);
g_list_free (children);
gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (shrink_dialog)), edge_lock,
FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (shrink_dialog), "edge_lock_toggle", edge_lock);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edge_lock),

68
app/menus/menus.c
View File

@ -606,7 +606,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/View/New View"), NULL,
view_new_view_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"view/new_view.html", NULL },
{ { N_("/View/Shrink Wrap"), "<control>E",
@ -673,22 +673,22 @@ static GimpItemFactoryEntry image_entries[] =
"layers/stack/stack.html#next_layer", NULL },
{ { N_("/Layer/Stack/Raise Layer"), "<shift>Prior",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"layers/stack/stack.html#raise_layer", NULL },
{ { N_("/Layer/Stack/Lower Layer"), "<shift>Next",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"layers/stack/stack.html#lower_layer", NULL },
{ { N_("/Layer/Stack/Layer to Top"), "<control>Prior",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"layers/stack/stack.html#layer_to_top", NULL },
{ { N_("/Layer/Stack/Layer to Bottom"), "<control>Next",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"layers/stack/stack.html#layer_to_bottom", NULL },
@ -696,7 +696,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Layer/New Layer..."), NULL,
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"layers/dialogs/new_layer.html", NULL },
{ { N_("/Layer/Duplicate Layer"), NULL,
@ -711,7 +711,7 @@ static GimpItemFactoryEntry image_entries[] =
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_layer.html", NULL },
@ -996,28 +996,28 @@ static GimpItemFactoryEntry layers_entries[] =
{
{ { N_("/New Layer..."), "<control>N",
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_layer.html", NULL },
{ { N_("/Raise Layer"), "<control>F",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"stack/stack.html#raise_layer", NULL },
{ { N_("/Layer to Top"), "<control><shift>F",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"stack/stack.html#later_to_top", NULL },
{ { N_("/Lower Layer"), "<control>B",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"stack/stack.html#lower_layer", NULL },
{ { N_("/Layer to Bottom"), "<control><shift>B",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"stack/stack.html#layer_to_bottom", NULL },
@ -1033,7 +1033,7 @@ static GimpItemFactoryEntry layers_entries[] =
"anchor_layer.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_layer.html", NULL },
@ -1114,17 +1114,17 @@ static GimpItemFactoryEntry channels_entries[] =
{
{ { N_("/New Channel..."), "<control>N",
channels_new_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_channel.html", NULL },
{ { N_("/Raise Channel"), "<control>F",
channels_raise_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"raise_channel.html", NULL },
{ { N_("/Lower Channel"), "<control>B",
channels_lower_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"lower_channel.html", NULL },
{ { N_("/Duplicate Channel"), "<control>C",
@ -1160,7 +1160,7 @@ static GimpItemFactoryEntry channels_entries[] =
{ { N_("/Delete Channel"), "<control>X",
channels_delete_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_channel.html", NULL },
@ -1180,7 +1180,7 @@ static GimpItemFactoryEntry paths_entries[] =
{
{ { N_("/New Path"), "<control>N",
paths_dialog_new_path_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"new_path.html", NULL },
{ { N_("/Duplicate Path"), "<control>U",
@ -1205,7 +1205,7 @@ static GimpItemFactoryEntry paths_entries[] =
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
paths_dialog_delete_path_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_path.html", NULL },
@ -1334,7 +1334,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{
{ { N_("/New Brush"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Brush"), NULL,
@ -1349,7 +1349,7 @@ static GimpItemFactoryEntry brushes_entries[] =
NULL, NULL },
{ { N_("/Delete Brush..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1357,7 +1357,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{ { N_("/Refresh Brushes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
@ -1369,7 +1369,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{
{ { N_("/New Pattern"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Pattern"), NULL,
@ -1384,7 +1384,7 @@ static GimpItemFactoryEntry patterns_entries[] =
NULL, NULL },
{ { N_("/Delete Pattern..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1392,7 +1392,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{ { N_("/Refresh Patterns"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
@ -1620,7 +1620,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{
{ { N_("/New Gradient"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Gradient"), NULL,
@ -1635,7 +1635,7 @@ static GimpItemFactoryEntry gradients_entries[] =
NULL, NULL },
{ { N_("/Delete Gradient..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1643,7 +1643,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{ { N_("/Refresh Gradients"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
@ -1663,7 +1663,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{
{ { N_("/New Palette"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Palette"), NULL,
@ -1678,7 +1678,7 @@ static GimpItemFactoryEntry palettes_entries[] =
NULL, NULL },
{ { N_("/Delete Palette..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1686,7 +1686,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{ { N_("/Refresh Palettes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
@ -1725,7 +1725,7 @@ static GimpItemFactoryEntry buffers_entries[] =
NULL, NULL },
{ { N_("/Delete Buffer"), NULL,
buffers_delete_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL }
};
@ -1752,7 +1752,7 @@ static GimpItemFactoryEntry documents_entries[] =
NULL, NULL },
{ { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
@ -1760,7 +1760,7 @@ static GimpItemFactoryEntry documents_entries[] =
{ { N_("/Refresh History"), NULL,
documents_refresh_documents_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};

2
app/widgets/gimpbufferview.c
View File

@ -169,7 +169,7 @@ gimp_buffer_view_new (GimpViewType view_type,
buffer_view->delete_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_buffer_view_delete_clicked),
NULL,

10
app/widgets/gimpdatafactoryview.c
View File

@ -191,7 +191,7 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
factory_view->new_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_NEW,
GTK_STOCK_NEW,
_("New"), NULL,
G_CALLBACK (gimp_data_factory_view_new_clicked),
NULL,
@ -215,7 +215,7 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
factory_view->delete_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_data_factory_view_delete_clicked),
NULL,
@ -223,7 +223,7 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
factory_view->refresh_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_REFRESH,
GTK_STOCK_REFRESH,
_("Refresh"), NULL,
G_CALLBACK (gimp_data_factory_view_refresh_clicked),
NULL,
@ -406,9 +406,9 @@ gimp_data_factory_view_delete_clicked (GtkWidget *widget,
dialog = gimp_query_boolean_box (_("Delete Data Object"),
gimp_standard_help_func, NULL,
FALSE,
GTK_STOCK_DIALOG_QUESTION,
str,
GIMP_STOCK_DELETE, GTK_STOCK_CANCEL,
GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
G_OBJECT (data),
"disconnect",
gimp_data_factory_view_delete_callback,

4
app/widgets/gimpdocumentview.c
View File

@ -163,7 +163,7 @@ gimp_document_view_new (GimpViewType view_type,
document_view->delete_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Remove selected entry"), NULL,
G_CALLBACK (gimp_document_view_delete_clicked),
NULL,
@ -171,7 +171,7 @@ gimp_document_view_new (GimpViewType view_type,
document_view->refresh_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_REFRESH,
GTK_STOCK_REFRESH,
_("Refresh (check files for existence)"),
NULL,
G_CALLBACK (gimp_document_view_refresh_clicked),

8
app/widgets/gimpdrawablelistview.c
View File

@ -183,7 +183,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->new_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_NEW,
GTK_STOCK_NEW,
_("New"), NULL,
G_CALLBACK (gimp_drawable_list_view_new_clicked),
NULL,
@ -191,7 +191,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->raise_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_RAISE,
GTK_STOCK_GO_UP,
_("Raise\n"
"<Shift> To Top"), NULL,
G_CALLBACK (gimp_drawable_list_view_raise_clicked),
@ -200,7 +200,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->lower_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_LOWER,
GTK_STOCK_GO_DOWN,
_("Lower\n"
"<Shift> To Bottom"), NULL,
G_CALLBACK (gimp_drawable_list_view_lower_clicked),
@ -225,7 +225,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->delete_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_drawable_list_view_delete_clicked),
NULL,

8
app/widgets/gimpdrawabletreeview.c
View File

@ -183,7 +183,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->new_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_NEW,
GTK_STOCK_NEW,
_("New"), NULL,
G_CALLBACK (gimp_drawable_list_view_new_clicked),
NULL,
@ -191,7 +191,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->raise_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_RAISE,
GTK_STOCK_GO_UP,
_("Raise\n"
"<Shift> To Top"), NULL,
G_CALLBACK (gimp_drawable_list_view_raise_clicked),
@ -200,7 +200,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->lower_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_LOWER,
GTK_STOCK_GO_DOWN,
_("Lower\n"
"<Shift> To Bottom"), NULL,
G_CALLBACK (gimp_drawable_list_view_lower_clicked),
@ -225,7 +225,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->delete_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_drawable_list_view_delete_clicked),
NULL,

8
app/widgets/gimpitemlistview.c
View File

@ -183,7 +183,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->new_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_NEW,
GTK_STOCK_NEW,
_("New"), NULL,
G_CALLBACK (gimp_drawable_list_view_new_clicked),
NULL,
@ -191,7 +191,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->raise_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_RAISE,
GTK_STOCK_GO_UP,
_("Raise\n"
"<Shift> To Top"), NULL,
G_CALLBACK (gimp_drawable_list_view_raise_clicked),
@ -200,7 +200,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->lower_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_LOWER,
GTK_STOCK_GO_DOWN,
_("Lower\n"
"<Shift> To Bottom"), NULL,
G_CALLBACK (gimp_drawable_list_view_lower_clicked),
@ -225,7 +225,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->delete_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_drawable_list_view_delete_clicked),
NULL,

8
app/widgets/gimpitemtreeview.c
View File

@ -183,7 +183,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->new_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_NEW,
GTK_STOCK_NEW,
_("New"), NULL,
G_CALLBACK (gimp_drawable_list_view_new_clicked),
NULL,
@ -191,7 +191,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->raise_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_RAISE,
GTK_STOCK_GO_UP,
_("Raise\n"
"<Shift> To Top"), NULL,
G_CALLBACK (gimp_drawable_list_view_raise_clicked),
@ -200,7 +200,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->lower_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_LOWER,
GTK_STOCK_GO_DOWN,
_("Lower\n"
"<Shift> To Bottom"), NULL,
G_CALLBACK (gimp_drawable_list_view_lower_clicked),
@ -225,7 +225,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
view->delete_button =
gimp_container_view_add_button (container_view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_drawable_list_view_delete_clicked),
NULL,

8
libgimpwidgets/gimppatheditor.c
View File

@ -138,7 +138,7 @@ gimp_path_editor_init (GimpPathEditor *gpe)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GIMP_STOCK_NEW, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@ -151,7 +151,7 @@ gimp_path_editor_init (GimpPathEditor *gpe)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GIMP_STOCK_RAISE, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@ -164,7 +164,7 @@ gimp_path_editor_init (GimpPathEditor *gpe)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GIMP_STOCK_LOWER, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@ -177,7 +177,7 @@ gimp_path_editor_init (GimpPathEditor *gpe)
gtk_box_pack_start (GTK_BOX (button_box), button, TRUE, TRUE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GIMP_STOCK_DELETE, GTK_ICON_SIZE_BUTTON);
image = gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);

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;
}

5
libgimpwidgets/gimpquerybox.h
View File

@ -50,6 +50,11 @@ typedef void (* GimpQueryBooleanCallback) (GtkWidget *query_box,
gboolean value,
gpointer data);
#define GIMP_QUERY_BOX_VBOX(qbox) g_object_get_data (G_OBJECT (qbox), \
"gimp-query-box-vbox")
/* some simple query dialogs */
GtkWidget * gimp_query_string_box (const gchar *title,
GimpHelpFunc help_func,

10
libgimpwidgets/gimpstock.c
View File

@ -86,17 +86,12 @@ add_sized_with_same_fallback (GtkIconFactory *factory,
static GtkStockItem gimp_stock_items[] =
{
{ GIMP_STOCK_ANCHOR, N_("Anchor"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_DELETE, N_("_Delete"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_DUPLICATE, N_("Duplicate"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_EDIT, N_("Edit"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_LINKED, N_("Linked"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_LOWER, N_("Lower"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_NEW, N_("New"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_PASTE, N_("Paste"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_PASTE_AS_NEW, N_("Paste as New"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_RAISE, N_("Raise"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_REFRESH, N_("Refresh"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_RESET, N_("_Reset"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_STROKE, N_("_Stroke"), 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TO_PATH, N_("Selection To Path"), 0, 0, "gimp-libgimp" },
@ -165,17 +160,12 @@ static struct
gimp_stock_button_pixbufs[] =
{
{ GIMP_STOCK_ANCHOR, stock_button_anchor },
{ GIMP_STOCK_DELETE, stock_button_delete },
{ GIMP_STOCK_DUPLICATE, stock_button_duplicate },
{ GIMP_STOCK_EDIT, stock_button_edit },
{ GIMP_STOCK_LINKED, stock_button_linked },
{ GIMP_STOCK_LOWER, stock_button_lower },
{ GIMP_STOCK_NEW, stock_button_new },
{ GIMP_STOCK_PASTE, stock_button_paste },
{ GIMP_STOCK_PASTE_AS_NEW, stock_button_paste_as_new },
{ GIMP_STOCK_PASTE_INTO, stock_button_paste_into },
{ GIMP_STOCK_RAISE, stock_button_raise },
{ GIMP_STOCK_REFRESH, stock_button_refresh },
{ GIMP_STOCK_RESET, stock_button_refresh },
{ GIMP_STOCK_STROKE, stock_button_stroke },
{ GIMP_STOCK_TO_PATH, stock_button_to_path },

5
libgimpwidgets/gimpstock.h
View File

@ -29,17 +29,12 @@ G_BEGIN_DECLS
#define GIMP_STOCK_ANCHOR "gimp-anchor"
#define GIMP_STOCK_DELETE "gimp-delete"
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#define GIMP_STOCK_LOWER "gimp-lower"
#define GIMP_STOCK_NEW "gimp-new"
#define GIMP_STOCK_PASTE "gimp-paste"
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RAISE "gimp-raise"
#define GIMP_STOCK_REFRESH "gimp-refresh"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_STROKE "gimp-stroke"
#define GIMP_STOCK_TO_PATH "gimp-to-path"

6
libgimpwidgets/gimpwidgets.c
View File

@ -52,10 +52,10 @@ gimp_widgets_init (void)
const guint8 *inline_pixbufs[] =
{
stock_wilber_64_64,
stock_wilber_48_48,
stock_wilber_16_16,
stock_wilber_32_32,
stock_wilber_16_16
stock_wilber_48_48,
stock_wilber_64_64
};
gimp_stock_init ();

3
plug-ins/common/uniteditor.c
View File

@ -528,8 +528,9 @@ unit_editor_dialog (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, TRUE,
GIMP_STOCK_REFRESH, refresh_callback,
GTK_STOCK_REFRESH, refresh_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, TRUE, TRUE,

8
themes/Default/Makefile.am
View File

@ -11,8 +11,6 @@ EXTRA_DIST = $(themedata_DATA)
STOCK_VARIABLES = @STRIP_BEGIN@ \
stock_button_anchor \
$(srcdir)/images/stock-button-anchor.png \
stock_button_delete \
$(srcdir)/images/stock-button-delete.png \
stock_button_duplicate \
$(srcdir)/images/stock-button-duplicate.png \
stock_button_edit \
@ -21,18 +19,12 @@ STOCK_VARIABLES = @STRIP_BEGIN@ \
$(srcdir)/images/stock-button-eye.png \
stock_button_linked \
$(srcdir)/images/stock-button-linked.png \
stock_button_lower \
$(srcdir)/images/stock-button-lower.png \
stock_button_new \
$(srcdir)/images/stock-button-new.png \
stock_button_paste \
$(srcdir)/images/stock-button-paste.png \
stock_button_paste_as_new \
$(srcdir)/images/stock-button-paste-as-new.png \
stock_button_paste_into \
$(srcdir)/images/stock-button-paste-into.png \
stock_button_raise \
$(srcdir)/images/stock-button-raise.png \
stock_button_refresh \
$(srcdir)/images/stock-button-refresh.png \
stock_button_stroke \

30
themes/Default/gtkrc
View File

@ -17,8 +17,34 @@
# Do override some GTK stock icons however.
style "gimp-dialog-icons"
style "gimp-gtk-icons"
{
stock["gtk-delete"] =
{
{ "images/stock-button-delete.png", *, *, "gtk-button" },
{ "images/stock-button-delete.png", *, *, * }
}
stock["gtk-go-down"] =
{
{ "images/stock-button-lower.png", *, *, "gtk-button" },
{ "images/stock-button-lower.png", *, *, * }
}
stock["gtk-go-up"] =
{
{ "images/stock-button-raise.png", *, *, "gtk-button" },
{ "images/stock-button-raise.png", *, *, * }
}
stock["gtk-new"] =
{
{ "images/stock-button-new.png", *, *, "gtk-button" },
{ "images/stock-button-new.png", *, *, * }
}
stock["gtk-refresh"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },
{ "images/stock-button-refresh.png", *, *, * }
}
stock["gtk-dialog-error"] =
{
{ "images/gimp-dialog-error.png", *, *, "gtk-dialog" }
@ -37,7 +63,7 @@ style "gimp-dialog-icons"
}
}
class "GtkImage" style "gimp-dialog-icons"
class "GtkImage" style "gimp-gtk-icons"
style "gimp-normal-font-style"

25
themes/Default/imagerc
View File

@ -32,11 +32,6 @@ style "gimp-icons"
{ "images/stock-button-anchor.png", *, *, "gtk-button" },
{ "images/stock-button-anchor.png", *, *, * }
}
stock["gimp-delete"] =
{
{ "images/stock-button-delete.png", *, *, "gtk-button" },
{ "images/stock-button-delete.png", *, *, * }
}
stock["gimp-duplicate"] =
{
{ "images/stock-button-duplicate.png", *, *, "gtk-button" },
@ -52,16 +47,6 @@ style "gimp-icons"
{ "images/stock-button-linked.png", *, *, "gtk-button" },
{ "images/stock-button-linked.png", *, *, * }
}
stock["gimp-lower"] =
{
{ "images/stock-button-lower.png", *, *, "gtk-button" },
{ "images/stock-button-lower.png", *, *, * }
}
stock["gimp-new"] =
{
{ "images/stock-button-new.png", *, *, "gtk-button" },
{ "images/stock-button-new.png", *, *, * }
}
stock["gimp-paste"] =
{
{ "images/stock-button-paste.png", *, *, "gtk-button" },
@ -77,16 +62,6 @@ style "gimp-icons"
{ "images/stock-button-paste-into.png", *, *, "gtk-button" },
{ "images/stock-button-paste-into.png", *, *, * }
}
stock["gimp-raise"] =
{
{ "images/stock-button-raise.png", *, *, "gtk-button" },
{ "images/stock-button-raise.png", *, *, * }
}
stock["gimp-refresh"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },
{ "images/stock-button-refresh.png", *, *, * }
}
stock["gimp-reset"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },