Commit b8fc8e60 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

themes/Default/images/Makefile.am

2005-07-29  Sven Neumann  <sven@gimp.org>

	* themes/Default/images/Makefile.am
	* themes/Default/images/tools/stock-tool-foreground-select-16.png
	* themes/Default/images/tools/stock-tool-foreground-select-22.png:
	added placeholder for yet-to-be-drawn tool icon.

	* libgimpwidgets/gimpstock.[ch]: register it.

	* app/tools/gimpforegroundselecttool.c: use it.

	* app/widgets/gimpclipboard.[ch] (gimp_clipboard_get_svg): return
	a signed char pointer.

	* app/actions/edit-commands.c
	* app/tools/gimpinkoptions-gui.c: fixed signedness issues.
parent f84a1e43
2005-07-29 Sven Neumann <sven@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/tools/stock-tool-foreground-select-16.png
* themes/Default/images/tools/stock-tool-foreground-select-22.png:
added placeholder for yet-to-be-drawn tool icon.
* libgimpwidgets/gimpstock.[ch]: register it.
* app/tools/gimpforegroundselecttool.c: use it.
* app/widgets/gimpclipboard.[ch] (gimp_clipboard_get_svg): return
a signed char pointer.
* app/actions/edit-commands.c
* app/tools/gimpinkoptions-gui.c: fixed signedness issues.
2005-07-29 Sven Neumann <sven@gimp.org> 2005-07-29 Sven Neumann <sven@gimp.org>
* app/base/siox.[ch] * app/base/siox.[ch]
......
...@@ -99,8 +99,8 @@ edit_undo_clear_cmd_callback (GtkAction *action, ...@@ -99,8 +99,8 @@ edit_undo_clear_cmd_callback (GtkAction *action,
GtkWidget *widget; GtkWidget *widget;
GtkWidget *dialog; GtkWidget *dialog;
gchar *size; gchar *size;
guint64 memsize; gint64 memsize;
guint64 guisize; gint64 guisize;
return_if_no_image (gimage, data); return_if_no_image (gimage, data);
return_if_no_widget (widget, data); return_if_no_widget (widget, data);
...@@ -319,7 +319,7 @@ static void ...@@ -319,7 +319,7 @@ static void
edit_paste (GimpDisplay *gdisp, edit_paste (GimpDisplay *gdisp,
gboolean paste_into) gboolean paste_into)
{ {
guchar *svg; gchar *svg;
gsize svg_size; gsize svg_size;
svg = gimp_clipboard_get_svg (gdisp->gimage->gimp, &svg_size); svg = gimp_clipboard_get_svg (gdisp->gimage->gimp, &svg_size);
......
...@@ -85,10 +85,10 @@ gimp_foreground_select_tool_register (GimpToolRegisterCallback callback, ...@@ -85,10 +85,10 @@ gimp_foreground_select_tool_register (GimpToolRegisterCallback callback,
0, 0,
"gimp-foreground-select-tool", "gimp-foreground-select-tool",
_("Foreground Select"), _("Foreground Select"),
_("Extract foreground"), _("Extract foreground using SIOX algorithm"),
N_("_Foreground Select"), NULL, N_("_Foreground Select"), NULL,
NULL, GIMP_HELP_TOOL_FOREGROUND_SELECT, NULL, GIMP_HELP_TOOL_FOREGROUND_SELECT,
GIMP_STOCK_TOOL_FUZZY_SELECT, GIMP_STOCK_TOOL_FOREGROUND_SELECT,
data); data);
} }
......
...@@ -175,7 +175,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options) ...@@ -175,7 +175,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
static GtkWidget * static GtkWidget *
blob_image_new (GimpInkBlobType blob_type) blob_image_new (GimpInkBlobType blob_type)
{ {
const guchar *stock_id = NULL; const gchar *stock_id = NULL;
switch (blob_type) switch (blob_type)
{ {
......
...@@ -281,7 +281,7 @@ gimp_clipboard_get_buffer (Gimp *gimp) ...@@ -281,7 +281,7 @@ gimp_clipboard_get_buffer (Gimp *gimp)
* Return value: a reference to a #GimpBuffer or %NULL if there's no * Return value: a reference to a #GimpBuffer or %NULL if there's no
* image data * image data
**/ **/
guchar * gchar *
gimp_clipboard_get_svg (Gimp *gimp, gimp_clipboard_get_svg (Gimp *gimp,
gsize *svg_length) gsize *svg_length)
{ {
...@@ -304,12 +304,13 @@ gimp_clipboard_get_svg (Gimp *gimp, ...@@ -304,12 +304,13 @@ gimp_clipboard_get_svg (Gimp *gimp,
if (data) if (data)
{ {
guchar *svg; const guchar *stream;
gchar *svg = NULL;
svg = (guchar *) gimp_selection_data_get_stream (data, svg_length); stream = gimp_selection_data_get_stream (data, svg_length);
if (svg) if (stream)
svg = g_memdup (svg, *svg_length); svg = g_memdup (stream, *svg_length);
gtk_selection_data_free (data); gtk_selection_data_free (data);
......
...@@ -27,7 +27,7 @@ gboolean gimp_clipboard_has_buffer (Gimp *gimp); ...@@ -27,7 +27,7 @@ gboolean gimp_clipboard_has_buffer (Gimp *gimp);
GimpBuffer * gimp_clipboard_get_buffer (Gimp *gimp); GimpBuffer * gimp_clipboard_get_buffer (Gimp *gimp);
gboolean gimp_clipboard_has_svg (Gimp *gimp); gboolean gimp_clipboard_has_svg (Gimp *gimp);
guchar * gimp_clipboard_get_svg (Gimp *gimp, gchar * gimp_clipboard_get_svg (Gimp *gimp,
gsize *svg_length); gsize *svg_length);
......
...@@ -280,6 +280,7 @@ static GtkStockItem gimp_stock_items[] = ...@@ -280,6 +280,7 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_TOOL_ERASER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_ERASER, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_FLIP, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_FLIP, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_FREE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_FREE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_FOREGROUND_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_INK, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_TOOL_INK, NULL, 0, 0, LIBGIMP_DOMAIN },
...@@ -413,6 +414,7 @@ gimp_stock_button_pixbufs[] = ...@@ -413,6 +414,7 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_TOOL_ERASER, stock_tool_eraser_22 }, { GIMP_STOCK_TOOL_ERASER, stock_tool_eraser_22 },
{ GIMP_STOCK_TOOL_FLIP, stock_tool_flip_22 }, { GIMP_STOCK_TOOL_FLIP, stock_tool_flip_22 },
{ GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_free_select_22 }, { GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_free_select_22 },
{ GIMP_STOCK_TOOL_FOREGROUND_SELECT, stock_tool_foreground_select_22 },
{ GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_fuzzy_select_22 }, { GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_fuzzy_select_22 },
{ GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_hue_saturation_22 }, { GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_hue_saturation_22 },
{ GIMP_STOCK_TOOL_INK, stock_tool_ink_22 }, { GIMP_STOCK_TOOL_INK, stock_tool_ink_22 },
...@@ -554,6 +556,7 @@ gimp_stock_menu_pixbufs[] = ...@@ -554,6 +556,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_TOOL_ERASER, stock_tool_eraser_16 }, { GIMP_STOCK_TOOL_ERASER, stock_tool_eraser_16 },
{ GIMP_STOCK_TOOL_FLIP, stock_tool_flip_16 }, { GIMP_STOCK_TOOL_FLIP, stock_tool_flip_16 },
{ GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_free_select_16 }, { GIMP_STOCK_TOOL_FREE_SELECT, stock_tool_free_select_16 },
{ GIMP_STOCK_TOOL_FOREGROUND_SELECT, stock_tool_foreground_select_16 },
{ GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_fuzzy_select_16 }, { GIMP_STOCK_TOOL_FUZZY_SELECT, stock_tool_fuzzy_select_16 },
{ GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_hue_saturation_16 }, { GIMP_STOCK_TOOL_HUE_SATURATION, stock_tool_hue_saturation_16 },
{ GIMP_STOCK_TOOL_INK, stock_tool_ink_16 }, { GIMP_STOCK_TOOL_INK, stock_tool_ink_16 },
......
...@@ -115,6 +115,7 @@ G_BEGIN_DECLS ...@@ -115,6 +115,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_TOOL_ERASER "gimp-tool-eraser" #define GIMP_STOCK_TOOL_ERASER "gimp-tool-eraser"
#define GIMP_STOCK_TOOL_FLIP "gimp-tool-flip" #define GIMP_STOCK_TOOL_FLIP "gimp-tool-flip"
#define GIMP_STOCK_TOOL_FREE_SELECT "gimp-tool-free-select" #define GIMP_STOCK_TOOL_FREE_SELECT "gimp-tool-free-select"
#define GIMP_STOCK_TOOL_FOREGROUND_SELECT "gimp-tool-foreground-select"
#define GIMP_STOCK_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select" #define GIMP_STOCK_TOOL_FUZZY_SELECT "gimp-tool-fuzzy-select"
#define GIMP_STOCK_TOOL_HUE_SATURATION "gimp-tool-hue-saturation" #define GIMP_STOCK_TOOL_HUE_SATURATION "gimp-tool-hue-saturation"
#define GIMP_STOCK_TOOL_INK "gimp-tool-ink" #define GIMP_STOCK_TOOL_INK "gimp-tool-ink"
......
...@@ -279,6 +279,8 @@ STOCK_TOOL_IMAGES = \ ...@@ -279,6 +279,8 @@ STOCK_TOOL_IMAGES = \
tools/stock-tool-flip-22.png \ tools/stock-tool-flip-22.png \
tools/stock-tool-free-select-16.png \ tools/stock-tool-free-select-16.png \
tools/stock-tool-free-select-22.png \ tools/stock-tool-free-select-22.png \
tools/stock-tool-foreground-select-16.png \
tools/stock-tool-foreground-select-22.png \
tools/stock-tool-fuzzy-select-16.png \ tools/stock-tool-fuzzy-select-16.png \
tools/stock-tool-fuzzy-select-22.png \ tools/stock-tool-fuzzy-select-22.png \
tools/stock-tool-hue-saturation-16.png \ tools/stock-tool-hue-saturation-16.png \
......
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