diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 6 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/gtk.h | 1 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 12 | ||||
| -rw-r--r-- | gtk/gtkscalebutton.c | 1246 | ||||
| -rw-r--r-- | gtk/gtkscalebutton.h | 94 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
11 files changed, 1381 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2007-05-19 Bastien Nocera <hadess@hadess.net> + + reviewed by: Matthias Clasen <mclasen@redhat.com> + + * gtk/Makefile.am: + * gtk/gtk.h: + * gtk/gtk.symbols: + * gtk/gtkscalebutton.[ch]: Add the GtkScaleButton widget, + a button that pops up a scale when pressed + 2007-05-19 Matthias Clasen <mclasen@redhat.com> * gtk/gtk.symbols: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index f1d033f80..acf974319 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,9 @@ +2007-05-20 Bastien Nocera <hadess@hadess.net> + + * gtk/gtk-docs.sgml: + * gtk/gtk-sections.txt: add the GtkScaleButton widget + to the docs + 2007-05-19 Matthias Clasen <mclasen@redhat.com> * gtk/gtk-sections.txt: Add gtk_notebook_[gs]et_group diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 87c9f2bd5..f0a080ded 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -108,6 +108,7 @@ <!ENTITY GtkRecentManager SYSTEM "xml/gtkrecentmanager.xml"> <!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml"> <!ENTITY GtkScale SYSTEM "xml/gtkscale.xml"> +<!ENTITY GtkScaleButton SYSTEM "xml/gtkscalebutton.xml"> <!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml"> <!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml"> <!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml"> @@ -391,6 +392,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or &GtkButton; &GtkCheckButton; &GtkRadioButton; + &GtkScaleButton; &GtkToggleButton; &GtkLinkButton; </chapter> diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 1337eace1..044e64711 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -3021,9 +3021,11 @@ gtk_scale_get_type <TITLE>GtkScaleButton</TITLE> GtkScaleButton gtk_scale_button_new +gtk_scale_button_set_adjustment +gtk_scale_button_set_icons gtk_scale_button_set_value +gtk_scale_button_get_adjustment gtk_scale_button_get_value -gtk_scale_button_set_icons <SUBSECTION Standard> GTK_SCALE_BUTTON GTK_SCALE_IS_BUTTON diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 3097d2054..0f514e80a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -259,6 +259,7 @@ gtk_public_h_sources = \ gtkrecentmanager.h \ gtkruler.h \ gtkscale.h \ + gtkscalebutton.h \ gtkscrollbar.h \ gtkscrolledwindow.h \ gtkselection.h \ @@ -533,6 +534,7 @@ gtk_base_c_sources = \ gtkrecentmanager.c \ gtkruler.c \ gtkscale.c \ + gtkscalebutton.c \ gtkscrollbar.c \ gtkscrolledwindow.c \ gtkselection.c \ @@ -150,6 +150,7 @@ #include <gtk/gtkrecentmanager.h> #include <gtk/gtkruler.h> #include <gtk/gtkscale.h> +#include <gtk/gtkscalebutton.h> #include <gtk/gtkscrollbar.h> #include <gtk/gtkscrolledwindow.h> #include <gtk/gtkselection.h> diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 86b985763..3bcd95b42 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -3234,6 +3234,18 @@ gtk_scale_set_value_pos #endif #endif +#if IN_HEADER(__GTK_SCALE_BUTTON_H__) +#if IN_FILE(__GTK_SCALE_BUTTON_C__) +gtk_scale_button_get_type G_GNUC_CONST +gtk_scale_button_get_value +gtk_scale_button_new +gtk_scale_button_set_icons +gtk_scale_button_set_value +gtk_scale_button_get_adjustment +gtk_scale_button_set_adjustment +#endif +#endif + #if IN_HEADER(__GTK_SCROLLBAR_H__) #if IN_FILE(__GTK_SCROLLBAR_C__) gtk_scrollbar_get_type G_GNUC_CONST diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c new file mode 100644 index 000000000..307a253df --- /dev/null +++ b/gtk/gtkscalebutton.c @@ -0,0 +1,1246 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2005 Ronald S. Bultje + * Copyright (C) 2006, 2007 Christian Persch + * Copyright (C) 2006 Jan Arne Petersen + * Copyright (C) 2005-2007 Red Hat, Inc. + * + * Authors: + * - Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * - Bastien Nocera <bnocera@redhat.com> + * - Jan Arne Petersen <jpetersen@jpetersen.org> + * - Christian Persch <chpe@svn.gnome.org> + * + * 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, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 2007. 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> + +#define _GNU_SOURCE +#include <math.h> +#include <stdlib.h> +#include <string.h> + +#include "gtkmain.h" +#include "gtkintl.h" +#include "gtkrange.h" +#include "gtkbindings.h" +#include "gtkscale.h" +#include "gtkvscale.h" +#include "gtkframe.h" +#include "gtkvbox.h" +#include "gtkwindow.h" +#include "gtkmarshalers.h" +#include "gtkstock.h" + +#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gdk/gdkkeysyms.h> +#include "gtkscalebutton.h" + +#define SCALE_SIZE 100 +#define CLICK_TIMEOUT 250 + +enum { + VALUE_CHANGED, + POPUP, + POPDOWN, + LAST_SIGNAL +}; + +enum { + PROP_0, + PROP_VALUE, + PROP_SIZE, + PROP_ADJUSTMENT +}; + +struct _GtkScaleButtonPrivate { + GtkWidget *dock, *scale, *image; + GtkIconSize size; + guint click_id; + gdouble direction; + guint32 pop_time; + gchar **icon_list; + gint click_timeout; + guint timeout : 1; +} _GtkScaleButtonPrivate; + +static void gtk_scale_button_class_init (GtkScaleButtonClass *klass); +static void gtk_scale_button_init (GtkScaleButton *button); +static void gtk_scale_button_dispose (GObject *object); +static void gtk_scale_button_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_scale_button_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static gboolean gtk_scale_button_scroll (GtkWidget *widget, + GdkEventScroll *event); +static void gtk_scale_button_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen); +static gboolean gtk_scale_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean gtk_scale_button_key_release (GtkWidget *widget, + GdkEventKey *event); +static void gtk_scale_button_popup_from_bindings (GtkWidget *widget); +static void gtk_scale_button_popdown_from_bindings (GtkWidget *widget); +static gboolean cb_dock_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static gboolean cb_dock_key_release (GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); +static gboolean cb_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static gboolean cb_button_release (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); +static void cb_dock_grab_notify (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data); +static gboolean cb_dock_grab_broken_event (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data); +static void cb_scale_grab_notify (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data); +static void gtk_scale_button_update_icon (GtkScaleButton *button); +static void gtk_scale_button_scale_value_changed(GtkRange *range); + +/* see below for scale definitions */ +static GtkWidget *gtk_scale_button_scale_new (GtkScaleButton *button, + gdouble min, + gdouble max, + gdouble step); + +static GtkButtonClass *parent_class = NULL; +static guint signals[LAST_SIGNAL] = { 0 }; + +G_DEFINE_TYPE (GtkScaleButton, gtk_scale_button, GTK_TYPE_BUTTON) + +static void +gtk_scale_button_class_init (GtkScaleButtonClass *klass) +{ + GtkBindingSet *binding_set; + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + parent_class = g_type_class_peek_parent (klass); + + gobject_class->dispose = gtk_scale_button_dispose; + gobject_class->set_property = gtk_scale_button_set_property; + gobject_class->get_property = gtk_scale_button_get_property; + widget_class->button_press_event = gtk_scale_button_press; + widget_class->key_release_event = gtk_scale_button_key_release; + widget_class->scroll_event = gtk_scale_button_scroll; + widget_class->screen_changed = gtk_scale_button_screen_changed; + + g_object_class_install_property (gobject_class, + PROP_VALUE, + g_param_spec_double ("value", + P_("Value"), + P_("The value of the scale"), + -G_MAXDOUBLE, + G_MAXDOUBLE, + 0, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_SIZE, + g_param_spec_enum ("size", + P_("Icon size"), + P_("The icon size"), + GTK_TYPE_ICON_SIZE, + GTK_ICON_SIZE_SMALL_TOOLBAR, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_ADJUSTMENT, + g_param_spec_object ("adjustment", + P_("Adjustment"), + P_("The GtkAdjustment that contains the current value of this scale button object"), + GTK_TYPE_ADJUSTMENT, + G_PARAM_READWRITE)); + + /** + * GtkScaleButton::value-changed: + * @button: the object that received the signal + * + * Emitted when the value field has changed. + * + * Since: 2.12 + * + */ + signals[VALUE_CHANGED] = + g_signal_new (I_("value-changed"), + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkScaleButtonClass, value_changed), + NULL, NULL, + _gtk_marshal_VOID__DOUBLE, + G_TYPE_NONE, 1, G_TYPE_DOUBLE); + signals[POPUP] = + _gtk_binding_signal_new (I_("popup"), + G_OBJECT_CLASS_TYPE (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_scale_button_popup_from_bindings), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[POPDOWN] = + _gtk_binding_signal_new (I_("popdown"), + G_OBJECT_CLASS_TYPE (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_scale_button_popdown_from_bindings), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + /* Key bindings */ + binding_set = gtk_binding_set_by_class (widget_class); + + gtk_binding_entry_add_signal (binding_set, GDK_space, 0, + "popup", 0); + gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, + "popup", 0); + gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, + "popup", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, + "popup", 0); + gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, + "popdown", 0); +} + +static void +gtk_scale_button_init (GtkScaleButton *button) +{ + GtkWidget *frame, *box; + GtkScaleButtonPrivate *priv; + + button->priv = g_new0 (GtkScaleButtonPrivate, 1); + priv = button->priv; + + priv->timeout = FALSE; + priv->click_id = 0; + priv->click_timeout = CLICK_TIMEOUT; + + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + + /* image */ + priv->image = gtk_image_new (); + gtk_container_add (GTK_CONTAINER (button), priv->image); + gtk_widget_show_all (priv->image); + + /* window */ + priv->dock = gtk_window_new (GTK_WINDOW_POPUP); + g_signal_connect (priv->dock, "button-press-event", + G_CALLBACK (cb_dock_button_press), button); + g_signal_connect (priv->dock, "key-release-event", + G_CALLBACK (cb_dock_key_release), button); + g_signal_connect (priv->dock, "grab-notify", + G_CALLBACK (cb_dock_grab_notify), button); + g_signal_connect (priv->dock, "grab-broken-event", + G_CALLBACK (cb_dock_grab_broken_event), button); + gtk_window_set_decorated (GTK_WINDOW (priv->dock), FALSE); + + /* frame */ + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); + gtk_container_add (GTK_CONTAINER (priv->dock), frame); + box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (frame), box); + + /* + */ + button->plus_button = gtk_button_new_with_label ("+"); + gtk_button_set_relief (GTK_BUTTON (button->plus_button), GTK_RELIEF_NONE); + g_signal_connect (button->plus_button, "button-press-event", + G_CALLBACK (cb_button_press), button); + g_signal_connect (button->plus_button, "button-release-event", + G_CALLBACK (cb_button_release), button); + gtk_box_pack_start (GTK_BOX (box), button->plus_button, TRUE, FALSE, 0); + + /* scale */ + priv->scale = gtk_scale_button_scale_new (button, 0., 100., 2.); + gtk_widget_set_size_request (priv->scale, -1, SCALE_SIZE); + gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE); + gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE); + gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, FALSE, 0); + g_signal_connect (priv->scale, "grab-notify", + G_CALLBACK (cb_scale_grab_notify), button); + + /* - */ + button->minus_button = gtk_button_new_with_label ("-"); + gtk_button_set_relief (GTK_BUTTON (button->minus_button), GTK_RELIEF_NONE); + g_signal_connect (button->minus_button, "button-press-event", + G_CALLBACK (cb_button_press), button); + g_signal_connect (button->minus_button, "button-release-event", + G_CALLBACK (cb_button_release), button); + gtk_box_pack_start (GTK_BOX (box), button->minus_button, TRUE, FALSE, 0); + + /* set button text and size */ + priv->size = GTK_ICON_SIZE_SMALL_TOOLBAR; + gtk_scale_button_update_icon (button); +} + +static void +gtk_scale_button_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkScaleButton *button; + + button = GTK_SCALE_BUTTON (object); + + switch (prop_id) + { + case PROP_VALUE: + gtk_scale_button_set_value (button, g_value_get_double (value)); + break; + case PROP_SIZE: + { + GtkIconSize size; + size = g_value_get_enum (value); + if (button->priv->size != size) + { + button->priv->size = size; + gtk_scale_button_update_icon (button); + } + } + break; + case PROP_ADJUSTMENT: + gtk_scale_button_set_adjustment (button, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gtk_scale_button_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + + button = GTK_SCALE_BUTTON (object); + priv = button->priv; + + switch (prop_id) + { + case PROP_VALUE: + g_value_set_float (value, gtk_scale_button_get_value (button)); + break; + case PROP_SIZE: + g_value_set_enum (value, priv->size); + break; + case PROP_ADJUSTMENT: + g_value_set_object (value, gtk_scale_button_get_adjustment (button)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gtk_scale_button_dispose (GObject *object) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + + button = GTK_SCALE_BUTTON (object); + + priv = button->priv; + + if (priv && priv->dock) + { + gtk_widget_destroy (priv->dock); + priv->dock = NULL; + } + + if (priv && priv->click_id != 0) + { + g_source_remove (priv->click_id); + priv->click_id = 0; + } + + if (priv && priv->icon_list) + { + g_strfreev (priv->icon_list); + priv->icon_list = NULL; + } + + g_free (priv); + button->priv = NULL; + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + +/** + * gtk_scale_button_new + * @size: a stock icon size + * @lower: the minimum value of the scale (usually 0) + * @upper: the maximum value of the scale (usually 100) + * @step_increment: the stepping of value when a scroll-wheel event, + * or up/down arrow event occurs (usually 2) + * @icons: a %NULL-terminated array of icon names, or %NULL if + * you want to set the list later with gtk_scale_button_set_icons(). See + * gtk_scale_button_set_icons() for details. + * + * Creates a #GtkScaleButton, with a range between lower and upper, with + * a stepping of step_increment. + * + * Return value: a new #GtkScaleButton + * + * Since: 2.12 + */ +GtkWidget * +gtk_scale_button_new (GtkIconSize size, + gdouble lower, + gdouble upper, + gdouble step_increment, + const gchar **icons) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + + button = g_object_new (GTK_TYPE_SCALE_BUTTON, NULL); + priv = button->priv; + + if (icons != NULL) + gtk_scale_button_set_icons (button, icons); + + gtk_range_set_range (GTK_RANGE (priv->scale), lower, upper); + gtk_range_set_increments (GTK_RANGE (priv->scale), + step_increment, + 10 * step_increment); + + if (priv->size != size) + { + priv->size = size; + gtk_scale_button_update_icon (button); + } + + return GTK_WIDGET (button); +} + +/** + * gtk_scale_button_get_value + * @button: a #GtkScaleButton + * + * Gets the current value of the scale button. + * + * Return value: current value of the scale button + * + * Since: 2.12 + */ +gdouble +gtk_scale_button_get_value (GtkScaleButton * button) +{ + GtkScaleButtonPrivate *priv; + + g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), 0); + + priv = button->priv; + + return gtk_range_get_value (GTK_RANGE (priv->scale)); +} + +/** + * gtk_scale_button_set_value + * @button: a #GtkScaleButton + * @value: new value of the scale button + * + * Sets the current value of the scale; if the value is outside the minimum or + * maximum range values, it will be clamped to fit inside them. The scale button + * emits the "value_changed" signal if the value changes. + * + * Since: 2.12 + */ +void +gtk_scale_button_set_value (GtkScaleButton *button, + gdouble value) +{ + GtkScaleButtonPrivate *priv; + + g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); + + priv = button->priv; + + gtk_range_set_value (GTK_RANGE (priv->scale), value); +} + +/** + * gtk_scale_button_set_icons + * @button: a #GtkScaleButton + * @icons: a %NULL-terminated array of icon names + * + * Sets the icons to be used by the scale button. The first item in the array + * will be used in the button when the current value is the lowest value, the + * second item for the highest value. All the subsequent icons will be used for + * all the other values, spread evenly over the range of values. + * + * If there's only one icon in the @icons array, it will be used for all the + * values. If only two icons are in the @icons array, the first one will be + * used for the bottom 50% of the scale, and the second one for the top 50%. + * So it is recommended to use at least 3 icons so that the #GtkScaleButton + * reflects the current value of the scale better for the users. + * + * Since 2.12 + */ +void +gtk_scale_button_set_icons (GtkScaleButton *button, + const gchar **icons) +{ + GtkScaleButtonPrivate *priv; + + g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); + g_return_if_fail (icons != NULL); + g_return_if_fail (icons[0] != NULL); + + priv = button->priv; + + g_strfreev (priv->icon_list); + priv->icon_list = g_strdupv ((gchar **) icons); + gtk_scale_button_update_icon (button); +} + +/** + * gtk_scale_button_get_adjustment + * @button: a #GtkScaleButton + * + * Gets the #GtkAdjustment associated with the #GtkScaleButton's scale. + * See gtk_range_get_adjustment() for details. + * + * Since: 2.12 + */ +GtkAdjustment* +gtk_scale_button_get_adjustment (GtkScaleButton *button) +{ + GtkRange *range; + + g_return_val_if_fail (GTK_IS_SCALE_BUTTON (button), NULL); + + range = GTK_RANGE (button->priv->scale); + g_return_val_if_fail (range != NULL, NULL); + + return gtk_range_get_adjustment (range); +} + +/** + * gtk_scale_button_set_adjustment + * @button: a #GtkScaleButton + * @adjustment: a #GtkAdjustment + * + * Sets the #GtkAdjustment to be used as a model for the #GtkScaleButton's scale. + * See gtk_range_set_adjustment() for details. + * + * Since: 2.12 + */ +void +gtk_scale_button_set_adjustment (GtkScaleButton *button, + GtkAdjustment *adjustment) +{ + g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); + g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + + gtk_range_set_adjustment (GTK_RANGE (button->priv->scale), + adjustment); +} + +/* + * button callbacks. + */ + +static gboolean +gtk_scale_button_scroll (GtkWidget *widget, + GdkEventScroll *event) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + GtkAdjustment *adj; + gdouble d; + + button = GTK_SCALE_BUTTON (widget); + priv = button->priv; + adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); + + if (event->type != GDK_SCROLL) + return FALSE; + + d = gtk_scale_button_get_value (button); + if (event->direction == GDK_SCROLL_UP) + { + d += adj->step_increment; + if (d > adj->upper) + d = adj->upper; + } + else + { + d -= adj->step_increment; + if (d < adj->lower) + d = adj->lower; + } + gtk_scale_button_set_value (button, d); + + return TRUE; +} + +static void +gtk_scale_button_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen) +{ + GtkScaleButton *button = (GtkScaleButton *) widget; + GtkScaleButtonPrivate *priv; + GdkScreen *screen; + GValue value = { 0, }; + + if (gtk_widget_has_screen (widget) == FALSE) + return; + + priv = button->priv; + + screen = gtk_widget_get_screen (widget); + g_value_init (&value, G_TYPE_INT); + if (gdk_screen_get_setting (screen, + "gtk-double-click-time", + &value) == FALSE) + { + priv->click_timeout = CLICK_TIMEOUT; + return; + } + + priv->click_timeout = g_value_get_int (&value); +} + +static gboolean +gtk_scale_popup (GtkWidget *widget, + GdkEvent *event, + guint32 time) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + GtkAdjustment *adj; + gint x, y, m, dx, dy, sx, sy, ystartoff; + gdouble v; + GdkDisplay *display; + GdkScreen *screen; + + button = GTK_SCALE_BUTTON (widget); + priv = button->priv; + adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); + + display = gtk_widget_get_display (widget); + screen = gtk_widget_get_screen (widget); + + /* position roughly */ + gtk_window_set_screen (GTK_WINDOW (priv->dock), screen); + + gdk_window_get_origin (widget->window, &x, &y); + x += widget->allocation.x; + y += widget->allocation.y; + gtk_window_move (GTK_WINDOW (priv->dock), x, y - (SCALE_SIZE / 2)); + gtk_widget_show_all (priv->dock); + gdk_window_get_origin (priv->dock->window, &dx, &dy); + dy += priv->dock->allocation.y; + gdk_window_get_origin (priv->scale->window, &sx, &sy); + sy += priv->scale->allocation.y; + ystartoff = sy - dy; + priv->timeout = TRUE; + + /* position (needs widget to be shown already) */ + v = gtk_scale_button_get_value (button) / (adj->upper - adj->lower); + x += (widget->allocation.width - priv->dock->allocation.width) / 2; + y -= ystartoff; + y -= GTK_RANGE (priv->scale)->min_slider_size / 2; + m = priv->scale->allocation.height - + GTK_RANGE (priv->scale)->min_slider_size; + y -= m * (1.0 - v); + + /* Make sure the dock stays inside the monitor */ + if (event->type == GDK_BUTTON_PRESS) + { + int monitor; + GdkEventButton *button_event = (GdkEventButton *) event; + GdkRectangle rect; + GtkWidget *d; + + d = GTK_WIDGET (priv->dock); + monitor = gdk_screen_get_monitor_at_point (screen, + button_event->x, + button_event->y); + gdk_screen_get_monitor_geometry (screen, monitor, &rect); + + y += button_event->y; + if (y < rect.y) + y = rect.y; + else if (y + d->allocation.height > rect.height + rect.y) + y = rect.y + rect.height - d->allocation.height; + + if (x < rect.x) + x = rect.x; + else if (x + d->allocation.width > rect.width - rect.x) + x = rect.x + rect.width - d->allocation.width; + } + + gtk_window_move (GTK_WINDOW (priv->dock), x, y); + + if (event->type == GDK_BUTTON_PRESS) + GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, (GdkEventButton *) event); + + /* grab focus */ + gtk_grab_add (priv->dock); + + if (gdk_pointer_grab (priv->dock->window, TRUE, + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK, NULL, NULL, time) + != GDK_GRAB_SUCCESS) + { + gtk_grab_remove (priv->dock); + gtk_widget_hide (priv->dock); + return FALSE; + } + + if (gdk_keyboard_grab (priv->dock->window, TRUE, time) != GDK_GRAB_SUCCESS) + { + gdk_display_pointer_ungrab (display, time); + gtk_grab_remove (priv->dock); + gtk_widget_hide (priv->dock); + return FALSE; + } + + gtk_widget_grab_focus (priv->dock); + + if (event->type == GDK_BUTTON_PRESS) + { + GdkEventButton *e; + GdkEventButton *button_event = (GdkEventButton *) event; + + /* forward event to the slider */ + e = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event); + e->window = priv->scale->window; + + /* position: the X position isn't relevant, halfway will work just fine. + * The vertical position should be *exactly* in the middle of the slider + * of the scale; if we don't do that correctly, it'll move from its current + * position, which means a position change on-click, which is bad. */ + e->x = priv->scale->allocation.width / 2; + m = priv->scale->allocation.height - + GTK_RANGE (priv->scale)->min_slider_size; + e->y = ((1.0 - v) * m) + GTK_RANGE (priv->scale)->min_slider_size / 2; + gtk_widget_event (priv->scale, (GdkEvent *) e); + e->window = button_event->window; + gdk_event_free ((GdkEvent *) e); + } + + gtk_widget_grab_focus (priv->scale); + + priv->pop_time = time; + + return TRUE; +} + +static gboolean +gtk_scale_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + return gtk_scale_popup (widget, (GdkEvent *) event, event->time); +} + +static void +gtk_scale_button_popup_from_bindings (GtkWidget *widget) +{ + GdkEvent *ev; + + ev = gdk_event_new (GDK_KEY_RELEASE); + gtk_scale_popup (widget, ev, GDK_CURRENT_TIME); + gdk_event_free (ev); +} + +static gboolean +gtk_scale_button_key_release (GtkWidget *widget, + GdkEventKey *event) +{ + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); +} + +/* This is called when the grab is broken for + * either the dock, or the scale itself */ +static void +gtk_scale_button_grab_notify (GtkScaleButton *button, + gboolean was_grabbed) +{ + GdkDisplay *display; + GtkScaleButtonPrivate *priv; + + if (was_grabbed != FALSE) + return; + + priv = button->priv; + + if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock)) + return; + + display = gtk_widget_get_display (priv->dock); + gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME); + gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME); + gtk_grab_remove (priv->dock); + + /* hide again */ + gtk_widget_hide (priv->dock); + priv->timeout = FALSE; +} + +/* + * +/- button callbacks. + */ + +static gboolean +cb_button_timeout (gpointer user_data) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + GtkAdjustment *adj; + gdouble val; + gboolean res = TRUE; + + button = GTK_SCALE_BUTTON (user_data); + priv = button->priv; + + if (priv->click_id == 0) + return FALSE; + + adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); + + val = gtk_scale_button_get_value (button); + val += priv->direction; + if (val <= adj->lower) + { + res = FALSE; + val = adj->lower; + } + else if (val > adj->upper) + { + res = FALSE; + val = adj->upper; + } + gtk_scale_button_set_value (button, val); + + if (!res) + { + g_source_remove (priv->click_id); + priv->click_id = 0; + } + + return res; +} + +static gboolean +cb_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + GtkAdjustment *adj; + + button = GTK_SCALE_BUTTON (user_data); + priv = button->priv; + adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); + + if (priv->click_id != 0) + g_source_remove (priv->click_id); + + if (widget == button->plus_button) + priv->direction = fabs (adj->page_increment); + else + priv->direction = - fabs (adj->page_increment); + + priv->click_id = g_timeout_add (priv->click_timeout, + (GSourceFunc) cb_button_timeout, button); + cb_button_timeout (button); + + return TRUE; +} + +static gboolean +cb_button_release (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + + button = GTK_SCALE_BUTTON (user_data); + priv = button->priv; + + if (priv->click_id != 0) + { + g_source_remove (priv->click_id); + priv->click_id = 0; + } + + return TRUE; +} + +static void +cb_dock_grab_notify (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data) +{ + GtkScaleButton *button = (GtkScaleButton *) user_data; + + gtk_scale_button_grab_notify (button, was_grabbed); +} + +static gboolean +cb_dock_grab_broken_event (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data) +{ + GtkScaleButton *button = (GtkScaleButton *) user_data; + + gtk_scale_button_grab_notify (button, FALSE); + + return FALSE; +} + +/* + * Scale callbacks. + */ + +static void +gtk_scale_button_release_grab (GtkScaleButton *button, + GdkEventButton *event) +{ + GdkEventButton *e; + GdkDisplay *display; + GtkScaleButtonPrivate *priv; + + priv = button->priv; + + /* ungrab focus */ + display = gtk_widget_get_display (GTK_WIDGET (button)); + gdk_display_keyboard_ungrab (display, event->time); + gdk_display_pointer_ungrab (display, event->time); + gtk_grab_remove (priv->dock); + + /* hide again */ + gtk_widget_hide (priv->dock); + priv->timeout = FALSE; + + e = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event); + e->window = GTK_WIDGET (button)->window; + e->type = GDK_BUTTON_RELEASE; + gtk_widget_event (GTK_WIDGET (button), (GdkEvent *) e); + e->window = event->window; + gdk_event_free ((GdkEvent *) e); +} + +static gboolean +cb_dock_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + GtkScaleButton *button = GTK_SCALE_BUTTON (user_data); + + if (event->type == GDK_BUTTON_PRESS) + { + gtk_scale_button_release_grab (button, event); + return TRUE; + } + + return FALSE; +} + +static void +gtk_scale_button_popdown_from_bindings (GtkWidget *widget) +{ + GtkScaleButton *button; + GtkScaleButtonPrivate *priv; + GdkDisplay *display; + + button = GTK_SCALE_BUTTON (widget); + priv = button->priv; + + /* ungrab focus */ + display = gtk_widget_get_display (widget); + gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME); + gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME); + gtk_grab_remove (priv->dock); + + /* hide again */ + gtk_widget_hide (priv->dock); + priv->timeout = FALSE; +} + +static gboolean +cb_dock_key_release (GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) +{ + if (event->keyval == GDK_Escape) + { + gtk_scale_button_popdown_from_bindings (GTK_WIDGET (user_data)); + return TRUE; + } + + if (!gtk_bindings_activate_event (GTK_OBJECT (widget), event)) + { + /* The popup hasn't managed the event, pass onto the button */ + gtk_bindings_activate_event (GTK_OBJECT (user_data), event); + } + + return TRUE; +} + +static void +cb_scale_grab_notify (GtkWidget *widget, + gboolean was_grabbed, + gpointer user_data) +{ + GtkScaleButton *button = (GtkScaleButton *) user_data; + + gtk_scale_button_grab_notify (button, was_grabbed); +} + +/* + * Scale stuff. + */ + +#define GTK_TYPE_SCALE_BUTTON_SCALE \ + (gtk_scale_button_scale_get_type ()) +#define GTK_SCALE_BUTTON_SCALE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_SCALE, \ + GtkScaleButtonScale)) + +typedef struct _GtkScaleButtonScaleClass { + GtkVScaleClass parent_class; +} GtkScaleButtonScaleClass; + +typedef struct _GtkScaleButtonScale { + GtkVScale parent; + GtkScaleButton *button; +} GtkScaleButtonScale; + +static GType gtk_scale_button_scale_get_type (void); +static void gtk_scale_button_scale_class_init (GtkScaleButtonScaleClass *klass); +static gboolean gtk_scale_button_scale_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean gtk_scale_button_scale_release (GtkWidget *widget, + GdkEventButton *event); + +static GtkVScaleClass *scale_parent_class = NULL; + +G_DEFINE_TYPE (GtkScaleButtonScale, gtk_scale_button_scale, GTK_TYPE_VSCALE) + +static void +gtk_scale_button_scale_class_init (GtkScaleButtonScaleClass *klass) +{ + GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); + GtkRangeClass *gtkrange_class = GTK_RANGE_CLASS (klass); + + scale_parent_class = g_type_class_peek_parent (klass); + + gtkwidget_class->button_press_event = gtk_scale_button_scale_press; + gtkwidget_class->button_release_event = gtk_scale_button_scale_release; + gtkrange_class->value_changed = gtk_scale_button_scale_value_changed; +} + +static void +gtk_scale_button_scale_init (GtkScaleButtonScale *scale) +{ +} + +static GtkWidget * +gtk_scale_button_scale_new (GtkScaleButton *button, + gdouble min, + gdouble max, + gdouble step) +{ + GtkScaleButtonScale *scale; + GtkScaleButtonPrivate *priv; + GtkObject *adj; + + priv = button->priv; + scale = g_object_new (GTK_TYPE_SCALE_BUTTON_SCALE, NULL); + adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0); + gtk_range_set_adjustment (GTK_RANGE (scale), GTK_ADJUSTMENT (adj)); + scale->button = button; + + return GTK_WIDGET (scale); +} + +static gboolean +gtk_scale_button_scale_press (GtkWidget *widget, + GdkEventButton *event) +{ + GtkScaleButtonScale *scale; + GtkScaleButtonPrivate *priv; + + scale = GTK_SCALE_BUTTON_SCALE (widget); + priv = scale->button->priv; + + /* the scale will grab input; if we have input grabbed, all goes + * horribly wrong, so let's not do that. */ + gtk_grab_remove (priv->dock); + + return GTK_WIDGET_CLASS (scale_parent_class)->button_press_event (widget, event); +} + +static gboolean +gtk_scale_button_scale_release (GtkWidget *widget, + GdkEventButton *event) +{ + GtkScaleButtonScale *scale; + GtkScaleButtonPrivate *priv; + gboolean res; + + scale = GTK_SCALE_BUTTON_SCALE (widget); + priv = scale->button->priv; + + if (priv->timeout) + { + /* if we did a quick click, leave the window open; else, hide it */ + if (event->time > priv->pop_time + priv->click_timeout) + { + gtk_scale_button_release_grab (scale->button, event); + GTK_WIDGET_CLASS (scale_parent_class)->button_release_event (widget, event); + return TRUE; + } + priv->timeout = FALSE; + } + + res = GTK_WIDGET_CLASS (scale_parent_class)->button_release_event (widget, event); + + /* the scale will release input; right after that, we *have to* grab + * it back so we can catch out-of-scale clicks and hide the popup, + * so I basically want a g_signal_connect_after_always(), but I can't + * find that, so we do this complex 'first-call-parent-then-do-actual- + * action' thingy... */ + gtk_grab_add (priv->dock); + + return res; +} + +static void +gtk_scale_button_update_icon (GtkScaleButton *button) +{ + GtkScaleButtonPrivate *priv; + GtkRange *range; + GtkAdjustment *adj; + gdouble value; + const gchar *name; + guint num_icons; + + priv = button->priv; + + if (priv->icon_list == NULL || priv->icon_list[0] == NULL) + { + gtk_image_set_from_stock (GTK_IMAGE (priv->image), + GTK_STOCK_MISSING_IMAGE, + priv->size); + return; + } + + for (num_icons = 0; priv->icon_list[num_icons] != NULL; num_icons++) {} + + /* The 1-icon special case */ + if (num_icons == 1) + { + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + priv->icon_list[0], + priv->size); + return; + } + + range = GTK_RANGE (priv->scale); + adj = gtk_range_get_adjustment (range); + value = gtk_scale_button_get_value (button); + + /* The 2-icons special case */ + if (num_icons == 2) + { + gdouble limit; + limit = (adj->upper - adj->lower) / 2 + adj->lower; + if (value < limit) + name = priv->icon_list[0]; + else + name = priv->icon_list[1]; + + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + name, + priv->size); + return; + } + + /* With 3 or more icons */ + if (value == adj->lower) + { + name = priv->icon_list[0]; + } + else if (value == adj->upper) + { + name = priv->icon_list[1]; + } + else + { + gdouble step; + guint i; + + step = (adj->upper - adj->lower) / (num_icons - 2); + i = (guint) (value - adj->lower) / step + 2; + g_assert (i < num_icons); + name = priv->icon_list[i]; + } + + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + name, + priv->size); +} + +static void +gtk_scale_button_scale_value_changed (GtkRange *range) +{ + GtkScaleButtonScale *scale = GTK_SCALE_BUTTON_SCALE (range); + GtkScaleButton *button = scale->button; + gdouble value; + + value = gtk_range_get_value (range); + + gtk_scale_button_update_icon (button); + + g_signal_emit (button, signals[VALUE_CHANGED], 0, value); + g_object_notify (G_OBJECT (button), "value"); +} + +/* + * vim: sw=2 ts=8 cindent noai bs=2 + */ diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h new file mode 100644 index 000000000..ee41caf54 --- /dev/null +++ b/gtk/gtkscalebutton.h @@ -0,0 +1,94 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2005 Ronald S. Bultje + * Copyright (C) 2006, 2007 Christian Persch + * Copyright (C) 2006 Jan Arne Petersen + * Copyright (C) 2007 Red Hat, Inc. + * + * Authors: + * - Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * - Bastien Nocera <bnocera@redhat.com> + * - Jan Arne Petersen <jpetersen@jpetersen.org> + * - Christian Persch <chpe@svn.gnome.org> + * + * 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, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 2007. 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 __GTK_SCALE_BUTTON_H__ +#define __GTK_SCALE_BUTTON_H__ + +#include <gtk/gtkbutton.h> + +G_BEGIN_DECLS + +#define GTK_TYPE_SCALE_BUTTON (gtk_scale_button_get_type ()) +#define GTK_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButton)) +#define GTK_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass)) +#define GTK_IS_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON)) +#define GTK_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE_BUTTON)) +#define GTK_SCALE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass)) + +typedef struct _GtkScaleButton GtkScaleButton; +typedef struct _GtkScaleButtonClass GtkScaleButtonClass; +typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate; + +struct _GtkScaleButtonClass +{ + GtkButtonClass parent_class; + + /* signals */ + void (* value_changed) (GtkScaleButton *button, gdouble value); + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); +}; + +struct _GtkScaleButton +{ + GtkButton parent; + GtkWidget *plus_button; + GtkWidget *minus_button; + GtkScaleButtonPrivate *priv; +}; + +GType gtk_scale_button_get_type (void) G_GNUC_CONST; +GtkWidget* gtk_scale_button_new (GtkIconSize size, + gdouble min, + gdouble max, + gdouble step, + const gchar **icons); +void gtk_scale_button_set_icons (GtkScaleButton *button, + const gchar **icons); +gdouble gtk_scale_button_get_value (GtkScaleButton *button); +void gtk_scale_button_set_value (GtkScaleButton *button, + gdouble value); +GtkAdjustment* gtk_scale_button_get_adjustment (GtkScaleButton *button); +void gtk_scale_button_set_adjustment (GtkScaleButton *button, + GtkAdjustment *adjustment); + +G_END_DECLS + +#endif /* __GTK_SCALE_BUTTON_H__ */ + diff --git a/po/ChangeLog b/po/ChangeLog index cc0d43a78..f8c199b9a 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-05-19 Bastien Nocera <hadess@hadess.net> + + * POTFILES.in: Add scale button to the list + 2007-05-20 Yair Hershkovitz <yairhr@gmail.com> * he.po: Updated Hebrew translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 5116debfa..dead79002 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -173,6 +173,7 @@ gtk/gtkrecentchoosermenu.c gtk/gtkrecentmanager.c gtk/gtkruler.c gtk/gtkscale.c +gtk/gtkscalebutton.c gtk/gtkscrollbar.c gtk/gtkscrolledwindow.c gtk/gtkselection.c |