X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=0607771d476f689f75b741ee46c5c13f2a7fddd3;hb=2d603e6e91cf2b8095cc94c26441bbfc15b4e59d;hp=85cf501edb7d8cff505d096d55a02a0d47015e71;hpb=0d8fec8c37551f267785577cdc1488b29284bc78;p=evince.git

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 85cf501e..0607771d 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -32,6 +32,7 @@
 #include "ev-document-forms.h"
 #include "ev-document-images.h"
 #include "ev-document-links.h"
+#include "ev-document-layers.h"
 #include "ev-document-misc.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
@@ -56,6 +57,7 @@ enum {
 	SIGNAL_SELECTION_CHANGED,
 	SIGNAL_SYNC_SOURCE,
 	SIGNAL_ANNOT_ADDED,
+	SIGNAL_LAYERS_CHANGED,
 	N_SIGNALS
 };
 
@@ -789,7 +791,7 @@ add_scroll_binding_keypad (GtkBindingSet  *binding_set,
     			   GtkScrollType   scroll,
 			   gboolean        horizontal)
 {
-  guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
+  guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left;
 
   gtk_binding_entry_add_signal (binding_set, keyval, modifiers,
                                 "binding_activated", 2,
@@ -1738,6 +1740,38 @@ ev_view_handle_link (EvView *view, EvLink *link)
 			ev_view_goto_dest (view, dest);
 		}
 			break;
+	        case EV_LINK_ACTION_TYPE_LAYERS_STATE: {
+			GList            *show, *hide, *toggle;
+			GList            *l;
+			EvDocumentLayers *document_layers;
+
+			document_layers = EV_DOCUMENT_LAYERS (view->document);
+
+			show = ev_link_action_get_show_list (action);
+			for (l = show; l; l = g_list_next (l)) {
+				ev_document_layers_show_layer (document_layers, EV_LAYER (l->data));
+			}
+
+			hide = ev_link_action_get_hide_list (action);
+			for (l = hide; l; l = g_list_next (l)) {
+				ev_document_layers_hide_layer (document_layers, EV_LAYER (l->data));
+			}
+
+			toggle = ev_link_action_get_toggle_list (action);
+			for (l = toggle; l; l = g_list_next (l)) {
+				EvLayer *layer = EV_LAYER (l->data);
+
+				if (ev_document_layers_layer_is_visible (document_layers, layer)) {
+					ev_document_layers_hide_layer (document_layers, layer);
+				} else {
+					ev_document_layers_show_layer (document_layers, layer);
+				}
+			}
+
+			g_signal_emit (view, signals[SIGNAL_LAYERS_CHANGED], 0);
+			ev_view_reload_page (view, view->current_page, NULL);
+		}
+			break;
 	        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
 	        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
 	        case EV_LINK_ACTION_TYPE_LAUNCH:
@@ -3479,10 +3513,13 @@ ev_view_query_tooltip (GtkWidget  *widget,
 		get_link_area (view, x, y, link, &link_area);
 		gtk_tooltip_set_text (tooltip, text);
 		gtk_tooltip_set_tip_area (tooltip, &link_area);
+		g_free (text);
+
+		return TRUE;
 	}
 	g_free (text);
 
-	return TRUE;
+	return FALSE;
 }
 
 static void
@@ -4678,24 +4715,32 @@ ev_view_class_init (EvViewClass *class)
 		         g_cclosure_marshal_VOID__OBJECT,
 		         G_TYPE_NONE, 1,
 			 EV_TYPE_ANNOTATION);
+	signals[SIGNAL_LAYERS_CHANGED] = g_signal_new ("layers-changed",
+	  	         G_TYPE_FROM_CLASS (object_class),
+		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		         G_STRUCT_OFFSET (EvViewClass, layers_changed),
+		         NULL, NULL,
+		         g_cclosure_marshal_VOID__VOID,
+		         G_TYPE_NONE, 0,
+			 G_TYPE_NONE);
 
 	binding_set = gtk_binding_set_by_class (class);
 
-	add_scroll_binding_keypad (binding_set, GDK_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);
+        gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
 				      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE);
-	gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
 				      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
 				      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
 				      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE);
 	
 }