Commit e5eb3782 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

changes to color combo. ditto. ditto. (cb_back_color_changed) : ditto.

2002-03-11  Jody Goldberg <jody@gnome.org>

	* src/gui-util.c (color_combo_get_style_color) : changes to color combo.
	* src/sheet-object-graphic.c (cb_fill_color_changed) : ditto.
	* src/workbook-format-toolbar.c (cb_fore_color_changed) : ditto.
	(cb_back_color_changed) : ditto.
	(workbook_create_format_toolbar) : ditto.

2002-03-10  Jody Goldberg <jody@gnome.org>

	* configure.in : bump gal req to pull in the colour combo changes.
parent 4043dfb0
2002-03-11 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (color_combo_get_style_color) : changes to color combo.
* src/sheet-object-graphic.c (cb_fill_color_changed) : ditto.
* src/workbook-format-toolbar.c (cb_fore_color_changed) : ditto.
(cb_back_color_changed) : ditto.
(workbook_create_format_toolbar) : ditto.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : bump gal req to pull in the colour combo changes.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump
......
2002-03-11 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (color_combo_get_style_color) : changes to color combo.
* src/sheet-object-graphic.c (cb_fill_color_changed) : ditto.
* src/workbook-format-toolbar.c (cb_fore_color_changed) : ditto.
(cb_back_color_changed) : ditto.
(workbook_create_format_toolbar) : ditto.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : bump gal req to pull in the colour combo changes.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump
......
2002-03-11 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (color_combo_get_style_color) : changes to color combo.
* src/sheet-object-graphic.c (cb_fill_color_changed) : ditto.
* src/workbook-format-toolbar.c (cb_fore_color_changed) : ditto.
(cb_back_color_changed) : ditto.
(workbook_create_format_toolbar) : ditto.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : bump gal req to pull in the colour combo changes.
2002-03-10 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump
......
......@@ -30,7 +30,7 @@ libxml-2.0 >= 2.4.12
gtk+-2.0 >= 1.3.14
libglade-2.0 >= 1.99.7
libgnomecanvas-2.0 >= 1.110.0
gal-2.0 >= 0.0.1
gal-2.0 >= 0.0.2
libgnome-2.0 >= 1.105.0
libgnomeui-2.0 >= 1.106.0
libgnomeprint-2.0 >= 1.106.0
......
2002-03-11 Jody Goldberg <jody@gnome.org>
* dialog-cell-format.c : changes to color combo.
2002-03-10 Jody Goldberg <jody@gnome.org>
* Release 1.1.1
......
......@@ -327,9 +327,6 @@ setup_color_pickers (ColorPicker *picker,
gtk_combo_box_set_title (GTK_COMBO_BOX (combo), caption);
/* Connect to the sample canvas and redraw it */
g_signal_connect (G_OBJECT (combo),
"changed",
preview_update, state);
picker->combo = combo;
picker->preview_update = preview_update;
......@@ -1256,7 +1253,9 @@ cb_font_changed (GtkWidget *widget, MStyle *mstyle, FormatState *state)
* It is called whenever the color combo changes value.
*/
static void
cb_font_preview_color (ColorCombo *combo, GdkColor *c, gboolean by_user, FormatState *state)
cb_font_preview_color (ColorCombo *combo, GdkColor *c,
gboolean is_custom, gboolean by_user, gboolean is_default,
FormatState *state)
{
if (!state->enable_edit)
return;
......@@ -1408,7 +1407,9 @@ draw_pattern_preview (FormatState *state)
}
static void
cb_back_preview_color (ColorCombo *combo, GdkColor *c, gboolean by_user, FormatState *state)
cb_back_preview_color (ColorCombo *combo, GdkColor *c,
gboolean is_custom, gboolean by_user, gboolean is_default,
FormatState *state)
{
state->back.back_color_is_default = (c == NULL);
......@@ -1440,7 +1441,9 @@ cb_back_preview_color (ColorCombo *combo, GdkColor *c, gboolean by_user, FormatS
}
static void
cb_pattern_preview_color (ColorCombo *combo, GdkColor *c, gboolean by_user, FormatState *state)
cb_pattern_preview_color (ColorCombo *combo, GdkColor *c,
gboolean is_custom, gboolean by_user, gboolean is_default,
FormatState *state)
{
mstyle_set_color (state->back.style, MSTYLE_COLOR_PATTERN,
style_color_new (c->red, c->green, c->blue));
......@@ -1884,7 +1887,9 @@ cb_border_toggle (GtkToggleButton *button, BorderPicker *picker)
}
static void
cb_border_color (ColorCombo *combo, GdkColor *c, gboolean by_user, FormatState *state)
cb_border_color (ColorCombo *combo, GdkColor *c,
gboolean is_custom, gboolean by_user, gboolean is_default,
FormatState *state)
{
state->border.rgba = GNOME_CANVAS_COLOR (c->red>>8, c->green>>8, c->blue>>8);
}
......
......@@ -997,7 +997,7 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
StyleColor *
color_combo_get_style_color (GtkWidget *color_combo)
{
GdkColor *gdk = color_combo_get_color (COLOR_COMBO (color_combo));
GdkColor *gdk = color_combo_get_color (COLOR_COMBO (color_combo), NULL);
return (gdk == NULL) ? NULL
: style_color_new (gdk->red, gdk->green, gdk->blue);
}
......
......@@ -422,7 +422,8 @@ cb_adjustment_value_changed (GtkAdjustment *adj, DialogGraphicData *data)
static void
cb_fill_color_changed (ColorCombo *color_combo, GdkColor *color,
gboolean by_user, DialogGraphicData *data)
gboolean is_custom, gboolean by_user, gboolean is_default,
DialogGraphicData *data)
{
gnome_canvas_item_set (data->arrow, "fill_color_gdk", color, NULL);
}
......@@ -550,7 +551,7 @@ sheet_object_graphic_user_config (SheetObject *so, SheetControlGUI *scg)
"value_changed",
G_CALLBACK (cb_adjustment_value_changed), data);
g_signal_connect (G_OBJECT (data->fill_color_combo),
"changed",
"color_changed",
G_CALLBACK (cb_fill_color_changed), data);
}
......
......@@ -508,7 +508,8 @@ static BonoboUIVerb verbs [] = {
static void
cb_fore_color_changed (ColorCombo *combo, GdkColor *c,
gboolean by_user, WorkbookControlGUI *wbcg)
gboolean is_custom, gboolean by_user, gboolean is_default,
WorkbookControlGUI *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
......@@ -535,7 +536,8 @@ cb_fore_color_changed (ColorCombo *combo, GdkColor *c,
static void
cb_back_color_changed (ColorCombo *combo, GdkColor *c,
gboolean by_user, WorkbookControlGUI *wbcg)
gboolean is_custom, gboolean by_user, gboolean is_default,
WorkbookControlGUI *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
......@@ -790,7 +792,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg)
/* Draw an outline for the default */
NULL, cg);
g_signal_connect (G_OBJECT (back_combo),
"changed",
"color_changed",
G_CALLBACK (cb_back_color_changed), wbcg);
disable_focus (back_combo, NULL);
gtk_combo_box_set_title (GTK_COMBO_BOX (back_combo),
......@@ -800,7 +802,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg)
WORKBOOK_FOREACH_CONTROL (wb_control_workbook (WORKBOOK_CONTROL (wbcg)), view, control,
if (control != WORKBOOK_CONTROL (wbcg)) {
GdkColor *color = color_combo_get_color (
COLOR_COMBO (WORKBOOK_CONTROL_GUI (control)->back_color));
COLOR_COMBO (WORKBOOK_CONTROL_GUI (control)->back_color), NULL);
if (color) {
color_combo_set_color (
COLOR_COMBO (wbcg->back_color), color);
......@@ -816,7 +818,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg)
_("Automatic"), /* Draw black for the default */
&gs_black, cg);
g_signal_connect (G_OBJECT (fore_combo),
"changed",
"color_changed",
G_CALLBACK (cb_fore_color_changed), wbcg);
disable_focus (fore_combo, NULL);
gtk_combo_box_set_title (GTK_COMBO_BOX (fore_combo),
......@@ -826,7 +828,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg)
WORKBOOK_FOREACH_CONTROL (wb_control_workbook (WORKBOOK_CONTROL (wbcg)), view, control,
if (control != WORKBOOK_CONTROL (wbcg)) {
GdkColor *color = color_combo_get_color (
COLOR_COMBO (WORKBOOK_CONTROL_GUI (control)->fore_color));
COLOR_COMBO (WORKBOOK_CONTROL_GUI (control)->fore_color), NULL);
if (color) {
color_combo_set_color (
COLOR_COMBO (wbcg->fore_color), color);
......
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