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

<shift>+click toggles the active layer's "linked" property now. 

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

	* app/tools/gimpmovetool.c: <shift>+click toggles the active
	layer's "linked" property now.

	* themes/Default/images/stock-tool-options-16.png: new icon.

	* themes/Default/images/Makefile.am
	* themes/Default/imagerc
	* libgimpwidgets/gimpstock.[ch]: added it to the stock system.

	* app/gui/menus.c: use it for the tool_options dialog's menu
	entries.
This commit is contained in:
Michael Natterer 2002-05-15 19:15:23 +00:00 committed by Michael Natterer
parent 4904ca124e
commit 8d37831a94
9 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2002-05-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimpmovetool.c: <shift>+click toggles the active
layer's "linked" property now.
* themes/Default/images/stock-tool-options-16.png: new icon.
* themes/Default/images/Makefile.am
* themes/Default/imagerc
* libgimpwidgets/gimpstock.[ch]: added it to the stock system.
* app/gui/menus.c: use it for the tool_options dialog's menu
entries.
2002-05-15 Simon Budig <simon@gimp.org>
* plug-ins/pagecurl/pagecurl.c: tiny fix, there was an

9
app/gui/menus.c
View File

@ -156,7 +156,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
NULL, NULL },
{ { N_("/File/Dialogs/Tool Options..."), "<control><shift>T",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
@ -868,7 +869,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
NULL, NULL },
{ { N_("/Dialogs/Tool Options..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
@ -1372,7 +1374,8 @@ static GimpItemFactoryEntry dialogs_entries[] =
ADD_TAB (N_("/Add Tab/Layers..."), "gimp-layer-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Channels..."), "gimp-channel-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Paths..."), "gimp-vectors-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options", NULL, NULL),
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options",
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS),
SEPARATOR ("/Add Tab/---"),

9
app/menus/menus.c
View File

@ -156,7 +156,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
NULL, NULL },
{ { N_("/File/Dialogs/Tool Options..."), "<control><shift>T",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
@ -868,7 +869,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
NULL, NULL },
{ { N_("/Dialogs/Tool Options..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
@ -1372,7 +1374,8 @@ static GimpItemFactoryEntry dialogs_entries[] =
ADD_TAB (N_("/Add Tab/Layers..."), "gimp-layer-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Channels..."), "gimp-channel-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Paths..."), "gimp-vectors-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options", NULL, NULL),
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options",
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS),
SEPARATOR ("/Add Tab/---"),

4
app/tools/gimpmovetool.c
View File

@ -292,6 +292,10 @@ gimp_move_tool_button_press (GimpTool *tool,
else
{
gimp_image_set_active_layer (gdisp->gimage, layer);
if (state & GDK_SHIFT_MASK)
gimp_layer_set_linked (layer, ! gimp_layer_get_linked (layer));
init_edit_selection (tool, gdisp, coords, EDIT_LAYER_TRANSLATE);
}

2
libgimpwidgets/gimpstock.c
View File

@ -124,6 +124,7 @@ 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_TOOL_OPTIONS, 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" },
@ -265,6 +266,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
{ GIMP_STOCK_QMASK_ON, stock_qmask_on_16 },
{ GIMP_STOCK_TOOL_OPTIONS, stock_tool_options_16 },
{ GIMP_STOCK_INFO, stock_info_16 },
{ GIMP_STOCK_WARNING, stock_warning_16 },
{ GIMP_STOCK_WILBER, stock_wilber_16 }

1
libgimpwidgets/gimpstock.h
View File

@ -72,6 +72,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_INFO "gimp-info"
#define GIMP_STOCK_WARNING "gimp-warning"
#define GIMP_STOCK_WILBER "gimp-wilber"

61
themes/Default/imagerc
View File

@ -122,76 +122,81 @@ style "gimp-icons"
#
stock["gimp-convert-rgb"] =
{
{ "images/stock-menu-convert-rgb.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-rgb.png", *, *, * }
{ "images/stock-convert-rgb-16.png", *, *, "gtk-menu" },
{ "images/stock-convert-rgb-16.png", *, *, * }
}
stock["gimp-convert-grayscale"] =
{
{ "images/stock-menu-convert-grayscale.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-grayscale.png", *, *, * }
{ "images/stock-convert-grayscale-16.png", *, *, "gtk-menu" },
{ "images/stock-convert-grayscale-16.png", *, *, * }
}
stock["gimp-convert-indexed"] =
{
{ "images/stock-menu-convert-indexed.png", *, *, "gtk-menu" },
{ "images/stock-menu-convert-indexed.png", *, *, * }
{ "images/stock-convert-indexed-16.png", *, *, "gtk-menu" },
{ "images/stock-convert-indexed-16.png", *, *, * }
}
stock["gimp-merge-down"] =
{
{ "images/stock-menu-merge-down.png", *, *, "gtk-menu" },
{ "images/stock-menu-merge-down.png", *, *, * }
{ "images/stock-merge-down-16.png", *, *, "gtk-menu" },
{ "images/stock-merge-down-16.png", *, *, * }
}
stock["gimp-reshow-filter"] =
{
{ "images/stock-menu-reshow-filter.png", *, *, "gtk-menu" },
{ "images/stock-menu-reshow-filter.png", *, *, * }
{ "images/stock-reshow-filter-16.png", *, *, "gtk-menu" },
{ "images/stock-reshow-filter-16.png", *, *, * }
}
stock["gimp-rotate-90"] =
{
{ "images/stock-menu-rotate-90.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-90.png", *, *, * }
{ "images/stock-rotate-90-16.png", *, *, "gtk-menu" },
{ "images/stock-rotate-90-16.png", *, *, * }
}
stock["gimp-rotate-180"] =
{
{ "images/stock-menu-rotate-180.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-180.png", *, *, * }
{ "images/stock-rotate-180-16.png", *, *, "gtk-menu" },
{ "images/stock-rotate-180-16.png", *, *, * }
}
stock["gimp-rotate-270"] =
{
{ "images/stock-menu-rotate-270.png", *, *, "gtk-menu" },
{ "images/stock-menu-rotate-270.png", *, *, * }
{ "images/stock-rotate-270-16.png", *, *, "gtk-menu" },
{ "images/stock-rotate-270-16.png", *, *, * }
}
stock["gimp-resize"] =
{
{ "images/stock-menu-resize.png", *, *, "gtk-menu" },
{ "images/stock-menu-resize.png", *, *, * }
{ "images/stock-resize-16.png", *, *, "gtk-menu" },
{ "images/stock-resize-16.png", *, *, * }
}
stock["gimp-scale"] =
{
{ "images/stock-menu-scale.png", *, *, "gtk-menu" },
{ "images/stock-menu-scale.png", *, *, * }
{ "images/stock-scale-16.png", *, *, "gtk-menu" },
{ "images/stock-scale-16.png", *, *, * }
}
stock["gimp-selection-to-channel"] =
{
{ "images/stock-menu-selection-to-channel.png", *, *, "gtk-menu" },
{ "images/stock-menu-selection-to-channel.png", *, *, * }
{ "images/stock-selection-to-channel-16.png", *, *, "gtk-menu" },
{ "images/stock-selection-to-channel-16.png", *, *, * }
}
stock["gimp-tool-options"] =
{
{ "images/stock-tool-options-16.png", *, *, "gtk-menu" },
{ "images/stock-tool-options-16.png", *, *, * }
}
# Image window icons
#
stock["gimp-navigation"] =
{
{ "images/stock-menu-navigation.png", *, *, "gtk-menu" },
{ "images/stock-menu-navigation.png", *, *, * }
{ "images/stock-navigation-16.png", *, *, "gtk-menu" },
{ "images/stock-navigation-16.png", *, *, * }
}
stock["gimp-qmask-off"] =
{
{ "images/stock-menu-qmask-off.png", *, *, "gtk-menu" },
{ "images/stock-menu-qmask-off.png", *, *, * }
{ "images/stock-qmask-off-16.png", *, *, "gtk-menu" },
{ "images/stock-qmask-off-16.png", *, *, * }
}
stock["gimp-qmask-on"] =
{
{ "images/stock-menu-qmask-on.png", *, *, "gtk-menu" },
{ "images/stock-menu-qmask-on.png", *, *, * }
{ "images/stock-qmask-on-16.png", *, *, "gtk-menu" },
{ "images/stock-qmask-on-16.png", *, *, * }
}
# X & Y linked or not

1
themes/Default/images/Makefile.am
View File

@ -82,6 +82,7 @@ STOCK_MENU_IMAGES = @STRIP_BEGIN@ \
stock-navigation-16.png \
stock-qmask-off-16.png \
stock-qmask-on-16.png \
stock-tool-options-16.png \
stock-info-16.png \
stock-warning-16.png \
stock-wilber-16.png \

BIN
themes/Default/images/stock-tool-options-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 466 B