* Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
*
* Author: Kuisma Salonen <kuisma.salonen@nokia.com>
- * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ * Contact: Rodrigo Novo <rodrigo.novo@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
*/
+/**
+ * SECTION:hildon-color-chooser-dialog
+ * @short_description: A dialog used to select a color from HSV colorspace.
+ * @see_also: #HildonColorButton
+ *
+ * HildonColorChooserDialog enables the user to
+ * select an arbitrary color from a HSV colorspace.
+ * The color is stored in one of the predefined color
+ * slots and can be reselected later on.
+ *
+ * Additionally the user can choose one of the standard "factory"
+ * colors.
+ *
+ */
+
+#undef HILDON_DISABLE_DEPRECATED
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <memory.h>
#include <string.h>
#include <libintl.h>
-#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
+
#include "hildon-color-chooser-dialog.h"
#include "hildon-color-chooser.h"
#include "hildon-defines.h"
#include "hildon-banner.h"
#include "hildon-color-chooser-dialog-private.h"
-#define _(String) dgettext(PACKAGE, String)
+#define _(String) dgettext("hildon-libs", String)
static HildonColorChooserDialogClass* parent_class = NULL;
gtk_box_pack_start (GTK_BOX (priv->vbox), priv->separator, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (priv->vbox), priv->align_custom, FALSE, FALSE, 0);
- gtk_dialog_add_button (GTK_DIALOG (object), _("ecdg_bd_colour_selector_ok"), GTK_RESPONSE_OK);
- gtk_dialog_add_button (GTK_DIALOG (object), _("ecdg_bd_colour_selector_cancel"), GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (object), _("wdgt_bd_done"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_OK);
g_signal_connect (G_OBJECT (priv->chooser),
- "insensitive-press", G_CALLBACK (hildon_color_chooser_dialog_insensitive_press), object);
+ "query-tooltip", G_CALLBACK (hildon_color_chooser_dialog_insensitive_press), object);
g_signal_connect (G_OBJECT (priv->area_custom),
"expose-event", G_CALLBACK (hildon_color_chooser_dialog_area_expose), object);
GTK_TYPE_BORDER,
G_PARAM_READABLE));
-
gtk_widget_class_install_style_property (widget_klass,
g_param_spec_boxed ("default_color", "Default color",
"Default color for nonpainted custom colors",
for (i = 0; i < tmp; i++) {
g_object_unref (priv->gc_array[i]);
+ priv->gc_array[i] = NULL;
}
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
if (tmpcolor) {
priv->style_info.default_color = *tmpcolor;
+ gdk_color_free (tmpcolor);
} else {
priv->style_info.default_color.red = 0x0000;
priv->style_info.default_color.green = 0x0000;
for (i = 0; i < tmpn; i++) {
g_object_unref (priv->gc_array[i]);
+ priv->gc_array[i] = NULL;
}
}
(priv->style_info.num_buttons.top * priv->style_info.num_buttons.bottom);
priv->gc_array = (GdkGC **) g_malloc0 (sizeof (GdkGC *) * tmpn);
+ if (GTK_WIDGET_REALIZED (widget)) {
+ for (i = 0; i < tmpn; i++) {
+ priv->gc_array[i] = gdk_gc_new (widget->window);
+ }
+ }
if (priv->gconf_client) {
if (tmpcolor) {
priv->colors_defined[i] = *tmpcolor;
+ gdk_color_free (tmpcolor);
} else {
if(i < 16) {
priv->colors_defined[i] = hardcoded_colors[i];
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
+/**
+ * hildon_color_chooser_dialog_set_color:
+ * @dialog: a #HildonColorChooserDialog
+ * @color: a color to set on the #HildonColorChooserDialog
+ *
+ * Sets the dialog to point at the given color. It'll first try to
+ * search the palette of the existing colors to match the passed color.
+ * If the color is not found in the pallette, the color in the currently
+ * selected box will be modified.
+ *
+ */
void
hildon_color_chooser_dialog_set_color (HildonColorChooserDialog *dialog,
GdkColor *color)
y = ((i / w) * (tot_h + spacing));
gdk_draw_rectangle (widget->window,
- widget->style->black_gc,
+ (i == num_selected) ? widget->style->bg_gc[GTK_STATE_SELECTED] : widget->style->bg_gc[GTK_STATE_NORMAL],
TRUE,
(i == num_selected) ? x : x + 2,
(i == num_selected) ? y : y + 2,
(i == num_selected) ? tot_h : tot_h - 4);
gdk_draw_rectangle(widget->window,
- widget->style->white_gc,
+ (i == num_selected) ? widget->style->bg_gc[GTK_STATE_NORMAL] : widget->style->white_gc,
TRUE,
x + 3,
y + 3,
HildonColorChooserDialogPrivate *priv = HILDON_COLOR_CHOOSER_DIALOG_GET_PRIVATE (data);
char key[128], color_str[13];
int tmp;
- GdkColor *color = g_new (GdkColor, 1);
+ GdkColor color;
g_assert (priv);
- hildon_color_chooser_get_color (chooser, color);
+ hildon_color_chooser_get_color (chooser, &color);
tmp = (priv->style_info.num_buttons.left * priv->style_info.num_buttons.right);
if (priv->selected >= tmp) {
- priv->colors_custom[priv->selected - tmp] = *color;
+ priv->colors_custom[priv->selected - tmp] = color;
gdk_gc_set_rgb_fg_color (priv->gc_array[priv->selected], &priv->colors_custom[priv->selected - tmp]);
gtk_widget_queue_draw (priv->area_custom);
if (tmp1) {
priv->style_info.cont_sizes = *tmp1;
- g_free (tmp1);
+ gtk_border_free (tmp1);
} else {
priv->style_info.cont_sizes.left = 0;
priv->style_info.cont_sizes.right = 8;
if (tmp2) {
priv->style_info.radio_sizes = *tmp2;
- g_free (tmp2);
+ gtk_border_free (tmp2);
} else {
priv->style_info.radio_sizes.left = 16;
priv->style_info.radio_sizes.right = 16;
if (tmp3) {
priv->style_info.num_buttons = *tmp3;
- g_free (tmp3);
+ gtk_border_free (tmp3);
} else {
priv->style_info.num_buttons.left = 8;
priv->style_info.num_buttons.right = 2;
/**
* hildon_color_chooser_dialog_get_color:
* @dialog: a #HildonColorChooserDialog
- * @color: a color to fill with new value
+ * @color: a color structure to fill with the currently selected color
+ *
+ * Retrives the currently selected color in the color chooser dialog.
*
*/
void