diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 6 | ||||
| -rw-r--r-- | src/ephy-window.c | 14 |
3 files changed, 24 insertions, 5 deletions
@@ -1,5 +1,14 @@ 2003-11-26 Marco Pesenti Gritti <marco@gnome.org> + * data/ui/epiphany-ui.xml: + * src/ephy-window.c: (update_edit_actions_sensitivity), + (edit_menu_show_cb), (show_embed_popup): + + Restore clipboard actions in input context menu. + Show it only if mozilla is recent enough though. + +2003-11-26 Marco Pesenti Gritti <marco@gnome.org> + * embed/downloader-view.c: (update_download_row), (download_changed_cb), (downloader_view_add_download), (downloader_view_build_ui): diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index a9cbdc49a..60f9de706 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -88,11 +88,11 @@ </menubar> <popup name="EphyInputPopup" action="PopupAction"> + <menuitem name="EditCutIP" action="EditCut"/> + <menuitem name="EditCopyIP" action="EditCopy"/> <menuitem name="EditPasteIP" action="EditPaste"/> </popup> -<popup name="EphyTextPopup" action="PopupAction"> - <menuitem name="EditCopyTP" action="EditCopy"/> -</popup> + <popup name="EphyDocumentPopup" action="PopupAction"> <menuitem name="GoBackDP" action="GoBack"/> <menuitem name="GoForwardDP" action="GoForward"/> diff --git a/src/ephy-window.c b/src/ephy-window.c index a8470b567..a74598f8d 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -567,9 +567,9 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW return FALSE; } + static void -edit_menu_show_cb (GtkWidget *menu, - EphyWindow *window) +update_edit_actions_sensitivity (EphyWindow *window) { GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); GtkActionGroup *action_group; @@ -623,6 +623,13 @@ edit_menu_show_cb (GtkWidget *menu, } static void +edit_menu_show_cb (GtkWidget *menu, + EphyWindow *window) +{ + update_edit_actions_sensitivity (window); +} + +static void edit_menu_hide_cb (GtkWidget *menu, EphyWindow *window) { @@ -1076,10 +1083,13 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event) { popup = "/EphyImagePopup"; } +#if MOZILLA_SNAPSHOT > 12 else if (context & EMBED_CONTEXT_INPUT) { + update_edit_actions_sensitivity (window); popup = "/EphyInputPopup"; } +#endif else { popup = framed ? "/EphyFramedDocumentPopup" : |