diff options
| author | Yosef Or Boczko <yoseforb@gmail.com> | 2013-11-14 16:49:48 +0200 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2013-11-15 10:38:16 +0200 |
| commit | 71950801a0f1cb560e8a35c85f973e4d452196d1 (patch) | |
| tree | dba4a5fd62ff3a8cc04edde4771e806325c2214a | |
| parent | c915e5783f5460d19347557e6a643cb8c4003aa6 (diff) | |
| download | epiphany-71950801a0f1cb560e8a35c85f973e4d452196d1.tar.gz | |
ephy-window: Allow again undo and redo and work again accel Ctrl+Z and Shift+Ctrl+Z
* Add Undo and Redo to the gear menu
* Add Undo and Redo to the popup menu when context is editable
* Work again Ctrl+Z accel to Undo and Shift+Ctrl+Z accel to Redo
* Bump the WebKitGTK+ requirements to 2.2.2
https://bugzilla.gnome.org/show_bug.cgi?id=698703
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 6 | ||||
| -rw-r--r-- | src/resources/epiphany-ui.xml | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 255dc0051..d27ae867d 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ GLIB_REQUIRED=2.35.6 GTK_REQUIRED=3.9.12 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 -WEBKIT_GTK_REQUIRED=2.1.4 +WEBKIT_GTK_REQUIRED=2.2.2 LIBSOUP_REQUIRED=2.42.1 GNOME_DESKTOP_REQUIRED=2.91.2 LIBSECRET_REQUIRED=0.14 diff --git a/src/ephy-window.c b/src/ephy-window.c index b8896a426..a2e655ffc 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1956,6 +1956,12 @@ populate_context_menu (WebKitWebView *web_view, update_edit_actions_sensitivity (window, FALSE); add_action_to_context_menu (context_menu, + priv->action_group, "EditUndo"); + add_action_to_context_menu (context_menu, + priv->action_group, "EditRedo"); + webkit_context_menu_append (context_menu, + webkit_context_menu_item_new_separator ()); + add_action_to_context_menu (context_menu, priv->action_group, "EditCut"); add_action_to_context_menu (context_menu, priv->action_group, "EditCopy"); diff --git a/src/resources/epiphany-ui.xml b/src/resources/epiphany-ui.xml index ba400071a..2faa796ef 100644 --- a/src/resources/epiphany-ui.xml +++ b/src/resources/epiphany-ui.xml @@ -77,6 +77,9 @@ <menuitem name="FileSaveAsMenu" action="FileSaveAs"/> <menuitem name="FileSaveAsApplicationMenu" action="FileSaveAsApplication"/> <separator name="FileSep2"/> + <menuitem name="EditUndoMenu" action="EditUndo"/> + <menuitem name="EditRedoMenu" action="EditRedo"/> + <separator name="EditSep2"/> <menuitem name="EditCutMenu" action="EditCut"/> <menuitem name="EditCopyMenu" action="EditCopy"/> <menuitem name="EditPasteMenu" action="EditPaste"/> |