aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDavid Bordoley <bordoley@msu.edu>2003-04-28 22:21:56 +0800
committerDave Bordoley <Bordoley@src.gnome.org>2003-04-28 22:21:56 +0800
commiteeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef (patch)
tree59e4c84de0c540738807219b88ec645018309e58 /data
parent2b4f4ce2f4d105ec1d24d236ed1508e7aa59ad12 (diff)
downloadgsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.gz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.bz2
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.lz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.xz
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.tar.zst
gsoc2013-epiphany-eeaf97888b199c4fbd313665cbfd0f2ad6a2a7ef.zip
Consistent use of the term "Bookmarks Bar" in the code, ui and schema.
2003-04-28 David Bordoley <bordoley@msu.edu> * data/epiphany.schemas.in: * data/ui/epiphany-bookmark-editor-ui.xml.in: * data/ui/epiphany-toolbar.xml.in: * data/ui/epiphany-ui.xml.in: * embed/ephy-embed-types.h: * embed/mozilla/mozilla-embed.cpp: (mozilla_embed_new_window_cb): * lib/ephy-prefs.h: * src/ephy-toolbars-model.c: (ephy_toolbars_model_remove_bookmark), (ephy_toolbars_model_add_bookmark), (ephy_toolbars_model_has_bookmark): * src/ephy-window.c: (save_window_chrome), (translate_default_chrome), (update_layout_toggles), (ephy_window_set_chrome): * src/toolbar.c: (init_bookmarks_toolbar), (toolbar_set_visibility): * src/window-commands.c: (window_cmd_view_bookmarks_bar): * src/window-commands.h: * src/bookmarks/ephy-bookmark-properties.c: (build_ui): * src/bookmarks/ephy-bookmarks-editor.c: (cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu): Consistent use of the term "Bookmarks Bar" in the code, ui and schema. Replaces "Bookmarks Toolbar" and "Personal Toolbar." You'll probably have to delete your epiphany-toolbar.xml file to get the bm toolbar to work now.
Diffstat (limited to 'data')
-rw-r--r--data/epiphany.schemas.in8
-rw-r--r--data/ui/epiphany-bookmark-editor-ui.xml.in2
-rw-r--r--data/ui/epiphany-toolbar.xml.in2
-rw-r--r--data/ui/epiphany-ui.xml.in2
4 files changed, 7 insertions, 7 deletions
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index b795f33dc..06d0afd5f 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -260,14 +260,14 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/epiphany/interface/show_personal_toolbar</key>
- <applyto>/apps/epiphany/interface/show_personal_toolbar</applyto>
+ <key>/schemas/apps/epiphany/interface/show_bookmarks_bar</key>
+ <applyto>/apps/epiphany/interface/show_bookmarks_bar</applyto>
<owner>epiphany</owner>
<type>bool</type>
<default>0</default>
<locale name="C">
- <short>Show bookmarks toolbar by default</short>
- <long>Show bookmarks toolbar by default.</long>
+ <short>Show bookmarks bar by default</short>
+ <long>Show bookmarks bar by default.</long>
</locale>
</schema>
<schema>
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in
index 88d4044d9..5a2590d79 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml.in
+++ b/data/ui/epiphany-bookmark-editor-ui.xml.in
@@ -10,7 +10,7 @@
<menuitem name="FileRename" verb="Rename"/>
<menuitem name="FileDelete" verb="Delete"/>
<separator name="FileSep3"/>
- <menuitem name="FileShowInToolbar" verb="ShowInToolbar"/>
+ <menuitem name="FileShowInBookmarksBar" verb="ShowInBookmarksBar"/>
<menuitem name="FileProperties" verb="Properties"/>
<separator name="FileSep4"/>
<menuitem name="FileClose" verb="Close"/>
diff --git a/data/ui/epiphany-toolbar.xml.in b/data/ui/epiphany-toolbar.xml.in
index c0680a827..bb55af077 100644
--- a/data/ui/epiphany-toolbar.xml.in
+++ b/data/ui/epiphany-toolbar.xml.in
@@ -33,7 +33,7 @@
<toolitem verb="Location"/>
<toolitem verb="Spinner"/>
</toolbar>
-<toolbar name="BookmarksToolbar">
+<toolbar name="BookmarksBar">
<toolitem verb="GoTopicId0"/>
</toolbar>
</editabletoolbar>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 0da96aa19..b954f76d7 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -33,7 +33,7 @@
<submenu name="ViewMenu" verb="View">
<menuitem name="ViewToolbarMenu" verb="ViewToolbar"/>
- <menuitem name="ViewBookmarksToolbarMenu" verb="ViewBookmarksToolbar"/>
+ <menuitem name="ViewBookmarksBarMenu" verb="ViewBookmarksBar"/>
<menuitem name="ViewStatusbarMenu" verb="ViewStatusbar"/>
<menuitem name="ViewFullscreenMenu" verb="ViewFullscreen"/>
<separator name="ViewSep1"/>