diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-07-28 18:34:13 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-07-28 18:34:13 +0000 |
| commit | 0430cc6d73028613d1d3a4214085f57f13bbaa7e (patch) | |
| tree | 2c669f26e04b91a93f37d886c26eeec881b38751 /data | |
| parent | 0d92144b4266746817aeb19081ae5fd5ae93b3fe (diff) | |
| download | nautilus-0430cc6d73028613d1d3a4214085f57f13bbaa7e.tar.gz | |
Finished task 1793 (Display hierarchical pre-canned set of bookmarks)
There's now a "static_bookmarks.xml" file that gets installed into
the Nautilus data directory. Its contents are parsed into menu items
that appear above the user's dynamic items. The static items can
include hierarchy and separators. I put in silly content; someone
else will have to figure out what content we want to ship.
* data/static_bookmarks.xml: New file, tree of bookmarks to display.
* data/Makefile.am: Install the bookmarks file into data directory.
* src/nautilus-bookmark-parsing.h,
* src/nautilus-bookmark-parsing.c: New files, contain xml-bookmark-
parsing code that's used by both the static and dynamic bookmarks.
* src/Makefile.am: tell build about new files.
* src/nautilus-bookmark-list.c:
(make_bookmark_from_node): Moved and renamed this into new file.
(nautilus_bookmark_list_load_file): Call renamed function.
* src/nautilus-window-menus.c:
Renamed BookmarkHolder "in_bookmarks_menu" field to "prompt_for_removal"
to clarify its use.
(bookmark_holder_new), (show_bogus_bookmark_window): Accounted for
name changes.
(append_separator): Just moved this function.
(get_static_bookmarks_file_path): New function, returns path for
static bookmarks file if found.
(create_menu_item_from_node): New function, creates a menu item
from an xml node, recursing into folders.
(append_static_bookmarks): New function, reads xml document and
starts the menu-item-creation recursion.
(nautilus_window_initialize_bookmarks_menu): Now calls
append_static_bookmarks before handling the dynamic ones.
* src/nautilus-window-private.h: New last_static_bookmark_path field
in Details struct.
* src/nautilus-window.c: (nautilus_window_destroy): free
last_static_bookmark_path field.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/static_bookmarks.xml | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7790fb3f7..41c9466d2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,6 +4,7 @@ infodir = $(datadir)/nautilus info_DATA = \ browser.xml \ + static_bookmarks.xml \ $(NULL) EXTRA_DIST = $(info_DATA) diff --git a/data/static_bookmarks.xml b/data/static_bookmarks.xml new file mode 100644 index 000000000..b87952495 --- /dev/null +++ b/data/static_bookmarks.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<bookmarks> + <folder name="Linux"> + <bookmark name="Nautilus" uri="http://nautilus.eazel.com"/> + <separator/> + <bookmark name="Eazel" uri="http://www.eazel.com"/> + <bookmark name="Gnome" uri="http://www.gnome.org"/> + <bookmark name="HelixCode" uri="http://www.helixcode.com"/> + <bookmark name="Red Hat" uri="http://www.redhat.com"/> + </folder> + <folder name="Dances"> + <bookmark name="Hampster Dance" uri="http://www.hamsterdance2.com"/> + <bookmark name="Lizard Dance" uri="http://www.lizarddance.com"/> + <bookmark name="Armadillo Dance" uri="http://www.armadillodance.com"/> + </folder> + <folder name="Products"> + <bookmark name="Lemur Dolls" uri="http://www.lemurdolls.com"/> + <bookmark name="Frog Stuff" uri="http://www.frogstuff.com"/> + <bookmark name="Archie McPhee" uri="http://www.mcphee.com"/> + </folder> +</bookmarks> |