aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-09-17 00:55:09 +0800
committerChristian Persch <chpe@src.gnome.org>2003-09-17 00:55:09 +0800
commit3333b0f664a978f7cb86ce9cd164778e28febe06 (patch)
tree28cbd70e8d4a834a4d7162a5f05a0f53bd880e6b
parentc373fff1059ce15f8c4f4dc8616dc0f36bb65bea (diff)
downloadgsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar.gz
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar.bz2
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar.lz
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar.xz
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.tar.zst
gsoc2013-epiphany-3333b0f664a978f7cb86ce9cd164778e28febe06.zip
Adapt to changed GtkActionGroup api.
2003-09-16 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_construct): * src/ephy-window.c: (setup_window): Adapt to changed GtkActionGroup api.
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c17
-rw-r--r--src/ephy-window.c34
3 files changed, 44 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d264108c..9a734d41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-16 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (ephy_bookmarks_editor_construct):
+ * src/ephy-window.c: (setup_window):
+
+ Adapt to changed GtkActionGroup api.
+
2003-09-16 Christopher James Lahey <clahey@ximian.com>
* src/epiphany.in: Added MOZ_PLUGIN_PATH default. Added migration
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 3c0cd258d..55a0bcf03 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -172,9 +172,6 @@ static GtkActionEntry ephy_bookmark_popup_entries [] = {
{ "Delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
N_("Delete the selected bookmark or topic"),
G_CALLBACK (cmd_delete) },
- { "ShowInBookmarksBar", NULL, N_("_Show in Bookmarks Bar"), NULL,
- N_("Show the selected bookmark or topic in the bookmarks bar"),
- G_CALLBACK (cmd_show_in_bookmarks_bar), TRUE },
{ "Properties", GTK_STOCK_PROPERTIES, N_("_Properties"), "<alt>Return",
N_("View or modify the properties of the selected bookmark"),
G_CALLBACK (cmd_bookmark_properties) },
@@ -220,6 +217,16 @@ static GtkActionEntry ephy_bookmark_popup_entries [] = {
};
static guint ephy_bookmark_popup_n_entries = G_N_ELEMENTS (ephy_bookmark_popup_entries);
+static GtkToggleActionEntry ephy_bookmark_popup_toggle_entries [] =
+{
+ /* File Menu */
+ { "ShowInBookmarksBar", NULL, N_("_Show in Bookmarks Bar"), NULL,
+ N_("Show the selected bookmark or topic in the bookmarks bar"),
+ G_CALLBACK (cmd_show_in_bookmarks_bar), FALSE }
+};
+
+static guint ephy_bookmark_popup_n_toggle_entries = G_N_ELEMENTS (ephy_bookmark_popup_toggle_entries);
+
static void
entry_selection_changed_cb (GtkWidget *widget, GParamSpec *pspec, EphyBookmarksEditor *editor)
{
@@ -1226,6 +1233,10 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
gtk_action_group_set_translation_domain (action_group, NULL);
gtk_action_group_add_actions (action_group, ephy_bookmark_popup_entries,
ephy_bookmark_popup_n_entries, editor);
+ gtk_action_group_add_toggle_actions (action_group,
+ ephy_bookmark_popup_toggle_entries,
+ ephy_bookmark_popup_n_toggle_entries,
+ editor);
gtk_ui_manager_insert_action_group (ui_merge,
action_group, 0);
gtk_ui_manager_add_ui_from_file (ui_merge,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 825623b4a..f64f310be 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -133,18 +133,6 @@ static GtkActionEntry ephy_menu_entries [] = {
{ "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
N_("Display the latest content of the current page"),
G_CALLBACK (window_cmd_view_reload) },
- { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
- N_("Show or hide toolbar"),
- G_CALLBACK (window_cmd_view_toolbar), TRUE },
- { "ViewBookmarksBar", NULL, N_("_Bookmarks Bar"), NULL,
- N_("Show or hide bookmarks bar"),
- G_CALLBACK (window_cmd_view_bookmarks_bar), TRUE },
- { "ViewStatusbar", NULL, N_("St_atusbar"), NULL,
- N_("Show or hide statusbar"),
- G_CALLBACK (window_cmd_view_statusbar), TRUE },
- { "ViewFullscreen", EPHY_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
- N_("Browse at full screen"),
- G_CALLBACK (window_cmd_view_fullscreen), TRUE},
{ "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
N_("Increase the text size"),
G_CALLBACK (window_cmd_view_zoom_in) },
@@ -214,6 +202,24 @@ static GtkActionEntry ephy_menu_entries [] = {
};
static guint ephy_menu_n_entries = G_N_ELEMENTS (ephy_menu_entries);
+static GtkToggleActionEntry ephy_menu_toggle_entries [] =
+{
+ /* View Menu */
+ { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T",
+ N_("Show or hide toolbar"),
+ G_CALLBACK (window_cmd_view_toolbar), TRUE },
+ { "ViewBookmarksBar", NULL, N_("_Bookmarks Bar"), NULL,
+ N_("Show or hide bookmarks bar"),
+ G_CALLBACK (window_cmd_view_bookmarks_bar), TRUE },
+ { "ViewStatusbar", NULL, N_("St_atusbar"), NULL,
+ N_("Show or hide statusbar"),
+ G_CALLBACK (window_cmd_view_statusbar), TRUE },
+ { "ViewFullscreen", EPHY_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
+ N_("Browse at full screen"),
+ G_CALLBACK (window_cmd_view_fullscreen), FALSE}
+};
+static guint ephy_menu_n_toggle_entries = G_N_ELEMENTS (ephy_menu_toggle_entries);
+
static GtkActionEntry ephy_popups_entries [] = {
/* Document */
{ "SaveBackgroundAs", NULL, N_("_Save Background As..."), NULL,
@@ -605,6 +611,10 @@ setup_window (EphyWindow *window)
gtk_action_group_set_translation_domain (action_group, NULL);
gtk_action_group_add_actions (action_group, ephy_menu_entries,
ephy_menu_n_entries, window);
+ gtk_action_group_add_toggle_actions (action_group,
+ ephy_menu_toggle_entries,
+ ephy_menu_n_toggle_entries,
+ window);
gtk_ui_manager_insert_action_group (merge, action_group, 0);
window->priv->action_group = action_group;
action = gtk_action_group_get_action (action_group, "FileOpen");