#include "gtkdialog.h"
#include "gtkstock.h"
+#include "gtkbutton.h"
#include "gtkbox.h"
#include "gtkprivate.h"
#include "gtkintl.h"
g_object_notify (G_OBJECT (cc), pspec->name);
}
+static void
+save_color (GtkColorChooserDialog *dialog)
+{
+ GdkRGBA color;
+
+ /* This causes the color chooser widget to save the
+ * selected and custom colors to GSettings.
+ */
+ gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+ gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+}
+
static void
color_activated_cb (GtkColorChooser *chooser,
GdkRGBA *color,
GtkDialog *dialog)
{
+ save_color (GTK_COLOR_CHOOSER_DIALOG (dialog));
+ gtk_dialog_response (dialog, GTK_RESPONSE_OK);
+}
+
+static void
+selected_cb (GtkButton *button,
+ GtkDialog *dialog)
+{
+ save_color (GTK_COLOR_CHOOSER_DIALOG (dialog));
gtk_dialog_response (dialog, GTK_RESPONSE_OK);
}
priv->cancel_button = gtk_dialog_add_button (dialog,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
- priv->select_button = gtk_dialog_add_button (dialog,
- _("_Select"),
- GTK_RESPONSE_OK);
+
+ /* We emit the response for the Select button manually,
+ * since we want to save the color first
+ */
+ priv->select_button = gtk_button_new_from_stock (_("_Select"));
+ g_signal_connect (priv->select_button, "clicked",
+ G_CALLBACK (selected_cb), dialog);
+ gtk_widget_set_can_default (priv->select_button, TRUE);
+ gtk_widget_show (priv->select_button);
+ gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (dialog)),
+ priv->select_button, FALSE, TRUE, 0);
gtk_widget_grab_default (priv->select_button);
gtk_dialog_set_alternative_button_order (dialog,
}
static void
-gtk_color_chooser_dialog_response (GtkDialog *dialog,
- gint response_id)
+gtk_color_chooser_dialog_map (GtkWidget *widget)
{
- if (response_id == GTK_RESPONSE_OK)
- {
- GdkRGBA color;
-
- gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
- gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
- }
-
- g_object_set (GTK_COLOR_CHOOSER_DIALOG (dialog)->priv->chooser,
+ /* We never want the dialog to come up with the editor,
+ * even if it was showing the editor the last time it was used.
+ */
+ g_object_set (GTK_COLOR_CHOOSER_DIALOG (widget)->priv->chooser,
"show-editor", FALSE, NULL);
+
+ GTK_WIDGET_CLASS (gtk_color_chooser_dialog_parent_class)->map (widget);
}
static void
gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class->get_property = gtk_color_chooser_dialog_get_property;
object_class->set_property = gtk_color_chooser_dialog_set_property;
- dialog_class->response = gtk_color_chooser_dialog_response;
+ widget_class->map = gtk_color_chooser_dialog_map;
g_object_class_override_property (object_class, PROP_RGBA, "rgba");
g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
static void
gtk_color_chooser_dialog_add_palette (GtkColorChooser *chooser,
- gboolean horizontal,
+ GtkOrientation orientation,
gint colors_per_line,
gint n_colors,
GdkRGBA *colors)
GtkColorChooserDialog *cc = GTK_COLOR_CHOOSER_DIALOG (chooser);
gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (cc->priv->chooser),
- horizontal, colors_per_line, n_colors, colors);
+ orientation, colors_per_line, n_colors, colors);
}
static void