Some fixes for the Catalan translation.

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 7275fb643b37bdf323ebaf26065b00cd8312aba9..9f59ea1d18445a3ffd72e8ae70233a95d0fb19bb 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1348,14 +1348,14 @@ ev_view_handle_link (EvView *view, EvLink *link)
        if (!action)
                return;
 
-       g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link);
-       
        type = ev_link_action_get_action_type (action);
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST: {
                        EvLinkDest *dest;
                        
+                       g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link);
+               
                        dest = ev_link_action_get_dest (action);
                        ev_view_goto_dest (view, dest);
                }
@@ -1369,8 +1369,8 @@ ev_view_handle_link (EvView *view, EvLink *link)
        }
 }
 
-static gchar *
-page_label_from_dest (EvView *view, EvLinkDest *dest)
+gchar *
+ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest)
 {
        EvLinkDestType type;
        gchar *msg = NULL;
@@ -1393,6 +1393,10 @@ page_label_from_dest (EvView *view, EvLinkDest *dest)
                }
                        
                        break;
+               case EV_LINK_DEST_TYPE_PAGE_LABEL: {
+                       msg = g_strdup (ev_link_dest_get_page_label (dest));
+               }
+                       break;
                default: 
                        msg = ev_page_cache_get_page_label (view->page_cache,
                                                            ev_link_dest_get_page (dest));
@@ -1442,8 +1446,8 @@ tip_from_link (EvView *view, EvLink *link)
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST:
-                       page_label = page_label_from_dest (view,
-                                                          ev_link_action_get_dest (action));
+                       page_label = ev_view_page_label_from_dest (view,
+                                                                  ev_link_action_get_dest (action));
                        msg = g_strdup_printf (_("Go to page %s"), page_label);
                        g_free (page_label);
                        break;
@@ -1513,7 +1517,6 @@ handle_link_over_xy (EvView *view, gint x, gint y)
                    view->cursor == EV_VIEW_CURSOR_IBEAM)
                        ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
        }
-       return;
 }
 
 /*** Images ***/
@@ -1978,6 +1981,9 @@ ev_view_button_press_event (GtkWidget      *widget,
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);
+
+       if (!view->document)
+               return FALSE;
        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);
@@ -2000,7 +2006,8 @@ ev_view_button_press_event (GtkWidget      *widget,
                                }
                                
                                gtk_widget_queue_draw (widget);
-                       } else if ((image = ev_view_get_image_at_location (view, event->x, event->y))) {
+                       } else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
+                                  (image = ev_view_get_image_at_location (view, event->x, event->y))) {
                                if (view->image_dnd_info.image)
                                        g_object_unref (view->image_dnd_info.image);
                                view->image_dnd_info.image = g_object_ref (image);
@@ -2314,7 +2321,7 @@ ev_view_button_release_event (GtkWidget      *widget,
                ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
        }
 
-       if (view->document && view->pressed_button == 1) {
+       if (view->document && view->pressed_button != 3) {
                link = ev_view_get_link_at_location (view, event->x, event->y);
        } else {
                link = NULL;
@@ -2343,7 +2350,23 @@ ev_view_button_release_event (GtkWidget      *widget,
                
                view->selection_info.in_drag = FALSE;
        } else if (link) {
-               ev_view_handle_link (view, link);
+               if (event->button == 2) {
+                       EvLinkAction    *action;
+                       EvLinkActionType type;
+
+                       action = ev_link_get_action (link);
+                       if (!action)
+                               return FALSE;
+
+                       type = ev_link_action_get_action_type (action);
+                       if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) {
+                               g_signal_emit (view,
+                                              signals[SIGNAL_EXTERNAL_LINK],
+                                              0, action);
+                       }
+               } else {
+                       ev_view_handle_link (view, link);
+               }
        } else if (view->presentation) {
                switch (event->button) {
                        case 1:
@@ -2426,6 +2449,8 @@ ev_view_goto_window_key_press_event (GtkWidget   *widget,
                case GDK_Return:
                case GDK_KP_Enter:
                case GDK_ISO_Enter:
+               case GDK_BackSpace:
+               case GDK_Delete:
                        return FALSE;
                default:
                        if (!key_is_numeric (event->keyval))
@@ -2563,6 +2588,9 @@ ev_view_key_press_event (GtkWidget   *widget,
        EvView *view = EV_VIEW (widget);
        EvPresentationState current;
 
+       if (!view->document)
+               return FALSE;
+       
        if (!view->presentation ||
            view->presentation_state == EV_PRESENTATION_END)
                return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
@@ -3377,10 +3405,17 @@ page_changed_cb (EvPageCache *page_cache,
                 EvView      *view)
 {
        if (view->current_page != new_page) {
+               gint x, y;
+               
                view->current_page = new_page;
                view->pending_scroll = SCROLL_TO_PAGE_POSITION;
+
                if (view->presentation)
                        ev_view_presentation_transition_start (view);
+               
+               gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+               handle_link_over_xy (view, x, y);
+               
                gtk_widget_queue_resize (GTK_WIDGET (view));
        } else {
                gtk_widget_queue_draw (GTK_WIDGET (view));
@@ -3392,10 +3427,12 @@ page_changed_cb (EvPageCache *page_cache,
        }
 }
 
-static void on_adjustment_value_changed (GtkAdjustment  *adjustment,
-                                        EvView *view)
+static void
+on_adjustment_value_changed (GtkAdjustment *adjustment,
+                            EvView        *view)
 {
        int dx = 0, dy = 0;
+       gint x, y;
 
        if (! GTK_WIDGET_REALIZED (view))
                return;
@@ -3414,12 +3451,13 @@ static void on_adjustment_value_changed (GtkAdjustment  *adjustment,
                view->scroll_y = 0;
        }
 
-
        if (view->pending_resize)
                gtk_widget_queue_draw (GTK_WIDGET (view));
        else
                gdk_window_scroll (GTK_WIDGET (view)->window, dx, dy);
-
+               
+       gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+       handle_link_over_xy (view, x, y);
 
        if (view->document)
                view_update_range_and_current_page (view);
@@ -3442,6 +3480,9 @@ setup_caches (EvView *view)
        g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
        view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
        g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
+       page_changed_cb (view->page_cache,
+                        ev_page_cache_get_current_page (view->page_cache),
+                        view);
 }
 
 static void
@@ -3761,6 +3802,9 @@ ev_view_zoom_in (EvView *view)
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
+       if (view->presentation)
+               return;
+       
        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }
@@ -3770,6 +3814,9 @@ ev_view_zoom_out (EvView *view)
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
+       if (view->presentation)
+               return;
+       
        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
@@ -4708,8 +4755,10 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
        }
 
        text = get_selected_text (ev_view);
-       gtk_selection_data_set_text (selection_data, text, -1);
-       g_free (text);
+       if (text) {
+               gtk_selection_data_set_text (selection_data, text, -1);
+               g_free (text);
+       }
 }
 
 static void