Added more control strip properties. Approved by RJC.

modules/rdf/include/vocab.h

@@ -145,6 +145,7 @@ typedef struct _RDF_NCVocabStruct {
   RDF_Resource titleBarFGColor;
   RDF_Resource titleBarBGColor;
   RDF_Resource titleBarBGURL;
+  RDF_Resource titleBarShowText;
   RDF_Resource dividerColor;
   RDF_Resource showDivider;
   RDF_Resource selectedColumnHeaderFGColor;
@@ -187,6 +188,8 @@ typedef struct _RDF_NCVocabStruct {
   RDF_Resource controlStripFGColor; /* The tree's control strip foreground */
   RDF_Resource controlStripBGColor; /* The tree's control strip background */
   RDF_Resource controlStripBGURL; /* The tree's control strip BG URL */
+  RDF_Resource controlStripModeText; /* The text to display for switching modes in the control strip. */
+  RDF_Resource controlStripCloseText; /* The text displayed for the close function in the control strip. */
 
   RDF_Resource pos;
   RDF_Resource from;

modules/rdf/src/ht.c

@@ -5343,7 +5343,8 @@ HT_IsNodeDataEditable(HT_Resource node, void *token, uint32 tokenType)
 			(token == gNavCenter->loadOpenState) || (token == gNavCenter->saveOpenState) ||
 			(token == gNavCenter->useSelection) || (token == gNavCenter->controlStripFGColor) ||
 			(token == gNavCenter->controlStripBGColor) || (token == gNavCenter->controlStripBGURL) ||
-
+			(token == gNavCenter->controlStripModeText) || (token == gNavCenter->controlStripCloseText) ||
+			(token == gNavCenter->titleBarShowText) ||
 		/*  ((token == gWebData->RDF_URL) && ht_isURLReal(node)) || */
 #ifdef	HT_PASSWORD_RTNS
 			(token == gNavCenter->RDF_Password) ||
@@ -5853,7 +5854,9 @@ htIsPropertyInMoreOptions(RDF_Resource r)
 		(r == gNavCenter->useInlineEditing) || (r == gNavCenter->useSingleClick) ||
 		(r == gNavCenter->loadOpenState) || (r == gNavCenter->saveOpenState) ||
 		(r == gNavCenter->useSelection) || (r == gNavCenter->controlStripFGColor) ||
-		(r == gNavCenter->controlStripBGColor) || (r == gNavCenter->controlStripBGURL))
+		(r == gNavCenter->controlStripBGColor) || (r == gNavCenter->controlStripBGURL) ||
+		(r == gNavCenter->controlStripCloseText) || (r == gNavCenter->controlStripModeText) ||
+		(r == gNavCenter->titleBarShowText))
 
 	{
 		retVal = PR_TRUE;

modules/rdf/src/vocab.c

@@ -256,6 +256,9 @@ createNavCenterVocab () {
   gNavCenter->controlStripFGColor = newResource("controlStripFGColor", 0 /* XXX */);
   gNavCenter->controlStripBGColor = newResource("controlStripBGColor", 0 /* XXX */);
   gNavCenter->controlStripBGURL = newResource("controlStripBGURL", 0 /* XXX */);
+  gNavCenter->controlStripModeText = newResource("controlModeText", 0 /* XXX */);
+  gNavCenter->controlStripCloseText = newResource("controlCloseText", 0 /* XXX */);
+  gNavCenter->titleBarShowText = newResource("titleBarShowText", 0 /* XXX */);
 
   /* Buttons */
   gNavCenter->buttonTreeMode = newResource("buttonTreeMode", 0 /* XXX */);