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, 223 insertions, 0 deletions

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 <config.h>
+#endif
+
+#include "ephy-zoom-action.h"
+#include "ephy-zoom-control.h"
+#include "ephy-zoom.h"
+
+#include <glib-object.h>
+#include <bonobo/bonobo-i18n.h>
+
+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;
+}