Commit ce4e7c67 authored by Darin Adler's avatar Darin Adler

reviewed by: John Sullivan <sullivan@eazel.com>

	Fix bug 6147 (selected icons flash unselected/selected rapidly):

	* src/nautilus-window-manage-views.c: (change_selection): Don't
	send out selection change notices to the view that reported the
	selection change.
	(change_selection_callback): Pass in view that requested the
	change so we can know not to send a selection change to that view.
	* src/file-manager/fm-directory-view.c:
	(fm_directory_view_send_selection_change): Clear flag that says we
	have a selection change for the shell.
	(selection_changed_callback): Add code to indicate this selection
	change is due to the shell, so we don't tell the shell about
	something it just told us.
	(done_loading): Set flag so we don't tell the shell about selection
	changes that are part of the first load of the directory.
	(display_selection_info_idle_callback): Only send a selection change
	to the shell if the change was initiated here. Also remove the code
	that ref's the NautilusView object -- wasn't helping.
	(update_menus_timeout_callback), (display_pending_idle_callback),
	(display_pending_timeout_callback): Remove the code that ref's the
	NautilusView object -- wasn't helping.
	(fm_directory_view_notify_selection_changed): Propagate flag that
	tells the idle code we have made the change to the selection and
	the shell should be notified.

	Fix bug 6158 (nautilus --quit shouldn't check for
	~/.nautilus/first-time-wizard-flag).

	* src/nautilus-main.c: (main): Don't do the first-time druid check
	when the --quit or --restart option is used.

	Fix bug 803 (All metafile tags should be lower case).

	* libnautilus-extensions/nautilus-metadata.h: Use lower-case for
	metadata tags.
	* libnautilus-extensions/nautilus-directory-metafile.c:
	(create_metafile_root), (get_file_node),
	(nautilus_directory_rename_file_metadata),
	(nautilus_directory_copy_file_metadata),
	(nautilus_directory_set_metafile_contents): Change metadata tags
	to be lower-case.
	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_self_check_directory): Use lower-case in metadata
	self-test for clarity.
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_keywords), (nautilus_file_set_keywords): Change
	metadata tags to be lower-case.

	* data/top/.nautilus-metafile.xml
	* icons/ardmore/ardmore.xml:
	* icons/arlo/arlo.xml:
	* icons/arlo/i-directory.xml:
	* icons/arlo/i-regular.xml:
	* icons/crux_eggplant/crux_eggplant.xml:
	* icons/crux_eggplant/i-directory.xml:
	* icons/crux_eggplant/i-regular.xml:
	* icons/default.xml:
	* icons/gnome/gnome.xml:
	* icons/i-directory-accept.xml:
	* icons/i-directory.xml:
	* icons/i-regular.xml:
	* icons/villanova/villanova.xml:
	Change XML to use lower-case.

	* libnautilus-extensions/nautilus-link-set.c: (create_new_link):
	Use lower-case for link XML tags.
	* libnautilus-extensions/nautilus-link.c:
	(nautilus_link_local_create), (nautilus_link_local_set_link_uri),
	(nautilus_link_local_set_type),
	(nautilus_link_local_get_link_uri),
	(nautilus_link_local_get_link_type),
	(nautilus_link_get_link_uri_given_file_contents): Use lower-case
	for link XML tags.

	* src/nautilus-sidebar-title.c:
	(nautilus_sidebar_title_select_text_color),
	(nautilus_sidebar_title_theme_changed): Use lower-case for theme
	XML tags.
	* components/throbber/nautilus-throbber.c:
	(get_bonobo_properties), (nautilus_throbber_initialize),
	(nautilus_throbber_load_images),
	(nautilus_throbber_button_press_event): Change theme XML tags to be
	lower-case.
	* libnautilus-extensions/nautilus-icon-container.c:
	(start_rubberbanding): Use lower-case for theme XML tags.
	(nautilus_icon_container_initialize): Fix comment.
	(update_label_color), (nautilus_icon_container_theme_changed): Use
	lower-case for theme XML tags.
	* libnautilus-extensions/nautilus-icon-factory.c: (set_theme): Use
	lower-case for theme XML tags.
	(get_themed_icon_file_path): Use lower-case for icon XML file
	tags.
	(icon_theme_changed_callback): Use lower-case for theme XML tags.
	* src/nautilus-sidebar-tabs.c:
	(nautilus_sidebar_tabs_load_theme_data), (get_text_offset): Use
	lowe-case for theme XML tags.
	* src/nautilus-sidebar.c: (nautilus_sidebar_update_appearance):
	Use lower-case for theme XML tags.
	* src/nautilus-window-toolbars.c: (get_file_name_from_icon_name):
	Use lower-case for theme XML tags.
	* src/nautilus-zoom-control.c: (draw_number): Use lower-case for
	theme XML tags.

	Change code that used GSList when it should use GList. We use
	GList so that we can share utility functions. It's arbitrary. We
	could have decided to use all GSList instead, but we chose GList
	(because of its name, initially).

	* components/tree/nautilus-tree-expansion-state.c:
	(expansion_state_load_callback),
	(nautilus_tree_expansion_state_load_table_from_gconf),
	(hash_table_get_keys_callback), (hash_table_get_keys),
	(nautilus_tree_expansion_state_save_table_to_gconf): Update to use
	GList instead of GSList.
	* libnautilus-extensions/nautilus-gconf-extensions.h:
	* libnautilus-extensions/nautilus-gconf-extensions.c:
	(nautilus_gconf_handle_error), (nautilus_gconf_set_string_list),
	(nautilus_gconf_get_string_list): Change to work with GList
	instead of GSList to match the rest of Nautilus, so that the lists
	can be manipulated with all the GList utility functions.
	* libnautilus-extensions/nautilus-glib-extensions.h:
	* libnautilus-extensions/nautilus-glib-extensions.c:
	(nautilus_round): Changed name from nautilus_g_round -- "g" for
	"gratuitous".
	(nautilus_g_list_from_g_slist), (nautilus_g_slist_from_g_list):
	Added utility functions to help make GSLists from GLists and vice
	versa. Useful when dealing with functions that yield/expect
	GSLists.
	* libnautilus-extensions/nautilus-icon-text-item.c: (iti_destroy),
	(iti_update), (iti_paint_text), (iti_draw), (iti_render),
	(iti_event): Use nautilus_round by its new name.
	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-preferences.c:
	(nautilus_preferences_set_string_list),
	(nautilus_preferences_get_string_list),
	(nautilus_preferences_default_set_string_list),
	(nautilus_preferences_default_get_string_list): Change to use
	GList instead of GSList.
	* libnautilus-extensions/nautilus-search-uri.c:
	(free_tokenized_uri), (tokenize_uri), (get_translated_criterion),
	(get_nth_criterion_prefix), (parse_uri): Change to use GList
	instead of GSList.
	* src/nautilus-application.h:
	* src/nautilus-application.c:
	(nautilus_application_get_window_list): Renamed from
	nautilus_application_windows and changed to use GList instead of
	GSList.
	(nautilus_application_destroyed_window),
	(nautilus_application_create_window), (volume_unmounted_callback):
	Change to use GList instead of GSList.
	* src/nautilus-shell.c: (save_window_states),
	(restore_window_states): Use GList instead of GSList.
	* src/nautilus-window-manage-views.c: (just_one_window): Use GList
	instead of GSList.
	(open_location_prefer_existing_window_callback): Use GList instead
	of GSList.
	* src/nautilus-window.c: (nautilus_forget_history): Use GList
	instead of GSList and the new name for
	nautilus_application_get_window_list.

	Other changes.

	* src/nautilus-shell.c: (display_caveat_first_time): Turn off the
	caveat -- we're close enough to 1.0.

	* libnautilus-extensions/nautilus-view-identifier.c:
	(nautilus_view_identifier_new_from_oaf_server_info): Use free_deep
	call.

	* libnautilus/nautilus-view-standard-main.h: Use
	BEGIN/END_GNOME_DECLS.

	* src/file-manager/fm-desktop-icon-view.c: Remove unneeded
	include.
parent edae9104
2001-01-30 Darin Adler <darin@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
Fix bug 6147 (selected icons flash unselected/selected rapidly):
* src/nautilus-window-manage-views.c: (change_selection): Don't
send out selection change notices to the view that reported the
selection change.
(change_selection_callback): Pass in view that requested the
change so we can know not to send a selection change to that view.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_send_selection_change): Clear flag that says we
have a selection change for the shell.
(selection_changed_callback): Add code to indicate this selection
change is due to the shell, so we don't tell the shell about
something it just told us.
(done_loading): Set flag so we don't tell the shell about selection
changes that are part of the first load of the directory.
(display_selection_info_idle_callback): Only send a selection change
to the shell if the change was initiated here. Also remove the code
that ref's the NautilusView object -- wasn't helping.
(update_menus_timeout_callback), (display_pending_idle_callback),
(display_pending_timeout_callback): Remove the code that ref's the
NautilusView object -- wasn't helping.
(fm_directory_view_notify_selection_changed): Propagate flag that
tells the idle code we have made the change to the selection and
the shell should be notified.
Fix bug 6158 (nautilus --quit shouldn't check for
~/.nautilus/first-time-wizard-flag).
* src/nautilus-main.c: (main): Don't do the first-time druid check
when the --quit or --restart option is used.
Fix bug 803 (All metafile tags should be lower case).
* libnautilus-extensions/nautilus-metadata.h: Use lower-case for
metadata tags.
* libnautilus-extensions/nautilus-directory-metafile.c:
(create_metafile_root), (get_file_node),
(nautilus_directory_rename_file_metadata),
(nautilus_directory_copy_file_metadata),
(nautilus_directory_set_metafile_contents): Change metadata tags
to be lower-case.
* libnautilus-extensions/nautilus-directory.c:
(nautilus_self_check_directory): Use lower-case in metadata
self-test for clarity.
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_get_keywords), (nautilus_file_set_keywords): Change
metadata tags to be lower-case.
* data/top/.nautilus-metafile.xml
* icons/ardmore/ardmore.xml:
* icons/arlo/arlo.xml:
* icons/arlo/i-directory.xml:
* icons/arlo/i-regular.xml:
* icons/crux_eggplant/crux_eggplant.xml:
* icons/crux_eggplant/i-directory.xml:
* icons/crux_eggplant/i-regular.xml:
* icons/default.xml:
* icons/gnome/gnome.xml:
* icons/i-directory-accept.xml:
* icons/i-directory.xml:
* icons/i-regular.xml:
* icons/villanova/villanova.xml:
Change XML to use lower-case.
* libnautilus-extensions/nautilus-link-set.c: (create_new_link):
Use lower-case for link XML tags.
* libnautilus-extensions/nautilus-link.c:
(nautilus_link_local_create), (nautilus_link_local_set_link_uri),
(nautilus_link_local_set_type),
(nautilus_link_local_get_link_uri),
(nautilus_link_local_get_link_type),
(nautilus_link_get_link_uri_given_file_contents): Use lower-case
for link XML tags.
* src/nautilus-sidebar-title.c:
(nautilus_sidebar_title_select_text_color),
(nautilus_sidebar_title_theme_changed): Use lower-case for theme
XML tags.
* components/throbber/nautilus-throbber.c:
(get_bonobo_properties), (nautilus_throbber_initialize),
(nautilus_throbber_load_images),
(nautilus_throbber_button_press_event): Change theme XML tags to be
lower-case.
* libnautilus-extensions/nautilus-icon-container.c:
(start_rubberbanding): Use lower-case for theme XML tags.
(nautilus_icon_container_initialize): Fix comment.
(update_label_color), (nautilus_icon_container_theme_changed): Use
lower-case for theme XML tags.
* libnautilus-extensions/nautilus-icon-factory.c: (set_theme): Use
lower-case for theme XML tags.
(get_themed_icon_file_path): Use lower-case for icon XML file
tags.
(icon_theme_changed_callback): Use lower-case for theme XML tags.
* src/nautilus-sidebar-tabs.c:
(nautilus_sidebar_tabs_load_theme_data), (get_text_offset): Use
lowe-case for theme XML tags.
* src/nautilus-sidebar.c: (nautilus_sidebar_update_appearance):
Use lower-case for theme XML tags.
* src/nautilus-window-toolbars.c: (get_file_name_from_icon_name):
Use lower-case for theme XML tags.
* src/nautilus-zoom-control.c: (draw_number): Use lower-case for
theme XML tags.
Change code that used GSList when it should use GList. We use
GList so that we can share utility functions. It's arbitrary. We
could have decided to use all GSList instead, but we chose GList
(because of its name, initially).
* components/tree/nautilus-tree-expansion-state.c:
(expansion_state_load_callback),
(nautilus_tree_expansion_state_load_table_from_gconf),
(hash_table_get_keys_callback), (hash_table_get_keys),
(nautilus_tree_expansion_state_save_table_to_gconf): Update to use
GList instead of GSList.
* libnautilus-extensions/nautilus-gconf-extensions.h:
* libnautilus-extensions/nautilus-gconf-extensions.c:
(nautilus_gconf_handle_error), (nautilus_gconf_set_string_list),
(nautilus_gconf_get_string_list): Change to work with GList
instead of GSList to match the rest of Nautilus, so that the lists
can be manipulated with all the GList utility functions.
* libnautilus-extensions/nautilus-glib-extensions.h:
* libnautilus-extensions/nautilus-glib-extensions.c:
(nautilus_round): Changed name from nautilus_g_round -- "g" for
"gratuitous".
(nautilus_g_list_from_g_slist), (nautilus_g_slist_from_g_list):
Added utility functions to help make GSLists from GLists and vice
versa. Useful when dealing with functions that yield/expect
GSLists.
* libnautilus-extensions/nautilus-icon-text-item.c: (iti_destroy),
(iti_update), (iti_paint_text), (iti_draw), (iti_render),
(iti_event): Use nautilus_round by its new name.
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(nautilus_preferences_set_string_list),
(nautilus_preferences_get_string_list),
(nautilus_preferences_default_set_string_list),
(nautilus_preferences_default_get_string_list): Change to use
GList instead of GSList.
* libnautilus-extensions/nautilus-search-uri.c:
(free_tokenized_uri), (tokenize_uri), (get_translated_criterion),
(get_nth_criterion_prefix), (parse_uri): Change to use GList
instead of GSList.
* src/nautilus-application.h:
* src/nautilus-application.c:
(nautilus_application_get_window_list): Renamed from
nautilus_application_windows and changed to use GList instead of
GSList.
(nautilus_application_destroyed_window),
(nautilus_application_create_window), (volume_unmounted_callback):
Change to use GList instead of GSList.
* src/nautilus-shell.c: (save_window_states),
(restore_window_states): Use GList instead of GSList.
* src/nautilus-window-manage-views.c: (just_one_window): Use GList
instead of GSList.
(open_location_prefer_existing_window_callback): Use GList instead
of GSList.
* src/nautilus-window.c: (nautilus_forget_history): Use GList
instead of GSList and the new name for
nautilus_application_get_window_list.
Other changes.
* src/nautilus-shell.c: (display_caveat_first_time): Turn off the
caveat -- we're close enough to 1.0.
* libnautilus-extensions/nautilus-view-identifier.c:
(nautilus_view_identifier_new_from_oaf_server_info): Use free_deep
call.
* libnautilus/nautilus-view-standard-main.h: Use
BEGIN/END_GNOME_DECLS.
* src/file-manager/fm-desktop-icon-view.c: Remove unneeded
include.
2001-01-30 Maciej Stachowiak <mjs@eazel.com>
reviewed by: Gene Z. Ragan <gzr@eazel.com>
......@@ -144,7 +323,6 @@
Reduced timed-wait initial timeout from 5 seconds to
3 after playing around with the gnome-vfs test-method.
2001-01-29 Darin Adler <darin@eazel.com>
reviewed by: Maciej Stachowiak <mjs@eazel.com>
......@@ -8092,8 +8270,6 @@ Wed Jan 24 21:21:52 2001 George Lebl <jirka@5z.com>
2000-12-19 Ramiro Estrugo <ramiro@eazel.com>
reviewed by: <delete if not using a buddy>
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-debug-drawing.h:
* libnautilus-extensions/nautilus-debug-drawing.c:
......
......@@ -135,7 +135,7 @@ get_bonobo_properties (BonoboPropertyBag *bag,
case LOCATION:
{
char *location = nautilus_theme_get_theme_data ("throbber", "URL");
char *location = nautilus_theme_get_theme_data ("throbber", "url");
if (location != NULL) {
BONOBO_ARG_SET_STRING (arg, location);
g_free (location);
......@@ -279,7 +279,7 @@ nautilus_throbber_initialize (NautilusThrobber *throbber)
gtk_container_add (GTK_CONTAINER (box), widget);
/* set up the delay from the theme */
delay_str = nautilus_theme_get_theme_data ("throbber", "DELAY");
delay_str = nautilus_theme_get_theme_data ("throbber", "delay");
if (delay_str) {
throbber->details->delay = atoi (delay_str);
......@@ -548,12 +548,12 @@ nautilus_throbber_load_images (NautilusThrobber *throbber)
nautilus_throbber_unload_images (throbber);
image_theme = nautilus_theme_get_theme_data ("throbber", "IMAGE_THEME");
image_theme = nautilus_theme_get_theme_data ("throbber", "image_theme");
throbber->details->quiescent_pixbuf = load_themed_image ("throbber/rest.png", image_theme, throbber->details->small_mode);
/* images are of the form throbber/001.png, 002.png, etc, so load them into a list */
frames = nautilus_theme_get_theme_data ("throbber", "FRAME_COUNT");
frames = nautilus_theme_get_theme_data ("throbber", "frame_count");
if (frames != NULL) {
throbber->details->max_frame = atoi (frames);
g_free (frames);
......@@ -586,7 +586,7 @@ nautilus_throbber_button_press_event (GtkWidget *widget, GdkEventButton *event)
BonoboArg *location_arg;
throbber = NAUTILUS_THROBBER (widget);
location = nautilus_theme_get_theme_data ("throbber", "URL");
location = nautilus_theme_get_theme_data ("throbber", "url");
if (location != NULL) {
location_arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (location_arg, location);
......
......@@ -26,10 +26,9 @@
#include <config.h>
#include "nautilus-tree-expansion-state.h"
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-preferences.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
struct NautilusTreeExpansionStateDetails {
......@@ -74,59 +73,56 @@ nautilus_tree_expansion_state_initialize_class (gpointer klass)
#define NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE "tree-sidebar-panel/expansion_state"
static void
nautilus_tree_expansion_state_load_foreach_callback (char *uri,
NautilusTreeExpansionState *expansion_state)
expansion_state_load_callback (gpointer node_data,
gpointer callback_data)
{
nautilus_tree_expansion_state_expand_node_internal (expansion_state, uri);
nautilus_tree_expansion_state_expand_node_internal
(callback_data, node_data);
}
static void
nautilus_tree_expansion_state_load_table_from_gconf (NautilusTreeExpansionState *expansion_state)
{
GSList *uris;
GList *uris;
uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
g_slist_foreach (uris, (GFunc) nautilus_tree_expansion_state_load_foreach_callback, expansion_state);
nautilus_g_slist_free_deep (uris);
g_list_foreach (uris, expansion_state_load_callback, expansion_state);
nautilus_g_list_free_deep (uris);
}
static void
g_hash_table_get_keys_callback (gpointer key,
gpointer value,
gpointer user_data)
hash_table_get_keys_callback (gpointer key,
gpointer value,
gpointer user_data)
{
GSList **keys;
GList **keys;
keys = (GSList **) user_data;
*keys = g_slist_prepend (*keys, key);
keys = (GList **) user_data;
*keys = g_list_prepend (*keys, key);
}
static GSList *
g_hash_table_get_keys (GHashTable *hash_table)
static GList *
hash_table_get_keys (GHashTable *hash_table)
{
GSList *keys;
GList *keys;
keys = NULL;
g_hash_table_foreach (hash_table,
g_hash_table_get_keys_callback,
hash_table_get_keys_callback,
&keys);
return keys;
}
static void
nautilus_tree_expansion_state_save_table_to_gconf (NautilusTreeExpansionState *expansion_state)
{
GSList *uris;
uris = g_hash_table_get_keys (expansion_state->details->table);
GList *uris;
uris = hash_table_get_keys (expansion_state->details->table);
uris = nautilus_g_str_list_alphabetize (uris);
nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
g_slist_free (uris);
g_list_free (uris);
}
static void
......
<?xml version="1.0"?>
<DIRECTORY ICONS_AUTO_LAYOUT="false" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF-rgb:FFFF/9999/3333:h" ICONS_ZOOM_LEVEL="3" SIDEBAR_BUTTONS="button=Edit Links...;script=#linksets">
<FILE NAME="Computer.link" ICON_POSITION="251,216"/>
<FILE NAME="Gnumeric.link" ICON_POSITION="437,370"/>
<FILE NAME="Netscape.link" ICON_POSITION="363,372"/>
<FILE NAME="Services.link" ICON_POSITION="397,217"/>
<FILE NAME="The Gimp.link" ICON_POSITION="508,368"/>
</DIRECTORY>
<directory icons_auto_layout="false" background_color="rgb:FFFF/FFFF/FFFF-rgb:FFFF/9999/3333:h" icon_list_zoom_level="3" sidebar_buttons="button=Edit Links...;script=#linksets">
<file name="Computer.link" icon_position="251,216"/>
<file name="Gnumeric.link" icon_position="437,370"/>
<file name="Netscape.link" icon_position="363,372"/>
<file name="Services.link" icon_position="397,217"/>
<file name="The Gimp.link" icon_position="508,368"/>
</directory>
<?xml version="1.0"?>
<theme _name="Tahoe" _description="This theme uses photo-realistic folders.">
<sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./bluewall.png" SIDEBAR_BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_COLOR="rgb:0000/0000/0000" TITLE_SHADOW_COLOR="rgb:BBBB/BBBB/BBBB" TITLE_INFO_COLOR="rgb:0000/0000/0000"/>
<directory BACKGROUND_TILE_IMAGE="./blueridge.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
<desktop BACKGROUND_TILE_IMAGE="patterns/fleur_de_lis.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
<zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
</theme>
<sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="rgb:FFFF/FFFF/FFFF" title_color="rgb:0000/0000/0000" title_shadow_color="rgb:BBBB/BBBB/BBBB" title_info_color="rgb:0000/0000/0000"/>
<directory background_tile_image="./blueridge.png" background_color="rgb:FFFF/FFFF/FFFF"/>
<desktop background_tile_image="patterns/fleur_de_lis.png" background_color="rgb:FFFF/FFFF/FFFF"/>
<zoom_control number_v_offset="-6" digit_width="6"/>
</theme>
<?xml version="1.0"?>
<theme _name="Crux-Teal" _description="A Teal variation of the Crux theme.">
<directory BACKGROUND_TILE_IMAGE="./backgrounds/window_pattern.png" DARK_INFO_COLOR="0x777777"
LIGHT_INFO_COLOR="0xAAAAAA" SELECTION_BOX_COLOR_RGBA="0x497B7E40" SELECTION_BOX_COLOR="rgb:4949/7B7B/7E7E" />
<sidebar SIDEBAR_BACKGROUND_COLOR="rgb:6666/9999/9999-rgb:0000/3333/3333%90-rgb:0000/0000/0000:h" SIDEBAR_BACKGROUND_TILE_IMAGE="patterns/.striated.png" TAB_PIECE_IMAGES="sidebar_tab_pieces" COMBINE="TRUE"
LEFT_OFFSET="0" SHADOW_OFFSET="1" TEXT_H_OFFSET="-4" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop BACKGROUND_TILE_IMAGE="./backgrounds/background_pattern.png"/>
<zoom_control NUMBER_V_OFFSET="-6" NUMBER_H_OFFSET="0" DIGIT_WIDTH="6"/>
<throbber FRAME_COUNT="28" URL="http://www.eazel.com"/>
<directory background_tile_image="./backgrounds/window_pattern.png" dark_info_color="0x777777"
light_info_color="0xAAAAAA" selection_box_color_rgba="0x497B7E40" selection_box_color="rgb:4949/7B7B/7E7E" />
<sidebar sidebar_background_color="rgb:6666/9999/9999-rgb:0000/3333/3333%90-rgb:0000/0000/0000:h"
sidebar_background_tile_image="patterns/.striated.png"
tab_piece_images="sidebar_tab_pieces" combine="true"
left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF"
tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop background_tile_image="./backgrounds/background_pattern.png"/>
<zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
<throbber frame_count="28" url="http://www.eazel.com"/>
</theme>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="48" ATTACH_POINTS="18,22|50,0|50,24|50,48"/>
<ICON SIZE="72" ATTACH_POINTS="21,43|50,0|50,24|50,48"/>
<ICON SIZE="96" ATTACH_POINTS="29,58|50,0|50,24|50,48"/>
</ICON_SET>
<icon_set>
<icon size="48" attach_points="18,22|50,0|50,24|50,48"/>
<icon size="72" attach_points="21,43|50,0|50,24|50,48"/>
<icon size="96" attach_points="29,58|50,0|50,24|50,48"/>
</icon_set>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="48" EMBEDDED_TEXT_RECTANGLE="11,10,38,53"/>
<ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="14,13,57,80"/>
<ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="17,16,82,113"/>
<ICON SIZE="192" EMBEDDED_TEXT_RECTANGLE="28,26,159,219"/>
</ICON_SET>
<icon_set>
<icon size="48" embedded_text_rectangle="11,10,38,53"/>
<icon size="72" embedded_text_rectangle="14,13,57,80"/>
<icon size="96" embedded_text_rectangle="17,16,82,113"/>
<icon size="192" embedded_text_rectangle="28,26,159,219"/>
</icon_set>
<?xml version="1.0"?>
<theme _name="Crux-Eggplant" _description="An Eggplant variation of the Crux theme.">
<directory BACKGROUND_TILE_IMAGE="./backgrounds/window_pattern.png" DARK_INFO_COLOR="0x777777"
LIGHT_INFO_COLOR="0xAAAAAA" SELECTION_BOX_COLOR_RGBA="0x71577440" SELECTION_BOX_COLOR="rgb:7171/5757/7474" />
<sidebar SIDEBAR_BACKGROUND_COLOR="rgb:8888/6F6F/8D8D-rgb:2525/0C0C/2A2A%90-rgb:0000/0000/0000:h" SIDEBAR_BACKGROUND_TILE_IMAGE="patterns/.striated.png" TAB_PIECE_IMAGES="sidebar_tab_pieces" COMBINE="TRUE"
LEFT_OFFSET="0" SHADOW_OFFSET="1" TEXT_H_OFFSET="-4" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop BACKGROUND_TILE_IMAGE="./backgrounds/background_pattern.png"/>
<zoom_control NUMBER_V_OFFSET="-6" NUMBER_H_OFFSET="0" DIGIT_WIDTH="6"/>
<throbber FRAME_COUNT="28" URL="http://www.eazel.com"/>
<directory background_tile_image="./backgrounds/window_pattern.png" dark_info_color="0x777777"
light_info_color="0xAAAAAA" selection_box_color_rgba="0x71577440" selection_box_color="rgb:7171/5757/7474" />
<sidebar sidebar_background_color="rgb:8888/6F6F/8D8D-rgb:2525/0C0C/2A2A%90-rgb:0000/0000/0000:h"
sidebar_background_tile_image="patterns/.striated.png"
tab_piece_images="sidebar_tab_pieces" combine="true"
left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF"
tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop background_tile_image="./backgrounds/background_pattern.png"/>
<zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
<throbber frame_count="28" url="http://www.eazel.com"/>
</theme>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="48" ATTACH_POINTS="18,22|50,0|50,24|50,48"/>
<ICON SIZE="72" ATTACH_POINTS="21,43|50,0|50,24|50,48"/>
<ICON SIZE="96" ATTACH_POINTS="29,58|50,0|50,24|50,48"/>
</ICON_SET>
<icon_set>
<icon size="48" attach_points="18,22|50,0|50,24|50,48"/>
<icon size="72" attach_points="21,43|50,0|50,24|50,48"/>
<icon size="96" attach_points="29,58|50,0|50,24|50,48"/>
</icon_set>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="48" EMBEDDED_TEXT_RECTANGLE="11,10,38,53"/>
<ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="14,13,57,80"/>
<ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="17,16,82,113"/>
<ICON SIZE="192" EMBEDDED_TEXT_RECTANGLE="28,26,159,219"/>
</ICON_SET>
<icon_set>
<icon size="48" embedded_text_rectangle="11,10,38,53"/>
<icon size="72" embedded_text_rectangle="14,13,57,80"/>
<icon size="96" embedded_text_rectangle="17,16,82,113"/>
<icon size="192" embedded_text_rectangle="28,26,159,219"/>
</icon_set>
<?xml version="1.0"?>
<theme _name="Default" _description="This is the default theme for Nautilus.">
<sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./side_bar_image.png"
SIDEBAR_BACKGROUND_COLOR="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
TITLE_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_INFO_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_SHADOW_COLOR="rgb:0000/0000/0000"
TAB_PIECE_IMAGES="sidebar_tab_pieces" COMBINE="TRUE" LEFT_OFFSET="0" SHADOW_OFFSET="1" TEXT_H_OFFSET="-4" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop BACKGROUND_TILE_IMAGE="patterns/brushed_metal.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
<sidebar sidebar_background_tile_image="./side_bar_image.png"
sidebar_background_color="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
title_color="rgb:FFFF/FFFF/FFFF"
title_info_color="rgb:FFFF/FFFF/FFFF"
title_shadow_color="rgb:0000/0000/0000"
tab_piece_images="sidebar_tab_pieces" combine="true"
left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF"
tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
<desktop background_tile_image="patterns/brushed_metal.png" background_color="rgb:FFFF/FFFF/FFFF"/>
<directory BACKGROUND_COLOR="rgb:CFFF/D333/D999"
SELECTION_BOX_COLOR_RGBA="0x727D974C" SELECTION_BOX_COLOR="rgb:7222/7DDD/9777" />
<directory background_color="rgb:CFFF/D333/D999"
selection_box_color_rgba="0x727D974C"
selection_box_color="rgb:7222/7DDD/9777" />
<icon HIGHLIGHT_BACKGROUND_COLOR="rgb:0000/0000/0000" HIGHLIGHT_TEXT_COLOR="rgb:FFFF/FFFF/FFFF" TEXT_FILL_COLOR="rgb:FFFF/FFFF/FFFF"/>
<icon highlight_background_color="rgb:0000/0000/0000"
highlight_text_color="rgb:FFFF/FFFF/FFFF"
text_fill_color="rgb:FFFF/FFFF/FFFF"/>
<thumbnails FRAME_OFFSETS="3,3,6,6"/>
<thumbnails frame_offsets="3,3,6,6"/>
<throbber FRAME_COUNT="15" URL="http://www.eazel.com" DELAY="75"/>
<throbber frame_count="15" url="http://www.eazel.com" delay="75"/>
<zoom_control NUMBER_V_OFFSET="-6" NUMBER_H_OFFSET="-2" DIGIT_WIDTH="6"/>
<zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/>
</theme>
</theme>
<?xml version="1.0"?>
<theme _name="GNOME" _description="This theme uses the classic GNOME icons.">
<sidebar SIDEBAR_BACKGROUND_COLOR="rgb:DDDD/DDDD/FFFF" TITLE_COLOR="rgb:0000/0000/0000" TITLE_SHADOW_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_INFO_COLOR="rgb:0000/0000/0000"/>
<desktop BACKGROUND_TILE_IMAGE="patterns/gnome.jpg"/>
<directory BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
<icon HIGHLIGHT_BACKGROUND_COLOR="rgb:0000/0000/0000" HIGHLIGHT_TEXT_COLOR="rgb:FFFF/FFFF/FFFF" TEXT_FILL_COLOR="rgb:FFFF/FFFF/FFFF"/>
<thumbnails FRAME_OFFSETS="3,3,6,6"/>
<toolbar ICON_THEME="standard"/>
<throbber FRAME_COUNT="10" URL="http://www.gnome.org"/>
<sidebar sidebar_background_color="rgb:DDDD/DDDD/FFFF" title_color="rgb:0000/0000/0000" title_shadow_color="rgb:FFFF/FFFF/FFFF" title_info_color="rgb:0000/0000/0000"/>
<desktop background_tile_image="patterns/gnome.jpg"/>
<directory background_color="rgb:FFFF/FFFF/FFFF"/>
<icon highlight_background_color="rgb:0000/0000/0000" highlight_text_color="rgb:FFFF/FFFF/FFFF" text_fill_color="rgb:FFFF/FFFF/FFFF"/>
<thumbnails frame_offsets="3,3,6,6"/>
<toolbar icon_theme="standard"/>
<throbber frame_count="10" url="http://www.gnome.org"/>
</theme>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="24" ATTACH_POINTS="12,11|25,0|25,12|25,24"/>
<ICON SIZE="36" ATTACH_POINTS="18,17|38,0|38,20|38,40"/>
<ICON SIZE="48" ATTACH_POINTS="28,25|50,0|50,24|50,48"/>
<ICON SIZE="72" ATTACH_POINTS="33,31|76,0|76,32|76,64"/>
<ICON SIZE="96" ATTACH_POINTS="48,45|100,0|100,48|100,96"/>
</ICON_SET>
<icon_set>
<icon size="24" attach_points="12,11|25,0|25,12|25,24"/>
<icon size="36" attach_points="18,17|38,0|38,20|38,40"/>
<icon size="48" attach_points="28,25|50,0|50,24|50,48"/>
<icon size="72" attach_points="33,31|76,0|76,32|76,64"/>
<icon size="96" attach_points="48,45|100,0|100,48|100,96"/>
</icon_set>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="24" ATTACH_POINTS="12,12|25,0|25,12|25,24"/>
<ICON SIZE="36" ATTACH_POINTS="20,20|38,0|38,20|38,40"/>
<ICON SIZE="48" ATTACH_POINTS="26,26|50,0|50,24|50,48"/>
<ICON SIZE="72" ATTACH_POINTS="36,36|76,0|76,32|76,64"/>
<ICON SIZE="96" ATTACH_POINTS="50,50|100,0|100,48|100,96"/>
</ICON_SET>
<icon_set>
<icon size="24" attach_points="12,12|25,0|25,12|25,24"/>
<icon size="36" attach_points="20,20|38,0|38,20|38,40"/>
<icon size="48" attach_points="26,26|50,0|50,24|50,48"/>
<icon size="72" attach_points="36,36|76,0|76,32|76,64"/>
<icon size="96" attach_points="50,50|100,0|100,48|100,96"/>
</icon_set>
<?xml version="1.0"?>
<ICON_SET>
<ICON SIZE="36" EMBEDDED_TEXT_RECTANGLE="3,3,28,38"/>
<ICON SIZE="48" EMBEDDED_TEXT_RECTANGLE="4,4,40,48"/>
<ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="8,8,56,72"/>
<ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="12,12,65,92"/>
</ICON_SET>
<icon_set>
<icon size="36" embedded_text_rectangle="3,3,28,38"/>
<icon size="48" embedded_text_rectangle="4,4,40,48"/>
<icon size="72" embedded_text_rectangle="8,8,56,72"/>
<icon size="96" embedded_text_rectangle="12,12,65,92"/>
</icon_set>
<?xml version="1.0"?>
<theme _name="Sierra" _description="Uses manila folders and gray-green backgrounds.">
<sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./green_weave.png" SIDEBAR_BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF" TAB_PIECE_IMAGES="none"/>
<directory BACKGROUND_TILE_IMAGE="./villanova_green.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF" SELECTION_BOX_COLOR_RGBA="0x70818359" SELECTION_BOX_COLOR="rgb:7000/8111/8333"/>
<desktop BACKGROUND_TILE_IMAGE="./Sierra_desktop.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
<zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
</theme>
<sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="rgb:FFFF/FFFF/FFFF" tab_piece_images="none"/>
<directory background_tile_image="./villanova_green.png" background_color="rgb:FFFF/FFFF/FFFF" selection_box_color_rgba="0x70818359" selection_box_color="rgb:7000/8111/8333"/>
<desktop background_tile_image="./Sierra_desktop.png" background_color="rgb:FFFF/FFFF/FFFF"/>
<zoom_control number_v_offset="-6" digit_width="6"/>
</theme>
......@@ -86,7 +86,7 @@ create_metafile_root (NautilusDirectory *directory)
}
root = xmlDocGetRootElement (directory->details->metafile);
if (root == NULL) {
root = xmlNewDocNode (directory->details->metafile, NULL, "DIRECTORY", NULL);
root = xmlNewDocNode (directory->details->metafile, NULL, "directory", NULL);
xmlDocSetRootElement (directory->details->metafile, root);
}
......@@ -111,8 +111,8 @@ get_file_node (NautilusDirectory *directory,
if (create) {
root = create_metafile_root (directory);
node = xmlNewChild (root, NULL, "FILE", NULL);
xmlSetProp (node, "NAME", file_name);
node = xmlNewChild (root, NULL, "file", NULL);
xmlSetProp (node, "name", file_name);
g_hash_table_insert (hash, xmlMemStrdup (file_name), node);
return node;
}
......@@ -650,7 +650,7 @@ nautilus_directory_rename_file_metadata (NautilusDirectory *directory,
xmlFree (key);
g_hash_table_insert (hash,
xmlMemStrdup (new_file_name), value);
xmlSetProp (file_node, "NAME", new_file_name);
xmlSetProp (file_node, "name", new_file_name);
nautilus_directory_request_write_metafile (directory);
}
} else {
......@@ -872,7 +872,7 @@ nautilus_directory_copy_file_metadata (NautilusDirectory *source_directory,
node = xmlCopyNode (source_node, TRUE);
root = create_metafile_root (destination_directory);
xmlAddChild (root, node);
xmlSetProp (node, "NAME", destination_file_name);
xmlSetProp (node, "name", destination_file_name);
g_hash_table_insert (destination_directory->details->metafile_node_hash,
xmlMemStrdup (destination_file_name), node);
} else {
......@@ -972,8 +972,8 @@ nautilus_directory_set_metafile_contents (NautilusDirectory *directory,
hash = directory->details->metafile_node_hash;
for (node = nautilus_xml_get_root_children (metafile_contents);
node != NULL; node = node->next) {
if (strcmp (node->name, "FILE") == 0) {
name = xmlGetProp (node, "NAME");
if (strcmp (node->name, "file") == 0) {
name = xmlGetProp (node, "name");
if (g_hash_table_lookup (hash, name) != NULL) {
xmlFree (name);
/* FIXME: Should we delete duplicate nodes as we discover them? */
......
......@@ -1498,23 +1498,23 @@ nautilus_self_check_directory (void)
gtk_main_iteration ();
}
nautilus_file_set_metadata (file, "TEST", "default", "value");
NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "TEST", "default"), "value");
nautilus_file_set_boolean_metadata (file, "TEST_BOOLEAN", TRUE, TRUE);
NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "TEST_BOOLEAN", TRUE), TRUE);
nautilus_file_set_boolean_metadata (file, "TEST_BOOLEAN", TRUE, FALSE);
NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "TEST_BOOLEAN", TRUE), FALSE);
NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (NULL, "TEST_BOOLEAN", TRUE), TRUE);
nautilus_file_set_integer_metadata (file, "TEST_INTEGER", 0, 17);
NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "TEST_INTEGER", 0), 17);
nautilus_file_set_integer_metadata (file, "TEST_INTEGER", 0, -1);
NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "TEST_INTEGER", 0), -1);
nautilus_file_set_integer_metadata (file, "TEST_INTEGER", 42, 42);
NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "TEST_INTEGER", 42), 42);
NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (NULL, "TEST_INTEGER", 42), 42);
NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "NONEXISTENT_KEY", 42), 42);
nautilus_file_set_metadata (file, "test", "default", "value");
NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, TRUE);
NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), TRUE);
nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, FALSE);
NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), FALSE);