Simplified and reorganised zoom. Implement a zoom control for the toolbar.

2003-05-19  Christian Persch <chpe+gnomebugz@stud.uni-saarland.de>

 	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.

1 files changed, 344 insertions, 0 deletions

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 <config.h>
+#endif
+
+#include "ephy-zoom-control.h"
+#include "ephy-marshal.h"
+#include "ephy-zoom.h"
+
+#include <gtk/gtk.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkoptionmenu.h>
+#include <bonobo/bonobo-i18n.h>
+
+/**
+ * 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;
+}