From 606f66cbbca54996a165121743cda6a993762c47 Mon Sep 17 00:00:00 2001 From: James Bowes Date: Mon, 2 May 2005 16:19:48 +0000 Subject: [PATCH] Output zoom-control Makefile. build zoom-control subdir. 2005-05-02 James Bowes * configure.ac: Output zoom-control Makefile. * cut-n-paste/Makefile.am: build zoom-control subdir. * cut-n-paste/zoom-control/ephy-zoom-action.c: * cut-n-paste/zoom-control/ephy-zoom-action.h: * cut-n-paste/zoom-control/ephy-zoom-control.c: * cut-n-paste/zoom-control/ephy-zoom-control.h: * cut-n-paste/zoom-control/ephy-zoom.c: * cut-n-paste/zoom-control/ephy-zoom.h: New files imported from epiphany, and modified to add a separator into the menu. * cut-n-paste/zoom-control/Makefile.am: Build zoom-control. * data/evince-ui.xml: Replace old zoom toolbar actions with new zoom-control action. * shell/Makefile.am: Include zoom-control flags. * shell/ev-view.c: (ev_view_set_zoom), (ev_view_get_zoom), (ev_view_get_sizing_mode), (ev_view_zoom_in), (ev_view_zoom_out), (ev_view_zoom_for_size_presentation), (ev_view_zoom_for_size_continuous_and_dual_page), (ev_view_zoom_for_size_continuous), (ev_view_zoom_for_size_dual_page), (ev_view_zoom_for_size_single_page), (ev_view_zoom_normal): s/ev_view_zoom/ev_view_set_zoom/ and make public, add ev_view_get_zoom and ev_view_get_sizing_mode. * shell/ev-view.h: * shell/ev-window.c: (update_action_sensitivity), (update_sizing_buttons), (zoom_control_changed_cb), (register_custom_actions): Initialize and use the zoom-control widget. --- ChangeLog | 30 ++ configure.ac | 2 + cut-n-paste/Makefile.am | 2 +- cut-n-paste/zoom-control/Makefile.am | 36 ++ cut-n-paste/zoom-control/ephy-zoom-action.c | 287 +++++++++++++++ cut-n-paste/zoom-control/ephy-zoom-action.h | 63 ++++ cut-n-paste/zoom-control/ephy-zoom-control.c | 354 +++++++++++++++++++ cut-n-paste/zoom-control/ephy-zoom-control.h | 63 ++++ cut-n-paste/zoom-control/ephy-zoom.c | 68 ++++ cut-n-paste/zoom-control/ephy-zoom.h | 76 ++++ data/evince-ui.xml | 10 +- shell/Makefile.am | 13 +- shell/ev-view.c | 36 +- shell/ev-view.h | 31 +- shell/ev-window.c | 62 ++++ 15 files changed, 1094 insertions(+), 39 deletions(-) create mode 100644 cut-n-paste/zoom-control/Makefile.am create mode 100644 cut-n-paste/zoom-control/ephy-zoom-action.c create mode 100644 cut-n-paste/zoom-control/ephy-zoom-action.h create mode 100644 cut-n-paste/zoom-control/ephy-zoom-control.c create mode 100644 cut-n-paste/zoom-control/ephy-zoom-control.h create mode 100644 cut-n-paste/zoom-control/ephy-zoom.c create mode 100644 cut-n-paste/zoom-control/ephy-zoom.h diff --git a/ChangeLog b/ChangeLog index 041ddd8c..11d8eb47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2005-05-02 James Bowes + + * configure.ac: Output zoom-control Makefile. + * cut-n-paste/Makefile.am: build zoom-control subdir. + * cut-n-paste/zoom-control/ephy-zoom-action.c: + * cut-n-paste/zoom-control/ephy-zoom-action.h: + * cut-n-paste/zoom-control/ephy-zoom-control.c: + * cut-n-paste/zoom-control/ephy-zoom-control.h: + * cut-n-paste/zoom-control/ephy-zoom.c: + * cut-n-paste/zoom-control/ephy-zoom.h: New files imported + from epiphany, and modified to add a separator into the menu. + * cut-n-paste/zoom-control/Makefile.am: Build zoom-control. + * data/evince-ui.xml: Replace old zoom toolbar actions with new + zoom-control action. + * shell/Makefile.am: Include zoom-control flags. + * shell/ev-view.c: (ev_view_set_zoom), (ev_view_get_zoom), + (ev_view_get_sizing_mode), (ev_view_zoom_in), (ev_view_zoom_out), + (ev_view_zoom_for_size_presentation), + (ev_view_zoom_for_size_continuous_and_dual_page), + (ev_view_zoom_for_size_continuous), + (ev_view_zoom_for_size_dual_page), + (ev_view_zoom_for_size_single_page), (ev_view_zoom_normal): + s/ev_view_zoom/ev_view_set_zoom/ and make public, add + ev_view_get_zoom and ev_view_get_sizing_mode. + * shell/ev-view.h: + * shell/ev-window.c: (update_action_sensitivity), + (update_sizing_buttons), (zoom_control_changed_cb), + (register_custom_actions): Initialize and use the zoom-control + widget. + Sun May 1 00:46:47 2005 Jonathan Blandford * shell/ev-pixbuf-cache.c: (ev_pixbuf_cache_init): Change the diff --git a/configure.ac b/configure.ac index a3d4a90d..f24ff119 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ POPPLER_REQUIRED=0.3.0 PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0) PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) +PKG_CHECK_MODULES(ZOOM_CONTROL, gtk+-2.0 >= 2.4.0) PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler-glib >= $POPPLER_REQUIRED) PKG_CHECK_MODULES(THUMBNAILER, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 poppler-glib >= $POPPLER_REQUIRED) PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0) @@ -219,6 +220,7 @@ AC_OUTPUT([ Makefile cut-n-paste/Makefile cut-n-paste/recent-files/Makefile +cut-n-paste/zoom-control/Makefile data/Makefile lib/Makefile pdf/Makefile diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am index bd1def47..785d7a29 100644 --- a/cut-n-paste/Makefile.am +++ b/cut-n-paste/Makefile.am @@ -1 +1 @@ -SUBDIRS = recent-files +SUBDIRS = recent-files zoom-control diff --git a/cut-n-paste/zoom-control/Makefile.am b/cut-n-paste/zoom-control/Makefile.am new file mode 100644 index 00000000..fa8ec2c3 --- /dev/null +++ b/cut-n-paste/zoom-control/Makefile.am @@ -0,0 +1,36 @@ +noinst_LTLIBRARIES = libephymisc.la libephywidgets.la + +libephywidgets_la_SOURCES = \ + ephy-zoom-action.h \ + ephy-zoom-action.c \ + ephy-zoom-control.c \ + ephy-zoom-control.h + +libephywidgets_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + $(AM_CPPFLAGS) + +libephywidgets_la_CFLAGS = \ + $(ZOOM_CONTROL_CFLAGS) \ + $(AM_CFLAGS) + +libephywidgets_la_LIBADD = \ + libephymisc.la + +NOINST_H_FILES = \ + ephy-zoom.h + +libephymisc_la_SOURCES = \ + ephy-zoom.c \ + $(NOINST_H_FILES) + +libephymisc_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + $(AM_CPPFLAGS) + +libephymisc_la_CFLAGS = \ + $(ZOOM_CONTROL_CFLAGS) \ + $(AM_CFLAGS) \ No newline at end of file diff --git a/cut-n-paste/zoom-control/ephy-zoom-action.c b/cut-n-paste/zoom-control/ephy-zoom-action.c new file mode 100644 index 00000000..3582feeb --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom-action.c @@ -0,0 +1,287 @@ +/* + * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003, 2004 Christian Persch + * + * Modified 2005 by James Bowes for use in evince. + * + * 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. + * + * $Id$ + */ + +#include "config.h" + +#include "ephy-zoom-action.h" +#include "ephy-zoom-control.h" +#include "ephy-zoom.h" + +#include +#include +#include +#include +#include +#include +#include + +#define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate)) + +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); + +enum +{ + ZOOM_TO_LEVEL_SIGNAL, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +static GObjectClass *parent_class = NULL; + +GType +ephy_zoom_action_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (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, + }; + + type = g_type_register_static (GTK_TYPE_ACTION, + "EphyZoomAction", + &our_info, 0); + } + + return type; +} + +static void +zoom_to_level_cb (EphyZoomControl *control, + float zoom, + EphyZoomAction *action) +{ + g_signal_emit (action, signals[ZOOM_TO_LEVEL_SIGNAL], 0, zoom); +} + +static void +sync_zoom_cb (GtkAction *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 (GtkAction *action, GtkWidget *proxy) +{ + if (EPHY_IS_ZOOM_CONTROL (proxy)) + { + g_signal_connect_object (action, "notify::zoom", + G_CALLBACK (sync_zoom_cb), proxy, 0); + + g_signal_connect (proxy, "zoom_to_level", + G_CALLBACK (zoom_to_level_cb), action); + } + + GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy); +} + +static void +proxy_menu_activate_cb (GtkMenuItem *menu_item, EphyZoomAction *action) +{ + gint index; + float zoom; + + /* 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 != action->priv->zoom) + { + g_signal_emit (action, signals[ZOOM_TO_LEVEL_SIGNAL], 0, zoom); + } +} + +static GtkWidget * +create_menu_item (GtkAction *action) +{ + EphyZoomActionPrivate *p = EPHY_ZOOM_ACTION (action)->priv; + GtkWidget *menu, *menu_item; + GSList *group = NULL; + int i; + + menu = gtk_menu_new (); + + for (i = 0; i < n_zoom_levels; i++) + { + if (zoom_levels[i].level == EPHY_ZOOM_SEPARATOR) + { + menu_item = gtk_separator_menu_item_new (); + } + else + { + 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), action, 0); + } + + gtk_widget_show (menu); + + menu_item = GTK_ACTION_CLASS (parent_class)->create_menu_item (action); + + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); + + gtk_widget_show (menu_item); + + return menu_item; +} + +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); + 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) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + GtkActionClass *action_class = GTK_ACTION_CLASS (class); + + object_class->set_property = ephy_zoom_action_set_property; + object_class->get_property = ephy_zoom_action_get_property; + + parent_class = g_type_class_peek_parent (class); + + action_class->toolbar_item_type = EPHY_TYPE_ZOOM_CONTROL; + action_class->connect_proxy = connect_proxy; + action_class->create_menu_item = create_menu_item; + + 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)); + + 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); + + g_type_class_add_private (object_class, sizeof (EphyZoomActionPrivate)); +} + +static void +ephy_zoom_action_init (EphyZoomAction *action) +{ + action->priv = EPHY_ZOOM_ACTION_GET_PRIVATE (action); + + action->priv->zoom = 1.0; +} + +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/cut-n-paste/zoom-control/ephy-zoom-action.h b/cut-n-paste/zoom-control/ephy-zoom-action.h new file mode 100644 index 00000000..77f9b415 --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom-action.h @@ -0,0 +1,63 @@ +/* + * 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. + * + * $Id$ + */ + +#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 +{ + GtkAction parent; + + /*< private >*/ + EphyZoomActionPrivate *priv; +}; + +struct _EphyZoomActionClass +{ + GtkActionClass 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/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c new file mode 100644 index 00000000..d3b7e572 --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom-control.c @@ -0,0 +1,354 @@ +/* + * Copyright (C) 2003, 2004 Christian Persch + * + * Modified 2005 by James Bowes for use in evince. + * + * 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. + * + * $Id$ + */ + +#include "config.h" + +#include "ephy-zoom-control.h" +#include "ephy-zoom.h" +#include "ev-debug.h" + +#include +#include +#include +#include + +#define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate)) + +struct _EphyZoomControlPrivate +{ + GtkComboBox *combo; + float zoom; + guint handler_id; +}; + +enum +{ + COL_TEXT, + COL_IS_SEP +}; + +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); + +GType +ephy_zoom_control_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (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, + }; + + type = g_type_register_static (GTK_TYPE_TOOL_ITEM, + "EphyZoomControl", + &our_info, 0); + } + + return type; +} + +static void +combo_changed_cb (GtkComboBox *combo, EphyZoomControl *control) +{ + gint index; + float zoom; + + index = gtk_combo_box_get_active (combo); + 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->combo, p->handler_id); + gtk_combo_box_set_active (p->combo, index); + g_signal_handler_unblock (p->combo, p->handler_id); +} + +static gboolean +row_is_separator (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + gboolean is_sep; + gtk_tree_model_get (model, iter, COL_IS_SEP, &is_sep, -1); + return is_sep; +} + +static void +ephy_zoom_control_init (EphyZoomControl *control) +{ + EphyZoomControlPrivate *p; + GtkWidget *vbox; + GtkCellRenderer *renderer; + GtkListStore *store; + GtkTreeIter iter; + guint i; + + p = EPHY_ZOOM_CONTROL_GET_PRIVATE (control); + control->priv = p; + + p->zoom = 1.0; + + store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); + + for (i = 0; i < n_zoom_levels; i++) + { + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + COL_TEXT, zoom_levels[i].name, + COL_IS_SEP, zoom_levels[i].name == NULL, + -1); + } + + p->combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); + g_object_unref (store); + + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (p->combo), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (p->combo), renderer, + "text", COL_TEXT, NULL); + gtk_combo_box_set_row_separator_func (p->combo, + (GtkTreeViewRowSeparatorFunc) row_is_separator, + NULL, NULL); + + gtk_combo_box_set_focus_on_click (p->combo, FALSE); + g_object_ref (p->combo); + gtk_object_sink (GTK_OBJECT (p->combo)); + gtk_widget_show (GTK_WIDGET (p->combo)); + + i = ephy_zoom_get_zoom_level_index (p->zoom); + gtk_combo_box_set_active (p->combo, i); + + vbox = gtk_vbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (p->combo), TRUE, FALSE, 0); + gtk_widget_show (vbox); + + gtk_container_add (GTK_CONTAINER (control), vbox); + + p->handler_id = g_signal_connect (p->combo, "changed", + G_CALLBACK (combo_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); + 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 +set_combo_tooltip (GtkWidget *widget, + GtkTooltipsData *data) +{ + if (GTK_IS_BUTTON (widget)) + { + gtk_tooltips_set_tip (data->tooltips, widget, + data->tip_text, data->tip_private); + } +} + +static void +combo_realized (GtkWidget *combo, + GtkWidget *control) +{ + GtkTooltipsData *data; + + data = gtk_tooltips_data_get (control); + g_return_if_fail (data != NULL); + + gtk_container_forall (GTK_CONTAINER (combo), + (GtkCallback) set_combo_tooltip, data); +} + +static gboolean +ephy_zoom_control_set_tooltip (GtkToolItem *tool_item, + GtkTooltips *tooltips, + const char *tip_text, + const char *tip_private) +{ + EphyZoomControl *control = EPHY_ZOOM_CONTROL (tool_item); + GtkWidget *widget = GTK_WIDGET (tool_item); + + /* hack to make tooltips work also on Ctrl-F1 */ + gtk_tooltips_set_tip (tooltips, widget, tip_text, tip_private); + + g_signal_handlers_disconnect_by_func + (control->priv->combo, G_CALLBACK (combo_realized), widget); + + if (GTK_WIDGET_REALIZED (tool_item)) + { + combo_realized (GTK_WIDGET (control->priv->combo), widget); + } + else + { + g_signal_connect_after (control->priv->combo, "realize", + G_CALLBACK (combo_realized), widget); + } + + return TRUE; +} + +static void +ephy_zoom_control_class_init (EphyZoomControlClass *klass) +{ + GObjectClass *object_class; + GtkToolItemClass *tool_item_class; + + parent_class = g_type_class_peek_parent (klass); + + object_class = (GObjectClass *)klass; + tool_item_class = (GtkToolItemClass *)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->set_tooltip = ephy_zoom_control_set_tooltip; + + 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); + + g_type_class_add_private (object_class, sizeof (EphyZoomControlPrivate)); +} + +static void +ephy_zoom_control_finalize (GObject *o) +{ + EphyZoomControl *control = EPHY_ZOOM_CONTROL (o); + + g_object_unref (control->priv->combo); + + 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/cut-n-paste/zoom-control/ephy-zoom-control.h b/cut-n-paste/zoom-control/ephy-zoom-control.h new file mode 100644 index 00000000..6c2f5ba8 --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom-control.h @@ -0,0 +1,63 @@ +/* + * 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. + * + * $Id$ + */ + +#ifndef EPHY_ZOOM_CONTROL_H +#define EPHY_ZOOM_CONTROL_H + +#include + +G_BEGIN_DECLS + +#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)) + +typedef struct _EphyZoomControl EphyZoomControl; +typedef struct _EphyZoomControlClass EphyZoomControlClass; +typedef struct _EphyZoomControlPrivate EphyZoomControlPrivate; + +struct _EphyZoomControlClass +{ + GtkToolItemClass parent_class; + + /* signals */ + void (*zoom_to_level) (EphyZoomControl *control, float level); +}; + +struct _EphyZoomControl +{ + GtkToolItem parent_object; + + /*< private >*/ + 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 diff --git a/cut-n-paste/zoom-control/ephy-zoom.c b/cut-n-paste/zoom-control/ephy-zoom.c new file mode 100644 index 00000000..d24530b2 --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom.c @@ -0,0 +1,68 @@ +/* + * 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. + * + * $Id$ + */ + +#include "config.h" + +#include "ephy-zoom.h" + +#include + +guint +ephy_zoom_get_zoom_level_index (float level) +{ + guint i; + float previous, current, mean; + + /* Handle our options at the end of the list. */ + if (level == EPHY_ZOOM_BEST_FIT) { + return n_zoom_levels - 2; + } else if (level == EPHY_ZOOM_FIT_WIDTH) { + return n_zoom_levels - 1; + } + + previous = zoom_levels[0].level; + + for (i = 1; i < n_zoom_levels - 2; i++) + { + current = zoom_levels[i].level; + mean = sqrt (previous * current); + + if (level <= mean) return i - 1; + + previous = current; + } + + return n_zoom_levels - 4; +} + + +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/cut-n-paste/zoom-control/ephy-zoom.h b/cut-n-paste/zoom-control/ephy-zoom.h new file mode 100644 index 00000000..e62fdef3 --- /dev/null +++ b/cut-n-paste/zoom-control/ephy-zoom.h @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2003 Christian Persch + * + * Modified 2005 by James Bowes for use in evince. + * + * 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. + * + * $Id$ + */ + +#ifndef EPHY_ZOOM_H +#define EPHY_ZOOM_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +G_BEGIN_DECLS + +#define EPHY_ZOOM_BEST_FIT (-3.0) +#define EPHY_ZOOM_FIT_WIDTH (-4.0) +#define EPHY_ZOOM_SEPARATOR (-5.0) + +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 }, + { NULL, EPHY_ZOOM_SEPARATOR }, + { N_("Best Fit"), EPHY_ZOOM_BEST_FIT }, + { N_("Fit Page Width"), EPHY_ZOOM_FIT_WIDTH } +}; +static const guint n_zoom_levels = G_N_ELEMENTS (zoom_levels); + +#define ZOOM_MINIMAL (EPHY_ZOOM_SEPARATOR) +#define ZOOM_MAXIMAL (zoom_levels[n_zoom_levels - 4].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/data/evince-ui.xml b/data/evince-ui.xml index d6205118..0811ed96 100644 --- a/data/evince-ui.xml +++ b/data/evince-ui.xml @@ -59,10 +59,7 @@ - - - - +