Small "Search Editor" changes.

xpfe/components/search/resources/search-editor.js

@@ -440,6 +440,11 @@ function NewCategory()
 
 function RenameCategory()
 {
+	// make sure we have at least one category
+	var categoryPopup = document.getElementById( "categoryPopup" );
+	if (!categoryPopup)	return(false);
+	if (categoryPopup.childNodes.length < 1)	return(false);
+
 	var categoryList = document.getElementById( "categoryList" );
 	var currentName = categoryList.selectedItem.getAttribute("value");
 	var promptStr = bundle.GetStringFromName("RenameCategoryPrompt");
@@ -477,16 +482,17 @@ function RenameCategory()
 
 function RemoveCategory()
 {
+	// make sure we have at least one category
+	var categoryPopup = document.getElementById( "categoryPopup" );
+	if (!categoryPopup)	return(false);
+	if (categoryPopup.childNodes.length < 1)	return(false);
+
 	var promptStr = bundle.GetStringFromName("RemoveCategoryPrompt");
 	if (!confirm(promptStr))	return(false);
 
 	var categoryRes = RDF.GetResource("NC:SearchCategoryRoot");
 	if (!categoryRes)	return(false);
 
-	var categoryPopup = document.getElementById( "categoryPopup" );
-	if (!categoryPopup)	return(false);
-	if (categoryPopup.childNodes.length < 1)	return(false);
-
 	var categoryList = document.getElementById( "categoryList" );
 	if (!categoryList)	return(false);
 

xpfe/components/search/resources/search-editor.xul

@@ -25,8 +25,8 @@
 
 -->
 
-<?xml-stylesheet href="chrome://search/skin/search-editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://search/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://search/skin/search-editor.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
@@ -69,12 +69,15 @@
 			<tree multiple="true" id="engineList" flex="1" datasources="rdf:internetsearch" class="inset">
 				<template>
 					<treechildren>
-						<treeitem uri="...">
-							<treerow>
-								<treecell class="iconic" flex="1" crop="right" align="left"
-									src="rdf:http://home.netscape.com/NC-rdf#Icon" value="rdf:http://home.netscape.com/NC-rdf#Name" />
-							</treerow>
-						</treeitem>
+					<treeitem uri="...">
+					<treerow>
+					<treecell>
+						<titledbutton class="iconic" flex="1" crop="right" align="left"
+							src="rdf:http://home.netscape.com/NC-rdf#Icon"
+							value="rdf:http://home.netscape.com/NC-rdf#Name" />
+					</treecell>
+					</treerow>
+					</treeitem>
 					</treechildren>
 				</template>
 
@@ -109,12 +112,15 @@
 			<tree multiple="true" class="inset" id="allengines" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch">
 				<template>
 					<treechildren>
-						<treeitem uri="..." loading="rdf:http://home.netscape.com/NC-rdf#loading">
-							<treerow>
-								<treecell class="iconic" flex="1" crop="right" align="left"
-									src="rdf:http://home.netscape.com/NC-rdf#Icon" value="rdf:http://home.netscape.com/NC-rdf#Name" />
-							</treerow>
-						</treeitem>
+					<treeitem uri="..." loading="rdf:http://home.netscape.com/NC-rdf#loading">
+					<treerow>
+					<treecell>
+						<titledbutton class="iconic" flex="1" crop="right" align="left"
+							src="rdf:http://home.netscape.com/NC-rdf#Icon"
+							value="rdf:http://home.netscape.com/NC-rdf#Name" />
+					</treecell>
+					</treerow>
+					</treeitem>
 					</treechildren>
 				</template>