diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 15 | ||||
| -rw-r--r-- | src/ephy-window.c | 8 |
3 files changed, 28 insertions, 6 deletions
@@ -1,5 +1,16 @@ 2005-01-06 Christian Persch <chpe@cvs.gnome.org> + * data/ui/epiphany-ui.xml: + + Add placeholder group for tabs move actions. + + * src/ephy-window.c: (show_notebook_popup_menu): + + Activate the action before showing the context menu, so + extensions can sync their UI. + +2005-01-06 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-go-action.c: (create_tool_item): Don't focus the button on click. diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index de3b72f92..a5dc99572 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -82,8 +82,10 @@ <menuitem name="TabsPreviousMenu" action="TabsPrevious"/> <menuitem name="TabsNextMenu" action="TabsNext"/> <separator name="TabsSep1"/> - <menuitem name="TabsMoveLeftMenu" action="TabsMoveLeft"/> - <menuitem name="TabsMoveRightMenu" action="TabsMoveRight"/> + <placeholder name="TabsMoveGroup"> + <menuitem name="TabsMoveLeftMenu" action="TabsMoveLeft"/> + <menuitem name="TabsMoveRightMenu" action="TabsMoveRight"/> + </placeholder> <menuitem name="TabsDetachMenu" action="TabsDetach"/> <placeholder name="TabsOpen"> <separator name="TabsSep2"/> @@ -181,11 +183,12 @@ <menuitem name="CopyImageLocationIELP" action="CopyImageLocation"/> </popup> - <popup name="EphyNotebookPopup" action="PopupAction"> +<popup name="EphyNotebookPopup" action="NotebookPopupAction"> + <placeholder name="TabsMoveGroupENP" position="top"> + <menuitem name="TabMoveLeftENP" action="TabsMoveLeft"/> + <menuitem name="TabMoveRightENP" action="TabsMoveRight"/> + </placeholder> <menuitem name="TabDetachENP" action="TabsDetach"/> - <separator name="TabsSep1"/> - <menuitem name="TabMoveLeftENP" action="TabsMoveLeft"/> - <menuitem name="TabMoveRightENP" action="TabsMoveRight"/> </popup> <accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/> diff --git a/src/ephy-window.c b/src/ephy-window.c index 0ba58a61c..4ae0c4a84 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -100,6 +100,7 @@ static GtkActionEntry ephy_menu_entries [] = { { "Tabs", NULL, N_("_Tabs") }, { "Help", NULL, N_("_Help") }, { "PopupAction", NULL, "" }, + { "NotebookPopupAction", NULL, "" }, /* File menu */ @@ -2049,10 +2050,17 @@ show_notebook_popup_menu (GtkNotebook *notebook, GdkEventButton *event) { GtkWidget *menu, *tab, *tab_label; + GtkAction *action; menu = gtk_ui_manager_get_widget (window->priv->manager, "/EphyNotebookPopup"); g_return_val_if_fail (menu != NULL, FALSE); + /* allow extensions to sync when showing the popup */ + action = gtk_action_group_get_action (window->priv->action_group, + "NotebookPopupAction"); + g_return_val_if_fail (action != NULL, FALSE); + gtk_action_activate (action); + if (event != NULL) { gtk_menu_popup (GTK_MENU (menu), NULL, NULL, |