Make the way we deal with enumerations simpler. Add "View Preferences"

	* libnautilus-extensions/nautilus-global-preferences.h:
	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_register_enumerations),
	(global_preferences_create_dialog),
	(global_preferences_populate_sidebar_panels_callback),
	(global_preferences_install_font_defaults),
	(global_preferences_populate_pane):
	Make the way we deal with enumerations simpler.  Add "View
	Preferences" pane and all the related defines.

	* libnautilus-extensions/nautilus-preferences-group.h:
	* libnautilus-extensions/nautilus-preferences-group.c:
	(nautilus_preferences_group_initialize_class),
	(nautilus_preferences_group_initialize),
	(nautilus_preferences_group_destroy),
	(nautilus_preferences_group_new),
	(nautilus_preferences_group_add_item),
	(nautilus_preferences_group_update),
	(nautilus_preferences_group_get_num_visible_items),
	(nautilus_preferences_group_get_title_label),
	(nautilus_preferences_group_get_max_caption_width),
	(nautilus_preferences_group_align_captions):
	Add support for 2 columns.  Add better support for caption
	alignment.  Some minor style tweaking.

	* libnautilus-extensions/nautilus-preferences-item.h:
	* libnautilus-extensions/nautilus-preferences-item.c:
	(preferences_item_destroy),
	(preferences_item_update_enumeration_radio),
	(preferences_item_create_enumeration_radio),
	(preferences_item_create_boolean),
	(preferences_item_create_editable_string),
	(preferences_item_create_editable_integer),
	(preferences_item_update_enumeration_menu),
	(preferences_item_create_enumeration_menu),
	(preferences_item_create_font), (preferences_item_create_padding),
	(smooth_font_changed_callback),
	(preferences_item_create_smooth_font),
	(nautilus_preferences_item_new),
	(enumeration_radio_changed_callback), (font_changed_callback),
	(enumeration_menu_changed_callback),
	(preferences_item_update_displayed_value),
	(nautilus_preferences_item_get_child_width),
	(nautilus_preferences_item_update_showing):
	Add support for padding items.  Rename the enumeration items to
	better describe their look and function.
	No longer need to store the whole enumeration.  We just need the
	enumeration id to make enumeration queries.  Remove the
	constrained integer stuff which is replaced by the use of an
	enumeration id.

	* libnautilus-extensions/nautilus-preferences-pane.h:
	* libnautilus-extensions/nautilus-preferences-pane.c:
	(nautilus_preferences_pane_add_item_to_nth_group),
	(preferences_pane_get_max_caption_width),
	(nautilus_preferences_pane_update),
	(nautilus_preferences_pane_get_num_visible_groups):
	Better caption alignment.

	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-preferences.c:
	(preferences_entry_free), (nautilus_preferences_get_description),
	(nautilus_preferences_set_enumeration_id),
	(nautilus_preferences_get_enumeration_id):
	No longer store the whole enumeration, just an enumeration id.

	* src/file-manager/fm-icon-view.c: (fm_icon_view_initialize),
	(fm_icon_view_update_icon_container_font_size_table):
	* src/file-manager/fm-list-view.c: (fm_list_view_initialize),
	(fm_list_view_update_font):
	Update for new "View Preferences" preferences.  Not hooked up for
	real yet.

1 files changed, 15 insertions, 9 deletions

diff --git a/libnautilus-extensions/nautilus-preferences-group.h b/libnautilus-extensions/nautilus-preferences-group.h
index e80bc002c..449dca1cc 100644
--- a/libnautilus-extensions/nautilus-preferences-group.h
+++ b/libnautilus-extensions/nautilus-preferences-group.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 
-/* nautilus-prefs-group-check.h - Check button prefs group interface.
+/* nautilus-preferences-group.h - A group of preferences items bounded by a frame.
 
    Copyright (C) 1999, 2000 Eazel, Inc.
 
@@ -38,32 +38,38 @@ BEGIN_GNOME_DECLS
 #define NAUTILUS_IS_PREFERENCES_GROUP(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_PREFERENCES_GROUP))
 #define NAUTILUS_IS_PREFERENCES_GROUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_PREFERENCES_GROUP))
 
-typedef struct _NautilusPreferencesGroup	   NautilusPreferencesGroup;
-typedef struct _NautilusPreferencesGroupClass      NautilusPreferencesGroupClass;
-typedef struct _NautilusPreferencesGroupDetails    NautilusPreferencesGroupDetails;
+typedef struct NautilusPreferencesGroup		   NautilusPreferencesGroup;
+typedef struct NautilusPreferencesGroupClass	   NautilusPreferencesGroupClass;
+typedef struct NautilusPreferencesGroupDetails	   NautilusPreferencesGroupDetails;
 
-struct _NautilusPreferencesGroup
+struct NautilusPreferencesGroup
 {
 	/* Super Class */
-	GtkFrame			frame;
+	GtkFrame frame;
 	
 	/* Private stuff */
 	NautilusPreferencesGroupDetails	*details;
 };
 
-struct _NautilusPreferencesGroupClass
+struct NautilusPreferencesGroupClass
 {
-	GtkFrameClass	parent_class;
+	GtkFrameClass parent_class;
 };
 
 GtkType    nautilus_preferences_group_get_type              (void);
 GtkWidget* nautilus_preferences_group_new                   (const gchar                    *title);
 GtkWidget* nautilus_preferences_group_add_item              (NautilusPreferencesGroup       *group,
 							     const char                     *preference_name,
-							     NautilusPreferencesItemType     item_type);
+							     NautilusPreferencesItemType     item_type,
+							     int                             column);
 void       nautilus_preferences_group_update                (NautilusPreferencesGroup       *group);
 guint      nautilus_preferences_group_get_num_visible_items (const NautilusPreferencesGroup *group);
 char *     nautilus_preferences_group_get_title_label       (const NautilusPreferencesGroup *group);
+int        nautilus_preferences_group_get_max_caption_width (const NautilusPreferencesGroup *group,
+							     int                             column);
+void       nautilus_preferences_group_align_captions        (NautilusPreferencesGroup       *group,
+							     int                             max_caption_width,
+							     int                             column);
 
 END_GNOME_DECLS