Merge lp:~larsu/evince/port-popup-menu-to-gmenumodel into lp:~ubuntu-desktop/evince/ubuntu

[Lars Karlitski]

menubar patch: port popup menus to GMenuModel

menubar patch: port popup menus to GMenuModel

[Sebastien Bacher (seb128)]

Thanks, that works fine, I noticed that some menu items are missing (compared to the old/upstream version)

- copy
- select all
- open parent folder

Did you mean to drop those? Having at least the "copy" one seems like useful

review: Needs Information

[Lars Karlitski (larsu)]

> Thanks, that works fine, I noticed that some menu items are missing (compared
> to the old/upstream version)
>
> - copy
> - select all
> - open parent folder
>
> Did you mean to drop those? Having at least the "copy" one seems like useful

Ah thanks. I've overlooked them. Added them back in r238.

[lp:~larsu/evince/port-popup-menu-to-gmenumodel]

238. By Lars Karlitski on 2014-03-04

menubar patch: add missing items to popup menus

[Sebastien Bacher (seb128)]

great

review: Approve

=== modified file 'debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch'
--- debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch	2014-03-03 11:19:48 +0000
+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch	2014-03-04 13:05:00 +0000
@@ -30,8 +30,8 @@
 
 Index: evince-3.10.3/shell/Makefile.am
 ===================================================================
---- evince-3.10.3.orig/shell/Makefile.am	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/Makefile.am	2014-03-03 12:17:53.183442435 +0100
+--- evince-3.10.3.orig/shell/Makefile.am	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/Makefile.am	2014-03-04 14:02:21.029143557 +0100
 @@ -75,6 +75,8 @@
  	ev-sidebar-page.h		\
  	ev-sidebar-thumbnails.c		\
@@ -41,13 +41,13 @@
  	main.c
  
  nodist_evince_SOURCES = \
-@@ -172,12 +174,13 @@
+@@ -172,12 +174,12 @@
  
  EXTRA_DIST = \
  	evince.css \
 -	evince-appmenu.ui \
  	evince-icon.rc \
- 	evince-ui.xml \
+-	evince-ui.xml \
  	evince.gresource.xml \
  	ev-gdbus.xml \
 -	ev-daemon-gdbus.xml
@@ -59,8 +59,8 @@
  	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
 Index: evince-3.10.3/shell/ev-application.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-application.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-application.c	2014-03-03 12:18:09.000000000 +0100
+--- evince-3.10.3.orig/shell/ev-application.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-application.c	2014-03-04 14:02:24.000000000 +0100
 @@ -42,6 +42,9 @@
  #include "ev-application.h"
  #include "ev-file-helpers.h"
@@ -447,8 +447,8 @@
 +}
 Index: evince-3.10.3/shell/ev-application.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-application.h	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-application.h	2014-03-03 12:17:53.183442435 +0100
+--- evince-3.10.3.orig/shell/ev-application.h	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-application.h	2014-03-04 14:02:21.033143557 +0100
 @@ -81,6 +81,14 @@
                                                        GdkScreen       *screen,
                                                        const char      *topic);
@@ -466,8 +466,8 @@
  #endif /* !EV_APPLICATION_H */
 Index: evince-3.10.3/shell/ev-bookmarks.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-bookmarks.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-bookmarks.c	2014-03-03 12:17:53.183442435 +0100
+--- evince-3.10.3.orig/shell/ev-bookmarks.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-bookmarks.c	2014-03-04 14:02:21.033143557 +0100
 @@ -224,6 +224,14 @@
          return g_list_copy (bookmarks->items);
  }
@@ -485,8 +485,8 @@
                    EvBookmark  *bookmark)
 Index: evince-3.10.3/shell/ev-bookmarks.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-bookmarks.h	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-bookmarks.h	2014-03-03 12:17:53.183442435 +0100
+--- evince-3.10.3.orig/shell/ev-bookmarks.h	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-bookmarks.h	2014-03-04 14:02:21.033143557 +0100
 @@ -43,6 +43,7 @@
  GType        ev_bookmarks_get_type      (void) G_GNUC_CONST;
  EvBookmarks *ev_bookmarks_new           (EvMetadata *metadata);
@@ -498,7 +498,7 @@
 Index: evince-3.10.3/shell/ev-recent-menu-model.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/ev-recent-menu-model.c	2014-03-03 12:17:53.183442435 +0100
++++ evince-3.10.3/shell/ev-recent-menu-model.c	2014-03-04 14:02:21.033143557 +0100
 @@ -0,0 +1,108 @@
 +/*
 + * Copyright 2014 Canonical Ltd
@@ -611,7 +611,7 @@
 Index: evince-3.10.3/shell/ev-recent-menu-model.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/ev-recent-menu-model.h	2014-03-03 12:17:53.183442435 +0100
++++ evince-3.10.3/shell/ev-recent-menu-model.h	2014-03-04 14:02:21.033143557 +0100
 @@ -0,0 +1,30 @@
 +/*
 + * Copyright 2014 Canonical Ltd
@@ -645,8 +645,8 @@
 +#endif
 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c	2014-03-03 12:17:53.187442435 +0100
+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c	2014-03-04 14:02:21.037143557 +0100
 @@ -40,11 +40,6 @@
          N_COLUMNS
  };
@@ -716,8 +716,8 @@
  GtkWidget *
 Index: evince-3.10.3/shell/ev-toolbar.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-toolbar.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-toolbar.c	2014-03-03 12:17:53.187442435 +0100
+--- evince-3.10.3.orig/shell/ev-toolbar.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-toolbar.c	2014-03-04 14:02:21.037143557 +0100
 @@ -24,9 +24,12 @@
  
  #include "ev-toolbar.h"
@@ -984,8 +984,8 @@
  static void
 Index: evince-3.10.3/shell/ev-utils.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-utils.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-utils.c	2014-03-03 12:17:53.187442435 +0100
+--- evince-3.10.3.orig/shell/ev-utils.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-utils.c	2014-03-04 14:02:21.037143557 +0100
 @@ -22,6 +22,7 @@
  
  #include "ev-utils.h"
@@ -1087,8 +1087,8 @@
 +}
 Index: evince-3.10.3/shell/ev-utils.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-utils.h	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-utils.h	2014-03-03 12:17:53.187442435 +0100
+--- evince-3.10.3.orig/shell/ev-utils.h	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-utils.h	2014-03-04 14:02:21.037143557 +0100
 @@ -42,6 +42,13 @@
  void           		file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
  GdkPixbufFormat* 	get_gdk_pixbuf_format_by_extension (const gchar *uri);
@@ -1105,8 +1105,8 @@
  #endif /* __EV_VIEW_H__ */
 Index: evince-3.10.3/shell/ev-window.c
 ===================================================================
---- evince-3.10.3.orig/shell/ev-window.c	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-window.c	2014-03-03 12:18:34.127444106 +0100
+--- evince-3.10.3.orig/shell/ev-window.c	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-window.c	2014-03-04 14:02:45.629144561 +0100
 @@ -87,10 +87,10 @@
  #include "ev-print-operation.h"
  #include "ev-progress-message-area.h"
@@ -1119,8 +1119,12 @@
  
  #ifdef ENABLE_DBUS
  #include "ev-gdbus-generated.h"
-@@ -175,8 +175,6 @@
- 	GtkActionGroup   *attachment_popup_action_group;
+@@ -171,24 +171,26 @@
+ 
+ 	/* UI Builders */
+ 	GtkActionGroup   *action_group;
+-	GtkActionGroup   *view_popup_action_group;
+-	GtkActionGroup   *attachment_popup_action_group;
  	GtkActionGroup   *zoom_selector_popup_action_group;
  	GtkRecentManager *recent_manager;
 -	GtkActionGroup   *recent_action_group;
@@ -1128,7 +1132,27 @@
  	GtkActionGroup   *bookmarks_action_group;
  	guint             bookmarks_ui_id;
  	GtkUIManager     *ui_manager;
-@@ -206,6 +204,7 @@
+ 
+ 	/* Popup view */
+-	GtkWidget    *view_popup;
+ 	EvLink       *link;
+ 	EvImage      *image;
+ 	EvAnnotation *annot;
+ 
++	GMenuModel *document_view_menu;
++	GMenuModel *external_link_section;
++	GMenuModel *internal_link_section;
++	GMenuModel *image_section;
++	GMenuModel *attachment_section;
++	GMenuModel *annotation_section;
++	GtkWidget *popup_menu;
++
+ 	/* Popup attachment */
+-	GtkWidget    *attachment_popup;
+ 	GList        *attach_list;
+ 
+ 	/* Document */
+@@ -206,6 +208,7 @@
  	EvWindowTitle *title;
  	EvMetadata *metadata;
  	EvBookmarks *bookmarks;
@@ -1136,7 +1160,7 @@
  
  	/* Load params */
  	EvLinkDest       *dest;
-@@ -262,8 +261,6 @@
+@@ -262,8 +265,6 @@
  #define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
  #define GS_PAGE_CACHE_SIZE       "page-cache-size"
  #define GS_AUTO_RELOAD           "auto-reload"
@@ -1145,7 +1169,7 @@
  
  #define SIDEBAR_DEFAULT_SIZE    132
  #define LINKS_SIDEBAR_ID "links"
-@@ -328,13 +325,9 @@
+@@ -328,29 +329,9 @@
  static void     ev_window_run_fullscreen                (EvWindow         *window);
  static void     ev_window_stop_fullscreen               (EvWindow         *window,
  							 gboolean          unfullscreen_window);
@@ -1156,10 +1180,26 @@
  							 gboolean          unfullscreen_window);
 -static void     ev_window_cmd_view_presentation         (GtkAction        *action,
 -							 EvWindow         *window);
- static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
- 							 EvWindow         *window);
- static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *action,
-@@ -361,8 +354,6 @@
+-static void     ev_view_popup_cmd_open_link             (GtkAction        *action,
+-							 EvWindow         *window);
+-static void     ev_view_popup_cmd_open_link_new_window  (GtkAction        *action,
+-							 EvWindow         *window);
+-static void     ev_view_popup_cmd_copy_link_address     (GtkAction        *action,
+-							 EvWindow         *window);
+-static void     ev_view_popup_cmd_save_image_as         (GtkAction        *action,
+-							 EvWindow         *window);
+-static void     ev_view_popup_cmd_copy_image            (GtkAction        *action,
+-							 EvWindow         *window);
+-static void     ev_view_popup_cmd_annot_properties      (GtkAction        *action,
+-							 EvWindow         *window);
+-static void	ev_attachment_popup_cmd_open_attachment (GtkAction        *action,
+-							 EvWindow         *window);
+-static void	ev_attachment_popup_cmd_save_attachment_as (GtkAction     *action, 
+-							 EvWindow         *window);
+ static void	ev_window_cmd_view_fit_page 		(GtkAction 	  *action,
+ 							 EvWindow 	  *ev_window);
+ static void	ev_window_cmd_view_fit_width 		(GtkAction 	  *action,
+@@ -361,8 +342,6 @@
  							 EvLink           *link, 
  							 EvWindow         *window);
  static void     ev_window_update_find_status_message    (EvWindow         *ev_window);
@@ -1168,7 +1208,7 @@
  static void     find_bar_search_changed_cb              (EggFindBar       *find_bar,
  							 GParamSpec       *param,
  							 EvWindow         *ev_window);
-@@ -396,6 +387,17 @@
+@@ -396,6 +375,17 @@
  }
  
  static void
@@ -1186,7 +1226,7 @@
  ev_window_set_action_sensitive (EvWindow   *ev_window,
  		    	        const char *name,
  		  	        gboolean    sensitive)
-@@ -419,6 +421,7 @@
+@@ -419,6 +409,7 @@
  	gboolean can_get_text = FALSE;
  	gboolean has_pages = FALSE;
  	gboolean can_find = FALSE;
@@ -1194,7 +1234,7 @@
  
  	if (document) {
  		has_document = TRUE;
-@@ -438,10 +441,8 @@
+@@ -438,10 +429,8 @@
  		can_find = TRUE;
  	}
  
@@ -1207,7 +1247,7 @@
  	}
  
  	if (!override_restrictions && info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) {
-@@ -463,33 +464,31 @@
+@@ -463,33 +452,31 @@
  	}
  
  	/* File menu */
@@ -1260,7 +1300,7 @@
  					has_pages && ev_window->priv->bookmarks);
  
  	/* Toolbar-specific actions: */
-@@ -507,62 +506,58 @@
+@@ -507,62 +494,58 @@
  	gboolean has_pages = FALSE;
  	gboolean presentation_mode;
  	gboolean can_find_in_page = FALSE;
@@ -1351,7 +1391,7 @@
  }
  
  static void
-@@ -593,6 +588,8 @@
+@@ -593,6 +576,8 @@
  	set_widget_visibility (priv->toolbar, toolbar);
  	set_widget_visibility (priv->find_bar, findbar);
  	set_widget_visibility (priv->sidebar, sidebar);
@@ -1360,7 +1400,7 @@
  }
  
  static void
-@@ -892,7 +889,7 @@
+@@ -892,7 +877,7 @@
  view_selection_changed_cb (EvView   *view,
  			   EvWindow *window)
  {
@@ -1369,7 +1409,7 @@
  					ev_view_get_has_selection (view));
  }
  
-@@ -1436,27 +1433,6 @@
+@@ -1436,27 +1421,6 @@
  }
  #endif
  
@@ -1397,7 +1437,7 @@
  static gboolean
  ev_window_setup_document (EvWindow *ev_window)
  {
-@@ -1471,8 +1447,6 @@
+@@ -1471,8 +1435,6 @@
  	ev_window_title_set_document (ev_window->priv->title, document);
  	ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
  
@@ -1406,7 +1446,7 @@
  #ifdef HAVE_DESKTOP_SCHEMAS
  	if (!ev_window->priv->lockdown_settings) {
  		ev_window->priv->lockdown_settings = g_settings_new (GS_LOCKDOWN_SCHEMA_NAME);
-@@ -1563,8 +1537,9 @@
+@@ -1563,8 +1525,9 @@
  ev_window_document_changed (EvWindow *ev_window,
  			    gpointer  user_data)
  {
@@ -1418,7 +1458,7 @@
  		ev_window_reload_document (ev_window, NULL);
  }
  
-@@ -2410,124 +2385,10 @@
+@@ -2410,124 +2373,10 @@
  	}
  }
  
@@ -1544,7 +1584,7 @@
  }
  
  static void
-@@ -2545,26 +2406,13 @@
+@@ -2545,26 +2394,13 @@
  }
  
  static void
@@ -1576,7 +1616,7 @@
  }
  
  static void
-@@ -2583,185 +2431,6 @@
+@@ -2583,185 +2419,6 @@
  	gtk_recent_manager_add_item (window->priv->recent_manager, filename);
  }
  
@@ -1762,7 +1802,7 @@
  static gboolean 
  show_saving_progress (GFile *dst)
  {
-@@ -2952,8 +2621,8 @@
+@@ -2952,8 +2609,8 @@
  		return;
  	}
  
@@ -1773,7 +1813,7 @@
  
  	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
  
-@@ -2975,7 +2644,7 @@
+@@ -2975,7 +2632,7 @@
  }
  
  static void
@@ -1782,7 +1822,7 @@
  {
  	GtkWidget *fc;
  	gchar *base_name;
-@@ -3003,9 +2672,9 @@
+@@ -3003,9 +2660,9 @@
  	g_object_unref (file);
  	g_free (base_name);
  
@@ -1795,7 +1835,7 @@
  
  	g_signal_connect (fc, "response",
  			  G_CALLBACK (file_save_dialog_response_cb),
-@@ -3015,9 +2684,21 @@
+@@ -3015,9 +2672,21 @@
  }
  
  static void
@@ -1819,7 +1859,7 @@
  	GAppInfo   *app_info;
  	gchar      *command;
  	const char *uri;
-@@ -3052,8 +2733,11 @@
+@@ -3052,8 +2721,11 @@
  }
  
  static void
@@ -1832,7 +1872,7 @@
  	GtkWidget *ev_window_widget;
  	GFile *file;
  	GFile *parent;
-@@ -3589,14 +3273,22 @@
+@@ -3589,14 +3261,22 @@
  }
  
  static void
@@ -1857,7 +1897,7 @@
  	if (ev_window->priv->properties == NULL) {
  		ev_window->priv->properties = ev_properties_dialog_new ();
  		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
-@@ -3622,7 +3314,7 @@
+@@ -3622,7 +3302,7 @@
  
  	switch (response) {
  	case GTK_RESPONSE_YES:
@@ -1866,7 +1906,7 @@
  		break;
  	case GTK_RESPONSE_NO:
  		gtk_widget_destroy (GTK_WIDGET (ev_window));
-@@ -3823,64 +3515,81 @@
+@@ -3823,64 +3503,81 @@
  }
  
  static void
@@ -1972,7 +2012,7 @@
  }
  
  static void
-@@ -3897,9 +3606,27 @@
+@@ -3897,9 +3594,27 @@
  }
  
  static void
@@ -2003,7 +2043,7 @@
  }
  
  static void
-@@ -3916,12 +3643,6 @@
+@@ -3916,12 +3631,6 @@
  }
  
  static void
@@ -2016,7 +2056,7 @@
  ev_window_cmd_view_zoom_automatic (GtkAction *action,
  				   EvWindow  *ev_window)
  {
-@@ -3957,29 +3678,28 @@
+@@ -3957,29 +3666,28 @@
  }
  
  static void
@@ -2056,7 +2096,7 @@
  }
  
  static void
-@@ -4004,8 +3724,11 @@
+@@ -4004,8 +3712,11 @@
  }
  
  static void
@@ -2069,7 +2109,7 @@
  	gboolean find_bar_hidden;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window))
-@@ -4029,8 +3752,11 @@
+@@ -4029,8 +3740,11 @@
  }
  
  static void
@@ -2082,7 +2122,7 @@
  	gboolean find_bar_hidden;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window))
-@@ -4047,9 +3773,11 @@
+@@ -4047,9 +3761,11 @@
  }
  
  static void
@@ -2096,7 +2136,7 @@
  
  	ev_view_copy (EV_VIEW (ev_window->priv->view));
  }
-@@ -4067,15 +3795,12 @@
+@@ -4067,15 +3783,12 @@
  static void
  ev_window_update_fullscreen_action (EvWindow *window)
  {
@@ -2117,7 +2157,7 @@
  }
  
  static void
-@@ -4292,16 +4017,19 @@
+@@ -4292,16 +4005,19 @@
  }
  
  static void
@@ -2141,7 +2181,7 @@
  }
  
  static void
-@@ -4336,15 +4064,11 @@
+@@ -4336,15 +4052,11 @@
  static void
  ev_window_update_presentation_action (EvWindow *window)
  {
@@ -2161,7 +2201,7 @@
  }
  
  static void
-@@ -4459,14 +4183,17 @@
+@@ -4459,14 +4171,17 @@
  }
  
  static void
@@ -2183,7 +2223,7 @@
  }
  
  static gboolean
-@@ -4530,10 +4257,12 @@
+@@ -4530,10 +4245,12 @@
  	ev_window_update_actions_sensitivity (window);
  }
  
@@ -2198,7 +2238,7 @@
  	gint rotation;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
-@@ -4548,8 +4277,11 @@
+@@ -4548,8 +4265,11 @@
  }
  
  static void
@@ -2211,7 +2251,7 @@
  	gint rotation;
  
  	if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
-@@ -4564,16 +4296,23 @@
+@@ -4564,16 +4284,23 @@
  }
  
  static void
@@ -2239,7 +2279,7 @@
  	EvWindowPrivate *priv = ev_window->priv;
  	EvDocumentModel *model = priv->model;
  	GSettings       *settings = priv->default_settings;
-@@ -4582,7 +4321,7 @@
+@@ -4582,7 +4309,7 @@
  	g_settings_set_boolean (settings, "continuous",
  				ev_document_model_get_continuous (model));
  	g_settings_set_boolean (settings, "dual-page",
@@ -2248,7 +2288,7 @@
  	g_settings_set_boolean (settings, "dual-page-odd-left",
  				ev_document_model_get_dual_page_odd_pages_left (model));
  	g_settings_set_boolean (settings, "fullscreen",
-@@ -4607,59 +4346,78 @@
+@@ -4607,59 +4334,78 @@
  }
  
  static void
@@ -2345,7 +2385,7 @@
  	int n_pages, current_page;
  	
          g_return_if_fail (EV_IS_WINDOW (ev_window));
-@@ -4673,11 +4431,14 @@
+@@ -4673,11 +4419,14 @@
  }
  
  static void
@@ -2363,7 +2403,7 @@
  
  	current_page = ev_document_model_get_page (ev_window->priv->model);
  	
-@@ -4686,15 +4447,6 @@
+@@ -4686,15 +4435,6 @@
  	}
  }
  
@@ -2379,7 +2419,7 @@
  static gint
  compare_bookmarks (EvBookmark *a,
  		   EvBookmark *b)
-@@ -4705,59 +4457,33 @@
+@@ -4705,59 +4445,33 @@
  static void
  ev_window_setup_bookmarks (EvWindow *window)
  {
@@ -2407,27 +2447,27 @@
 -	window->priv->bookmarks_action_group = gtk_action_group_new ("BookmarksActions");
 -	gtk_ui_manager_insert_action_group (window->priv->ui_manager,
 -					    window->priv->bookmarks_action_group, -1);
--
++	for (it = items; it; it = it->next) {
++		EvBookmark *bookmark = it->data;
++		GMenuItem *item;
+ 
 -	items = ev_bookmarks_get_bookmarks (window->priv->bookmarks);
 -	items = g_list_sort (items, (GCompareFunc)compare_bookmarks);
--
++		item = g_menu_item_new (bookmark->title, NULL);
++		g_menu_item_set_action_and_target (item, "win.goto-bookmark", "u", bookmark->page);
++		g_menu_append_item (window->priv->bookmarks_menu, item);
+ 
 -	for (l = items; l && l->data; l = g_list_next (l)) {
 -		EvBookmark *bm = (EvBookmark *)l->data;
 -		GtkAction  *action;
-+	for (it = items; it; it = it->next) {
-+		EvBookmark *bookmark = it->data;
-+		GMenuItem *item;
- 
+-
 -		action = ev_bookmark_action_new (bm);
 -		g_signal_connect (action, "activate",
 -				  G_CALLBACK (ev_window_cmd_bookmark_activate),
 -				  window);
 -		gtk_action_group_add_action (window->priv->bookmarks_action_group,
 -					     action);
-+		item = g_menu_item_new (bookmark->title, NULL);
-+		g_menu_item_set_action_and_target (item, "win.goto-bookmark", "u", bookmark->page);
-+		g_menu_append_item (window->priv->bookmarks_menu, item);
- 
+-
 -		gtk_ui_manager_add_ui (window->priv->ui_manager,
 -				       window->priv->bookmarks_ui_id,
 -				       "/ActionMenu/BookmarksMenu/BookmarksItems",
@@ -2454,7 +2494,7 @@
  	EvBookmark bm;
  	gchar     *page_label;
  
-@@ -4771,32 +4497,41 @@
+@@ -4771,32 +4485,41 @@
  }
  
  static void
@@ -2508,7 +2548,7 @@
  	ev_view_autoscroll_stop (EV_VIEW (window->priv->view));
  
  	if (gtk_widget_get_visible (window->priv->find_bar))
-@@ -4890,29 +4625,20 @@
+@@ -4890,29 +4613,20 @@
  }
  
  static void
@@ -2546,7 +2586,7 @@
  }
  
  static void
-@@ -4930,27 +4656,16 @@
+@@ -4930,27 +4644,16 @@
  }
  
  static void
@@ -2578,7 +2618,7 @@
  
  	if (window->priv->metadata && !ev_window_is_empty (window))
  		ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
-@@ -4960,43 +4675,20 @@
+@@ -4960,43 +4663,20 @@
  }
  
  static void
@@ -2629,7 +2669,7 @@
  }
  
  static void
-@@ -5004,119 +4696,36 @@
+@@ -5004,119 +4684,36 @@
  					       GParamSpec      *pspec,
  					       EvWindow        *ev_window)
  {
@@ -2675,7 +2715,8 @@
 -                "Christian Persch <chpe" "\100" "gnome.org>",
 -		NULL
 -	};
--
++	EvWindow *ev_window = user_data;
+ 
 -	const char *documenters[] = {
 -		"Nickolay V. Shmyrev <[e-mail]>",
 -		"Phil Bull <[e-mail]>",
@@ -2705,8 +2746,7 @@
 -
 -	for (p = authors; *p; ++p)
 -		*p = _(*p);
-+	EvWindow *ev_window = user_data;
- 
+-
 -	for (p = documenters; *p; ++p)
 -		*p = _(*p);
 -#endif
@@ -2764,7 +2804,7 @@
  	update_chrome_visibility (ev_window);
  }
  
-@@ -5137,14 +4746,11 @@
+@@ -5137,14 +4734,11 @@
  					 GParamSpec *pspec,
  					 EvWindow   *ev_window)
  {
@@ -2781,7 +2821,263 @@
  
  		if (ev_window->priv->metadata)
  			ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
-@@ -5542,21 +5148,6 @@
+@@ -5154,14 +4748,10 @@
+ 	}
+ }
+ 
+-static void
++static GMenuModel *
+ view_menu_link_popup (EvWindow *ev_window,
+ 		      EvLink   *link)
+ {
+-	gboolean   show_external = FALSE;
+-	gboolean   show_internal = FALSE;
+-	GtkAction *action;
+-	
+ 	if (ev_window->priv->link)
+ 		g_object_unref (ev_window->priv->link);
+ 	
+@@ -5178,42 +4768,23 @@
+ 			switch (ev_link_action_get_action_type (ev_action)) {
+ 		                case EV_LINK_ACTION_TYPE_GOTO_DEST:
+ 		                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
+-					show_internal = TRUE;
+-					break;
++					return ev_window->priv->internal_link_section;
+ 		                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+ 		                case EV_LINK_ACTION_TYPE_LAUNCH:
+-					show_external = TRUE;
+-					break;
+-		                default:
+-					break;
++					return ev_window->priv->external_link_section;
++				default:
++					return NULL;
+ 			}
+ 		}
+ 	}
+-	
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "OpenLink");
+-	gtk_action_set_visible (action, show_external);
+-
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "CopyLinkAddress");
+-	gtk_action_set_visible (action, show_external);
+-
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "GoLink");
+-	gtk_action_set_visible (action, show_internal);
+-
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "OpenLinkNewWindow");
+-	gtk_action_set_visible (action, show_internal);
++
++	return NULL;
+ }
+ 
+-static void
++static GMenuModel *
+ view_menu_image_popup (EvWindow  *ev_window,
+ 		       EvImage   *image)
+ {
+-	GtkAction *action;
+-	gboolean   show_image = FALSE;
+-	
+ 	if (ev_window->priv->image)
+ 		g_object_unref (ev_window->priv->image);
+ 	
+@@ -5222,38 +4793,22 @@
+ 	else	
+ 		ev_window->priv->image = NULL;
+ 
+-	show_image = (ev_window->priv->image != NULL);
+-	
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "SaveImageAs");
+-	gtk_action_set_visible (action, show_image);
+-
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "CopyImage");
+-	gtk_action_set_visible (action, show_image);
++	return ev_window->priv->image != NULL ? ev_window->priv->image_section : NULL;
+ }
+ 
+-static void
++static GMenuModel *
+ view_menu_annot_popup (EvWindow     *ev_window,
+ 		       EvAnnotation *annot)
+ {
+-	GtkAction *action;
+-	gboolean   show_annot = FALSE;
+-
+ 	if (ev_window->priv->annot)
+ 		g_object_unref (ev_window->priv->annot);
+ 	ev_window->priv->annot = (annot) ? g_object_ref (annot) : NULL;
+ 
+-	action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group,
+-					      "AnnotProperties");
+-	gtk_action_set_visible (action, (annot != NULL && EV_IS_ANNOTATION_MARKUP (annot)));
+-
+ 	if (annot && EV_IS_ANNOTATION_ATTACHMENT (annot)) {
+ 		EvAttachment *attachment;
+ 
+ 		attachment = ev_annotation_attachment_get_attachment (EV_ANNOTATION_ATTACHMENT (annot));
+ 		if (attachment) {
+-			show_annot = TRUE;
+ 			if (ev_window->priv->attach_list) {
+ 				g_list_foreach (ev_window->priv->attach_list,
+ 						(GFunc) g_object_unref, NULL);
+@@ -5263,16 +4818,43 @@
+ 			ev_window->priv->attach_list =
+ 				g_list_prepend (ev_window->priv->attach_list,
+ 						g_object_ref (attachment));
++
++			return ev_window->priv->annotation_section;
+ 		}
+ 	}
+ 
+-	action = gtk_action_group_get_action (ev_window->priv->attachment_popup_action_group,
+-					      "OpenAttachment");
+-	gtk_action_set_visible (action, show_annot);
+-
+-	action = gtk_action_group_get_action (ev_window->priv->attachment_popup_action_group,
+-					      "SaveAttachmentAs");
+-	gtk_action_set_visible (action, show_annot);
++	return NULL;
++}
++
++static void
++popup_menu_detach (GtkWidget *attach_widget,
++		   GtkMenu   *menu)
++{
++	EvWindow *window = EV_WINDOW (attach_widget);
++
++	window->priv->popup_menu = NULL;
++}
++
++static GMenu *
++menu_new_copy (GMenuModel *source)
++{
++	GMenu *menu;
++	gint n_items;
++	gint i;
++
++	menu = g_menu_new ();
++
++	n_items = g_menu_model_get_n_items (source);
++	for (i = 0; i < n_items; i++) {
++		GMenuItem *item;
++
++		item = g_menu_item_new_from_model (source, i);
++		g_menu_append_item (menu, item);
++
++		g_object_unref (item);
++	}
++
++	return menu;
+ }
+ 
+ static gboolean
+@@ -5280,34 +4862,44 @@
+ 		    GList    *items,
+ 		    EvWindow *ev_window)
+ {
+-	GList   *l;
+-	gboolean has_link = FALSE;
+-	gboolean has_image = FALSE;
+-	gboolean has_annot = FALSE;
++	GList *l;
++	GMenu *popup;
++
++	if (ev_window->priv->popup_menu) {
++		gtk_widget_destroy (ev_window->priv->popup_menu);
++		ev_window->priv->popup_menu = NULL;
++	}
++
++	/* make a deep copy of the base menu to append the optionally
++	 * visible sections to */
++	popup = menu_new_copy (ev_window->priv->document_view_menu);
+ 
+ 	for (l = items; l; l = g_list_next (l)) {
+ 		if (EV_IS_LINK (l->data)) {
+-			view_menu_link_popup (ev_window, EV_LINK (l->data));
+-			has_link = TRUE;
++			GMenuModel *section = view_menu_link_popup (ev_window, EV_LINK (l->data));
++			if (section)
++				g_menu_prepend_section (popup, NULL, section);
+ 		} else if (EV_IS_IMAGE (l->data)) {
+-			view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+-			has_image = TRUE;
++			GMenuModel *section = view_menu_image_popup (ev_window, EV_IMAGE (l->data));
++			if (section)
++				g_menu_append_section (popup, NULL, section);
+ 		} else if (EV_IS_ANNOTATION (l->data)) {
+-			view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+-			has_annot = TRUE;
++			GMenuModel *section = view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
++			if (section)
++				g_menu_append_section (popup, NULL, section);
+ 		}
+ 	}
+ 
+-	if (!has_link)
+-		view_menu_link_popup (ev_window, NULL);
+-	if (!has_image)
+-		view_menu_image_popup (ev_window, NULL);
+-	if (!has_annot)
+-		view_menu_annot_popup (ev_window, NULL);
++	if (g_menu_model_get_n_items (G_MENU_MODEL (popup)) > 0) {
++		ev_window->priv->popup_menu = gtk_menu_new_from_model (G_MENU_MODEL (popup));
++		gtk_menu_attach_to_widget (GTK_MENU (ev_window->priv->popup_menu),
++					   GTK_WIDGET (ev_window), popup_menu_detach);
+ 
+-	gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
+-			NULL, NULL, NULL, NULL,
+-			3, gtk_get_current_event_time ());
++		gtk_menu_popup (GTK_MENU (ev_window->priv->popup_menu), NULL, NULL, NULL, NULL,
++				3, gtk_get_current_event_time ());
++	}
++
++	g_object_unref (popup);
+ 	return TRUE;
+ }
+ 
+@@ -5316,8 +4908,6 @@
+ 			      GList           *attach_list,
+ 			      EvWindow        *ev_window)
+ {
+-	GtkWidget *popup;
+-
+ 	g_assert (attach_list != NULL);
+ 
+ 	if (ev_window->priv->attach_list) {
+@@ -5325,13 +4915,19 @@
+ 				(GFunc) g_object_unref, NULL);
+ 		g_list_free (ev_window->priv->attach_list);
+ 	}
+-	
++
+ 	ev_window->priv->attach_list = attach_list;
+-	
+-	popup = ev_window->priv->attachment_popup;
+ 
+-	gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+-			NULL, NULL,
++	if (ev_window->priv->popup_menu) {
++		gtk_widget_destroy (ev_window->priv->popup_menu);
++		ev_window->priv->popup_menu = NULL;
++	}
++
++	ev_window->priv->popup_menu = gtk_menu_new_from_model (ev_window->priv->attachment_section);
++	gtk_menu_attach_to_widget (GTK_MENU (ev_window->priv->popup_menu),
++				   GTK_WIDGET (ev_window), popup_menu_detach);
++
++	gtk_menu_popup (GTK_MENU (ev_window->priv->popup_menu), NULL, NULL, NULL, NULL,
+ 			3, gtk_get_current_event_time ());
+ 
+ 	return TRUE;
+@@ -5542,21 +5138,6 @@
  }
  
  static void
@@ -2803,7 +3099,7 @@
  ev_window_show_find_bar (EvWindow *ev_window)
  {
  	if (gtk_widget_get_visible (ev_window->priv->find_bar)) {
-@@ -5583,7 +5174,7 @@
+@@ -5583,7 +5164,7 @@
  	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
  	update_chrome_visibility (ev_window);
  	gtk_widget_grab_focus (ev_window->priv->find_bar);
@@ -2812,7 +3108,7 @@
  }
  
  static void
-@@ -5601,7 +5192,7 @@
+@@ -5601,7 +5182,7 @@
  	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
  	update_chrome_visibility (ev_window);
  	gtk_widget_grab_focus (ev_window->priv->view);
@@ -2821,7 +3117,7 @@
  
  	ev_history_thaw (ev_window->priv->history);
  }
-@@ -5651,10 +5242,15 @@
+@@ -5651,10 +5232,15 @@
  ev_window_set_caret_navigation_enabled (EvWindow *window,
  					gboolean enabled)
  {
@@ -2837,7 +3133,7 @@
  }
  
  static void
-@@ -5668,7 +5264,7 @@
+@@ -5668,7 +5254,7 @@
  
  	/* Turn the confirmation dialog off if the user has requested not to show it again */
  	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (window->priv->ask_caret_navigation_check))) {
@@ -2846,7 +3142,7 @@
  		g_settings_apply (window->priv->settings);
  	}
  
-@@ -5678,9 +5274,11 @@
+@@ -5678,9 +5264,11 @@
  }
  
  static void
@@ -2860,7 +3156,7 @@
  	GtkWidget *message_area;
  	GtkWidget *box;
  	GtkWidget *hbox;
-@@ -5689,7 +5287,7 @@
+@@ -5689,7 +5277,7 @@
  	/* Don't ask for user confirmation to turn the caret navigation off when it is active,
  	 * or to turn it on when the confirmation dialog is not to be shown per settings */
  	enabled = ev_view_is_caret_navigation_enabled (EV_VIEW (window->priv->view));
@@ -2869,7 +3165,25 @@
  		ev_window_set_caret_navigation_enabled (window, !enabled);
  		return;
  	}
-@@ -5805,28 +5403,15 @@
+@@ -5793,40 +5381,24 @@
+ 		priv->action_group = NULL;
+ 	}
+ 
+-	if (priv->view_popup_action_group) {
+-		g_object_unref (priv->view_popup_action_group);
+-		priv->view_popup_action_group = NULL;
+-	}
+-
+-	if (priv->attachment_popup_action_group) {
+-		g_object_unref (priv->attachment_popup_action_group);
+-		priv->attachment_popup_action_group = NULL;
+-	}
++	g_clear_object (&priv->document_view_menu);
++	g_clear_object (&priv->external_link_section);
++	g_clear_object (&priv->internal_link_section);
++	g_clear_object (&priv->image_section);
++	g_clear_object (&priv->attachment_section);
++	g_clear_object (&priv->annotation_section);
  
  	g_clear_object (&priv->zoom_selector_popup_action_group);
  
@@ -2898,7 +3212,7 @@
  	if (priv->default_settings) {
  		g_settings_apply (priv->default_settings);
  		g_object_unref (priv->default_settings);
-@@ -5838,8 +5423,6 @@
+@@ -5838,8 +5410,6 @@
  		priv->lockdown_settings = NULL;
  	}
  
@@ -2907,7 +3221,7 @@
  	if (priv->model) {
  		g_signal_handlers_disconnect_by_func (priv->model,
  						      ev_window_page_changed_cb,
-@@ -5955,7 +5538,6 @@
+@@ -5955,7 +5525,6 @@
  	G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
  }
  
@@ -2915,7 +3229,7 @@
  /*
   * GtkWindow catches keybindings for the menu items _before_ passing them to
   * the focused widget. This is unfortunate and means that pressing Ctrl+a,
-@@ -6012,184 +5594,10 @@
+@@ -6012,206 +5581,6 @@
  	g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
  }
  
@@ -3093,24 +3407,36 @@
 -	  G_CALLBACK (ev_window_cmd_toggle_find) },
 -};
 -
- /* Popups specific items */
- static const GtkActionEntry view_popup_entries [] = {
- 	/* Links */
+-/* Popups specific items */
+-static const GtkActionEntry view_popup_entries [] = {
+-	/* Links */
 -	{ "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
-+	{ "OpenLink", NULL, N_("_Open Link"), NULL,
- 	  NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
- 	{ "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
- 	  NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
-@@ -6206,7 +5614,7 @@
- };
- 
- static const GtkActionEntry attachment_popup_entries [] = {
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+-	{ "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
+-	{ "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
+-	{ "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) },
+-	{ "SaveImageAs", NULL, N_("_Save Image As…"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) },
+-	{ "CopyImage", NULL, N_("Copy _Image"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) },
+-	{ "AnnotProperties", NULL, N_("Annotation Properties…"), NULL,
+-	  NULL, G_CALLBACK (ev_view_popup_cmd_annot_properties) }
+-};
+-
+-static const GtkActionEntry attachment_popup_entries [] = {
 -	{ "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL,
-+	{ "OpenAttachment", NULL, N_("_Open Attachment"), NULL,
- 	  NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
- 	{ "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As…"), NULL,
- 	  NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
-@@ -6276,13 +5684,6 @@
+-	  NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
+-	{ "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As…"), NULL,
+-	  NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
+-};
+-
+ static const GtkToggleActionEntry zoom_selector_popup_actions[] = {
+ 	{ "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL,
+ 	  N_("Make the current document fill the window"),
+@@ -6276,13 +5645,6 @@
  }
  
  static void
@@ -3124,7 +3450,7 @@
  zoom_action_activated_cb (EvZoomAction *action,
  			  EvWindow     *window)
  {
-@@ -6378,42 +5779,6 @@
+@@ -6378,42 +5740,6 @@
  }
  
  static void
@@ -3167,7 +3493,7 @@
  sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
  			  GParamSpec     *pspec,
  			  EvWindow       *ev_window)
-@@ -6647,21 +6012,21 @@
+@@ -6647,21 +5973,21 @@
  	const gchar *name = ev_link_action_get_name (action);
  
  	if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
@@ -3197,7 +3523,44 @@
  	} else {
  		g_warning ("Unimplemented named action: %s, please post a "
  		           "bug report in Evince bugzilla "
-@@ -6782,8 +6147,8 @@
+@@ -6702,14 +6028,21 @@
+ }
+ 
+ static void
+-ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window)
++ev_window_activate_open_link_action (GSimpleAction *action,
++				     GVariant      *parameter,
++				     gpointer       user_data)
+ {
++	EvWindow *window = user_data;
++
+ 	ev_view_handle_link (EV_VIEW (window->priv->view), window->priv->link);
+ }
+ 
+ static void
+-ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window)
++ev_window_activate_open_link_in_new_window_action (GSimpleAction *action,
++						   GVariant      *parameter,
++						   gpointer       user_data)
+ {
++	EvWindow     *window = user_data;
+ 	EvLinkAction *ev_action = NULL;
+ 	EvLinkDest   *dest;
+ 
+@@ -6725,8 +6058,11 @@
+ }
+ 
+ static void
+-ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window)
++ev_window_activate_copy_link_address_action (GSimpleAction *action,
++					     GVariant      *parameter,
++					     gpointer       user_data)
+ {
++	EvWindow *window = user_data;
+ 	EvLinkAction *ev_action;
+ 
+ 	ev_action = ev_link_get_action (window->priv->link);
+@@ -6782,8 +6118,8 @@
  		return;
  	}
  
@@ -3208,7 +3571,20 @@
  
  	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
  	filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (fc));
-@@ -6887,9 +6252,9 @@
+@@ -6862,8 +6198,11 @@
+ }
+ 
+ static void
+-ev_view_popup_cmd_save_image_as (GtkAction *action, EvWindow *window)
++ev_window_activate_save_image_action (GSimpleAction *action,
++				      GVariant      *parameter,
++				      gpointer       user_data)
+ {
++	EvWindow *window = user_data;
+ 	GtkWidget *fc;
+ 
+ 	if (!window->priv->image)
+@@ -6887,9 +6226,9 @@
  	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
  	
  	file_chooser_dialog_add_writable_pixbuf_formats	(GTK_FILE_CHOOSER (fc));
@@ -3221,7 +3597,47 @@
  
  	g_signal_connect (fc, "response",
  			  G_CALLBACK (image_save_dialog_response_cb),
-@@ -7023,8 +6388,8 @@
+@@ -6899,8 +6238,11 @@
+ }
+ 
+ static void
+-ev_view_popup_cmd_copy_image (GtkAction *action, EvWindow *window)
++ev_window_activate_copy_image_action (GSimpleAction *action,
++				      GVariant      *parameter,
++				      gpointer       user_data)
+ {
++	EvWindow     *window = user_data;
+ 	GtkClipboard *clipboard;
+ 	GdkPixbuf    *pixbuf;
+ 
+@@ -6919,9 +6261,11 @@
+ }
+ 
+ static void
+-ev_view_popup_cmd_annot_properties (GtkAction *action,
+-				    EvWindow  *window)
++ev_window_activate_show_annotation_properties_action (GSimpleAction *action,
++						      GVariant      *parameter,
++						      gpointer       user_data)
+ {
++	EvWindow                     *window = user_data;
+ 	const gchar                  *author;
+ 	GdkRGBA                       rgba;
+ 	gdouble                       opacity;
+@@ -6980,8 +6324,11 @@
+ }
+ 
+ static void
+-ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
++ev_window_activate_open_attachment_action (GSimpleAction *action,
++					   GVariant      *parameter,
++					   gpointer       user_data)
+ {
++	EvWindow  *window = user_data;
+ 	GList     *l;
+ 	GdkScreen *screen;
+ 	
+@@ -7023,8 +6370,8 @@
  		return;
  	}
  
@@ -3232,7 +3648,20 @@
  
  	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
  	target_file = g_file_new_for_uri (uri);
-@@ -7122,8 +6487,8 @@
+@@ -7089,8 +6436,11 @@
+ }
+ 
+ static void
+-ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
++ev_window_activate_save_attachment_action (GSimpleAction *action,
++					   GVariant      *parameter,
++					   gpointer       user_data)
+ {
++	EvWindow     *window = user_data;
+ 	GtkWidget    *fc;
+ 	EvAttachment *attachment = NULL;
+ 
+@@ -7122,8 +6472,8 @@
  		gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
  						   ev_attachment_get_name (attachment));
  
@@ -3243,7 +3672,7 @@
  
  	g_signal_connect (fc, "response",
  			  G_CALLBACK (attachment_save_dialog_response_cb),
-@@ -7154,16 +6519,16 @@
+@@ -7154,16 +6504,16 @@
  		if (EV_WINDOW_IS_PRESENTATION (window))
  			ev_view_presentation_previous_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
  		else
@@ -3264,7 +3693,7 @@
  	}
  }
  
-@@ -7278,8 +6643,72 @@
+@@ -7278,11 +6628,84 @@
  }
  
  static void
@@ -3332,12 +3761,24 @@
 +		{ "escape", ev_window_activate_escape_action, NULL, NULL, NULL },
 +		{ "open-menu", ev_window_activate_open_menu_command, NULL, NULL, NULL },
 +		{ "caret-navigation", activate_toggle_action, NULL, "false", ev_window_change_caret_navigation_action_state },
++		{ "open-link", ev_window_activate_open_link_action, NULL, NULL, NULL },
++		{ "open-link-in-new-window", ev_window_activate_open_link_in_new_window_action, NULL, NULL, NULL },
++		{ "save-image", ev_window_activate_save_image_action, NULL, NULL, NULL },
++		{ "copy-image", ev_window_activate_copy_image_action, NULL, NULL, NULL },
++		{ "show-annotation-properties", ev_window_activate_show_annotation_properties_action, NULL, NULL, NULL },
++		{ "copy-link-address", ev_window_activate_copy_link_address_action, NULL, NULL, NULL },
++		{ "open-attachment", ev_window_activate_open_attachment_action, NULL, NULL, NULL },
++		{ "save-attachment", ev_window_activate_save_attachment_action, NULL, NULL, NULL },
 +	};
 +
  	GtkActionGroup *action_group;
  	GtkAccelGroup *accel_group;
  	GtkCssProvider *css_provider;
-@@ -7343,6 +6772,8 @@
++	GtkBuilder *builder;
+ 	GError *error = NULL;
+ 	GtkWidget *sidebar_widget;
+ 	GtkWidget *overlay;
+@@ -7343,6 +6766,8 @@
  			  G_CALLBACK (activate_link_cb),
  			  ev_window);
  
@@ -3346,7 +3787,7 @@
  	app_info = g_app_info_get_default_for_uri_scheme ("mailto");
  	ev_window->priv->has_mailto_handler = app_info != NULL;
  	g_clear_object (&app_info);
-@@ -7351,15 +6782,13 @@
+@@ -7351,15 +6776,13 @@
  	gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
  	gtk_widget_show (ev_window->priv->main_box);
  
@@ -3366,7 +3807,44 @@
  	register_custom_actions (ev_window, action_group);
  
  	ev_window->priv->ui_manager = gtk_ui_manager_new ();
-@@ -7415,12 +6844,6 @@
+@@ -7370,24 +6793,6 @@
+ 		gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
+ 	gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
+ 
+-	action_group = gtk_action_group_new ("ViewPopupActions");
+-	ev_window->priv->view_popup_action_group = action_group;
+-	gtk_action_group_set_translation_domain (action_group, NULL);
+-	gtk_action_group_add_actions (action_group, view_popup_entries,
+-				      G_N_ELEMENTS (view_popup_entries),
+-				      ev_window);
+-	gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+-					    action_group, 0);
+-
+-	action_group = gtk_action_group_new ("AttachmentPopupActions");
+-	ev_window->priv->attachment_popup_action_group = action_group;
+-	gtk_action_group_set_translation_domain (action_group, NULL);
+-	gtk_action_group_add_actions (action_group, attachment_popup_entries,
+-				      G_N_ELEMENTS (attachment_popup_entries),
+-				      ev_window);
+-	gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+-					    action_group, 0);
+-
+ 	action_group = gtk_action_group_new ("ZoomSelectorPopupActions");
+ 	ev_window->priv->zoom_selector_popup_action_group = action_group;
+ 	gtk_action_group_set_translation_domain (action_group, NULL);
+@@ -7397,11 +6802,6 @@
+ 	gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
+ 					    action_group, 0);
+ 
+-        gtk_ui_manager_add_ui_from_resource (ev_window->priv->ui_manager,
+-                                             "/org/gnome/evince/shell/ui/evince.xml",
+-                                             &error);
+-        g_assert_no_error (error);
+-
+ 	ev_window_register_zoom_selector_popup_actions (ev_window);
+ 
+ 	css_provider = gtk_css_provider_new ();
+@@ -7415,12 +6815,6 @@
  	g_object_unref (css_provider);
  
  	ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
@@ -3379,7 +3857,7 @@
  
  	ev_window->priv->toolbar = ev_toolbar_new (ev_window);
  	gtk_widget_set_no_show_all (ev_window->priv->toolbar, TRUE);
-@@ -7526,10 +6949,6 @@
+@@ -7526,10 +6920,6 @@
  
  	sidebar_widget = ev_sidebar_bookmarks_new ();
  	ev_window->priv->sidebar_bookmarks = sidebar_widget;
@@ -3390,7 +3868,7 @@
  	gtk_widget_show (sidebar_widget);
  	ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
  			     sidebar_widget);
-@@ -7565,7 +6984,7 @@
+@@ -7565,7 +6955,7 @@
  	g_object_set(ev_window->priv->view, "enable-gestures",
  		     _oif_ev_application_get_gestures_enabled (EV_APP), NULL);
  #endif
@@ -3399,7 +3877,30 @@
  					     GS_PAGE_CACHE_SIZE);
  	ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view),
  				     page_cache_mb * 1024 * 1024);
-@@ -7731,9 +7150,6 @@
+@@ -7707,13 +7097,17 @@
+ 			  G_CALLBACK (find_bar_visibility_changed_cb),
+ 			  ev_window);
+ 
++	builder = gtk_builder_new_from_resource ("/org/gnome/evince/shell/ui/popup-menus.ui");
++
+ 	/* Popups */
+-	ev_window->priv->view_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+-								 "/DocumentPopup");
+-	ev_window->priv->link = NULL;
++	ev_window->priv->document_view_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "document-view-menu"));
++	ev_window->priv->external_link_section = G_MENU_MODEL (gtk_builder_get_object (builder, "external-link-menu"));
++	ev_window->priv->internal_link_section = G_MENU_MODEL (gtk_builder_get_object (builder, "internal-link-menu"));
++	ev_window->priv->image_section = G_MENU_MODEL (gtk_builder_get_object (builder, "image-menu"));
++	ev_window->priv->attachment_section = G_MENU_MODEL (gtk_builder_get_object (builder, "attachment-menu"));
++	ev_window->priv->annotation_section = G_MENU_MODEL (gtk_builder_get_object (builder, "annotation-menu"));
+ 
+-	ev_window->priv->attachment_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+-								       "/AttachmentPopup");
++	ev_window->priv->link = NULL;
+ 	ev_window->priv->attach_list = NULL;
+ 
+ 	/* Media player keys */
+@@ -7731,9 +7125,6 @@
  	g_settings_delay (ev_window->priv->default_settings);
  	ev_window_setup_default (ev_window);
  
@@ -3409,7 +3910,16 @@
  	gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
  
          ev_window_sizing_mode_changed_cb (ev_window->priv->model, NULL, ev_window);
-@@ -7762,7 +7178,6 @@
+@@ -7745,6 +7136,8 @@
+ 			   NULL, 0,
+ 			   GDK_ACTION_COPY);
+ 	gtk_drag_dest_add_uri_targets (GTK_WIDGET (ev_window));
++
++	g_object_unref (builder);
+ }
+ 
+ /**
+@@ -7762,7 +7155,6 @@
  	ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
  					      "type", GTK_WINDOW_TOPLEVEL,
                                                "application", g_application_get_default (),
@@ -3417,7 +3927,7 @@
  					      NULL));
  
  	return ev_window;
-@@ -7801,3 +7216,11 @@
+@@ -7801,3 +7193,11 @@
  
  	return ev_window->priv->zoom_selector_popup_action_group;
  }
@@ -3431,8 +3941,8 @@
 +}
 Index: evince-3.10.3/shell/ev-window.h
 ===================================================================
---- evince-3.10.3.orig/shell/ev-window.h	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/ev-window.h	2014-03-03 12:17:53.191442435 +0100
+--- evince-3.10.3.orig/shell/ev-window.h	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/ev-window.h	2014-03-04 14:02:21.041143557 +0100
 @@ -89,7 +89,7 @@
  GtkUIManager   *ev_window_get_ui_manager                 (EvWindow       *ev_window);
  GtkActionGroup *ev_window_get_main_action_group          (EvWindow       *ev_window);
@@ -3444,8 +3954,8 @@
  
 Index: evince-3.10.3/shell/evince-appmenu.ui
 ===================================================================
---- evince-3.10.3.orig/shell/evince-appmenu.ui	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/evince-appmenu.ui	2014-03-03 12:17:53.191442435 +0100
+--- evince-3.10.3.orig/shell/evince-appmenu.ui	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/evince-appmenu.ui	2014-03-04 14:02:21.041143557 +0100
 @@ -20,6 +20,16 @@
    <menu id="appmenu">
      <section>
@@ -3465,10 +3975,10 @@
          <attribute name="accel">F1</attribute>
 Index: evince-3.10.3/shell/evince-ui.xml
 ===================================================================
---- evince-3.10.3.orig/shell/evince-ui.xml	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/evince-ui.xml	2014-03-03 12:17:53.191442435 +0100
-@@ -1,70 +1,10 @@
- <ui>
+--- evince-3.10.3.orig/shell/evince-ui.xml	2014-03-04 14:02:21.045143557 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,118 +0,0 @@
+-<ui>
 -  <popup name="ActionMenu" accelerators="true">
 -    <menuitem name="FileOpenMenu" action="FileOpen"/>
 -    <menuitem name="FileOpenCopyMenu" action="FileOpenCopy"/>
@@ -3521,12 +4031,12 @@
 -    <menuitem name="ViewReload" action="ViewReload"/>
 -  </popup>
 -
-   <popup name="DocumentPopup" action="DocumentPopupAction">
-     <menuitem name="OpenLink" action="OpenLink"/>
-     <menuitem name="CopyLinkAddress" action="CopyLinkAddress"/>
-     <menuitem name="GoLink" action="GoLink"/>
-     <menuitem name="OpenLinkNewWindow" action="OpenLinkNewWindow"/>
-     <separator/>
+-  <popup name="DocumentPopup" action="DocumentPopupAction">
+-    <menuitem name="OpenLink" action="OpenLink"/>
+-    <menuitem name="CopyLinkAddress" action="CopyLinkAddress"/>
+-    <menuitem name="GoLink" action="GoLink"/>
+-    <menuitem name="OpenLinkNewWindow" action="OpenLinkNewWindow"/>
+-    <separator/>
 -    <menuitem name="GoPreviousPage" action="GoPreviousPage"/>
 -    <menuitem name="GoNextPage" action="GoNextPage"/>
 -    <menuitem name="ViewReload" action="ViewReload"/>
@@ -3535,21 +4045,29 @@
 -    <menuitem name="EditCopy" action="EditCopy"/>
 -    <menuitem name="EditSelectAllPopup" action="EditSelectAll"/>
 -    <separator/>
-     <menuitem name="SaveImageAs" action="SaveImageAs"/>
-     <menuitem name="CopyImage" action="CopyImage"/>
-     <separator/>
-@@ -72,7 +12,6 @@
-     <menuitem name="SaveAttachmentAs" action="SaveAttachmentAs"/>
-     <separator/>
-     <menuitem name="AnnotProperties" action="AnnotProperties"/>
+-    <menuitem name="SaveImageAs" action="SaveImageAs"/>
+-    <menuitem name="CopyImage" action="CopyImage"/>
+-    <separator/>
+-    <menuitem name="OpenAttachment" action="OpenAttachment"/>
+-    <menuitem name="SaveAttachmentAs" action="SaveAttachmentAs"/>
+-    <separator/>
+-    <menuitem name="AnnotProperties" action="AnnotProperties"/>
 -    <menuitem name="FileOpenContainingFolder" action="FileOpenContainingFolder"/>
-   </popup>
- 
-   <popup name="AttachmentPopup" action="AttachmentPopupAction">
-@@ -88,31 +27,4 @@
-     <separator/>
-     <placeholder name="ViewZoomItems"/>
-   </popup>
+-  </popup>
+-
+-  <popup name="AttachmentPopup" action="AttachmentPopupAction">
+-    <menuitem name="OpenAttachment" action="OpenAttachment"/>
+-    <separator/>
+-    <menuitem name="SaveAttachmentAs" action="SaveAttachmentAs"/>
+-  </popup>
+-
+-  <popup name="ZoomSelectorPopup">
+-    <menuitem name="ViewFitPage" action="ViewFitPage"/>
+-    <menuitem name="ViewFitWidth" action="ViewFitWidth"/>
+-    <menuitem name="ViewZoomAutomatic" action="ViewZoomAutomatic"/>
+-    <separator/>
+-    <placeholder name="ViewZoomItems"/>
+-  </popup>
 -
 -  <accelerator name="PageDownAccel" action="PageDown"/>
 -  <accelerator name="PageUpAccel" action="PageUp"/>
@@ -3577,24 +4095,27 @@
 -  <accelerator name="FitWidthAccel" action ="FitWidth" />
 -  <accelerator name="F10Accel" action="F10" />
 -  <accelerator name="F7Accel" action="F7" />
- </ui>
+-</ui>
 Index: evince-3.10.3/shell/evince.gresource.xml
 ===================================================================
---- evince-3.10.3.orig/shell/evince.gresource.xml	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/shell/evince.gresource.xml	2014-03-03 12:17:53.195442435 +0100
-@@ -19,6 +19,7 @@
+--- evince-3.10.3.orig/shell/evince.gresource.xml	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/shell/evince.gresource.xml	2014-03-04 14:02:21.041143557 +0100
+@@ -17,8 +17,9 @@
+ -->
+ <gresources>
    <gresource prefix="/org/gnome/evince/shell">
-     <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
+-    <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
      <file alias="ui/evince.css" compressed="true">evince.css</file>
 -    <file alias="ui/appmenu.ui" compressed="true" preprocess="xml-stripblanks">evince-appmenu.ui</file>
 +    <file alias="ui/menus.ui" compressed="true" preprocess="xml-stripblanks">menus.ui</file>
 +    <file alias="ui/traditional-menus.ui" compressed="true" preprocess="xml-stripblanks">traditional-menus.ui</file>
++    <file alias="ui/popup-menus.ui" compressed="true" preprocess="xml-stripblanks">popup-menus.ui</file>
    </gresource>
  </gresources>
 Index: evince-3.10.3/shell/menus.ui
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/menus.ui	2014-03-03 12:18:09.000000000 +0100
++++ evince-3.10.3/shell/menus.ui	2014-03-04 14:02:24.000000000 +0100
 @@ -0,0 +1,188 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
@@ -3787,7 +4308,7 @@
 Index: evince-3.10.3/shell/traditional-menus.ui
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ evince-3.10.3/shell/traditional-menus.ui	2014-03-03 12:17:53.195442435 +0100
++++ evince-3.10.3/shell/traditional-menus.ui	2014-03-04 14:02:21.041143557 +0100
 @@ -0,0 +1,230 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
@@ -4021,8 +4542,8 @@
 +</interface>
 Index: evince-3.10.3/po/POTFILES.in
 ===================================================================
---- evince-3.10.3.orig/po/POTFILES.in	2014-03-03 12:17:53.199442435 +0100
-+++ evince-3.10.3/po/POTFILES.in	2014-03-03 12:17:53.195442435 +0100
+--- evince-3.10.3.orig/po/POTFILES.in	2014-03-04 14:02:21.045143557 +0100
++++ evince-3.10.3/po/POTFILES.in	2014-03-04 14:02:21.041143557 +0100
 @@ -56,3 +56,6 @@
  shell/ev-window-title.c
  shell/main.c
@@ -4030,3 +4551,122 @@
 +[type: gettext/glade]shell/menus.ui
 +[type: gettext/glade]shell/traditional-menus.ui
 +shell/ev-toolbar.c
+Index: evince-3.10.3/shell/popup-menus.ui
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ evince-3.10.3/shell/popup-menus.ui	2014-03-04 14:02:45.629144561 +0100
+@@ -0,0 +1,114 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++  Copyright © 2013 Canonical Ltd.
++
++  This program is free software; you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation; either version 3, or (at your option)
++  any later version.
++
++  This program is distributed in the hope conf it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++  Author: Lars Uebernickel <[e-mail]>
++-->
++<interface>
++  <menu id="document-view-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Previous Page</attribute>
++        <attribute name="action">win.go-previous-page</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">_Next Page</attribute>
++        <attribute name="action">win.go-next-page</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">_Reload</attribute>
++        <attribute name="action">win.reload</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">Auto_scroll</attribute>
++        <attribute name="action">win.auto-scroll</attribute>
++      </item>
++    </section>
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Copy</attribute>
++        <attribute name="action">win.copy</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">Select _All</attribute>
++        <attribute name="action">win.select-all</attribute>
++      </item>
++    </section>
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">Open Containing _Folder</attribute>
++        <attribute name="action">win.open-containing-folder</attribute>
++      </item>
++    </section>
++  </menu>
++  <menu id="external-link-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Open Link</attribute>
++        <attribute name="action">win.open-link</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">_Copy Link Address</attribute>
++        <attribute name="action">win.copy-link-address</attribute>
++      </item>
++    </section>
++  </menu>
++  <menu id="internal-link-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Go To</attribute>
++        <attribute name="action">win.open-link</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">Open in New _Window</attribute>
++        <attribute name="action">win.open-link-in-new-window</attribute>
++      </item>
++    </section>
++  </menu>
++  <menu id="image-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Save Image As…</attribute>
++        <attribute name="action">win.save-image</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">Copy _Image</attribute>
++        <attribute name="action">win.copy-image</attribute>
++      </item>
++    </section>
++  </menu>
++  <menu id="attachment-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">_Open Attachment</attribute>
++        <attribute name="action">win.open-attachment</attribute>
++      </item>
++      <item>
++        <attribute name="label" translatable="yes">_Save Attachment As…</attribute>
++        <attribute name="action">win.save-attachment</attribute>
++      </item>
++    </section>
++  </menu>
++  <menu id="annotation-menu">
++    <section>
++      <item>
++        <attribute name="label" translatable="yes">Annotation Properties…</attribute>
++        <attribute name="action">win.show-annotation-properties</attribute>
++      </item>
++    </section>
++  </menu>
++</interface>