Skip to content

GitLab

GIMP
GIMP
Commit a53e4f25 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files
Options

themes/Default/images/preferences/folders-modules.png 

2002-03-06  Michael Natterer  <mitch@gimp.org>

	* themes/Default/images/preferences/folders-modules.png
	* themes/Default/images/preferences/folders-themes.png
	* themes/Default/images/preferences/folders-tool-plug-ins.png:
	Some more folder icons for the prefs. dialog.

	* themes/Default/images/preferences/Makefile.am
	* themes/Default/images/preferences/folders.xcf.gz: changed accordingly.

	* app/gui/preferences-dialog.c: use them.

	* themes/Default/Makefile.am
	* themes/Default/imagerc
	* libgimpwidgets/gimpstock.[ch]: removed GIMP_STOCK_PASTE.

	* themes/Default/gtkrc: override GTK_STOCK_PASTE with our icon
	instead.

	* app/gui/menus.c
	* app/widgets/gimpbufferview.c: s/GIMP_STOCK_PASTE/GTK_STOCK_PASTE/

	* themes/Default/images/Makefile.am: install all icons of the
	default theme so the installed directory can be used as template.
parent b50d8cd0
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 38 deletions
ChangeLog
View file @ a53e4f25
2002-03-06 Michael Natterer <mitch@gimp.org>
* themes/Default/images/preferences/folders-modules.png
* themes/Default/images/preferences/folders-themes.png
* themes/Default/images/preferences/folders-tool-plug-ins.png:
Some more folder icons for the prefs. dialog.
* themes/Default/images/preferences/Makefile.am
* themes/Default/images/preferences/folders.xcf.gz: changed accordingly.
* app/gui/preferences-dialog.c: use them.
* themes/Default/Makefile.am
* themes/Default/imagerc
* libgimpwidgets/gimpstock.[ch]: removed GIMP_STOCK_PASTE.
* themes/Default/gtkrc: override GTK_STOCK_PASTE with our icon
instead.
* app/gui/menus.c
* app/widgets/gimpbufferview.c: s/GIMP_STOCK_PASTE/GTK_STOCK_PASTE/
* themes/Default/images/Makefile.am: install all icons of the
default theme so the installed directory can be used as template.
2002-03-05 Michael Natterer <mitch@gimp.org>
* configure.in: mention gimp-remote in the error message if
......
app/dialogs/preferences-dialog.c
View file @ a53e4f25
......@@ -2867,15 +2867,15 @@ preferences_dialog_create (Gimp *gimp)
"dialogs/preferences/folders.html#plug_ins",
N_("Select Plug-In Folders"),
&edit_plug_in_path },
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders.png",
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders-tool-plug-ins.png",
"dialogs/preferences/folders.html#tool_plug_ins",
N_("Select Tool Plug-In Folders"),
&edit_tool_plug_in_path },
{ N_("Modules"), N_("Module Folders"), "folders.png",
{ N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules",
N_("Select Module Folders"),
&edit_module_path },
{ N_("Themes"), N_("Theme Folders"), "folders.png",
{ N_("Themes"), N_("Theme Folders"), "folders-themes.png",
"dialogs/preferences/folders.html#themes",
N_("Select Theme Folders"),
&edit_theme_path }
......
app/gui/menus.c
View file @ a53e4f25
......@@ -1796,7 +1796,7 @@ static GimpItemFactoryEntry buffers_entries[] =
{
{ { N_("/Paste Buffer"), NULL,
buffers_paste_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PASTE },
"<StockItem>", GTK_STOCK_PASTE },
NULL,
NULL, NULL },
{ { N_("/Paste Buffer Into"), NULL,
......
app/gui/preferences-dialog.c
View file @ a53e4f25
......@@ -2867,15 +2867,15 @@ preferences_dialog_create (Gimp *gimp)
"dialogs/preferences/folders.html#plug_ins",
N_("Select Plug-In Folders"),
&edit_plug_in_path },
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders.png",
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders-tool-plug-ins.png",
"dialogs/preferences/folders.html#tool_plug_ins",
N_("Select Tool Plug-In Folders"),
&edit_tool_plug_in_path },
{ N_("Modules"), N_("Module Folders"), "folders.png",
{ N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules",
N_("Select Module Folders"),
&edit_module_path },
{ N_("Themes"), N_("Theme Folders"), "folders.png",
{ N_("Themes"), N_("Theme Folders"), "folders-themes.png",
"dialogs/preferences/folders.html#themes",
N_("Select Theme Folders"),
&edit_theme_path }
......
app/menus/menus.c
View file @ a53e4f25
......@@ -1796,7 +1796,7 @@ static GimpItemFactoryEntry buffers_entries[] =
{
{ { N_("/Paste Buffer"), NULL,
buffers_paste_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PASTE },
"<StockItem>", GTK_STOCK_PASTE },
NULL,
NULL, NULL },
{ { N_("/Paste Buffer Into"), NULL,
......
app/widgets/gimpbufferview.c
View file @ a53e4f25
......@@ -145,7 +145,7 @@ gimp_buffer_view_new (GimpViewType view_type,
buffer_view->paste_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_PASTE,
GTK_STOCK_PASTE,
_("Paste"), NULL,
G_CALLBACK (gimp_buffer_view_paste_clicked),
NULL,
......
libgimpwidgets/gimpstock.c
View file @ a53e4f25
......@@ -89,7 +89,6 @@ static GtkStockItem gimp_stock_items[] =
{ 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_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_RESET, N_("_Reset"), 0, 0, "gimp-libgimp" },
......@@ -164,7 +163,6 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_DUPLICATE, stock_button_duplicate },
{ GIMP_STOCK_EDIT, stock_button_edit },
{ GIMP_STOCK_LINKED, stock_button_linked },
{ 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_RESET, stock_button_refresh },
......
libgimpwidgets/gimpstock.h
View file @ a53e4f25
......@@ -32,7 +32,6 @@ G_BEGIN_DECLS
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#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_RESET "gimp-reset"
......
themes/Default/Makefile.am
View file @ a53e4f25
......@@ -19,8 +19,6 @@ STOCK_VARIABLES = @STRIP_BEGIN@ \
$(srcdir)/images/stock-button-eye.png \
stock_button_linked \
$(srcdir)/images/stock-button-linked.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 \
......
themes/Default/gtkrc
View file @ a53e4f25
......@@ -39,6 +39,11 @@ style "gimp-gtk-icons"
{ "images/stock-button-new.png", *, *, "gtk-button" },
{ "images/stock-button-new.png", *, *, * }
}
stock["gtk-paste"] =
{
{ "images/stock-button-paste.png", *, *, "gtk-button" },
{ "images/stock-button-paste.png", *, *, * }
}
stock["gtk-refresh"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },
......
themes/Default/imagerc
View file @ a53e4f25
......@@ -47,11 +47,6 @@ style "gimp-icons"
{ "images/stock-button-linked.png", *, *, "gtk-button" },
{ "images/stock-button-linked.png", *, *, * }
}
stock["gimp-paste"] =
{
{ "images/stock-button-paste.png", *, *, "gtk-button" },
{ "images/stock-button-paste.png", *, *, * }
}
stock["gimp-paste-as-new"] =
{
{ "images/stock-button-paste-as-new.png", *, *, "gtk-button" },
......
themes/Default/images/Makefile.am
View file @ a53e4f25
......@@ -15,6 +15,7 @@ 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 \
@STRIP_END@
......@@ -25,7 +26,6 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-edit.png \
stock-button-eye.png \
stock-button-linked.png \
stock-button-paste.png \
stock-button-paste-as-new.png \
stock-button-paste-into.png \
stock-button-selection-replace.png \
......@@ -52,10 +52,9 @@ WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-64x64.png \
@STRIP_END@
themedata_DATA = $(DIALOG_IMAGES) $(GTK_STOCK_IMAGES)
themedata_DATA = $(DIALOG_IMAGES) $(GTK_STOCK_IMAGES) $(STOCK_IMAGES)
EXTRA_DIST = \
$(themedata_DATA) \
$(STOCK_IMAGES) \
$(WILBER_IMAGES) \
gimp-dialog-icons.xcf.gz
themes/Default/images/preferences/Makefile.am
View file @ a53e4f25
......@@ -3,22 +3,25 @@
themedatadir = $(gimpdatadir)/themes/Default/images/preferences
PREFS_IMAGES = @STRIP_BEGIN@ \
default-comment.png \
display.png \
environment.png \
folders.png \
folders-brushes.png \
folders-gradients.png \
folders-palettes.png \
folders-patterns.png \
folders-plug-ins.png \
help-system.png \
image-windows.png \
input-devices.png \
interface.png \
monitor.png \
new-image.png \
tool-options.png \
default-comment.png \
display.png \
environment.png \
folders.png \
folders-brushes.png \
folders-gradients.png \
folders-modules.png \
folders-palettes.png \
folders-patterns.png \
folders-plug-ins.png \
folders-themes.png \
folders-tool-plug-ins.png \
help-system.png \
image-windows.png \
input-devices.png \
interface.png \
monitor.png \
new-image.png \
tool-options.png \
@STRIP_END@
themedata_DATA = $(PREFS_IMAGES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment