 a1332167fb
			
		
	
	a1332167fb
	
	
	
		
			
			We have a testcolorchooser test, with a --edit option. It was supposed to make the color chooser come up in edit mode, but it didn't work ever since we dropped the ::response handler. Fix it by resetting show-editor on unmap, instead of on map. This way, users can set show-editor before showing the dialog, and it will take effect.
		
			
				
	
	
		
			288 lines
		
	
	
		
			9.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			288 lines
		
	
	
		
			9.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* GTK - The GIMP Toolkit
 | |
|  * Copyright (C) 2012 Red Hat, Inc.
 | |
|  *
 | |
|  * 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; either
 | |
|  * version 2 of 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
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 | |
|  */
 | |
| 
 | |
| #include "config.h"
 | |
| 
 | |
| #include "gtkdialog.h"
 | |
| #include "gtkdialogprivate.h"
 | |
| #include "gtkbutton.h"
 | |
| #include "gtkbox.h"
 | |
| #include "gtkprivate.h"
 | |
| #include "gtkintl.h"
 | |
| #include "gtksettings.h"
 | |
| 
 | |
| #include "gtkcolorchooserprivate.h"
 | |
| #include "gtkcolorchooserdialog.h"
 | |
| #include "gtkcolorchooserwidget.h"
 | |
| 
 | |
| /**
 | |
|  * SECTION:gtkcolorchooserdialog
 | |
|  * @Short_description: A dialog for choosing colors
 | |
|  * @Title: GtkColorChooserDialog
 | |
|  * @See_also: #GtkColorChooser, #GtkDialog
 | |
|  *
 | |
|  * The #GtkColorChooserDialog widget is a dialog for choosing
 | |
|  * a color. It implements the #GtkColorChooser interface.
 | |
|  *
 | |
|  * Since: 3.4
 | |
|  */
 | |
| 
 | |
| struct _GtkColorChooserDialogPrivate
 | |
| {
 | |
|   GtkWidget *chooser;
 | |
| };
 | |
| 
 | |
| enum
 | |
| {
 | |
|   PROP_ZERO,
 | |
|   PROP_RGBA,
 | |
|   PROP_USE_ALPHA,
 | |
|   PROP_SHOW_EDITOR
 | |
| };
 | |
| 
 | |
| static void gtk_color_chooser_dialog_iface_init (GtkColorChooserInterface *iface);
 | |
| 
 | |
| G_DEFINE_TYPE_WITH_CODE (GtkColorChooserDialog, gtk_color_chooser_dialog, GTK_TYPE_DIALOG,
 | |
|                          G_ADD_PRIVATE (GtkColorChooserDialog)
 | |
|                          G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_CHOOSER,
 | |
|                                                 gtk_color_chooser_dialog_iface_init))
 | |
| 
 | |
| static void
 | |
| propagate_notify (GObject               *o,
 | |
|                   GParamSpec            *pspec,
 | |
|                   GtkColorChooserDialog *cc)
 | |
| {
 | |
|   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
 | |
| gtk_color_chooser_dialog_response (GtkDialog *dialog,
 | |
|                                    gint       response_id,
 | |
|                                    gpointer   user_data)
 | |
| {
 | |
|   if (response_id == GTK_RESPONSE_OK)
 | |
|     save_color (GTK_COLOR_CHOOSER_DIALOG (dialog));
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc)
 | |
| {
 | |
|   cc->priv = gtk_color_chooser_dialog_get_instance_private (cc);
 | |
| 
 | |
|   gtk_widget_init_template (GTK_WIDGET (cc));
 | |
|   gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (cc));
 | |
| 
 | |
| G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 | |
|   gtk_dialog_set_alternative_button_order (GTK_DIALOG (cc),
 | |
|                                            GTK_RESPONSE_OK,
 | |
|                                            GTK_RESPONSE_CANCEL,
 | |
|                                            -1);
 | |
| G_GNUC_END_IGNORE_DEPRECATIONS
 | |
| 
 | |
|   g_signal_connect (cc, "response",
 | |
|                     G_CALLBACK (gtk_color_chooser_dialog_response), NULL);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_unmap (GtkWidget *widget)
 | |
| {
 | |
|   GTK_WIDGET_CLASS (gtk_color_chooser_dialog_parent_class)->unmap (widget);
 | |
| 
 | |
|   /* 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 (widget, "show-editor", FALSE, NULL);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_get_property (GObject    *object,
 | |
|                                        guint       prop_id,
 | |
|                                        GValue     *value,
 | |
|                                        GParamSpec *pspec)
 | |
| {
 | |
|   GtkColorChooserDialog *cd = GTK_COLOR_CHOOSER_DIALOG (object);
 | |
|   GtkColorChooser *cc = GTK_COLOR_CHOOSER (object);
 | |
| 
 | |
|   switch (prop_id)
 | |
|     {
 | |
|     case PROP_RGBA:
 | |
|       {
 | |
|         GdkRGBA color;
 | |
| 
 | |
|         gtk_color_chooser_get_rgba (cc, &color);
 | |
|         g_value_set_boxed (value, &color);
 | |
|       }
 | |
|       break;
 | |
|     case PROP_USE_ALPHA:
 | |
|       g_value_set_boolean (value, gtk_color_chooser_get_use_alpha (GTK_COLOR_CHOOSER (cd->priv->chooser)));
 | |
|       break;
 | |
|     case PROP_SHOW_EDITOR:
 | |
|       {
 | |
|         gboolean show_editor;
 | |
|         g_object_get (cd->priv->chooser, "show-editor", &show_editor, NULL);
 | |
|         g_value_set_boolean (value, show_editor);
 | |
|       }
 | |
|       break;
 | |
|     default:
 | |
|       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 | |
|       break;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_set_property (GObject      *object,
 | |
|                                        guint         prop_id,
 | |
|                                        const GValue *value,
 | |
|                                        GParamSpec   *pspec)
 | |
| {
 | |
|   GtkColorChooserDialog *cd = GTK_COLOR_CHOOSER_DIALOG (object);
 | |
|   GtkColorChooser *cc = GTK_COLOR_CHOOSER (object);
 | |
| 
 | |
|   switch (prop_id)
 | |
|     {
 | |
|     case PROP_RGBA:
 | |
|       gtk_color_chooser_set_rgba (cc, g_value_get_boxed (value));
 | |
|       break;
 | |
|     case PROP_USE_ALPHA:
 | |
|       if (gtk_color_chooser_get_use_alpha (GTK_COLOR_CHOOSER (cd->priv->chooser)) != g_value_get_boolean (value))
 | |
|         {
 | |
|           gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (cd->priv->chooser), g_value_get_boolean (value));
 | |
|           g_object_notify_by_pspec (object, pspec);
 | |
|         }
 | |
|       break;
 | |
|     case PROP_SHOW_EDITOR:
 | |
|       g_object_set (cd->priv->chooser,
 | |
|                     "show-editor", g_value_get_boolean (value),
 | |
|                     NULL);
 | |
|       break;
 | |
|     default:
 | |
|       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 | |
|       break;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class)
 | |
| {
 | |
|   GObjectClass *object_class = G_OBJECT_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;
 | |
| 
 | |
|   widget_class->unmap = gtk_color_chooser_dialog_unmap;
 | |
| 
 | |
|   g_object_class_override_property (object_class, PROP_RGBA, "rgba");
 | |
|   g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
 | |
|   g_object_class_install_property (object_class, PROP_SHOW_EDITOR,
 | |
|       g_param_spec_boolean ("show-editor", P_("Show editor"), P_("Show editor"),
 | |
|                             FALSE, GTK_PARAM_READWRITE));
 | |
| 
 | |
|   /* Bind class to template
 | |
|    */
 | |
|   gtk_widget_class_set_template_from_resource (widget_class,
 | |
| 					       "/org/gtk/libgtk/ui/gtkcolorchooserdialog.ui");
 | |
|   gtk_widget_class_bind_template_child_private (widget_class, GtkColorChooserDialog, chooser);
 | |
|   gtk_widget_class_bind_template_callback (widget_class, propagate_notify);
 | |
|   gtk_widget_class_bind_template_callback (widget_class, color_activated_cb);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_get_rgba (GtkColorChooser *chooser,
 | |
|                                    GdkRGBA         *color)
 | |
| {
 | |
|   GtkColorChooserDialog *cc = GTK_COLOR_CHOOSER_DIALOG (chooser);
 | |
| 
 | |
|   gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (cc->priv->chooser), color);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_set_rgba (GtkColorChooser *chooser,
 | |
|                                    const GdkRGBA   *color)
 | |
| {
 | |
|   GtkColorChooserDialog *cc = GTK_COLOR_CHOOSER_DIALOG (chooser);
 | |
| 
 | |
|   gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc->priv->chooser), color);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_add_palette (GtkColorChooser *chooser,
 | |
|                                       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),
 | |
|                                  orientation, colors_per_line, n_colors, colors);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_color_chooser_dialog_iface_init (GtkColorChooserInterface *iface)
 | |
| {
 | |
|   iface->get_rgba = gtk_color_chooser_dialog_get_rgba;
 | |
|   iface->set_rgba = gtk_color_chooser_dialog_set_rgba;
 | |
|   iface->add_palette = gtk_color_chooser_dialog_add_palette;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * gtk_color_chooser_dialog_new:
 | |
|  * @title: (allow-none): Title of the dialog, or %NULL
 | |
|  * @parent: (allow-none): Transient parent of the dialog, or %NULL
 | |
|  *
 | |
|  * Creates a new #GtkColorChooserDialog.
 | |
|  *
 | |
|  * Returns: a new #GtkColorChooserDialog
 | |
|  *
 | |
|  * Since: 3.4
 | |
|  */
 | |
| GtkWidget *
 | |
| gtk_color_chooser_dialog_new (const gchar *title,
 | |
|                               GtkWindow   *parent)
 | |
| {
 | |
|   GtkColorChooserDialog *dialog;
 | |
| 
 | |
|   dialog = g_object_new (GTK_TYPE_COLOR_CHOOSER_DIALOG,
 | |
|                          "title", title,
 | |
|                          "transient-for", parent,
 | |
|                          NULL);
 | |
| 
 | |
|   return GTK_WIDGET (dialog);
 | |
| }
 |