set the view's display to NULL in "destroy". Fixes crash on closing the

2002-05-13  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpnavigationview.c: set the view's display to NULL
	in "destroy". Fixes crash on closing the navigation dialog.

	* app/gui/dialogs-constructors.c
	* app/gui/menus.c: use GIMP_STOCK_NAVIGATION instead of
	GIMP_STOCK_TOOL_MOVE. Use the new GIMP_STOCK_WARNING (see below)
	for the error console.

	* themes/Default/images/*.png
	* themes/Default/images/tools/*.png: renamed all stock icons to
	have the pixel size instead of "button" or "menu" in the name.
	(e.g. stock-menu-scale.png -> stock-scale-16.png).

	* libgimpwidgets/gimpstock.[ch]
	* themes/Default/gtkrc
	* themes/Default/imagerc
	* themes/Default/images/Makefile.am: changed accordingly.
This commit is contained in:
Michael Natterer 2002-05-12 23:20:21 +00:00 committed by Michael Natterer
parent 384a2a851e
commit 474a4ec430
107 changed files with 430 additions and 324 deletions

View File

@ -1,3 +1,23 @@
2002-05-13 Michael Natterer <mitch@gimp.org>
* app/display/gimpnavigationview.c: set the view's display to NULL
in "destroy". Fixes crash on closing the navigation dialog.
* app/gui/dialogs-constructors.c
* app/gui/menus.c: use GIMP_STOCK_NAVIGATION instead of
GIMP_STOCK_TOOL_MOVE. Use the new GIMP_STOCK_WARNING (see below)
for the error console.
* themes/Default/images/*.png
* themes/Default/images/tools/*.png: renamed all stock icons to
have the pixel size instead of "button" or "menu" in the name.
(e.g. stock-menu-scale.png -> stock-scale-16.png).
* libgimpwidgets/gimpstock.[ch]
* themes/Default/gtkrc
* themes/Default/imagerc
* themes/Default/images/Makefile.am: changed accordingly.
2002-05-11 Michael Natterer <mitch@gimp.org>
* app/display/gimpnavigationview.c: connect to size allocations of

View File

@ -315,7 +315,8 @@ dialogs_error_console_get (GimpDialogFactory *factory,
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
return dialogs_dockable_new (view,
_("Error Console"), _("Errors"), NULL,
_("Error Console"), _("Errors"),
GIMP_STOCK_WARNING,
NULL,
NULL);
}
@ -938,7 +939,7 @@ dialogs_navigation_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Display Navigation"), _("Navigation"),
GIMP_STOCK_TOOL_MOVE,
GIMP_STOCK_NAVIGATION,
dialogs_stock_text_tab_func,
dialogs_set_navigation_context_func);
}

View File

@ -53,8 +53,10 @@
static void gimp_navigation_view_class_init (GimpNavigationViewClass *klass);
static void gimp_navigation_view_init (GimpNavigationView *view);
static GtkWidget * gimp_navigation_view_new_private (GimpDisplayShell *shell,
gboolean popup);
static void gimp_navigation_view_destroy (GtkObject *object);
static GtkWidget * gimp_navigation_view_new_private (GimpDisplayShell *shell,
gboolean popup);
static gboolean gimp_navigation_view_button_release (GtkWidget *widget,
GdkEventButton *bevent,
@ -128,11 +130,15 @@ gimp_navigation_view_get_type (void)
static void
gimp_navigation_view_class_init (GimpNavigationViewClass *klass)
{
GObjectClass *object_class;
GObjectClass *object_class;
GtkObjectClass *gtk_object_class;
object_class = G_OBJECT_CLASS (klass);
object_class = G_OBJECT_CLASS (klass);
gtk_object_class = GTK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gtk_object_class->destroy = gimp_navigation_view_destroy;
}
static void
@ -179,6 +185,20 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_widget_set_sensitive (GTK_WIDGET (view), FALSE);
}
static void
gimp_navigation_view_destroy (GtkObject *object)
{
GimpNavigationView *view;
view = GIMP_NAVIGATION_VIEW (object);
if (view->shell)
gimp_navigation_view_set_shell (view, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
/* public functions */

View File

@ -53,8 +53,10 @@
static void gimp_navigation_view_class_init (GimpNavigationViewClass *klass);
static void gimp_navigation_view_init (GimpNavigationView *view);
static GtkWidget * gimp_navigation_view_new_private (GimpDisplayShell *shell,
gboolean popup);
static void gimp_navigation_view_destroy (GtkObject *object);
static GtkWidget * gimp_navigation_view_new_private (GimpDisplayShell *shell,
gboolean popup);
static gboolean gimp_navigation_view_button_release (GtkWidget *widget,
GdkEventButton *bevent,
@ -128,11 +130,15 @@ gimp_navigation_view_get_type (void)
static void
gimp_navigation_view_class_init (GimpNavigationViewClass *klass)
{
GObjectClass *object_class;
GObjectClass *object_class;
GtkObjectClass *gtk_object_class;
object_class = G_OBJECT_CLASS (klass);
object_class = G_OBJECT_CLASS (klass);
gtk_object_class = GTK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
gtk_object_class->destroy = gimp_navigation_view_destroy;
}
static void
@ -179,6 +185,20 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_widget_set_sensitive (GTK_WIDGET (view), FALSE);
}
static void
gimp_navigation_view_destroy (GtkObject *object)
{
GimpNavigationView *view;
view = GIMP_NAVIGATION_VIEW (object);
if (view->shell)
gimp_navigation_view_set_shell (view, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
/* public functions */

View File

@ -315,7 +315,8 @@ dialogs_error_console_get (GimpDialogFactory *factory,
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
return dialogs_dockable_new (view,
_("Error Console"), _("Errors"), NULL,
_("Error Console"), _("Errors"),
GIMP_STOCK_WARNING,
NULL,
NULL);
}
@ -938,7 +939,7 @@ dialogs_navigation_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Display Navigation"), _("Navigation"),
GIMP_STOCK_TOOL_MOVE,
GIMP_STOCK_NAVIGATION,
dialogs_stock_text_tab_func,
dialogs_set_navigation_context_func);
}

View File

@ -201,7 +201,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/File/Dialogs/Images..."), NULL,
@ -214,7 +214,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
"gimp-document-history",
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
"file/dialogs/error_console.html", NULL },
@ -268,11 +269,13 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
"help/context_help.html", NULL },
{ { N_("/Help/Tip of the Day..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_INFO },
"gimp-tips-dialog",
"help/dialogs/tip_of_the_day.html", NULL },
{ { N_("/Help/About..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WILBER },
"gimp-about-dialog",
"help/dialogs/about.html", NULL }
};
@ -559,7 +562,7 @@ static GimpItemFactoryEntry image_entries[] =
"view/dialogs/info_window.html", NULL },
{ { N_("/View/Navigation Window..."), "<control><shift>N",
view_navigation_window_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
NULL,
"view/dialogs/navigation_window.html", NULL },
{ { N_("/View/Display Filters..."), NULL,
@ -910,7 +913,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/Dialogs/Images..."), NULL,
@ -923,7 +926,8 @@ static GimpItemFactoryEntry image_entries[] =
"gimp-document-history",
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
"dialogs/error_console.html", NULL },
@ -1388,11 +1392,12 @@ static GimpItemFactoryEntry dialogs_entries[] =
SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Navigation..."), "gimp-navigation-view",
"<StockItem>", GIMP_STOCK_TOOL_MOVE),
"<StockItem>", GIMP_STOCK_NAVIGATION),
ADD_TAB (N_("/Add Tab/Images..."), "gimp-image-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-history",
"<StockItem>", GTK_STOCK_OPEN),
ADD_TAB (N_("/Add Tab/Error Console..."), "gimp-error-console", NULL, NULL),
ADD_TAB (N_("/Add Tab/Error Console..."), "gimp-error-console",
"<StockItem>", GIMP_STOCK_WARNING),
SEPARATOR ("/Add Tab/---"),

View File

@ -201,7 +201,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/File/Dialogs/Images..."), NULL,
@ -214,7 +214,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
"gimp-document-history",
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
"file/dialogs/error_console.html", NULL },
@ -268,11 +269,13 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
"help/context_help.html", NULL },
{ { N_("/Help/Tip of the Day..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_INFO },
"gimp-tips-dialog",
"help/dialogs/tip_of_the_day.html", NULL },
{ { N_("/Help/About..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WILBER },
"gimp-about-dialog",
"help/dialogs/about.html", NULL }
};
@ -559,7 +562,7 @@ static GimpItemFactoryEntry image_entries[] =
"view/dialogs/info_window.html", NULL },
{ { N_("/View/Navigation Window..."), "<control><shift>N",
view_navigation_window_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
NULL,
"view/dialogs/navigation_window.html", NULL },
{ { N_("/View/Display Filters..."), NULL,
@ -910,7 +913,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_MOVE },
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/Dialogs/Images..."), NULL,
@ -923,7 +926,8 @@ static GimpItemFactoryEntry image_entries[] =
"gimp-document-history",
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
"dialogs/error_console.html", NULL },
@ -1388,11 +1392,12 @@ static GimpItemFactoryEntry dialogs_entries[] =
SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Navigation..."), "gimp-navigation-view",
"<StockItem>", GIMP_STOCK_TOOL_MOVE),
"<StockItem>", GIMP_STOCK_NAVIGATION),
ADD_TAB (N_("/Add Tab/Images..."), "gimp-image-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-history",
"<StockItem>", GTK_STOCK_OPEN),
ADD_TAB (N_("/Add Tab/Error Console..."), "gimp-error-console", NULL, NULL),
ADD_TAB (N_("/Add Tab/Error Console..."), "gimp-error-console",
"<StockItem>", GIMP_STOCK_WARNING),
SEPARATOR ("/Add Tab/---"),

View File

@ -124,6 +124,10 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_INFO, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_WARNING, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_WILBER, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp-libgimp" },
{ GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, "gimp-libgimp" },
@ -171,69 +175,71 @@ static struct
}
gimp_stock_button_pixbufs[] =
{
{ GIMP_STOCK_ANCHOR, stock_button_anchor },
{ GIMP_STOCK_DUPLICATE, stock_button_duplicate },
{ GIMP_STOCK_EDIT, stock_button_edit },
{ GIMP_STOCK_LINKED, stock_button_linked },
{ GIMP_STOCK_PASTE_AS_NEW, stock_button_paste_as_new },
{ GIMP_STOCK_PASTE_INTO, stock_button_paste_into },
{ GIMP_STOCK_RESET, stock_button_reset },
{ GIMP_STOCK_VISIBLE, stock_button_eye },
{ GIMP_STOCK_ANCHOR, stock_anchor_16 },
{ GIMP_STOCK_DUPLICATE, stock_duplicate_16 },
{ GIMP_STOCK_EDIT, stock_edit_16 },
{ GIMP_STOCK_LINKED, stock_linked_20 },
{ GIMP_STOCK_PASTE_AS_NEW, stock_paste_as_new_16 },
{ GIMP_STOCK_PASTE_INTO, stock_paste_into_16 },
{ GIMP_STOCK_RESET, stock_reset_16 },
{ GIMP_STOCK_VISIBLE, stock_eye_20 },
{ GIMP_STOCK_HCHAIN, stock_button_hchain },
{ GIMP_STOCK_HCHAIN_BROKEN, stock_button_hchain_broken },
{ GIMP_STOCK_VCHAIN, stock_button_vchain },
{ GIMP_STOCK_VCHAIN_BROKEN, stock_button_vchain_broken },
{ GIMP_STOCK_HCHAIN, stock_hchain_24 },
{ GIMP_STOCK_HCHAIN_BROKEN, stock_hchain_broken_24 },
{ GIMP_STOCK_VCHAIN, stock_vchain_24 },
{ GIMP_STOCK_VCHAIN_BROKEN, stock_vchain_broken_24 },
{ GIMP_STOCK_SELECTION_REPLACE, stock_button_selection_replace },
{ GIMP_STOCK_SELECTION_ADD, stock_button_selection_add },
{ GIMP_STOCK_SELECTION_SUBTRACT, stock_button_selection_subtract },
{ GIMP_STOCK_SELECTION_INTERSECT, stock_button_selection_intersect },
{ GIMP_STOCK_SELECTION_STROKE, stock_button_selection_stroke },
{ GIMP_STOCK_SELECTION_TO_PATH, stock_button_selection_to_path },
{ GIMP_STOCK_SELECTION_REPLACE, stock_selection_replace_16 },
{ GIMP_STOCK_SELECTION_ADD, stock_selection_add_16 },
{ GIMP_STOCK_SELECTION_SUBTRACT, stock_selection_subtract_16 },
{ GIMP_STOCK_SELECTION_INTERSECT, stock_selection_intersect_16 },
{ GIMP_STOCK_SELECTION_STROKE, stock_selection_stroke_16 },
{ GIMP_STOCK_SELECTION_TO_PATH, stock_selection_to_path_16 },
{ GIMP_STOCK_PATH_STROKE, stock_button_path_stroke },
{ GIMP_STOCK_PATH_STROKE, stock_path_stroke_16 },
{ GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_button_airbrush },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_button_bezier_select },
{ GIMP_STOCK_TOOL_BLEND, stock_tool_button_blend },
{ GIMP_STOCK_TOOL_BLUR, stock_tool_button_blur },
{ GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, stock_tool_button_brightness_contrast },
{ GIMP_STOCK_TOOL_BUCKET_FILL, stock_tool_button_bucket_fill },
{ GIMP_STOCK_TOOL_BY_COLOR_SELECT, stock_tool_button_by_color_select },
{ GIMP_STOCK_TOOL_CLONE, stock_tool_button_clone },
{ GIMP_STOCK_TOOL_COLOR_BALANCE, stock_tool_button_color_balance },
{ GIMP_STOCK_TOOL_COLOR_PICKER, stock_tool_button_color_picker },
{ GIMP_STOCK_TOOL_CROP, stock_tool_button_crop },
{ GIMP_STOCK_TOOL_CURVES, stock_tool_button_curves },
{ GIMP_STOCK_TOOL_DODGE, stock_tool_button_dodge },
{ GIMP_STOCK_TOOL_ELLIPSE_SELECT, stock_tool_button_ellipse_select },
{ GIMP_STOCK_TOOL_ERASER, stock_tool_button_eraser },
{ GIMP_STOCK_TOOL_FLIP, stock_tool_button_flip },
{ GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_button_free_select },
{ GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_button_fuzzy_select },
{ GIMP_STOCK_TOOL_HISTOGRAM, stock_tool_button_histogram },
{ GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_button_hue_saturation },
{ GIMP_STOCK_TOOL_INK, stock_tool_button_ink },
{ GIMP_STOCK_TOOL_ISCISSORS, stock_tool_button_iscissors },
{ GIMP_STOCK_TOOL_LEVELS, stock_tool_button_levels },
{ GIMP_STOCK_TOOL_MEASURE, stock_tool_button_measure },
{ GIMP_STOCK_TOOL_MOVE, stock_tool_button_move },
{ GIMP_STOCK_TOOL_PAINTBRUSH, stock_tool_button_paintbrush },
{ GIMP_STOCK_TOOL_PATH, stock_tool_button_path },
{ GIMP_STOCK_TOOL_PENCIL, stock_tool_button_pencil },
{ GIMP_STOCK_TOOL_PERSPECTIVE, stock_tool_button_perspective },
{ GIMP_STOCK_TOOL_POSTERIZE, stock_tool_button_posterize },
{ GIMP_STOCK_TOOL_RECT_SELECT, stock_tool_button_rect_select },
{ GIMP_STOCK_TOOL_ROTATE, stock_tool_button_rotate },
{ GIMP_STOCK_TOOL_SCALE, stock_tool_button_scale },
{ GIMP_STOCK_TOOL_SHEAR, stock_tool_button_shear },
{ GIMP_STOCK_TOOL_SMUDGE, stock_tool_button_smudge },
{ GIMP_STOCK_TOOL_TEXT, stock_tool_button_text },
{ GIMP_STOCK_TOOL_THRESHOLD, stock_tool_button_threshold },
{ GIMP_STOCK_TOOL_ZOOM, stock_tool_button_zoom },
{ GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_airbrush_22 },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_bezier_select_22 },
{ GIMP_STOCK_TOOL_BLEND, stock_tool_blend_22 },
{ GIMP_STOCK_TOOL_BLUR, stock_tool_blur_22 },
{ GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, stock_tool_brightness_contrast_22 },
{ GIMP_STOCK_TOOL_BUCKET_FILL, stock_tool_bucket_fill_22 },
{ GIMP_STOCK_TOOL_BY_COLOR_SELECT, stock_tool_by_color_select_22 },
{ GIMP_STOCK_TOOL_CLONE, stock_tool_clone_22 },
{ GIMP_STOCK_TOOL_COLOR_BALANCE, stock_tool_color_balance_22 },
{ GIMP_STOCK_TOOL_COLOR_PICKER, stock_tool_color_picker_22 },
{ GIMP_STOCK_TOOL_CROP, stock_tool_crop_22 },
{ GIMP_STOCK_TOOL_CURVES, stock_tool_curves_22 },
{ GIMP_STOCK_TOOL_DODGE, stock_tool_dodge_22 },
{ GIMP_STOCK_TOOL_ELLIPSE_SELECT, stock_tool_ellipse_select_22 },
{ GIMP_STOCK_TOOL_ERASER, stock_tool_eraser_22 },
{ GIMP_STOCK_TOOL_FLIP, stock_tool_flip_22 },
{ GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_free_select_22 },
{ GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_fuzzy_select_22 },
{ GIMP_STOCK_TOOL_HISTOGRAM, stock_tool_histogram_22 },
{ GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_hue_saturation_22 },
{ GIMP_STOCK_TOOL_INK, stock_tool_ink_22 },
{ GIMP_STOCK_TOOL_ISCISSORS, stock_tool_iscissors_22 },
{ GIMP_STOCK_TOOL_LEVELS, stock_tool_levels_22 },
{ GIMP_STOCK_TOOL_MEASURE, stock_tool_measure_22 },
{ GIMP_STOCK_TOOL_MOVE, stock_tool_move_22 },
{ GIMP_STOCK_TOOL_PAINTBRUSH, stock_tool_paintbrush_22 },
{ GIMP_STOCK_TOOL_PATH, stock_tool_path_22 },
{ GIMP_STOCK_TOOL_PENCIL, stock_tool_pencil_22 },
{ GIMP_STOCK_TOOL_PERSPECTIVE, stock_tool_perspective_22 },
{ GIMP_STOCK_TOOL_POSTERIZE, stock_tool_posterize_22 },
{ GIMP_STOCK_TOOL_RECT_SELECT, stock_tool_rect_select_22 },
{ GIMP_STOCK_TOOL_ROTATE, stock_tool_rotate_22 },
{ GIMP_STOCK_TOOL_SCALE, stock_tool_scale_22 },
{ GIMP_STOCK_TOOL_SHEAR, stock_tool_shear_22 },
{ GIMP_STOCK_TOOL_SMUDGE, stock_tool_smudge_22 },
{ GIMP_STOCK_TOOL_TEXT, stock_tool_text_22 },
{ GIMP_STOCK_TOOL_THRESHOLD, stock_tool_threshold_22 },
{ GIMP_STOCK_TOOL_ZOOM, stock_tool_zoom_22 },
{ GIMP_STOCK_WILBER_EEK, stock_wilber_eek }
{ GIMP_STOCK_INFO, stock_info_24 },
{ GIMP_STOCK_WARNING, stock_warning_24 },
{ GIMP_STOCK_WILBER_EEK, stock_wilber_eek_64 }
};
static struct
@ -243,21 +249,25 @@ static struct
}
gimp_stock_menu_pixbufs[] =
{
{ GIMP_STOCK_CONVERT_RGB, stock_menu_convert_rgb },
{ GIMP_STOCK_CONVERT_GRAYSCALE, stock_menu_convert_grayscale },
{ GIMP_STOCK_CONVERT_INDEXED, stock_menu_convert_indexed },
{ GIMP_STOCK_MERGE_DOWN, stock_menu_merge_down },
{ GIMP_STOCK_RESHOW_FILTER, stock_menu_reshow_filter },
{ GIMP_STOCK_ROTATE_90, stock_menu_rotate_90 },
{ GIMP_STOCK_ROTATE_180, stock_menu_rotate_180 },
{ GIMP_STOCK_ROTATE_270, stock_menu_rotate_270 },
{ GIMP_STOCK_RESIZE, stock_menu_resize },
{ GIMP_STOCK_SCALE, stock_menu_scale },
{ GIMP_STOCK_SELECTION_TO_CHANNEL, stock_menu_selection_to_channel },
{ GIMP_STOCK_CONVERT_RGB, stock_convert_rgb_16 },
{ GIMP_STOCK_CONVERT_GRAYSCALE, stock_convert_grayscale_16 },
{ GIMP_STOCK_CONVERT_INDEXED, stock_convert_indexed_16 },
{ GIMP_STOCK_MERGE_DOWN, stock_merge_down_16 },
{ GIMP_STOCK_RESHOW_FILTER, stock_reshow_filter_16 },
{ GIMP_STOCK_ROTATE_90, stock_rotate_90_16 },
{ GIMP_STOCK_ROTATE_180, stock_rotate_180_16 },
{ GIMP_STOCK_ROTATE_270, stock_rotate_270_16 },
{ GIMP_STOCK_RESIZE, stock_resize_16 },
{ GIMP_STOCK_SCALE, stock_scale_16 },
{ GIMP_STOCK_SELECTION_TO_CHANNEL, stock_selection_to_channel_16 },
{ GIMP_STOCK_NAVIGATION, stock_menu_navigation },
{ GIMP_STOCK_QMASK_OFF, stock_menu_qmask_off },
{ GIMP_STOCK_QMASK_ON, stock_menu_qmask_on }
{ GIMP_STOCK_NAVIGATION, stock_navigation_16 },
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
{ GIMP_STOCK_QMASK_ON, stock_qmask_on_16 },
{ GIMP_STOCK_INFO, stock_info_16 },
{ GIMP_STOCK_WARNING, stock_warning_16 },
{ GIMP_STOCK_WILBER, stock_wilber_16 }
};

View File

@ -72,6 +72,10 @@ G_BEGIN_DECLS
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
#define GIMP_STOCK_INFO "gimp-info"
#define GIMP_STOCK_WARNING "gimp-warning"
#define GIMP_STOCK_WILBER "gimp-wilber"
/* only in button size: */

View File

@ -24,50 +24,50 @@ style "gimp-default-style"
{
stock["gtk-delete"] =
{
{ "images/stock-button-delete.png", *, *, "gtk-button" },
{ "images/stock-button-delete.png", *, *, * }
{ "images/stock-delete-16.png", *, *, "gtk-button" },
{ "images/stock-delete-16.png", *, *, * }
}
stock["gtk-go-down"] =
{
{ "images/stock-button-lower.png", *, *, "gtk-button" },
{ "images/stock-button-lower.png", *, *, * }
{ "images/stock-lower-16.png", *, *, "gtk-button" },
{ "images/stock-lower-16.png", *, *, * }
}
stock["gtk-go-up"] =
{
{ "images/stock-button-raise.png", *, *, "gtk-button" },
{ "images/stock-button-raise.png", *, *, * }
{ "images/stock-raise-16.png", *, *, "gtk-button" },
{ "images/stock-raise-16.png", *, *, * }
}
stock["gtk-new"] =
{
{ "images/stock-button-new.png", *, *, "gtk-button" },
{ "images/stock-button-new.png", *, *, * }
{ "images/stock-new-16.png", *, *, "gtk-button" },
{ "images/stock-new-16.png", *, *, * }
}
stock["gtk-paste"] =
{
{ "images/stock-button-paste.png", *, *, "gtk-button" },
{ "images/stock-button-paste.png", *, *, * }
{ "images/stock-paste-16.png", *, *, "gtk-button" },
{ "images/stock-paste-16.png", *, *, * }
}
stock["gtk-refresh"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },
{ "images/stock-button-refresh.png", *, *, * }
{ "images/stock-refresh-16.png", *, *, "gtk-button" },
{ "images/stock-refresh-16.png", *, *, * }
}
stock["gtk-dialog-error"] =
{
{ "images/gimp-dialog-error.png", *, *, "gtk-dialog" }
{ "images/stock-error-64.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-info"] =
{
{ "images/gimp-dialog-info.png", *, *, "gtk-dialog" }
{ "images/stock-info-64.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-question"] =
{
{ "images/gimp-dialog-question.png", *, *, "gtk-dialog" }
{ "images/stock-question-64.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-warning"] =
{
{ "images/gimp-dialog-warning.png", *, *, "gtk-dialog" }
{ "images/stock-warning-64.png", *, *, "gtk-dialog" }
}
GtkPaned::handle_size = 6

View File

@ -29,81 +29,93 @@ style "gimp-icons"
#
stock["gimp-anchor"] =
{
{ "images/stock-button-anchor.png", *, *, "gtk-button" },
{ "images/stock-button-anchor.png", *, *, * }
{ "images/stock-anchor-16.png", *, *, "gtk-button" },
{ "images/stock-anchor-16.png", *, *, * }
}
stock["gimp-duplicate"] =
{
{ "images/stock-button-duplicate.png", *, *, "gtk-button" },
{ "images/stock-button-duplicate.png", *, *, * }
{ "images/stock-duplicate-16.png", *, *, "gtk-button" },
{ "images/stock-duplicate-16.png", *, *, * }
}
stock["gimp-edit"] =
{
{ "images/stock-button-edit.png", *, *, "gtk-button" },
{ "images/stock-button-edit.png", *, *, * }
{ "images/stock-edit-16.png", *, *, "gtk-button" },
{ "images/stock-edit-16.png", *, *, * }
}
stock["gimp-info"] =
{
{ "images/stock-info-16.png", *, *, "gtk-menu" },
{ "images/stock-info-24.png", *, *, "gtk-button" },
{ "images/stock-info-24.png", *, *, * },
}
stock["gimp-linked"] =
{
{ "images/stock-button-linked.png", *, *, "gtk-button" },
{ "images/stock-button-linked.png", *, *, * }
{ "images/stock-linked-16.png", *, *, "gtk-button" },
{ "images/stock-linked-16.png", *, *, * }
}
stock["gimp-paste-as-new"] =
{
{ "images/stock-button-paste-as-new.png", *, *, "gtk-button" },
{ "images/stock-button-paste-as-new.png", *, *, * }
{ "images/stock-paste-as-new-16.png", *, *, "gtk-button" },
{ "images/stock-paste-as-new-16.png", *, *, * }
}
stock["gimp-paste-into"] =
{
{ "images/stock-button-paste-into.png", *, *, "gtk-button" },
{ "images/stock-button-paste-into.png", *, *, * }
{ "images/stock-paste-into-16.png", *, *, "gtk-button" },
{ "images/stock-paste-into-16.png", *, *, * }
}
stock["gimp-reset"] =
{
{ "images/stock-button-reset.png", *, *, "gtk-button" },
{ "images/stock-button-reset.png", *, *, * }
{ "images/stock-reset-16.png", *, *, "gtk-button" },
{ "images/stock-reset-16.png", *, *, * }
}
stock["gimp-stroke"] =
{
{ "images/stock-button-stroke.png", *, *, "gtk-button" },
{ "images/stock-button-stroke.png", *, *, * }
{ "images/stock-stroke-16.png", *, *, "gtk-button" },
{ "images/stock-stroke-16.png", *, *, * }
}
stock["gimp-to-path"] =
{
{ "images/stock-button-to-path.png", *, *, "gtk-button" },
{ "images/stock-button-to-path.png", *, *, * }
{ "images/stock-to-path-16.png", *, *, "gtk-button" },
{ "images/stock-to-path-16.png", *, *, * }
}
stock["gimp-to-selection"] =
{
{ "images/stock-button-to-selection.png", *, *, "gtk-button" },
{ "images/stock-button-to-selection.png", *, *, * }
{ "images/stock-to-selection-16.png", *, *, "gtk-button" },
{ "images/stock-to-selection-16.png", *, *, * }
}
stock["gimp-visible"] =
{
{ "images/stock-button-visible.png", *, *, "gtk-button" },
{ "images/stock-button-visible.png", *, *, * }
{ "images/stock-visible-16.png", *, *, "gtk-button" },
{ "images/stock-visible-16.png", *, *, * }
}
stock["gimp-warning"] =
{
{ "images/stock-warning-16.png", *, *, "gtk-menu" },
{ "images/stock-warning-24.png", *, *, "gtk-button" },
{ "images/stock-warning-24.png", *, *, * },
}
# Selection tool options window
#
stock["gimp-selection-replace"] =
{
{ "images/stock-button-selection-replace.png", *, *, "gtk-button" },
{ "images/stock-button-selection-replace.png", *, *, * }
{ "images/stock-selection-replace-16.png", *, *, "gtk-button" },
{ "images/stock-selection-replace-16.png", *, *, * }
}
stock["gimp-selection-add"] =
{
{ "images/stock-button-selection-add.png", *, *, "gtk-button" },
{ "images/stock-button-selection-add.png", *, *, * }
{ "images/stock-selection-add-16.png", *, *, "gtk-button" },
{ "images/stock-selection-add-16.png", *, *, * }
}
stock["gimp-selection-subtract"] =
{
{ "images/stock-button-selection-subtract.png", *, *, "gtk-button" },
{ "images/stock-button-selection-subtract.png", *, *, * }
{ "images/stock-selection-subtract-16.png", *, *, "gtk-button" },
{ "images/stock-selection-subtract-16.png", *, *, * }
}
stock["gimp-selection-intersect"] =
{
{ "images/stock-button-selection-intersect.png", *, *, "gtk-button" },
{ "images/stock-button-selection-intersect.png", *, *, * }
{ "images/stock-selection-intersect-16.png", *, *, "gtk-button" },
{ "images/stock-selection-intersect-16.png", *, *, * }
}
# Misc menu icons
@ -186,223 +198,227 @@ style "gimp-icons"
#
stock["gimp-hchain"] =
{
{ "images/stock-button-hchain.png", *, *, "gtk-button" },
{ "images/stock-button-hchain.png", *, *, * }
{ "images/stock-hchain-24.png", *, *, "gtk-button" },
{ "images/stock-hchain-24.png", *, *, * }
}
stock["gimp-hchain-broken"] =
{
{ "images/stock-button-hchain-broken.png", *, *, "gtk-button" },
{ "images/stock-button-hchain-broken.png", *, *, * }
{ "images/stock-hchain-broken-24.png", *, *, "gtk-button" },
{ "images/stock-hchain-broken-24.png", *, *, * }
}
stock["gimp-vchain"] =
{
{ "images/stock-button-vchain.png", *, *, "gtk-button" },
{ "images/stock-button-vchain.png", *, *, * }
{ "images/stock-vchain-24.png", *, *, "gtk-button" },
{ "images/stock-vchain-24.png", *, *, * }
}
stock["gimp-vchain-broken"] =
{
{ "images/stock-button-vchain-broken.png", *, *, "gtk-button" },
{ "images/stock-button-vchain-broken.png", *, *, * }
{ "images/stock-vchain-broken-24.png", *, *, "gtk-button" },
{ "images/stock-vchain-broken-24.png", *, *, * }
}
# Wilber *_`@@'
#
stock["gimp-wilber"] =
{
{ "images/stock-wilber-16.png", *, *, "gtk-menu" }
}
stock["gimp-wilber-eek"] =
{
{ "images/stock-wilber-eek.png", *, *, * }
{ "images/stock-wilber-eek-64.png", *, *, * }
}
# Tool icons
#
stock["gimp-tool-airbrush"] =
{
{ "images/tools/stock-tool-button-airbrush.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-airbrush.png", *, *, * }
{ "images/tools/stock-tool-airbrush-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-airbrush-22.png", *, *, * }
}
stock["gimp-tool-bezier-select"] =
{
{ "images/tools/stock-tool-button-bezier-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-bezier-select.png", *, *, * }
{ "images/tools/stock-tool-bezier-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-bezier-select-22.png", *, *, * }
}
stock["gimp-tool-blend"] =
{
{ "images/tools/stock-tool-button-blend.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-blend.png", *, *, * }
{ "images/tools/stock-tool-blend-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-blend-22.png", *, *, * }
}
stock["gimp-tool-blur"] =
{
{ "images/tools/stock-tool-button-blur.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-blur.png", *, *, * }
{ "images/tools/stock-tool-blur-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-blur-22.png", *, *, * }
}
stock["gimp-tool-brightness-contrast"] =
{
{ "images/tools/stock-tool-button-brightness-contrast.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-brightness-contrast.png", *, *, * }
{ "images/tools/stock-tool-brightness-contrast-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-brightness-contrast-22.png", *, *, * }
}
stock["gimp-tool-bucket-fill"] =
{
{ "images/tools/stock-tool-button-bucket-fill.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-bucket-fill.png", *, *, * }
{ "images/tools/stock-tool-bucket-fill-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-bucket-fill-22.png", *, *, * }
}
stock["gimp-tool-by-color-select"] =
{
{ "images/tools/stock-tool-button-by-color-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-by-color-select.png", *, *, * }
{ "images/tools/stock-tool-by-color-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-by-color-select-22.png", *, *, * }
}
stock["gimp-tool-clone"] =
{
{ "images/tools/stock-tool-button-clone.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-clone.png", *, *, * }
{ "images/tools/stock-tool-clone-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-clone-22.png", *, *, * }
}
stock["gimp-tool-color-balance"] =
{
{ "images/tools/stock-tool-button-color-balance.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-color-balance.png", *, *, * }
{ "images/tools/stock-tool-color-balance-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-color-balance-22.png", *, *, * }
}
stock["gimp-tool-color-picker"] =
{
{ "images/tools/stock-tool-button-color-picker.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-color-picker.png", *, *, * }
{ "images/tools/stock-tool-color-picker-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-color-picker-22.png", *, *, * }
}
stock["gimp-tool-crop"] =
{
{ "images/tools/stock-tool-button-crop.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-crop.png", *, *, * }
{ "images/tools/stock-tool-crop-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-crop-22.png", *, *, * }
}
stock["gimp-tool-curves"] =
{
{ "images/tools/stock-tool-button-curves.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-curves.png", *, *, * }
{ "images/tools/stock-tool-curves-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-curves-22.png", *, *, * }
}
stock["gimp-tool-dodge"] =
{
{ "images/tools/stock-tool-button-dodge.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-dodge.png", *, *, * }
{ "images/tools/stock-tool-dodge-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-dodge-22.png", *, *, * }
}
stock["gimp-tool-ellipse-select"] =
{
{ "images/tools/stock-tool-button-ellipse-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-ellipse-select.png", *, *, * }
{ "images/tools/stock-tool-ellipse-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-ellipse-select-22.png", *, *, * }
}
stock["gimp-tool-eraser"] =
{
{ "images/tools/stock-tool-button-eraser.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-eraser.png", *, *, * }
{ "images/tools/stock-tool-eraser-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-eraser-22.png", *, *, * }
}
stock["gimp-tool-flip"] =
{
{ "images/tools/stock-tool-button-flip.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-flip.png", *, *, * }
{ "images/tools/stock-tool-flip-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-flip-22.png", *, *, * }
}
stock["gimp-tool-free-select"] =
{
{ "images/tools/stock-tool-button-free-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-free-select.png", *, *, * }
{ "images/tools/stock-tool-free-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-free-select-22.png", *, *, * }
}
stock["gimp-tool-fuzzy-select"] =
{
{ "images/tools/stock-tool-button-fuzzy-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-fuzzy-select.png", *, *, * }
{ "images/tools/stock-tool-fuzzy-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-fuzzy-select-22.png", *, *, * }
}
stock["gimp-tool-histogram"] =
{
{ "images/tools/stock-tool-button-histogram.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-histogram.png", *, *, * }
{ "images/tools/stock-tool-histogram-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-histogram-22.png", *, *, * }
}
stock["gimp-tool-hue-saturation"] =
{
{ "images/tools/stock-tool-button-hue-saturation.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-hue-saturation.png", *, *, * }
{ "images/tools/stock-tool-hue-saturation-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-hue-saturation-22.png", *, *, * }
}
stock["gimp-tool-ink"] =
{
{ "images/tools/stock-tool-button-ink.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-ink.png", *, *, * }
{ "images/tools/stock-tool-ink-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-ink-22.png", *, *, * }
}
stock["gimp-tool-iscissors"] =
{
{ "images/tools/stock-tool-button-iscissors.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-iscissors.png", *, *, * }
{ "images/tools/stock-tool-iscissors-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-iscissors-22.png", *, *, * }
}
stock["gimp-tool-levels"] =
{
{ "images/tools/stock-tool-button-levels.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-levels.png", *, *, * }
{ "images/tools/stock-tool-levels-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-levels-22.png", *, *, * }
}
stock["gimp-tool-measure"] =
{
{ "images/tools/stock-tool-button-measure.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-measure.png", *, *, * }
{ "images/tools/stock-tool-measure-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-measure-22.png", *, *, * }
}
stock["gimp-tool-move"] =
{
{ "images/tools/stock-tool-button-move.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-move.png", *, *, * }
{ "images/tools/stock-tool-move-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-move-22.png", *, *, * }
}
stock["gimp-tool-paintbrush"] =
{
{ "images/tools/stock-tool-button-paintbrush.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-paintbrush.png", *, *, * }
{ "images/tools/stock-tool-paintbrush-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-paintbrush-22.png", *, *, * }
}
stock["gimp-tool-path"] =
{
{ "images/tools/stock-tool-button-path.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-path.png", *, *, * }
{ "images/tools/stock-tool-path-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-path-22.png", *, *, * }
}
stock["gimp-tool-pencil"] =
{
{ "images/tools/stock-tool-button-pencil.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-pencil.png", *, *, * }
{ "images/tools/stock-tool-pencil-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-pencil-22.png", *, *, * }
}
stock["gimp-tool-perspective"] =
{
{ "images/tools/stock-tool-button-perspective.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-perspective.png", *, *, * }
{ "images/tools/stock-tool-perspective-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-perspective-22.png", *, *, * }
}
stock["gimp-tool-posterize"] =
{
{ "images/tools/stock-tool-button-posterize.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-posterize.png", *, *, * }
{ "images/tools/stock-tool-posterize-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-posterize-22.png", *, *, * }
}
stock["gimp-tool-rect-select"] =
{
{ "images/tools/stock-tool-button-rect-select.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-rect-select.png", *, *, * }
{ "images/tools/stock-tool-rect-select-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-rect-select-22.png", *, *, * }
}
stock["gimp-tool-rotate"] =
{
{ "images/tools/stock-tool-button-rotate.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-rotate.png", *, *, * }
{ "images/tools/stock-tool-rotate-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-rotate-22.png", *, *, * }
}
stock["gimp-tool-scale"] =
{
{ "images/tools/stock-tool-button-scale.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-scale.png", *, *, * }
{ "images/tools/stock-tool-scale-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-scale-22.png", *, *, * }
}
stock["gimp-tool-shear"] =
{
{ "images/tools/stock-tool-button-shear.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-shear.png", *, *, * }
{ "images/tools/stock-tool-shear-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-shear-22.png", *, *, * }
}
stock["gimp-tool-smudge"] =
{
{ "images/tools/stock-tool-button-smudge.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-smudge.png", *, *, * }
{ "images/tools/stock-tool-smudge-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-smudge-22.png", *, *, * }
}
stock["gimp-tool-text"] =
{
{ "images/tools/stock-tool-button-text.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-text.png", *, *, * }
{ "images/tools/stock-tool-text-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-text-22.png", *, *, * }
}
stock["gimp-tool-threshold"] =
{
{ "images/tools/stock-tool-button-threshold.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-threshold.png", *, *, * }
{ "images/tools/stock-tool-threshold-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-threshold-22.png", *, *, * }
}
stock["gimp-tool-zoom"] =
{
{ "images/tools/stock-tool-button-zoom.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-button-zoom.png", *, *, * }
{ "images/tools/stock-tool-zoom-22.png", *, *, "gtk-button" },
{ "images/tools/stock-tool-zoom-22.png", *, *, * }
}
}

View File

@ -8,124 +8,128 @@ themedatadir = $(gimpdatadir)/themes/Default/images
## Icons that override GTK+ default stock icons
DIALOG_IMAGES = @STRIP_BEGIN@ \
gimp-dialog-error.png \
gimp-dialog-info.png \
gimp-dialog-question.png \
gimp-dialog-warning.png \
stock-error-64.png \
stock-info-64.png \
stock-question-64.png \
stock-warning-64.png \
@STRIP_END@
GTK_STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-delete.png \
stock-button-lower.png \
stock-button-new.png \
stock-button-paste.png \
stock-button-raise.png \
stock-button-refresh.png \
stock-delete-16.png \
stock-lower-16.png \
stock-new-16.png \
stock-paste-16.png \
stock-raise-16.png \
stock-refresh-16.png \
@STRIP_END@
## Wilber icons for the window managaer, compiled in
WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-16x16.png \
stock-wilber-32x32.png \
stock-wilber-48x48.png \
stock-wilber-64x64.png \
stock-wilber-16.png \
stock-wilber-32.png \
stock-wilber-48.png \
stock-wilber-64.png \
@STRIP_END@
WILBER_VARIABLES = @STRIP_BEGIN@ \
stock_wilber_16_16 $(srcdir)/stock-wilber-16x16.png \
stock_wilber_32_32 $(srcdir)/stock-wilber-32x32.png \
stock_wilber_48_48 $(srcdir)/stock-wilber-48x48.png \
stock_wilber_64_64 $(srcdir)/stock-wilber-64x64.png \
stock_wilber_16 $(srcdir)/stock-wilber-16.png \
stock_wilber_32 $(srcdir)/stock-wilber-32.png \
stock_wilber_48 $(srcdir)/stock-wilber-48.png \
stock_wilber_64 $(srcdir)/stock-wilber-64.png \
@STRIP_END@
## Below are compiled in stock icons
STOCK_BUTTON_IMAGES = @STRIP_BEGIN@ \
stock-button-anchor.png \
stock-button-duplicate.png \
stock-button-edit.png \
stock-button-eye.png \
stock-button-linked.png \
stock-button-paste-as-new.png \
stock-button-paste-into.png \
stock-button-reset.png \
stock-button-selection-replace.png \
stock-button-selection-add.png \
stock-button-selection-subtract.png \
stock-button-selection-intersect.png \
stock-button-selection-stroke.png \
stock-button-selection-to-path.png \
stock-button-path-stroke.png \
stock-button-hchain.png \
stock-button-hchain-broken.png \
stock-button-vchain.png \
stock-button-vchain-broken.png \
stock-anchor-16.png \
stock-duplicate-16.png \
stock-edit-16.png \
stock-eye-20.png \
stock-linked-20.png \
stock-paste-as-new-16.png \
stock-paste-into-16.png \
stock-reset-16.png \
stock-selection-replace-16.png \
stock-selection-add-16.png \
stock-selection-subtract-16.png \
stock-selection-intersect-16.png \
stock-selection-stroke-16.png \
stock-selection-to-path-16.png \
stock-path-stroke-16.png \
stock-hchain-24.png \
stock-hchain-broken-24.png \
stock-vchain-24.png \
stock-vchain-broken-24.png \
stock-info-24.png \
stock-warning-24.png \
@STRIP_END@
STOCK_MENU_IMAGES = @STRIP_BEGIN@ \
stock-menu-convert-grayscale.png \
stock-menu-convert-indexed.png \
stock-menu-convert-rgb.png \
stock-menu-merge-down.png \
stock-menu-reshow-filter.png \
stock-menu-rotate-180.png \
stock-menu-rotate-270.png \
stock-menu-rotate-90.png \
stock-menu-resize.png \
stock-menu-scale.png \
stock-menu-selection-to-channel.png \
\
stock-menu-navigation.png \
stock-menu-qmask-off.png \
stock-menu-qmask-on.png \
stock-convert-grayscale-16.png \
stock-convert-indexed-16.png \
stock-convert-rgb-16.png \
stock-merge-down-16.png \
stock-reshow-filter-16.png \
stock-rotate-180-16.png \
stock-rotate-270-16.png \
stock-rotate-90-16.png \
stock-resize-16.png \
stock-scale-16.png \
stock-selection-to-channel-16.png \
stock-navigation-16.png \
stock-qmask-off-16.png \
stock-qmask-on-16.png \
stock-info-16.png \
stock-warning-16.png \
stock-wilber-16.png \
@STRIP_END@
STOCK_WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-eek.png \
stock-wilber-eek-64.png \
@STRIP_END@
STOCK_TOOL_IMAGES = @STRIP_BEGIN@ \
tools/stock-tool-button-airbrush.png \
tools/stock-tool-button-bezier-select.png \
tools/stock-tool-button-blend.png \
tools/stock-tool-button-blur.png \
tools/stock-tool-button-brightness-contrast.png \
tools/stock-tool-button-bucket-fill.png \
tools/stock-tool-button-by-color-select.png \
tools/stock-tool-button-clone.png \
tools/stock-tool-button-color-balance.png \
tools/stock-tool-button-color-picker.png \
tools/stock-tool-button-crop.png \
tools/stock-tool-button-curves.png \
tools/stock-tool-button-dodge.png \
tools/stock-tool-button-ellipse-select.png \
tools/stock-tool-button-eraser.png \
tools/stock-tool-button-flip.png \
tools/stock-tool-button-free-select.png \
tools/stock-tool-button-fuzzy-select.png \
tools/stock-tool-button-histogram.png \
tools/stock-tool-button-hue-saturation.png \
tools/stock-tool-button-ink.png \
tools/stock-tool-button-iscissors.png \
tools/stock-tool-button-levels.png \
tools/stock-tool-button-measure.png \
tools/stock-tool-button-move.png \
tools/stock-tool-button-paintbrush.png \
tools/stock-tool-button-path.png \
tools/stock-tool-button-pencil.png \
tools/stock-tool-button-perspective.png \
tools/stock-tool-button-posterize.png \
tools/stock-tool-button-rect-select.png \
tools/stock-tool-button-rotate.png \
tools/stock-tool-button-scale.png \
tools/stock-tool-button-shear.png \
tools/stock-tool-button-smudge.png \
tools/stock-tool-button-text.png \
tools/stock-tool-button-threshold.png \
tools/stock-tool-button-zoom.png \
tools/stock-tool-airbrush-22.png \
tools/stock-tool-bezier-select-22.png \
tools/stock-tool-blend-22.png \
tools/stock-tool-blur-22.png \
tools/stock-tool-brightness-contrast-22.png \
tools/stock-tool-bucket-fill-22.png \
tools/stock-tool-by-color-select-22.png \
tools/stock-tool-clone-22.png \
tools/stock-tool-color-balance-22.png \
tools/stock-tool-color-picker-22.png \
tools/stock-tool-crop-22.png \
tools/stock-tool-curves-22.png \
tools/stock-tool-dodge-22.png \
tools/stock-tool-ellipse-select-22.png \
tools/stock-tool-eraser-22.png \
tools/stock-tool-flip-22.png \
tools/stock-tool-free-select-22.png \
tools/stock-tool-fuzzy-select-22.png \
tools/stock-tool-histogram-22.png \
tools/stock-tool-hue-saturation-22.png \
tools/stock-tool-ink-22.png \
tools/stock-tool-iscissors-22.png \
tools/stock-tool-levels-22.png \
tools/stock-tool-measure-22.png \
tools/stock-tool-move-22.png \
tools/stock-tool-paintbrush-22.png \
tools/stock-tool-path-22.png \
tools/stock-tool-pencil-22.png \
tools/stock-tool-perspective-22.png \
tools/stock-tool-posterize-22.png \
tools/stock-tool-rect-select-22.png \
tools/stock-tool-rotate-22.png \
tools/stock-tool-scale-22.png \
tools/stock-tool-shear-22.png \
tools/stock-tool-smudge-22.png \
tools/stock-tool-text-22.png \
tools/stock-tool-threshold-22.png \
tools/stock-tool-zoom-22.png \
@STRIP_END@
STOCK_IMAGES = \

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 417 B

View File

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

View File

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 225 B

View File

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 171 B

View File

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 299 B

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 354 B

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 574 B

After

Width:  |  Height:  |  Size: 574 B

View File

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

View File

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 502 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

View File

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 357 B

View File

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

View File

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

View File

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

View File

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

View File

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

View File

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

View File

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

View File

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View File

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

View File

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

View File

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 556 B

View File

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

View File

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 556 B

View File

Before

Width:  |  Height:  |  Size: 405 B

After

Width:  |  Height:  |  Size: 405 B

View File

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 418 B

View File

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

View File

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

View File

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

View File

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

View File

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 284 B

View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View File

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 228 B

View File

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 591 B

View File

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 820 B

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 791 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 804 B

View File

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 674 B

View File

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 752 B

View File

Before

Width:  |  Height:  |  Size: 627 B

After

Width:  |  Height:  |  Size: 627 B

View File

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

View File

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 561 B

View File

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 832 B

View File

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 607 B

View File

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 902 B

View File

Before

Width:  |  Height:  |  Size: 882 B

After

Width:  |  Height:  |  Size: 882 B

View File

Before

Width:  |  Height:  |  Size: 852 B

After

Width:  |  Height:  |  Size: 852 B

View File

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 737 B

View File

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 457 B

View File

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 571 B

View File

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1011 B

View File

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 790 B

View File

Before

Width:  |  Height:  |  Size: 506 B

After

Width:  |  Height:  |  Size: 506 B

View File

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 605 B

View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View File

Before

Width:  |  Height:  |  Size: 854 B

After

Width:  |  Height:  |  Size: 854 B

View File

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

View File

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 729 B

View File

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 607 B

View File

Before

Width:  |  Height:  |  Size: 938 B

After

Width:  |  Height:  |  Size: 938 B

View File

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 196 B

Some files were not shown because too many files have changed in this diff Show More