From 754c3261279b58118b16cfe9018613f058b59c9b Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 20 May 2003 11:46:28 +0000 Subject: Simplified and reorganised zoom. Implement a zoom control for the toolbar. 2003-05-19 Christian Persch Simplified and reorganised zoom. Implement a zoom control for the toolbar. * lib/widgets/ephy-zoom-action.h: * lib/widgets/ephy-zoom-action.c: * lib/widgets/ephy-zoom-control.h: * lib/widgets/ephy-zoom-control.c: New. A simple zoom control and a corresponding egg action. * lib/ephy-zoom.h: * lib/ephy-zoom.c: New. Define the supported zoom levels, plus some helper functions. * data/ui/epiphany-toolbar.xml.in: * src/toolbar.h: * src/toolbar.c: (toolbar_update_zoom_control), (zoom_to_level_cb), (toolbar_setup_actions): Hook up zoom control. * src/ephy-window.c: (toolbar_update_zoom_control): New. Updates toolbar zoom control and menu item sensitivity. * embed/mozilla/mozilla-embed.c: (impl_zoom_set, impl_zoom_get): * embed/ephy-embed.[ch]: (zoom_set), (zoom_get), (ephy_embed_zoom_set), (ephy_embed_zoom_get): * lib/ephy-marshal.list: * src/ephy-nautilus-view.c: (gnv_embed_zoom_change_cb), (gnv_zoomable_set_zoom_level_cb): * src/ephy-tab.c: (ephy_tab_zoom_changed_cb): * src/ephy-window.c: (ephy_window_set_zoom): Use float zoom factor instead of int percent for zoom. * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init), (ephy_nautilus_view_class_init), (gnv_zoomable_set_zoom_level_cb), (gnv_zoomable_zoom_in_cb), (gnv_zoomable_zoom_out_cb), (gnv_zoomable_zoom_to_default_cb), (gnv_embed_zoom_change_cb): * src/window-commands.c: (window_cmd_view_zoom_in), (window_cmd_view_zoom_out), (window_cmd_view_zoom_normal): Simplified; use ephy-zoom.h where appropriate. --- lib/Makefile.am | 4 +- lib/ephy-marshal.list | 1 + lib/ephy-zoom.c | 57 +++++++ lib/ephy-zoom.h | 64 ++++++++ lib/widgets/Makefile.am | 7 +- lib/widgets/ephy-zoom-action.c | 223 ++++++++++++++++++++++++++ lib/widgets/ephy-zoom-action.h | 60 +++++++ lib/widgets/ephy-zoom-control.c | 344 ++++++++++++++++++++++++++++++++++++++++ lib/widgets/ephy-zoom-control.h | 66 ++++++++ 9 files changed, 823 insertions(+), 3 deletions(-) create mode 100644 lib/ephy-zoom.c create mode 100644 lib/ephy-zoom.h create mode 100644 lib/widgets/ephy-zoom-action.c create mode 100644 lib/widgets/ephy-zoom-action.h create mode 100644 lib/widgets/ephy-zoom-control.c create mode 100644 lib/widgets/ephy-zoom-control.h (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 9d16c7dd9..f043b19fa 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -56,7 +56,9 @@ libephy_la_SOURCES = \ ephy-stock-icons.h \ ephy-thread-helpers.c \ ephy-thread-helpers.h \ - ephy-types.h + ephy-types.h \ + ephy-zoom.h \ + ephy-zoom.c libephy_la_LIBADD = \ $(top_builddir)/lib/widgets/libephywidgets.la \ diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list index 1d6c352cf..622acfd50 100644 --- a/lib/ephy-marshal.list +++ b/lib/ephy-marshal.list @@ -15,3 +15,4 @@ VOID:INT,INT VOID:INT,INT,INT INT:OBJECT VOID:POINTER,POINTER +VOID:FLOAT diff --git a/lib/ephy-zoom.c b/lib/ephy-zoom.c new file mode 100644 index 000000000..af5d5f771 --- /dev/null +++ b/lib/ephy-zoom.c @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ephy-zoom.h" + +#include + +guint +ephy_zoom_get_zoom_level_index (float level) +{ + guint i; + float previous, current, mean; + + previous = zoom_levels[0].level; + + for (i = 1; i < n_zoom_levels; i++) + { + current = zoom_levels[i].level; + mean = sqrt (previous * current); + + if (level <= mean) return i - 1; + + previous = current; + } + + return n_zoom_levels - 1; +} + + +float +ephy_zoom_get_changed_zoom_level (float level, gint steps) +{ + guint index; + + index = ephy_zoom_get_zoom_level_index (level); + return zoom_levels[CLAMP(index + steps, 0, n_zoom_levels - 1)].level; +} + +float ephy_zoom_get_nearest_zoom_level (float level) +{ + return ephy_zoom_get_changed_zoom_level (level, 0); +} diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h new file mode 100644 index 000000000..648298fbc --- /dev/null +++ b/lib/ephy-zoom.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EPHY_ZOOM_H +#define EPHY_ZOOM_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +G_BEGIN_DECLS + +static const +struct +{ + gchar *name; + float level; +} +zoom_levels[] = +{ + { N_("50%"), 0.7071067811 }, + { N_("75%"), 0.8408964152 }, + { N_("100%"), 1.0 }, + { N_("125%"), 1.1892071149 }, + { N_("150%"), 1.4142135623 }, + { N_("175%"), 1.6817928304 }, + { N_("200%"), 2.0 }, + { N_("300%"), 2.8284271247 }, + { N_("400%"), 4.0 } +}; +static const guint n_zoom_levels = G_N_ELEMENTS (zoom_levels); + +#define ZOOM_MINIMAL (zoom_levels[0].level) +#define ZOOM_MAXIMAL (zoom_levels[n_zoom_levels - 1].level) +#define ZOOM_IN (-1.0) +#define ZOOM_OUT (-2.0) + +guint ephy_zoom_get_zoom_level_index (float level); + +float ephy_zoom_get_changed_zoom_level (float level, gint steps); + +float ephy_zoom_get_nearest_zoom_level (float level); + +G_END_DECLS + +#endif diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index a67862614..2d096046e 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -28,5 +28,8 @@ libephywidgets_la_SOURCES = \ ephy-tree-model-node.c \ ephy-tree-model-node.h \ ephy-tree-model-sort.c \ - ephy-tree-model-sort.h - + ephy-tree-model-sort.h \ + ephy-zoom-action.h \ + ephy-zoom-action.c \ + ephy-zoom-control.c \ + ephy-zoom-control.h diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c new file mode 100644 index 000000000..248d6c74e --- /dev/null +++ b/lib/widgets/ephy-zoom-action.c @@ -0,0 +1,223 @@ +/* + * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "ephy-zoom-action.h" +#include "ephy-zoom-control.h" +#include "ephy-zoom.h" + +#include +#include + +struct _EphyZoomActionPrivate { + float zoom; +}; + +enum +{ + PROP_0, + PROP_ZOOM +}; + + +static void ephy_zoom_action_init (EphyZoomAction *action); +static void ephy_zoom_action_class_init (EphyZoomActionClass *class); +static void ephy_zoom_action_finalize (GObject *object); + +enum +{ + ZOOM_TO_LEVEL_SIGNAL, + LAST_SIGNAL +}; + +static guint ephy_zoom_action_signals[LAST_SIGNAL] = { 0 }; + +static GObjectClass *parent_class = NULL; + +GType +ephy_zoom_action_get_type (void) +{ + static GType ephy_zoom_action_type = 0; + + if (ephy_zoom_action_type == 0) + { + static const GTypeInfo our_info = + { + sizeof (EphyZoomActionClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) ephy_zoom_action_class_init, + NULL, + NULL, /* class_data */ + sizeof (EphyZoomAction), + 0, /* n_preallocs */ + (GInstanceInitFunc) ephy_zoom_action_init, + }; + + ephy_zoom_action_type = g_type_register_static (EGG_TYPE_ACTION, + "EphyZoomAction", + &our_info, 0); + } + + return ephy_zoom_action_type; +} + +static void +zoom_to_level_cb (EphyZoomControl *control, + float zoom, + EphyZoomAction *action) +{ + g_signal_emit (action, + ephy_zoom_action_signals[ZOOM_TO_LEVEL_SIGNAL], + 0, zoom); +} + +static void +sync_zoom_cb (EggAction *action, GParamSpec *pspec, GtkWidget *proxy) +{ + EphyZoomAction *zoom_action = EPHY_ZOOM_ACTION (action); + + g_object_set (G_OBJECT (proxy), "zoom", zoom_action->priv->zoom, NULL); +} + +static void +connect_proxy (EggAction *action, GtkWidget *proxy) +{ + g_signal_connect_object (action, "notify::zoom", + G_CALLBACK (sync_zoom_cb), proxy, 0); + + g_signal_connect (proxy, "zoom_to_level", GTK_SIGNAL_FUNC(zoom_to_level_cb), action); + + EGG_ACTION_CLASS (parent_class)->connect_proxy (action, proxy); +} + +static void +ephy_zoom_action_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EphyZoomAction *action; + + action = EPHY_ZOOM_ACTION (object); + + switch (prop_id) + { + case PROP_ZOOM: + action->priv->zoom = g_value_get_float (value); + g_object_notify (object, "zoom"); + break; + } +} + +static void +ephy_zoom_action_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EphyZoomAction *action; + + action = EPHY_ZOOM_ACTION (object); + + switch (prop_id) + { + case PROP_ZOOM: + g_value_set_float (value, action->priv->zoom); + break; + } +} + +static void +ephy_zoom_action_class_init (EphyZoomActionClass *class) +{ + EggActionClass *action_class; + GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->set_property = ephy_zoom_action_set_property; + object_class->get_property = ephy_zoom_action_get_property; + object_class->finalize = ephy_zoom_action_finalize; + + parent_class = g_type_class_peek_parent (class); + action_class = EGG_ACTION_CLASS (class); + + action_class->toolbar_item_type = EPHY_TYPE_ZOOM_CONTROL; + action_class->connect_proxy = connect_proxy; + + g_object_class_install_property (object_class, + PROP_ZOOM, + g_param_spec_float ("zoom", + "Zoom", + "Zoom", + ZOOM_MINIMAL, + ZOOM_MAXIMAL, + 1.0, + G_PARAM_READWRITE)); + + ephy_zoom_action_signals[ZOOM_TO_LEVEL_SIGNAL] = + g_signal_new ("zoom_to_level", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EphyZoomActionClass, zoom_to_level), + NULL, NULL, + g_cclosure_marshal_VOID__FLOAT, + G_TYPE_NONE, + 1, + G_TYPE_FLOAT); +} + +static void +ephy_zoom_action_init (EphyZoomAction *action) +{ + action->priv = g_new0 (EphyZoomActionPrivate, 1); + + action->priv->zoom = 1.0; +} + +static void +ephy_zoom_action_finalize (GObject *object) +{ + EphyZoomAction *action = EPHY_ZOOM_ACTION (object); + + g_free (action->priv); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +void +ephy_zoom_action_set_zoom_level (EphyZoomAction *action, float zoom) +{ + g_return_if_fail (EPHY_IS_ZOOM_ACTION (action)); + + if (zoom < ZOOM_MINIMAL || zoom > ZOOM_MAXIMAL) return; + + action->priv->zoom = zoom; + g_object_notify (G_OBJECT (action), "zoom"); +} + +float +ephy_zoom_action_get_zoom_level (EphyZoomAction *action) +{ + g_return_val_if_fail (EPHY_IS_ZOOM_ACTION (action), 1.0); + + return action->priv->zoom; +} diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h new file mode 100644 index 000000000..04e2d4e9b --- /dev/null +++ b/lib/widgets/ephy-zoom-action.h @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EPHY_ZOOM_ACTION_H +#define EPHY_ZOOM_ACTION_H + +#include + +G_BEGIN_DECLS + +#define EPHY_TYPE_ZOOM_ACTION (ephy_zoom_action_get_type ()) +#define EPHY_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_ZOOM_ACTION, EphyZoomAction)) +#define EPHY_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionClass)) +#define EPHY_IS_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_ZOOM_ACTION)) +#define EPHY_IS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_ZOOM_ACTION)) +#define EPHY_ZOOM_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionClass)) + +typedef struct _EphyZoomAction EphyZoomAction; +typedef struct _EphyZoomActionClass EphyZoomActionClass; +typedef struct _EphyZoomActionPrivate EphyZoomActionPrivate; + +struct _EphyZoomAction +{ + EggAction parent; + + EphyZoomActionPrivate *priv; +}; + +struct _EphyZoomActionClass +{ + EggActionClass parent_class; + + void (* zoom_to_level) (EphyZoomAction *action, float level); +}; + +GType ephy_zoom_action_get_type (void); + +void ephy_zoom_action_set_zoom_level (EphyZoomAction *action, float zoom); + +float ephy_zoom_action_get_zoom_level (EphyZoomAction *action); + +G_END_DECLS + +#endif diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c new file mode 100644 index 000000000..c3751ebc4 --- /dev/null +++ b/lib/widgets/ephy-zoom-control.c @@ -0,0 +1,344 @@ +/* + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "ephy-zoom-control.h" +#include "ephy-marshal.h" +#include "ephy-zoom.h" + +#include +#include +#include +#include + +/** + * Private data + */ +struct _EphyZoomControlPrivate { + GtkWidget *option_menu; + float zoom; + guint handler_id; +}; + +enum +{ + PROP_0, + PROP_ZOOM +}; + +enum +{ + ZOOM_TO_LEVEL_SIGNAL, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static GObjectClass *parent_class = NULL; + +static void ephy_zoom_control_class_init (EphyZoomControlClass *klass); +static void ephy_zoom_control_init (EphyZoomControl *control); +static void ephy_zoom_control_finalize (GObject *o); + +#define MENU_ID "ephy-zoom-control-menu-id" + +/** + * EphyZoomControl object + */ + +GType +ephy_zoom_control_get_type (void) +{ + static GType ephy_zoom_control_type = 0; + + if (ephy_zoom_control_type == 0) + { + static const GTypeInfo our_info = + { + sizeof (EphyZoomControlClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) ephy_zoom_control_class_init, + NULL, + NULL, /* class_data */ + sizeof (EphyZoomControl), + 0, /* n_preallocs */ + (GInstanceInitFunc) ephy_zoom_control_init, + }; + + ephy_zoom_control_type = g_type_register_static (EGG_TYPE_TOOL_ITEM, + "EphyZoomControl", + &our_info, 0); + } + + return ephy_zoom_control_type; +} + +static void +proxy_menu_activate_cb (GtkMenuItem *menu_item, gpointer data) +{ + EphyZoomControl *control; + gint index; + float zoom; + + g_return_if_fail (EPHY_IS_ZOOM_CONTROL (data)); + control = EPHY_ZOOM_CONTROL (data); + + /* menu item was toggled OFF */ + if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu_item))) return; + + index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "zoom-level")); + zoom = zoom_levels[index].level; + + if (zoom != control->priv->zoom) + { + g_signal_emit (control, signals[ZOOM_TO_LEVEL_SIGNAL], 0, zoom); + } +} + +static gboolean +ephy_zoom_control_create_menu_proxy (EggToolItem *item) +{ + EphyZoomControl *control = EPHY_ZOOM_CONTROL (item); + EphyZoomControlPrivate *p = control->priv; + GtkWidget *menu, *menu_item; + GSList *group = NULL; + gint i; + + menu = gtk_menu_new (); + + for (i = 0; i < n_zoom_levels; i++) + { + menu_item = gtk_radio_menu_item_new_with_label (group, _(zoom_levels[i].name)); + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_item)); + + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), + p->zoom == zoom_levels[i].level); + + gtk_widget_show (menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + + g_object_set_data (G_OBJECT (menu_item), "zoom-level", GINT_TO_POINTER (i)); + g_signal_connect_object (G_OBJECT (menu_item), "activate", + G_CALLBACK (proxy_menu_activate_cb), control, 0); + } + + menu_item = gtk_menu_item_new_with_mnemonic (_("_Zoom")); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); + + gtk_widget_show (menu); + gtk_widget_show (menu_item); + + g_object_ref (menu_item); + gtk_object_sink (GTK_OBJECT (menu_item)); + egg_tool_item_set_proxy_menu_item (item, MENU_ID, menu_item); + g_object_unref (menu_item); + + return TRUE; +} + +static void +option_menu_changed_cb (GtkOptionMenu *option_menu, EphyZoomControl *control) +{ + gint index; + float zoom; + + index = gtk_option_menu_get_history (option_menu); + zoom = zoom_levels[index].level; + + if (zoom != control->priv->zoom) + { + g_signal_emit (control, signals[ZOOM_TO_LEVEL_SIGNAL], 0, zoom); + } +} + +static void +sync_zoom_cb (EphyZoomControl *control, GParamSpec *pspec, gpointer data) +{ + EphyZoomControlPrivate *p = control->priv; + guint index; + + index = ephy_zoom_get_zoom_level_index (p->zoom); + + g_signal_handler_block (p->option_menu, p->handler_id); + gtk_option_menu_set_history (GTK_OPTION_MENU (p->option_menu), index); + g_signal_handler_unblock (p->option_menu, p->handler_id); +} + +static void +ephy_zoom_control_init (EphyZoomControl *control) +{ + EphyZoomControlPrivate *p; + GtkWidget *item, *menu, *box; + guint i; + + p = g_new0 (EphyZoomControlPrivate, 1); + control->priv = p; + + p->zoom = 1.0; + + p->option_menu = gtk_option_menu_new (); + menu = gtk_menu_new (); + + for (i = 0; i < n_zoom_levels; i++) + { + item = gtk_menu_item_new_with_label (_(zoom_levels[i].name)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu),item); + + gtk_widget_show (item); + } + + gtk_option_menu_set_menu (GTK_OPTION_MENU (p->option_menu), menu); + gtk_widget_show (menu); + gtk_widget_show (p->option_menu); + + i = ephy_zoom_get_zoom_level_index (p->zoom); + gtk_option_menu_set_history (GTK_OPTION_MENU (p->option_menu), i); + + g_object_ref (p->option_menu); + gtk_object_sink (GTK_OBJECT (p->option_menu)); + + box = gtk_vbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), p->option_menu, TRUE, FALSE, 0); + gtk_widget_show (box); + + gtk_container_add (GTK_CONTAINER (control), box); + gtk_container_set_border_width (GTK_CONTAINER (control), 3); + + p->handler_id = g_signal_connect (p->option_menu, "changed", + G_CALLBACK (option_menu_changed_cb), control); + + g_signal_connect_object (control, "notify::zoom", + G_CALLBACK (sync_zoom_cb), NULL, 0); +} + +static void +ephy_zoom_control_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EphyZoomControl *control; + EphyZoomControlPrivate *p; + + control = EPHY_ZOOM_CONTROL (object); + p = control->priv; + + switch (prop_id) + { + case PROP_ZOOM: + p->zoom = g_value_get_float (value); + g_object_notify (object, "zoom"); + break; + } +} + +static void +ephy_zoom_control_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EphyZoomControl *control; + EphyZoomControlPrivate *p; + + control = EPHY_ZOOM_CONTROL (object); + p = control->priv; + + switch (prop_id) + { + case PROP_ZOOM: + g_value_set_float (value, p->zoom); + break; + } +} + +static void +ephy_zoom_control_class_init (EphyZoomControlClass *klass) +{ + GObjectClass *object_class; + EggToolItemClass *tool_item_class; + + parent_class = g_type_class_peek_parent (klass); + + object_class = (GObjectClass *)klass; + tool_item_class = (EggToolItemClass *)klass; + + object_class->set_property = ephy_zoom_control_set_property; + object_class->get_property = ephy_zoom_control_get_property; + object_class->finalize = ephy_zoom_control_finalize; + + tool_item_class->create_menu_proxy = ephy_zoom_control_create_menu_proxy; + + g_object_class_install_property (object_class, + PROP_ZOOM, + g_param_spec_float ("zoom", + _("Zoom"), + _("Zoom level to display in the item."), + ZOOM_MINIMAL, + ZOOM_MAXIMAL, + 1.0, + G_PARAM_READWRITE)); + + signals[ZOOM_TO_LEVEL_SIGNAL] = + g_signal_new ("zoom_to_level", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EphyZoomControlClass, + zoom_to_level), + NULL, NULL, + g_cclosure_marshal_VOID__FLOAT, + G_TYPE_NONE, + 1, + G_TYPE_FLOAT); +} + +static void +ephy_zoom_control_finalize (GObject *o) +{ + EphyZoomControl *control = EPHY_ZOOM_CONTROL (o); + + g_object_unref (control->priv->option_menu); + + g_free (control->priv); + + G_OBJECT_CLASS (parent_class)->finalize (o); +} + + +void +ephy_zoom_control_set_zoom_level (EphyZoomControl *control, float zoom) +{ + g_return_if_fail (EPHY_IS_ZOOM_CONTROL (control)); + + if (zoom < ZOOM_MINIMAL || zoom > ZOOM_MAXIMAL) return; + + control->priv->zoom = zoom; + g_object_notify (G_OBJECT (control), "zoom"); +} + +float +ephy_zoom_control_get_zoom_level (EphyZoomControl *control) +{ + g_return_val_if_fail (EPHY_IS_ZOOM_CONTROL (control), 1.0); + + return control->priv->zoom; +} diff --git a/lib/widgets/ephy-zoom-control.h b/lib/widgets/ephy-zoom-control.h new file mode 100644 index 000000000..8b0fa0e46 --- /dev/null +++ b/lib/widgets/ephy-zoom-control.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2003 Christian Persch + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EPHY_ZOOM_CONTROL_H +#define EPHY_ZOOM_CONTROL_H + +#include "eggtoolitem.h" + +G_BEGIN_DECLS + +/* object forward declarations */ + +typedef struct _EphyZoomControl EphyZoomControl; +typedef struct _EphyZoomControlClass EphyZoomControlClass; +typedef struct _EphyZoomControlPrivate EphyZoomControlPrivate; + +/** + * EphyZoomControl object + */ + +#define EPHY_TYPE_ZOOM_CONTROL (ephy_zoom_control_get_type()) +#define EPHY_ZOOM_CONTROL(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControl)) +#define EPHY_ZOOM_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlClass)) +#define EPHY_IS_ZOOM_CONTROL(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EPHY_TYPE_ZOOM_CONTROL)) +#define EPHY_IS_ZOOM_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_ZOOM_CONTROL)) +#define EPHY_ZOOM_CONTROL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlClass)) + +struct _EphyZoomControlClass +{ + EggToolItemClass parent_class; + + /* signals */ + void (*zoom_to_level) (EphyZoomControl *control, float level); +}; + +struct _EphyZoomControl +{ + EggToolItem parent_object; + + EphyZoomControlPrivate *priv; +}; + +GType ephy_zoom_control_get_type (void); + +void ephy_zoom_control_set_zoom_level (EphyZoomControl *control, float zoom); + +float ephy_zoom_control_get_zoom_level (EphyZoomControl *control); + +G_END_DECLS + +#endif -- cgit v1.2.3