X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-page-action.c;h=39ce3ec560e21bf411d931997dd32517d0ac1f14;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=744729d789cacd03c24b0742c40a20e5d994e65c;hpb=cde4965a843c973534347ab2953c09b9e81ff216;p=evince.git

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 744729d7..39ce3ec5 100644
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -118,6 +118,7 @@ activate_cb (GtkWidget *entry, GtkAction *action)
 	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;
@@ -125,11 +126,13 @@ activate_cb (GtkWidget *entry, GtkAction *action)
 	
 	link_dest = ev_link_dest_new_page_label (text);
 	link_action = ev_link_action_new_dest (link_dest);
-	link = ev_link_new (text, link_action);
+	link_text = g_strdup_printf ("Page: %s", text);
+	link = ev_link_new (link_text, link_action);
 
 	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 */
@@ -140,6 +143,21 @@ activate_cb (GtkWidget *entry, GtkAction *action)
 	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 *
 create_tool_item (GtkAction *action)
 {
@@ -154,6 +172,8 @@ create_tool_item (GtkAction *action)
 	gtk_box_set_spacing (GTK_BOX (hbox), 6);
 
 	proxy->entry = gtk_entry_new ();
+	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);
@@ -341,7 +361,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);
 	}
 }