diff options
| -rw-r--r-- | libmate-desktop/Makefile.am | 7 | ||||
| -rw-r--r-- | libmate-desktop/mate-colorbutton.c | 894 | ||||
| -rw-r--r-- | libmate-desktop/mate-colorbutton.h | 100 | ||||
| -rw-r--r-- | libmate-desktop/mate-desktop.abi | 13 | ||||
| -rw-r--r-- | libmate-desktop/meson.build | 8 | ||||
| -rw-r--r-- | libmate-desktop/test.c | 58 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
7 files changed, 1 insertions, 1080 deletions
diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am index 44b8b9b..6477c5c 100644 --- a/libmate-desktop/Makefile.am +++ b/libmate-desktop/Makefile.am @@ -12,7 +12,6 @@ libmate_desktop_HEADERS = \ mate-languages.h \ mate-rr-config.h \ mate-rr-labeler.h \ - mate-colorbutton.h \ mate-colorsel.h \ mate-hsv.h \ mate-colorseldialog.h \ @@ -32,7 +31,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(WARN_CFLAGS) -noinst_PROGRAMS = test-desktop-thumbnail test-ditem test test-languages test-image-menu-item +noinst_PROGRAMS = test-desktop-thumbnail test-ditem test-languages test-image-menu-item CLEANFILES = @@ -49,7 +48,6 @@ introspection_sources = \ mate-rr-config.c \ mate-rr-output-info.c \ mate-rr-labeler.c \ - mate-colorbutton.c \ mate-colorsel.c \ mate-hsv.c \ mate-colorseldialog.c \ @@ -73,9 +71,6 @@ libmate_desktop_2_la_LDFLAGS = \ -export-symbols-regex "^mate_.*" \ -no-undefined -test_SOURCES = \ - test.c - test_LDADD = \ libmate-desktop-2.la \ $(MATE_DESKTOP_LIBS) diff --git a/libmate-desktop/mate-colorbutton.c b/libmate-desktop/mate-colorbutton.c deleted file mode 100644 index de81782..0000000 --- a/libmate-desktop/mate-colorbutton.c +++ /dev/null @@ -1,894 +0,0 @@ -/* - * GTK - The GIMP Toolkit - * Copyright (C) 1998, 1999 Red Hat, Inc. - * All rights reserved. - * - * This Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -/* Color picker button for GNOME - * - * Author: Federico Mena <[email protected]> - * - * Modified by the GTK+ Team and others 2003. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" -#include "private.h" - -#include "mate-colorbutton.h" -#include "mate-colorsel.h" -#include "mate-colorseldialog.h" -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <glib/gi18n-lib.h> - -/* Size of checks and gray levels for alpha compositing checkerboard */ -#define CHECK_SIZE 4 -#define CHECK_DARK (1.0 / 3.0) -#define CHECK_LIGHT (2.0 / 3.0) - -struct _MateColorButtonPrivate -{ - GtkWidget *draw_area; /* Widget where we draw the color sample */ - GtkWidget *cs_dialog; /* Color selection dialog */ - - gchar *title; /* Title for the color selection window */ - - GdkColor color; - guint16 alpha; - - guint use_alpha : 1; /* Use alpha or not */ -}; - -/* Properties */ -enum -{ - PROP_0, - PROP_USE_ALPHA, - PROP_TITLE, - PROP_COLOR, - PROP_ALPHA -}; - -/* Signals */ -enum -{ - COLOR_SET, - LAST_SIGNAL -}; - -/* gobject signals */ -static void mate_color_button_finalize (GObject *object); -static void mate_color_button_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void mate_color_button_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); - -/* gtkwidget signals */ -static void mate_color_button_state_changed (GtkWidget *widget, - GtkStateType previous_state); - -/* gtkbutton signals */ -static void mate_color_button_clicked (GtkButton *button); - -/* source side drag signals */ -static void mate_color_button_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data); -static void mate_color_button_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, - MateColorButton *color_button); - -/* target side drag signals */ -static void mate_color_button_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint info, - guint32 time, - MateColorButton *color_button); - -static guint color_button_signals[LAST_SIGNAL] = { 0 }; - -static const GtkTargetEntry drop_types[] = { { "application/x-color", 0, 0 } }; - -G_DEFINE_TYPE_WITH_PRIVATE (MateColorButton, mate_color_button, GTK_TYPE_BUTTON) - -static void -mate_color_button_class_init (MateColorButtonClass *klass) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - GtkButtonClass *button_class; - - gobject_class = G_OBJECT_CLASS (klass); - widget_class = GTK_WIDGET_CLASS (klass); - button_class = GTK_BUTTON_CLASS (klass); - - gobject_class->get_property = mate_color_button_get_property; - gobject_class->set_property = mate_color_button_set_property; - gobject_class->finalize = mate_color_button_finalize; - widget_class->state_changed = mate_color_button_state_changed; - button_class->clicked = mate_color_button_clicked; - klass->color_set = NULL; - - /** - * MateColorButton:use-alpha: - * - * If this property is set to %TRUE, the color swatch on the button is rendered against a - * checkerboard background to show its opacity and the opacity slider is displayed in the - * color selection dialog. - * - * Since: 1.9.1 - */ - g_object_class_install_property (gobject_class, - PROP_USE_ALPHA, - g_param_spec_boolean ("use-alpha", _("Use alpha"), - _("Whether or not to give the color an alpha value"), - FALSE, - G_PARAM_READWRITE)); - - /** - * MateColorButton:title: - * - * The title of the color selection dialog - * - * Since: 1.9.1 - */ - g_object_class_install_property (gobject_class, - PROP_TITLE, - g_param_spec_string ("title", - _("Title"), - _("The title of the color selection dialog"), - _("Pick a Color"), - G_PARAM_READWRITE)); - - /** - * MateColorButton:color: - * - * The selected color. - * - * Since: 1.9.1 - */ - g_object_class_install_property (gobject_class, - PROP_COLOR, - g_param_spec_boxed ("color", - _("Current Color"), - _("The selected color"), - GDK_TYPE_COLOR, - G_PARAM_READWRITE)); - - /** - * MateColorButton:alpha: - * - * The selected opacity value (0 fully transparent, 65535 fully opaque). - * - * Since: 1.9.1 - */ - g_object_class_install_property (gobject_class, - PROP_ALPHA, - g_param_spec_uint ("alpha", - _("Current Alpha"), - _("The selected opacity value (0 fully transparent, 65535 fully opaque)"), - 0, 65535, 65535, - G_PARAM_READWRITE)); - - /** - * MateColorButton::color-set: - * @widget: the object which received the signal. - * - * The ::color-set signal is emitted when the user selects a color. - * When handling this signal, use mate_color_button_get_color() and - * mate_color_button_get_alpha() to find out which color was just selected. - * - * Note that this signal is only emitted when the <emphasis>user</emphasis> - * changes the color. If you need to react to programmatic color changes - * as well, use the notify::color signal. - * - * Since: 1.9.1 - */ - color_button_signals[COLOR_SET] = g_signal_new ("color-set", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (MateColorButtonClass, color_set), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); -} - -static gboolean -mate_color_button_has_alpha (MateColorButton *color_button) -{ - return color_button->priv->use_alpha && - color_button->priv->alpha < 65535; -} - -static cairo_pattern_t * -mate_color_button_get_checkered (void) -{ - /* need to respect pixman's stride being a multiple of 4 */ - static unsigned char data[8] = { 0xFF, 0x00, 0x00, 0x00, - 0x00, 0xFF, 0x00, 0x00 }; - static cairo_surface_t *checkered = NULL; - cairo_pattern_t *pattern; - - if (checkered == NULL) - { - checkered = cairo_image_surface_create_for_data (data, - CAIRO_FORMAT_A8, - 2, 2, 4); - } - - pattern = cairo_pattern_create_for_surface (checkered); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_pattern_set_filter (pattern, CAIRO_FILTER_NEAREST); - - return pattern; -} - -/* Handle exposure events for the color picker's drawing area */ -static gboolean -draw (GtkWidget *widget, - cairo_t *cr, - gpointer data) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (data); - cairo_pattern_t *checkered; - GtkStyleContext *context; - GdkRGBA rgba; - - mate_color_button_get_rgba (color_button, &rgba); - if (mate_color_button_has_alpha (color_button)) - { - cairo_save (cr); - - cairo_set_source_rgb (cr, CHECK_DARK, CHECK_DARK, CHECK_DARK); - cairo_paint (cr); - - cairo_set_source_rgb (cr, CHECK_LIGHT, CHECK_LIGHT, CHECK_LIGHT); - cairo_scale (cr, CHECK_SIZE, CHECK_SIZE); - - checkered = mate_color_button_get_checkered (); - cairo_mask (cr, checkered); - cairo_pattern_destroy (checkered); - - cairo_restore (cr); - - cairo_set_source_rgba (cr, - rgba.red, - rgba.green, - rgba.blue, - rgba.alpha); - } - else - { - gdk_cairo_set_source_rgba (cr, &rgba); - } - - cairo_paint (cr); - - if (!gtk_widget_is_sensitive (GTK_WIDGET (color_button))) - { - context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, GTK_STATE_FLAG_INSENSITIVE, &rgba); - gdk_cairo_set_source_rgba (cr, &rgba); - checkered = mate_color_button_get_checkered (); - cairo_mask (cr, checkered); - cairo_pattern_destroy (checkered); - } - - return FALSE; -} - -static void -mate_color_button_state_changed (GtkWidget *widget, - GtkStateType previous_state) -{ - gtk_widget_queue_draw (widget); -} - -static void -mate_color_button_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint info, - guint32 time, - MateColorButton *color_button) -{ - guint16 *dropped; - - if (gtk_selection_data_get_length (selection_data) < 0) - return; - - /* We accept drops with the wrong format, since the KDE color - * chooser incorrectly drops application/x-color with format 8. - */ - if (gtk_selection_data_get_length (selection_data) != 8) - { - g_warning (_("Received invalid color data\n")); - return; - } - - dropped = (guint16 *)gtk_selection_data_get_data (selection_data); - - color_button->priv->color.red = dropped[0]; - color_button->priv->color.green = dropped[1]; - color_button->priv->color.blue = dropped[2]; - color_button->priv->alpha = dropped[3]; - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_signal_emit (color_button, color_button_signals[COLOR_SET], 0); - - g_object_freeze_notify (G_OBJECT (color_button)); - g_object_notify (G_OBJECT (color_button), "color"); - g_object_notify (G_OBJECT (color_button), "alpha"); - g_object_thaw_notify (G_OBJECT (color_button)); -} - -static void -set_color_icon (GdkDragContext *context, - GdkColor *color) -{ - GdkPixbuf *pixbuf; - guint32 pixel; - - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, - 8, 48, 32); - - pixel = ((color->red & 0xff00) << 16) | - ((color->green & 0xff00) << 8) | - (color->blue & 0xff00); - - gdk_pixbuf_fill (pixbuf, pixel); - - gtk_drag_set_icon_pixbuf (context, pixbuf, -2, -2); - g_object_unref (pixbuf); -} - -static void -mate_color_button_drag_begin (GtkWidget *widget, - GdkDragContext *context, - gpointer data) -{ - MateColorButton *color_button = data; - - set_color_icon (context, &color_button->priv->color); -} - -static void -mate_color_button_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, - MateColorButton *color_button) -{ - guint16 dropped[4]; - - dropped[0] = color_button->priv->color.red; - dropped[1] = color_button->priv->color.green; - dropped[2] = color_button->priv->color.blue; - dropped[3] = color_button->priv->alpha; - - gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), - 16, (guchar *)dropped, 8); -} - -static void -mate_color_button_init (MateColorButton *color_button) -{ - GtkWidget *frame; - PangoLayout *layout; - PangoRectangle rect; - - _mate_desktop_init_i18n (); - - /* Create the widgets */ - color_button->priv = mate_color_button_get_instance_private (color_button); - - frame = gtk_frame_new (NULL); - gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_OUT); - gtk_container_add (GTK_CONTAINER (color_button), frame); - gtk_widget_show (frame); - - /* Just some widget we can hook to expose-event on */ - color_button->priv->draw_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_set_valign (color_button->priv->draw_area, GTK_ALIGN_CENTER); - gtk_widget_set_halign (color_button->priv->draw_area, GTK_ALIGN_CENTER); - - layout = gtk_widget_create_pango_layout (GTK_WIDGET (color_button), "Black"); - pango_layout_get_pixel_extents (layout, NULL, &rect); - g_object_unref (layout); - - gtk_widget_set_size_request (color_button->priv->draw_area, rect.width - 2, rect.height - 2); - g_signal_connect (color_button->priv->draw_area, "draw", - G_CALLBACK (draw), color_button); - gtk_container_add (GTK_CONTAINER (frame), color_button->priv->draw_area); - gtk_widget_show (color_button->priv->draw_area); - - color_button->priv->title = g_strdup (_("Pick a Color")); /* default title */ - - /* Start with opaque black, alpha disabled */ - - color_button->priv->color.red = 0; - color_button->priv->color.green = 0; - color_button->priv->color.blue = 0; - color_button->priv->alpha = 65535; - color_button->priv->use_alpha = FALSE; - - gtk_drag_dest_set (GTK_WIDGET (color_button), - GTK_DEST_DEFAULT_MOTION | - GTK_DEST_DEFAULT_HIGHLIGHT | - GTK_DEST_DEFAULT_DROP, - drop_types, 1, GDK_ACTION_COPY); - gtk_drag_source_set (GTK_WIDGET(color_button), - GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, - drop_types, 1, - GDK_ACTION_COPY); - g_signal_connect (color_button, "drag-begin", - G_CALLBACK (mate_color_button_drag_begin), color_button); - g_signal_connect (color_button, "drag-data-received", - G_CALLBACK (mate_color_button_drag_data_received), color_button); - g_signal_connect (color_button, "drag-data-get", - G_CALLBACK (mate_color_button_drag_data_get), color_button); -} - -static void -mate_color_button_finalize (GObject *object) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (object); - - if (color_button->priv->cs_dialog != NULL) - gtk_widget_destroy (color_button->priv->cs_dialog); - color_button->priv->cs_dialog = NULL; - - g_free (color_button->priv->title); - color_button->priv->title = NULL; - - G_OBJECT_CLASS (mate_color_button_parent_class)->finalize (object); -} - -/** - * mate_color_button_new: - * - * Creates a new color button. This returns a widget in the form of - * a small button containing a swatch representing the current selected - * color. When the button is clicked, a color-selection dialog will open, - * allowing the user to select a color. The swatch will be updated to reflect - * the new color when the user finishes. - * - * Returns: a new color button. - * - * Since: 1.9.1 - */ -GtkWidget * -mate_color_button_new (void) -{ - return g_object_new (MATE_TYPE_COLOR_BUTTON, NULL); -} - -/** - * mate_color_button_new_with_color: - * @color: A #GdkColor to set the current color with. - * - * Creates a new color button. - * - * Returns: a new color button. - * - * Since: 1.9.1 - */ -GtkWidget * -mate_color_button_new_with_color (const GdkColor *color) -{ - return g_object_new (MATE_TYPE_COLOR_BUTTON, "color", color, NULL); -} - -static void -dialog_ok_clicked (GtkWidget *widget, - gpointer data) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (data); - MateColorSelection *color_selection; - - color_selection = MATE_COLOR_SELECTION (MATE_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog)->colorsel); - - mate_color_selection_get_current_color (color_selection, &color_button->priv->color); - color_button->priv->alpha = mate_color_selection_get_current_alpha (color_selection); - - gtk_widget_hide (color_button->priv->cs_dialog); - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_signal_emit (color_button, color_button_signals[COLOR_SET], 0); - - g_object_freeze_notify (G_OBJECT (color_button)); - g_object_notify (G_OBJECT (color_button), "color"); - g_object_notify (G_OBJECT (color_button), "alpha"); - g_object_thaw_notify (G_OBJECT (color_button)); -} - -static gboolean -dialog_destroy (GtkWidget *widget, - gpointer data) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (data); - - color_button->priv->cs_dialog = NULL; - - return FALSE; -} - -static void -dialog_cancel_clicked (GtkWidget *widget, - gpointer data) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (data); - - gtk_widget_hide (color_button->priv->cs_dialog); -} - -static void -mate_color_button_clicked (GtkButton *button) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (button); - MateColorSelectionDialog *color_dialog; - - /* if dialog already exists, make sure it's shown and raised */ - if (!color_button->priv->cs_dialog) - { - /* Create the dialog and connects its buttons */ - GtkWidget *parent; - - parent = gtk_widget_get_toplevel (GTK_WIDGET (color_button)); - - color_button->priv->cs_dialog = mate_color_selection_dialog_new (color_button->priv->title); - - color_dialog = MATE_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog); - - if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent)) - { - if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (color_dialog))) - gtk_window_set_transient_for (GTK_WINDOW (color_dialog), GTK_WINDOW (parent)); - - gtk_window_set_modal (GTK_WINDOW (color_dialog), - gtk_window_get_modal (GTK_WINDOW (parent))); - } - - g_signal_connect (color_dialog->ok_button, "clicked", - G_CALLBACK (dialog_ok_clicked), color_button); - g_signal_connect (color_dialog->cancel_button, "clicked", - G_CALLBACK (dialog_cancel_clicked), color_button); - g_signal_connect (color_dialog, "destroy", - G_CALLBACK (dialog_destroy), color_button); - } - - color_dialog = MATE_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog); - - mate_color_selection_set_has_opacity_control (MATE_COLOR_SELECTION (color_dialog->colorsel), - color_button->priv->use_alpha); - - mate_color_selection_set_has_palette (MATE_COLOR_SELECTION (color_dialog->colorsel), TRUE); - - mate_color_selection_set_previous_color (MATE_COLOR_SELECTION (color_dialog->colorsel), - &color_button->priv->color); - mate_color_selection_set_previous_alpha (MATE_COLOR_SELECTION (color_dialog->colorsel), - color_button->priv->alpha); - - mate_color_selection_set_current_color (MATE_COLOR_SELECTION (color_dialog->colorsel), - &color_button->priv->color); - mate_color_selection_set_current_alpha (MATE_COLOR_SELECTION (color_dialog->colorsel), - color_button->priv->alpha); - - gtk_window_present (GTK_WINDOW (color_button->priv->cs_dialog)); -} - -/** - * mate_color_button_set_color: - * @color_button: a #MateColorButton. - * @color: A #GdkColor to set the current color with. - * - * Sets the current color to be @color. - * - * Since: 1.9.1 - **/ -void -mate_color_button_set_color (MateColorButton *color_button, - const GdkColor *color) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - g_return_if_fail (color != NULL); - - color_button->priv->color.red = color->red; - color_button->priv->color.green = color->green; - color_button->priv->color.blue = color->blue; - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_object_notify (G_OBJECT (color_button), "color"); -} - -/** - * mate_color_button_set_rgba: - * @color_button: a #MateColorButton. - * @color: A #GdkRGBA to set the current color with. - * - * Sets the current color to be @color. - * - * Since: 1.9.1 - **/ -void -mate_color_button_set_rgba (MateColorButton *color_button, - const GdkRGBA *color) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - g_return_if_fail (color != NULL); - - color_button->priv->color.red = color->red * 65535; - color_button->priv->color.green = color->green * 65535; - color_button->priv->color.blue = color->blue * 65535; - color_button->priv->alpha = color->alpha * 65535; - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_object_notify (G_OBJECT (color_button), "color"); -} - -/** - * mate_color_button_set_alpha: - * @color_button: a #MateColorButton. - * @alpha: an integer between 0 and 65535. - * - * Sets the current opacity to be @alpha. - * - * Since: 1.9.1 - **/ -void -mate_color_button_set_alpha (MateColorButton *color_button, - guint16 alpha) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - - color_button->priv->alpha = alpha; - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_object_notify (G_OBJECT (color_button), "alpha"); -} - -/** - * mate_color_button_get_color: - * @color_button: a #MateColorButton. - * @color: a #GdkColor to fill in with the current color. - * - * Sets @color to be the current color in the #MateColorButton widget. - * - * Since: 1.9.1 - **/ -void -mate_color_button_get_color (MateColorButton *color_button, - GdkColor *color) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - - color->red = color_button->priv->color.red; - color->green = color_button->priv->color.green; - color->blue = color_button->priv->color.blue; -} - -/** - * mate_color_button_get_rgba: - * @color_button: a #MateColorButton. - * @color: a #GdkRGBA to fill in with the current color. - * - * Sets @color to be the current color in the #MateColorButton widget. - * - * Since: 1.9.1 - **/ -void -mate_color_button_get_rgba (MateColorButton *color_button, - GdkRGBA *color) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - - color->red = color_button->priv->color.red / 65535.; - color->green = color_button->priv->color.green / 65535.; - color->blue = color_button->priv->color.blue / 65535.; - color->alpha = color_button->priv->alpha / 65535.; -} - -/** - * mate_color_button_get_alpha: - * @color_button: a #MateColorButton. - * - * Returns the current alpha value. - * - * Return value: an integer between 0 and 65535. - * - * Since: 1.9.1 - **/ -guint16 -mate_color_button_get_alpha (MateColorButton *color_button) -{ - g_return_val_if_fail (MATE_IS_COLOR_BUTTON (color_button), 0); - - return color_button->priv->alpha; -} - -/** - * mate_color_button_set_use_alpha: - * @color_button: a #MateColorButton. - * @use_alpha: %TRUE if color button should use alpha channel, %FALSE if not. - * - * Sets whether or not the color button should use the alpha channel. - * - * Since: 1.9.1 - */ -void -mate_color_button_set_use_alpha (MateColorButton *color_button, - gboolean use_alpha) -{ - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - - use_alpha = (use_alpha != FALSE); - - if (color_button->priv->use_alpha != use_alpha) - { - color_button->priv->use_alpha = (use_alpha != FALSE); - - gtk_widget_queue_draw (color_button->priv->draw_area); - - g_object_notify (G_OBJECT (color_button), "use-alpha"); - } -} - -/** - * mate_color_button_get_use_alpha: - * @color_button: a #MateColorButton. - * - * Does the color selection dialog use the alpha channel? - * - * Returns: %TRUE if the color sample uses alpha channel, %FALSE if not. - * - * Since: 1.9.1 - */ -gboolean -mate_color_button_get_use_alpha (MateColorButton *color_button) -{ - g_return_val_if_fail (MATE_IS_COLOR_BUTTON (color_button), FALSE); - - return color_button->priv->use_alpha; -} - -/** - * mate_color_button_set_title: - * @color_button: a #MateColorButton - * @title: String containing new window title. - * - * Sets the title for the color selection dialog. - * - * Since: 1.9.1 - */ -void -mate_color_button_set_title (MateColorButton *color_button, - const gchar *title) -{ - gchar *old_title; - - g_return_if_fail (MATE_IS_COLOR_BUTTON (color_button)); - - old_title = color_button->priv->title; - color_button->priv->title = g_strdup (title); - g_free (old_title); - - if (color_button->priv->cs_dialog) - gtk_window_set_title (GTK_WINDOW (color_button->priv->cs_dialog), - color_button->priv->title); - - g_object_notify (G_OBJECT (color_button), "title"); -} - -/** - * mate_color_button_get_title: - * @color_button: a #MateColorButton - * - * Gets the title of the color selection dialog. - * - * Returns: An internal string, do not free the return value - * - * Since: 1.9.1 - */ -const gchar * -mate_color_button_get_title (MateColorButton *color_button) -{ - g_return_val_if_fail (MATE_IS_COLOR_BUTTON (color_button), NULL); - - return color_button->priv->title; -} - -static void -mate_color_button_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (object); - - switch (param_id) - { - case PROP_USE_ALPHA: - mate_color_button_set_use_alpha (color_button, g_value_get_boolean (value)); - break; - case PROP_TITLE: - mate_color_button_set_title (color_button, g_value_get_string (value)); - break; - case PROP_COLOR: - mate_color_button_set_color (color_button, g_value_get_boxed (value)); - break; - case PROP_ALPHA: - mate_color_button_set_alpha (color_button, g_value_get_uint (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -mate_color_button_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - MateColorButton *color_button = MATE_COLOR_BUTTON (object); - GdkColor color; - - switch (param_id) - { - case PROP_USE_ALPHA: - g_value_set_boolean (value, mate_color_button_get_use_alpha (color_button)); - break; - case PROP_TITLE: - g_value_set_string (value, mate_color_button_get_title (color_button)); - break; - case PROP_COLOR: - mate_color_button_get_color (color_button, &color); - g_value_set_boxed (value, &color); - break; - case PROP_ALPHA: - g_value_set_uint (value, mate_color_button_get_alpha (color_button)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} diff --git a/libmate-desktop/mate-colorbutton.h b/libmate-desktop/mate-colorbutton.h deleted file mode 100644 index caff2ad..0000000 --- a/libmate-desktop/mate-colorbutton.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * GTK - The GIMP Toolkit - * Copyright (C) 1998, 1999 Red Hat, Inc. - * All rights reserved. - * - * This Library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with the Mate Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/* Color picker button for GNOME - * - * Author: Federico Mena <[email protected]> - * - * Modified by the GTK+ Team and others 2003. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __MATE_COLOR_BUTTON_H__ -#define __MATE_COLOR_BUTTON_H__ - -#include <glib.h> -#include <gtk/gtk.h> - -G_BEGIN_DECLS - -/* The MateColorButton widget is a simple color picker in a button. - * The button displays a sample of the currently selected color. When - * the user clicks on the button, a color selection dialog pops up. - * The color picker emits the "color_set" signal when the color is set. - */ - -#define MATE_TYPE_COLOR_BUTTON (mate_color_button_get_type ()) -#define MATE_COLOR_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MATE_TYPE_COLOR_BUTTON, MateColorButton)) -#define MATE_COLOR_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MATE_TYPE_COLOR_BUTTON, MateColorButtonClass)) -#define MATE_IS_COLOR_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MATE_TYPE_COLOR_BUTTON)) -#define MATE_IS_COLOR_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MATE_TYPE_COLOR_BUTTON)) -#define MATE_COLOR_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MATE_TYPE_COLOR_BUTTON, MateColorButtonClass)) - -typedef struct _MateColorButton MateColorButton; -typedef struct _MateColorButtonClass MateColorButtonClass; -typedef struct _MateColorButtonPrivate MateColorButtonPrivate; - -struct _MateColorButton { - GtkButton button; - - /*< private >*/ - - MateColorButtonPrivate *priv; -}; - -struct _MateColorButtonClass { - GtkButtonClass parent_class; - - void (* color_set) (MateColorButton *cp); - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - -GType mate_color_button_get_type (void) G_GNUC_CONST; -GtkWidget *mate_color_button_new (void); -GtkWidget *mate_color_button_new_with_color (const GdkColor *color); -void mate_color_button_set_color (MateColorButton *color_button, - const GdkColor *color); -void mate_color_button_set_rgba (MateColorButton *color_button, - const GdkRGBA *color); -void mate_color_button_set_alpha (MateColorButton *color_button, - guint16 alpha); -void mate_color_button_get_color (MateColorButton *color_button, - GdkColor *color); -void mate_color_button_get_rgba (MateColorButton *color_button, - GdkRGBA *color); -guint16 mate_color_button_get_alpha (MateColorButton *color_button); -void mate_color_button_set_use_alpha (MateColorButton *color_button, - gboolean use_alpha); -gboolean mate_color_button_get_use_alpha (MateColorButton *color_button); -void mate_color_button_set_title (MateColorButton *color_button, - const gchar *title); -const gchar *mate_color_button_get_title (MateColorButton *color_button); - -G_END_DECLS - -#endif /* __MATE_COLOR_BUTTON_H__ */ diff --git a/libmate-desktop/mate-desktop.abi b/libmate-desktop/mate-desktop.abi index 02108ab..b9fc084 100644 --- a/libmate-desktop/mate-desktop.abi +++ b/libmate-desktop/mate-desktop.abi @@ -34,19 +34,6 @@ mate_bg_set_filename mate_bg_set_placement mate_bg_set_surface_as_root mate_bg_set_surface_as_root_with_crossfade -mate_color_button_get_alpha -mate_color_button_get_color -mate_color_button_get_rgba -mate_color_button_get_title -mate_color_button_get_type -mate_color_button_get_use_alpha -mate_color_button_new -mate_color_button_new_with_color -mate_color_button_set_alpha -mate_color_button_set_color -mate_color_button_set_rgba -mate_color_button_set_title -mate_color_button_set_use_alpha mate_color_selection_dialog_get_color_selection mate_color_selection_dialog_get_type mate_color_selection_dialog_new diff --git a/libmate-desktop/meson.build b/libmate-desktop/meson.build index 4d1cc5f..91b8268 100644 --- a/libmate-desktop/meson.build +++ b/libmate-desktop/meson.build @@ -26,7 +26,6 @@ headers = [ 'mate-image-menu-item.h', 'mate-rr-config.h', 'mate-rr-labeler.h', - 'mate-colorbutton.h', 'mate-colorsel.h', 'mate-hsv.h', 'mate-colorseldialog.h', @@ -52,7 +51,6 @@ sources = files( 'mate-rr-config.c', 'mate-rr-output-info.c', 'mate-rr-labeler.c', - 'mate-colorbutton.c', 'mate-colorsel.c', 'mate-hsv.c', 'mate-colorseldialog.c', @@ -163,12 +161,6 @@ test_ditem = executable('test-ditem', install : false, ) -test_color_button = executable('test-color-button', - sources : 'test.c', - dependencies : libmate_desktop_dep, - install : false, -) - test_languages = executable('test-languages', sources : 'test-languages.c', dependencies : libmate_desktop_dep, diff --git a/libmate-desktop/test.c b/libmate-desktop/test.c deleted file mode 100644 index 3ad89eb..0000000 --- a/libmate-desktop/test.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * test.c: general tests for libmate-desktop - * - * Copyright (C) 2013-2014 Stefano Karapetsas - * Copyright (C) 2013-2021 MATE Developers - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * Authors: - * Stefano Karapetsas <[email protected]> - */ - -#include <config.h> -#include "mate-desktop.h" -#include "mate-colorbutton.h" - -int -main (int argc, char **argv) -{ - GtkWindow *window = NULL; - GtkWidget *widget = NULL; - - /* initialize GTK+ */ - gtk_init (&argc, &argv); - - /* create window */ - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - - gtk_window_set_title (window, "MATE Desktop Test"); - - /* create a MateColorButton */ - widget = mate_color_button_new (); - - /* add MateColorButton to window */ - gtk_container_add (GTK_CONTAINER (window), widget); - - /* quit signal */ - g_signal_connect (GTK_WIDGET (window), "destroy", gtk_main_quit, NULL); - - gtk_widget_show_all (GTK_WIDGET (window)); - - /* start application */ - gtk_main (); - return 0; -} diff --git a/po/POTFILES.in b/po/POTFILES.in index 3268ebd..0709f05 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,6 @@ mate-about/mate-about.h # When adding a file here, make sure that the entry point in the API of this # file calls _mate_desktop_init_i18n () libmate-desktop/display-name.c -libmate-desktop/mate-colorbutton.c libmate-desktop/mate-colorsel.c libmate-desktop/mate-hsv.c libmate-desktop/mate-colorseldialog.c |