Commit 1657c4d6 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

themes/Default/images/Makefile.am

2003-03-14  Sven Neumann  <sven@gimp.org>

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-curve-free-16.png
	* themes/Default/images/stock-curve-smooth-16.png: added new icons
	provided by Tuomas Kuosmanen <tigert@gimp.org>.

	* libgimpwidgets/gimpstock.[ch]: register the new icons.

	* app/tools/gimpcurvestool.[ch]: use radio buttons with the new
	curve type icons.
parent c216987b
2003-03-14 Sven Neumann <sven@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-curve-free-16.png
* themes/Default/images/stock-curve-smooth-16.png: added new icons
provided by Tuomas Kuosmanen <tigert@gimp.org>.
* libgimpwidgets/gimpstock.[ch]: register the new icons.
* app/tools/gimpcurvestool.[ch]: use radio buttons with the new
curve type icons.
2003-03-14 Sven Neumann <sven@gimp.org>
* app/base/base-enums.[ch]
......@@ -11,14 +11,18 @@ dubbed GIMP 1.4.
Overview of Changes in GIMP 1.3.13
==================================
- Allow to create channels from an image's color component [Sven, Mitch]
- Added a full-screen mode for the image window [Sven, Mitch]
- Added a simple config file writer to GimpConfig [Sven]
- Moved gimp-perl into it's own CVS module [Yosh]
- Started to migrate core dialogs to GtkTreeView [Mitch]
- Started to migrate core dialogs from GtkList to GtkTreeView [Mitch]
- Refactored the GimpDisplayShell update/draw code [Mitch, Sven]
- Rewrote the Undo History as a GimpDockable [Mitch]
- Lots of bug fixes
Other contributors:
Sunil Mohan Adapa, Tor Lillqvist, Jay Cox, Dave Neary
Sunil Mohan Adapa, Tor Lillqvist, Jay Cox, Dave Neary, Michael J. Hammel,
Toralf Lund, Raphael Quinet, Hans Breuer, Tuomas Kuosmanen
Overview of Changes in GIMP 1.3.12
......
......@@ -131,7 +131,7 @@ static void curves_channel_reset_callback (GtkWidget *widget,
static gboolean curves_set_sensitive_callback (gpointer item_data,
GimpCurvesTool *c_tool);
static void curves_type_callback (GtkWidget *widget,
static void curves_curve_type_callback (GtkWidget *widget,
GimpCurvesTool *c_tool);
static void curves_load_callback (GtkWidget *widget,
GimpCurvesTool *c_tool);
......@@ -598,11 +598,9 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
/* The option menu for selecting channels */
hbox = gtk_hbox_new (FALSE, 4);
c_tool->channel_menu =
gimp_enum_option_menu_new (GIMP_TYPE_HISTOGRAM_CHANNEL,
G_CALLBACK (curves_channel_callback),
c_tool);
c_tool->channel_menu = gimp_enum_option_menu_new (GIMP_TYPE_HISTOGRAM_CHANNEL,
G_CALLBACK (curves_channel_callback),
c_tool);
gtk_box_pack_start (GTK_BOX (hbox), c_tool->channel_menu, FALSE, FALSE, 0);
gtk_widget_show (c_tool->channel_menu);
......@@ -618,16 +616,6 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
_("Modify Curves for Channel:"), 1.0, 0.5,
hbox, 1, FALSE);
/* The option menu for selecting the curve type */
c_tool->curve_type_menu =
gimp_enum_option_menu_new (GIMP_TYPE_CURVE_TYPE,
G_CALLBACK (curves_type_callback),
c_tool);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Curve Type:"), 1.0, 0.5,
c_tool->curve_type_menu, 1, TRUE);
/* The table for the yrange and the graph */
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
......@@ -684,9 +672,13 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (table);
/* Horizontal button box for load / save */
hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
/* Horizontal button box for load / save */
frame = gtk_frame_new (_("All Channels"));
gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
hbbox = gtk_hbutton_box_new ();
......@@ -715,6 +707,23 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
g_signal_connect (button, "clicked",
G_CALLBACK (curves_save_callback),
c_tool);
/* The radio box for selecting the curve type */
frame = gtk_frame_new (_("Curve Type"));
gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
hbox = gimp_enum_stock_box_new (GIMP_TYPE_CURVE_TYPE,
"gimp-curve",
G_CALLBACK (curves_curve_type_callback),
c_tool,
&c_tool->curve_type);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_box_set_spacing (GTK_BOX (hbox), 4);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
}
static void
......@@ -879,8 +888,8 @@ curves_channel_callback (GtkWidget *widget,
c_tool->channel = 1;
}
gimp_option_menu_set_history (GTK_OPTION_MENU (c_tool->curve_type_menu),
GINT_TO_POINTER (c_tool->curves->curve_type[c_tool->channel]));
gimp_radio_group_set_active (GTK_RADIO_BUTTON (c_tool->curve_type),
GINT_TO_POINTER (c_tool->curves->curve_type[c_tool->channel]));
curves_update (c_tool, XRANGE_TOP | YRANGE);
gtk_widget_queue_draw (c_tool->graph);
......@@ -922,12 +931,12 @@ curves_set_sensitive_callback (gpointer item_data,
}
static void
curves_type_callback (GtkWidget *widget,
GimpCurvesTool *c_tool)
curves_curve_type_callback (GtkWidget *widget,
GimpCurvesTool *c_tool)
{
GimpCurveType curve_type;
gimp_menu_item_update (widget, &curve_type);
gimp_radio_button_update (widget, &curve_type);
if (c_tool->curves->curve_type[c_tool->channel] != curve_type)
{
......@@ -1459,8 +1468,8 @@ curves_read_from_file (GimpCurvesTool *c_tool,
curves_update (c_tool, ALL);
gtk_widget_queue_draw (c_tool->graph);
gimp_option_menu_set_history (GTK_OPTION_MENU (c_tool->curve_type_menu),
GINT_TO_POINTER (GIMP_CURVE_SMOOTH));
gimp_radio_group_set_active (GTK_RADIO_BUTTON (c_tool->curve_type),
GINT_TO_POINTER (GIMP_CURVE_SMOOTH));
gimp_image_map_tool_preview (GIMP_IMAGE_MAP_TOOL (c_tool));
......
......@@ -54,7 +54,7 @@ struct _GimpCurvesTool
GtkWidget *xrange;
GtkWidget *yrange;
GtkWidget *graph;
GtkWidget *curve_type_menu;
GtkWidget *curve_type;
gint cursor_x;
gint cursor_y;
......
......@@ -317,6 +317,8 @@ GIMP_STOCK_IMAGES
GIMP_STOCK_LAYERS
GIMP_STOCK_CHANNELS
GIMP_STOCK_PATHS
GIMP_STOCK_CURVE_FREE
GIMP_STOCK_CURVE_SMOOTH
GIMP_STOCK_COLOR_PICKER_BLACK
GIMP_STOCK_COLOR_PICKER_GRAY
GIMP_STOCK_COLOR_PICKER_WHITE
......
......@@ -374,6 +374,20 @@ size).
<!-- ##### MACRO GIMP_STOCK_CURVE_FREE ##### -->
<para>
<inlinegraphic fileref="stock-curve-free-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_CURVE_SMOOTH ##### -->
<para>
<inlinegraphic fileref="stock-curve-smooth-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_COLOR_PICKER_BLACK ##### -->
<para>
<inlinegraphic fileref="stock-color-picker-black-18.png" format="png"></inlinegraphic>
......
......@@ -121,6 +121,9 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_PATH_STROKE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CURVE_FREE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CURVE_SMOOTH, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_COLOR_PICKER_BLACK, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_COLOR_PICKER_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_COLOR_PICKER_WHITE, NULL, 0, 0, LIBGIMP_DOMAIN },
......@@ -246,6 +249,9 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_PATH_STROKE, stock_path_stroke_16 },
{ GIMP_STOCK_CURVE_FREE, stock_curve_free_16 },
{ GIMP_STOCK_CURVE_SMOOTH, stock_curve_smooth_16 },
{ GIMP_STOCK_COLOR_PICKER_BLACK, stock_color_picker_black_18 },
{ GIMP_STOCK_COLOR_PICKER_GRAY, stock_color_picker_gray_18 },
{ GIMP_STOCK_COLOR_PICKER_WHITE, stock_color_picker_white_18 },
......
......@@ -63,6 +63,9 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
#define GIMP_STOCK_CURVE_FREE "gimp-curve-free"
#define GIMP_STOCK_CURVE_SMOOTH "gimp-curve-smooth"
#define GIMP_STOCK_COLOR_PICKER_BLACK "gimp-color-picker-black"
#define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray"
#define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white"
......
......@@ -29,6 +29,8 @@ STOCK_BUTTON_IMAGES = \
stock-color-picker-gray-18.png \
stock-color-picker-white-18.png \
stock-color-triangle-16.png \
stock-curve-free-16.png \
stock-curve-smooth-16.png \
stock-duplicate-16.png \
stock-edit-16.png \
stock-eye-20.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