libnautilus-private/nautilus-global-preferences.h Use underscore instead

2002-04-20  Alexander Larsson  <alla@lysator.liu.se>

	* libnautilus-private/nautilus-global-preferences.h
	Use underscore instead of dashes in gconf keys.

	* libnautilus-private/Makefile.am
	* libnautilus-private/nautilus.schemas:
	* libnautilus-private/apps_nautilus_preferences.schemas:
	Renamed schemas file to apps_nautilus_preferences.schemas.
	Some new keys are documented.

	This patch is from Jonathan Blandford <jrb@redhat.com>

4 files changed, 214 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index ccbf912f5..de7339f89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2002-04-20  Alexander Larsson  <alla@lysator.liu.se>
 
+	* libnautilus-private/nautilus-global-preferences.h
+	Use underscore instead of dashes in gconf keys.
+	
+	* libnautilus-private/Makefile.am
+	* libnautilus-private/nautilus.schemas:
+	* libnautilus-private/apps_nautilus_preferences.schemas:
+	Renamed schemas file to apps_nautilus_preferences.schemas.
+	Some new keys are documented.
+
+	This patch is from Jonathan Blandford <jrb@redhat.com>
+
+2002-04-20  Alexander Larsson  <alla@lysator.liu.se>
+
 	* libnautilus-private/nautilus-icon-container.c (lay_down_icons_horizontal):
 	Fruitless attempt to optimize icon layout. It turns out it is text-measure and
 	icon lookup bound. I'm checking in this optimization anyway, even though it
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index fb83e70dd..2c77c1633 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -181,7 +181,7 @@ nautilus-marshal-guts.c: nautilus-marshal.list $(GLIB_GENMARSHAL)
 $(libnautilus_private_la_OBJECTS): nautilus_metafile_server_idl_stamp $(marshal_sources)
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = nautilus.schemas
+schema_DATA = apps_nautilus_preferences.schemas
 
 # don't do this if we are building in eg. rpm
 install-data-local:
@@ -206,4 +206,4 @@ CLEANFILES = \
 	$(NULL)
 
 dist-hook:
-	cd $(distdir); rm -f $(CLEANFILES)
\ No newline at end of file
+	cd $(distdir); rm -f $(CLEANFILES)
diff --git a/libnautilus-private/nautilus.schemas b/libnautilus-private/apps_nautilus_preferences.schemas
index eebf54074..1a6b79c3a 100644
--- a/libnautilus-private/nautilus.schemas
+++ b/libnautilus-private/apps_nautilus_preferences.schemas
@@ -41,6 +41,7 @@
       <applyto>/apps/nautilus/preferences/xalf/options</applyto>
       <owner>nautilus</owner>
       <type>list</type>
+      <list_type>string</list_type>
       <locale name="C">
          <short>xalf options</short>
          <long>
@@ -247,24 +248,187 @@
       </locale>
     </schema>
 
-   <schema>
-      <key>/schemas/apps/nautilus/preferences/smooth_graphics_mode</key>
-      <applyto>/apps/nautilus/preferences/smooth_graphics_mode</applyto>
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/preview_sound</key>
+      <applyto>/apps/nautilus/preferences/preview_sound</applyto>
+      <owner>nautilus</owner>
+      <type>string</type>
+      <default>local_only</default>
+      <locale name="C">
+         <short>Whether to preview sounds when mousing over an icon</short>
+         <long>
+           Speed tradeoff for when to preview a sound file when mousing
+           over a files icon.
+           If set to "always" then always plays the sound, 
+           even if the file is on a remote server.
+           If set to "local_only" then only plays previews on local filesystems.
+           If set to "never" then it never previews sound.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/show_special_flags</key>
+      <applyto>/apps/nautilus/preferences/show_special_flags</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Enable 'special' flags in file preferences dialog</short>
+	 <long>
+	  If set to true, then nautilus lets you edit some of the more
+	  esoteric options of a file in the file preferences dialog.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/sort_directories_first</key>
+      <applyto>/apps/nautilus/preferences/sort_directories_first</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Show directories first in windows</short>
+	 <long>
+	  If set to true, then nautilus shows directories prior to
+	  showing files in the icon and list views.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/show_desktop</key>
+      <applyto>/apps/nautilus/preferences/show_desktop</applyto>
       <owner>nautilus</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Whether to use smooth (antialiased) graphics</short>
+         <short>Nautilus handles drawing the desktop</short>
+	 <long>
+	  If set to true, then nautilus will draw the icons on the
+	  desktop.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/desktop_is_home_dir</key>
+      <applyto>/apps/nautilus/preferences/desktop_is_home_dir</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Nautilus uses the users home directory as the desktop</short>
+	 <long>
+	  If set to true, then nautilus will use the user's home
+	  directory as the desktop.  If it is false, then it will use
+	  ~/.gnome-desktop as the desktop.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/can_add_content</key>
+      <applyto>/apps/nautilus/preferences/can_add_content</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>User can add patterns to pattern dialog</short>
+	 <long>
+	  If set to true, then the user can add their own patterns,
+	  emblems and colors to the pattern dialog.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/search_bar_type</key>
+      <applyto>/apps/nautilus/preferences/search_bar_type</applyto>
+      <owner>nautilus</owner>
+      <type>string</type>
+      <default>search_by_text</default>
+      <locale name="C">
+         <short>Criteria for search bar searching.</short>
+	 <long>
+	  Criteria when matching files searched for in the search bar.
+	  If set to search_by_text, then nautilus will Search for files
+	  by file name only.
+	  If set to search_by_text_and_properties", then nautilus will
+	  search for files by file name and file properties. 
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/window_always_new</key>
+      <applyto>/apps/nautilus/preferences/window_always_new</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Bring up a new window for every opened file</short>
+	 <long>
+	  If set to true, then nautilus will bring up a new nautilus
+	  window by default whenever an item is opened.
+	</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/window_always_new</key>
+      <applyto>/apps/nautilus/preferences/window_always_new</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Bring up a new window for every opened file</short>
+	 <long>
+	  If set to true, then nautilus will bring up a new nautilus
+	  window by default whenever an item is opened.
+	</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/nautilus/icon_view/captions</key>
+      <applyto>/apps/nautilus/icon_view/captions</applyto>
+      <owner>nautilus</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[size,date_modified,type]</default>
+      <locale name="C">
+         <short>List of possible captions on icons</short>
          <long>
-           If toggled on, smooth out jagged graphics, possibly 
-           using more resources.
+	  A list of captions below an icon in the icon view and
+          the desktop.  The actual number of captions shown depends on
+          the zoom level.  Possible values are:
+	  size, type, date_modified, date_changed, date_accessed, owner,
+	  group, permissions, octal_permissions and mime_type
          </long>
       </locale>
     </schema>
 
-   <schema>
-      <key>/schemas/apps/nautilus/list-view/font</key>
-      <applyto>/apps/nautilus/list-view/font</applyto>
+    <schema>
+      <key>/schemas/apps/nautilus/preferences/hide_built_in_bookmarks</key>
+      <applyto>/apps/nautilus/preferences/hide_built_in_bookmarks</applyto>
+      <owner>nautilus</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Hide default bookmarks in the bookmark menu.</short>
+	 <long>
+	  If set to true, then nautilus will just show the user's
+	  bookmarks in the bookmark menu.
+	</long>
+      </locale>
+    </schema>
+
+
+    <schema>
+      <key>/schemas/apps/nautilus/list_view/font</key>
+      <applyto>/apps/nautilus/list_view/font</applyto>
       <owner>nautilus</owner>
       <type>string</type>
       <default>sans</default>
@@ -277,8 +441,8 @@
     </schema>
 
    <schema>
-      <key>/schemas/apps/nautilus/list-view/default_zoom_level_font_size</key>
-      <applyto>/apps/nautilus/list-view/default_zoom_level_font_size</applyto>
+      <key>/schemas/apps/nautilus/list_view/default_zoom_level_font_size</key>
+      <applyto>/apps/nautilus/list_view/default_zoom_level_font_size</applyto>
       <owner>nautilus</owner>
       <type>string</type>
       <default>12</default>
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index ddb2bb004..3ff05642e 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -31,7 +31,7 @@
 G_BEGIN_DECLS
 
 /* Which theme is active */
-#define NAUTILUS_PREFERENCES_THEME				"/desktop/gnome/file-views/icon_theme"
+#define NAUTILUS_PREFERENCES_THEME				"/desktop/gnome/file_views/icon_theme"
 
 /* How wide the sidebar is (or how wide it will be when expanded) */
 #define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH  			"preferences/sidebar_width"
@@ -48,26 +48,26 @@ G_BEGIN_DECLS
 #define NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR                "preferences/desktop_is_home_dir"
 
 /* Display  */
-#define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES  		"/desktop/gnome/file-views/show_hidden_files"
-#define NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES  		"/desktop/gnome/file-views/show_backup_files"
+#define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES  		"/desktop/gnome/file_views/show_hidden_files"
+#define NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES  		"/desktop/gnome/file_views/show_backup_files"
 #define NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS			"preferences/show_special_flags"
 
 /* Sidebar panels  */
-#define NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES         "sidebar-panels/tree/show_only_directories"
+#define NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES         "sidebar_panels/tree/show_only_directories"
 
 /* Navigation  */
 #define NAUTILUS_PREFERENCES_HOME_URI                 		"preferences/home_uri"
 #define NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS		"preferences/hide_built_in_bookmarks"
 
 /* Proxy */
-#define NAUTILUS_PREFERENCES_HTTP_USE_PROXY                	"/system/gnome-vfs/use-http-proxy"
-#define NAUTILUS_PREFERENCES_HTTP_PROXY_HOST                 	"/system/gnome-vfs/http-proxy-host"
-#define NAUTILUS_PREFERENCES_HTTP_PROXY_PORT                	"/system/gnome-vfs/http-proxy-port"
+#define NAUTILUS_PREFERENCES_HTTP_USE_PROXY                	"/system/gnome_vfs/use_http_proxy"
+#define NAUTILUS_PREFERENCES_HTTP_PROXY_HOST                 	"/system/gnome_vfs/http_proxy_host"
+#define NAUTILUS_PREFERENCES_HTTP_PROXY_PORT                	"/system/gnome_vfs/http_proxy_port"
 
 /* HTTP Proxy Authentication */
-#define NAUTILUS_PREFERENCES_HTTP_PROXY_USE_AUTH                "/system/gnome-vfs/use-http-proxy-authorization"
-#define NAUTILUS_PREFERENCES_HTTP_PROXY_AUTH_USERNAME      	"/system/gnome-vfs/http-proxy-authorization-user"
-#define NAUTILUS_PREFERENCES_HTTP_USE_AUTH_PASSWORD     	"/system/gnome-vfs/http-proxy-authorization-password"
+#define NAUTILUS_PREFERENCES_HTTP_PROXY_USE_AUTH                "/system/gnome_vfs/use_http_proxy_authorization"
+#define NAUTILUS_PREFERENCES_HTTP_PROXY_AUTH_USERNAME      	"/system/gnome_vfs/http_proxy_authorization_user"
+#define NAUTILUS_PREFERENCES_HTTP_USE_AUTH_PASSWORD     	"/system/gnome_vfs/http_proxy_authorization_password"
 
 /* Content fonts */
 #define NAUTILUS_PREFERENCES_DEFAULT_FONT			"preferences/default_font"
@@ -108,13 +108,13 @@ enum
 
 
 /* Icon View */
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"icon-view/default_sort_in_reverse_order"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER		"icon-view/default_sort_order"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT	"icon-view/default_use_tighter_layout"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL		"icon-view/default_zoom_level"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"icon-view/default_zoom_level_font_size"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT	"icon-view/default_use_manual_layout"
-#define NAUTILUS_PREFERENCES_ICON_VIEW_FONT				"icon-view/font"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"icon_view/default_sort_in_reverse_order"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER		"icon_view/default_sort_order"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT	"icon_view/default_use_tighter_layout"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL		"icon_view/default_zoom_level"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"icon_view/default_zoom_level_font_size"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT	"icon_view/default_use_manual_layout"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_FONT				"icon_view/font"
 
 /* The icon view uses 2 variables to store the sort order and
  * whether to use manual layout.  However, the UI for these
@@ -123,17 +123,17 @@ enum
  * In nautilus-global-preferences.c we install callbacks for
  * the proxy preference and update the other 2 when it changes 
  */
-#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT "icon-view/default_sort_order_or_manual_layout"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT "icon_view/default_sort_order_or_manual_layout"
 
 /* Which text attributes appear beneath icon names */
-#define NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS				"icon-view/captions"
+#define NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS				"icon_view/captions"
 
 /* List View */
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"list-view/default_sort_in_reverse_order"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER		"list-view/default_sort_order"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL		"list-view/default_zoom_level"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"list-view/default_zoom_level_font_size"
-#define NAUTILUS_PREFERENCES_LIST_VIEW_FONT				"list-view/font"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER	"list_view/default_sort_in_reverse_order"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER		"list_view/default_sort_order"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL		"list_view/default_zoom_level"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE	"list_view/default_zoom_level_font_size"
+#define NAUTILUS_PREFERENCES_LIST_VIEW_FONT				"list_view/font"
 
 /* News panel */
 #define NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS				"news/max_items"