diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index cc8b84b5f9..13a64d0870 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -328,8 +328,6 @@ libappwidgets_a_sources = \ gimpsamplepointeditor.h \ gimpsavedialog.c \ gimpsavedialog.h \ - gimpscalebutton.c \ - gimpscalebutton.h \ gimpsearchpopup.c \ gimpsearchpopup.h \ gimpselectiondata.c \ diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index 4675f06320..51eedde41d 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -46,7 +46,6 @@ #include "gimplanguagecombobox.h" #include "gimplanguageentry.h" #include "gimplayermodebox.h" -#include "gimpscalebutton.h" #include "gimpspinscale.h" #include "gimpview.h" #include "gimppolar.h" @@ -441,115 +440,6 @@ gimp_prop_color_button_notify (GObject *config, } -/******************/ -/* scale button */ -/******************/ - -static void gimp_prop_scale_button_callback (GtkWidget *widget, - gdouble value, - GObject *config); -static void gimp_prop_scale_button_notify (GObject *config, - GParamSpec *param_spec, - GtkWidget *button); - -/** - * gimp_prop_scale_button_new: - * @config: #GimpConfig object to which property is attached. - * @property_name: Name of gdouble property - * - * Creates a #GimpScaleButton to set and display the value of a - * gdouble property in a very space-efficient way. - * - * Return value: A new #GimpScaleButton widget. - * - * Since GIMP 2.6 - */ -GtkWidget * -gimp_prop_scale_button_new (GObject *config, - const gchar *property_name) -{ - GParamSpec *param_spec; - GtkWidget *button; - gdouble value; - - param_spec = check_param_spec_w (config, property_name, - G_TYPE_PARAM_DOUBLE, G_STRFUNC); - - if (! param_spec) - return NULL; - - g_object_get (config, - param_spec->name, &value, - NULL); - - button = gimp_scale_button_new (value, - G_PARAM_SPEC_DOUBLE (param_spec)->minimum, - G_PARAM_SPEC_DOUBLE (param_spec)->maximum); - - set_param_spec (G_OBJECT (button), button, param_spec); - - g_signal_connect (button, "value-changed", - G_CALLBACK (gimp_prop_scale_button_callback), - config); - - connect_notify (config, property_name, - G_CALLBACK (gimp_prop_scale_button_notify), - button); - - return button; -} - -static void -gimp_prop_scale_button_callback (GtkWidget *button, - gdouble value, - GObject *config) -{ - GParamSpec *param_spec; - gdouble v; - - param_spec = get_param_spec (G_OBJECT (button)); - if (! param_spec) - return; - - g_object_get (config, param_spec->name, &v, NULL); - - if (v != value) - { - g_signal_handlers_block_by_func (config, - gimp_prop_scale_button_notify, - button); - - g_object_set (config, param_spec->name, value, NULL); - - g_signal_handlers_unblock_by_func (config, - gimp_prop_scale_button_notify, - button); - } -} - -static void -gimp_prop_scale_button_notify (GObject *config, - GParamSpec *param_spec, - GtkWidget *button) -{ - gdouble value; - - g_object_get (config, - param_spec->name, &value, - NULL); - - g_signal_handlers_block_by_func (button, - gimp_prop_scale_button_callback, - config); - - gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), value); - - g_signal_handlers_unblock_by_func (button, - gimp_prop_scale_button_callback, - config); -} - - /*****************/ /* adjustments */ /*****************/ diff --git a/app/widgets/gimppropwidgets.h b/app/widgets/gimppropwidgets.h index 6393b1089f..3836fa138b 100644 --- a/app/widgets/gimppropwidgets.h +++ b/app/widgets/gimppropwidgets.h @@ -57,8 +57,6 @@ GtkWidget * gimp_prop_color_button_new (GObject *config, /* GParamDouble */ -GtkWidget * gimp_prop_scale_button_new (GObject *config, - const gchar *property_name); GtkWidget * gimp_prop_spin_scale_new (GObject *config, const gchar *property_name, const gchar *label, diff --git a/app/widgets/gimpscalebutton.c b/app/widgets/gimpscalebutton.c deleted file mode 100644 index 2cf8bd3ed7..0000000000 --- a/app/widgets/gimpscalebutton.c +++ /dev/null @@ -1,195 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * gimpscalebutton.c - * Copyright (C) 2008 Sven Neumann - * - * 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 3 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, see . - */ - -#include "config.h" - -#include - -#include "widgets-types.h" - -#include "gimpscalebutton.h" - - -static void gimp_scale_button_value_changed (GtkScaleButton *button, - gdouble value); -static void gimp_scale_button_update_tooltip (GimpScaleButton *button); -static gboolean gimp_scale_button_image_draw (GtkWidget *widget, - cairo_t *cr, - GimpScaleButton *button); - - -G_DEFINE_TYPE (GimpScaleButton, gimp_scale_button, GTK_TYPE_SCALE_BUTTON) - -#define parent_class gimp_scale_button_parent_class - - -static void -gimp_scale_button_class_init (GimpScaleButtonClass *klass) -{ - GtkScaleButtonClass *button_class = GTK_SCALE_BUTTON_CLASS (klass); - - button_class->value_changed = gimp_scale_button_value_changed; -} - -static void -gimp_scale_button_init (GimpScaleButton *button) -{ - GtkWidget *image = gtk_bin_get_child (GTK_BIN (button)); - GtkWidget *plusminus; - - plusminus = gtk_scale_button_get_plus_button (GTK_SCALE_BUTTON (button)); - gtk_widget_hide (plusminus); - gtk_widget_set_no_show_all (plusminus, TRUE); - - plusminus = gtk_scale_button_get_minus_button (GTK_SCALE_BUTTON (button)); - gtk_widget_hide (plusminus); - gtk_widget_set_no_show_all (plusminus, TRUE); - - g_signal_connect (image, "draw", - G_CALLBACK (gimp_scale_button_image_draw), - button); - - /* GtkScaleButton doesn't emit "value-changed" when the adjustment changes */ - g_signal_connect (button, "notify::adjustment", - G_CALLBACK (gimp_scale_button_update_tooltip), - NULL); - - gimp_scale_button_update_tooltip (button); -} - -static void -gimp_scale_button_value_changed (GtkScaleButton *button, - gdouble value) -{ - if (GTK_SCALE_BUTTON_CLASS (parent_class)->value_changed) - GTK_SCALE_BUTTON_CLASS (parent_class)->value_changed (button, value); - - gimp_scale_button_update_tooltip (GIMP_SCALE_BUTTON (button)); -} - -static void -gimp_scale_button_update_tooltip (GimpScaleButton *button) -{ - GtkAdjustment *adj; - gchar *text; - gdouble value; - gdouble lower; - gdouble upper; - - adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button)); - - value = gtk_adjustment_get_value (adj); - lower = gtk_adjustment_get_lower (adj); - upper = gtk_adjustment_get_upper (adj); - - /* use U+2009 THIN SPACE to separate the percent sign from the number */ - - text = g_strdup_printf ("%d\342\200\211%%", - (gint) (0.5 + ((value - lower) * 100.0 / - (upper - lower)))); - - gtk_widget_set_tooltip_text (GTK_WIDGET (button), text); - g_free (text); -} - -static gboolean -gimp_scale_button_image_draw (GtkWidget *widget, - cairo_t *cr, - GimpScaleButton *button) -{ - GtkStyleContext *style = gtk_widget_get_style_context (widget); - GtkAllocation allocation; - GtkAdjustment *adj; - GdkRGBA color; - gint value; - gint steps; - gint i; - - gtk_widget_get_allocation (widget, &allocation); - - steps = MIN (allocation.width, allocation.height) / 2; - - adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button)); - - if (steps < 1) - return TRUE; - - value = 0.5 + ((gtk_adjustment_get_value (adj) - - gtk_adjustment_get_lower (adj)) * (gdouble) steps / - (gtk_adjustment_get_upper (adj) - - gtk_adjustment_get_lower (adj))); - - cairo_set_line_width (cr, 0.5); - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - { - cairo_translate (cr, allocation.width - 0.5, allocation.height); - cairo_scale (cr, -2.0, -2.0); - } - else - { - cairo_translate (cr, 0.5, allocation.height); - cairo_scale (cr, 2.0, -2.0); - } - - for (i = 0; i < value; i++) - { - cairo_move_to (cr, i, 0); - cairo_line_to (cr, i, i + 0.5); - } - - gtk_style_context_get_color (style, gtk_widget_get_state_flags (widget), - &color); - gdk_cairo_set_source_rgba (cr, &color); - cairo_stroke (cr); - - for ( ; i < steps; i++) - { - cairo_move_to (cr, i, 0); - cairo_line_to (cr, i, i + 0.5); - } - - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_INSENSITIVE, - &color); - gdk_cairo_set_source_rgba (cr, &color); - cairo_stroke (cr); - - return TRUE; -} - -GtkWidget * -gimp_scale_button_new (gdouble value, - gdouble min, - gdouble max) -{ - GtkAdjustment *adj; - gdouble step; - - g_return_val_if_fail (value >= min && value <= max, NULL); - - step = (max - min) / 10.0; - adj = gtk_adjustment_new (value, min, max, step, step, 0); - - return g_object_new (GIMP_TYPE_SCALE_BUTTON, - "orientation", GTK_ORIENTATION_HORIZONTAL, - "adjustment", adj, - "size", GTK_ICON_SIZE_MENU, - NULL); -} diff --git a/app/widgets/gimpscalebutton.h b/app/widgets/gimpscalebutton.h deleted file mode 100644 index e4aacd67b3..0000000000 --- a/app/widgets/gimpscalebutton.h +++ /dev/null @@ -1,53 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * gimpscalebutton.h - * Copyright (C) 2008 Sven Neumann - * - * 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 3 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, see . - */ - -#ifndef __GIMP_SCALE_BUTTON_H__ -#define __GIMP_SCALE_BUTTON_H__ - - -#define GIMP_TYPE_SCALE_BUTTON (gimp_scale_button_get_type ()) -#define GIMP_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButton)) -#define GIMP_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass)) -#define GIMP_IS_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON)) -#define GIMP_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON)) -#define GIMP_SCALE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass)) - - -typedef struct _GimpScaleButtonClass GimpScaleButtonClass; - -struct _GimpScaleButton -{ - GtkScaleButton parent_instance; -}; - -struct _GimpScaleButtonClass -{ - GtkScaleButtonClass parent_class; -}; - - -GType gimp_scale_button_get_type (void) G_GNUC_CONST; - -GtkWidget * gimp_scale_button_new (gdouble value, - gdouble min, - gdouble max); - - -#endif /* __GIMP_SCALE_BUTTON_H__ */