2008-01-27 Jovan Naumovski <jovanna@svn.gnome.org> *mk.po: Updated Macedonian transla...

[evince.git] / shell / ev-page-action.c

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 7c28edc9a8c7ec9a4679b00208b46a41e5f83ed2..aab86ec7dbede280cd73e765e2fdb7c2e3ab1b34 100644 (file)
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -48,7 +48,6 @@ static void ev_page_action_class_init (EvPageActionClass *class);
 enum
 {
        ACTIVATE_LINK,
-       ACTIVATE_LABEL,
        N_SIGNALS
 };
 
@@ -115,30 +114,25 @@ activate_cb (GtkWidget *entry, GtkAction *action)
        EvPageCache *page_cache;
        const char *text;
        gchar *page_label;
-       gint page_number;
-       gboolean changed;
+       
+       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);
-
-       if (changed)
-               return;
        
-       /* Check whether it's a valid page number */
-       page_number = atoi (text) - 1;
-       if (page_number >= 0 &&
-           page_number < ev_page_cache_get_n_pages (page_cache)) {
-               page_label = ev_page_cache_get_page_label (page_cache, page_number);
-               gtk_entry_set_text (GTK_ENTRY (entry), page_label);
-               gtk_editable_set_position (GTK_EDITABLE (entry), -1);
-
-               g_signal_emit (action, signals[ACTIVATE_LABEL], 0, page_label, &changed);
-               g_free (page_label);
-               
-               return;
-       }
+       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);
+
+       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 */
@@ -149,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)
 {
@@ -163,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);
@@ -382,14 +393,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,