X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-page-action.c;h=cc3615abf091164041f99d7d59607e9f1bdda7f7;hb=0be3be0d4166be324d628802772e99cacd336f11;hp=52c74f549e60e6c74eaed987d1cc0fbb16f7652c;hpb=8228ff475e7dced57dbaa9550255534d0c275767;p=evince.git

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 52c74f54..cc3615ab 100644
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -18,7 +18,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include "ev-page-action.h"
 #include "ev-page-cache.h"
@@ -27,13 +35,6 @@
 #include "ev-page-action-widget.h"
 #include "ev-marshal.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <string.h>
-
 struct _EvPageActionPrivate
 {
 	EvPageCache *page_cache;
@@ -47,7 +48,6 @@ static void ev_page_action_class_init (EvPageActionClass *class);
 enum
 {
 	ACTIVATE_LINK,
-	ACTIVATE_LABEL,
 	N_SIGNALS
 };
 
@@ -113,23 +113,49 @@ activate_cb (GtkWidget *entry, GtkAction *action)
 	EvPageAction *page = EV_PAGE_ACTION (action);
 	EvPageCache *page_cache;
 	const char *text;
-	gboolean changed;
+	gchar *page_label;
+	
+	EvLinkDest *link_dest;
+	EvLinkAction *link_action;
+	EvLink *link;
+	gchar *link_text;
 
 	text = gtk_entry_get_text (GTK_ENTRY (entry));
 	page_cache = page->priv->page_cache;
 
-	g_signal_emit (action, signals[ACTIVATE_LABEL], 0, text, &changed);
+	
+	link_dest = ev_link_dest_new_page_label (text);
+	link_action = ev_link_action_new_dest (link_dest);
+	link_text = g_strdup_printf ("Page: %s", text);
+	link = ev_link_new (link_text, link_action);
 
-	if (!changed) {
-		/* rest the entry to the current page if we were unable to
-		 * change it */
-		gchar *page_label =
-			ev_page_cache_get_page_label (page_cache,
-						      ev_page_cache_get_current_page (page_cache));
-		gtk_entry_set_text (GTK_ENTRY (entry), page_label);
-		gtk_editable_set_position (GTK_EDITABLE (entry), -1);
-		g_free (page_label);
-	}
+	g_signal_emit (action, signals[ACTIVATE_LINK], 0, link);
+
+	g_object_unref (link);
+	g_free (link_text);
+	
+	/* rest the entry to the current page if we were unable to
+	 * change it */
+	page_label = ev_page_cache_get_page_label (page_cache,
+						   ev_page_cache_get_current_page (page_cache));
+	gtk_entry_set_text (GTK_ENTRY (entry), page_label);
+	gtk_editable_set_position (GTK_EDITABLE (entry), -1);
+	g_free (page_label);
+}
+
+static gboolean page_scroll_cb(GtkWidget *widget, GdkEventScroll *event, EvPageAction* action)
+{
+	gint pageno;
+
+	pageno = ev_page_cache_get_current_page (action->priv->page_cache);
+	if ((event->direction == GDK_SCROLL_DOWN) && 
+	    (pageno < ev_page_cache_get_n_pages(action->priv->page_cache) - 1))
+		pageno++;
+	if ((event->direction == GDK_SCROLL_UP) && (pageno > 0))
+		pageno--;
+	ev_page_cache_set_current_page (action->priv->page_cache, pageno);
+	
+	return TRUE;
 }
 
 static GtkWidget *
@@ -137,6 +163,7 @@ create_tool_item (GtkAction *action)
 {
 	EvPageActionWidget *proxy;
 	GtkWidget *hbox;
+        AtkObject *obj;
 
 	proxy = g_object_new (ev_page_action_widget_get_type (), NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (proxy), 6); 
@@ -146,6 +173,11 @@ create_tool_item (GtkAction *action)
 	gtk_box_set_spacing (GTK_BOX (hbox), 6);
 
 	proxy->entry = gtk_entry_new ();
+	obj = gtk_widget_get_accessible (proxy->entry);
+        atk_object_set_name (obj, "page-label-entry");
+	         
+	g_signal_connect(proxy->entry, "scroll-event",G_CALLBACK(page_scroll_cb),action);
+	gtk_widget_add_events(GTK_WIDGET(proxy->entry),GDK_BUTTON_MOTION_MASK);
 	gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 5);
 	gtk_box_pack_start (GTK_BOX (hbox), proxy->entry, FALSE, FALSE, 0);
 	gtk_widget_show (proxy->entry);
@@ -333,7 +365,9 @@ ev_page_action_grab_focus (EvPageAction *page_action)
 		EvPageActionWidget *proxy;
 
 		proxy = EV_PAGE_ACTION_WIDGET (proxies->data);
-		gtk_widget_grab_focus (proxy->entry);
+		
+		if (GTK_WIDGET_MAPPED (GTK_WIDGET (proxy)))
+			gtk_widget_grab_focus (proxy->entry);
 	}
 }
 
@@ -365,14 +399,6 @@ ev_page_action_class_init (EvPageActionClass *class)
 					       g_cclosure_marshal_VOID__OBJECT,
 					       G_TYPE_NONE, 1,
 					       G_TYPE_OBJECT);
-	signals[ACTIVATE_LABEL] = g_signal_new ("activate_label",
-					        G_OBJECT_CLASS_TYPE (object_class),
-					        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-					        G_STRUCT_OFFSET (EvPageActionClass, activate_label),
-					        NULL, NULL,
-					        ev_marshal_BOOLEAN__STRING,
-					        G_TYPE_BOOLEAN, 1,
-					        G_TYPE_STRING);
 
 	g_object_class_install_property (object_class,
 					 PROP_PAGE_CACHE,