Cleanup Select Addressing dialog, bug 10865. r=mscott

mailnews/addrbook/resources/content/abCardViewOverlay.js

@@ -135,6 +135,25 @@ function GetCurrentPrefs()
 			dump("failed to get the mail.addr_book.displayName.lastnamefirst pref\n");
 		}
 	}
+	
+	// check "Show Name As" menu item based on pref
+	var menuitemID;
+	switch ( cvPrefs.nameColumn )
+	{
+		case 2:
+			menuitemID = 'firstLastCmd';
+			break;
+		case 1:
+			menuitemID = 'lastFirstCmd';
+			break;
+		case 0:
+		default:
+			menuitemID = 'displayNameCmd';
+			break;
+	}
+	menuitem = top.document.getElementById(menuitemID);
+	if ( menuitem )
+		menuitem.setAttribute('checked', 'true');
 }
 
 

mailnews/addrbook/resources/content/abSelectAddressesDialog.js

@@ -177,3 +177,4 @@ function RemoveSelectedFromBucket()
 		}	
 	}	
 }
+

mailnews/addrbook/resources/content/abSelectAddressesDialog.xul

@@ -58,9 +58,9 @@ Rights Reserved.
 		
 		<spring style="width: 1em;"/>
 		
-		<titledbutton id="stop" value="&stopButton.label;" class="dialog push" onclick="SelectAddressStopButton()"/>	
+		<titledbutton id="stop" value="&stopButton.label;" class="dialog push" disabled="true" onclick="SelectAddressStopButton()"/>	
 		<spring style="width:5px"/>
-		<titledbutton id="search" value="&searchButton.label;" class="dialog push" onclick="SelectAddressSearchButton()"/>	
+		<titledbutton id="search" value="&searchButton.label;" class="dialog push" disabled="true" onclick="SelectAddressSearchButton()"/>	
 	</box>
 
 	<!-- Main box, 3 pane and majority of buttons -->
@@ -100,8 +100,8 @@ Rights Reserved.
 				<splitter collapse="after"/>
 				
 				<!-- Address bucket -->
-				<box align="vertical" style="height:170px; background-color:white; border-top:solid black 1px">
-					<tree id="addressBucket" style="width:100%; height:100%; min-width:10px"  flex="1">
+				<box align="vertical" style="height:170px; border-top:solid black 1px">
+					<tree id="addressBucket" style="width:100%; height:100%; min-width:10px" flex="1" multiple="true">
 						<treecol style="width:100%"/>
 						<treechildren id="bucketBody"/>
 					</tree>
@@ -117,8 +117,6 @@ Rights Reserved.
 				<titledbutton id="new" value="&newButton.label;" class="dialog push" onclick="AbNewCard()"/>	
 				<spring style="height:10px"/>
 				<titledbutton id="edit" value="&editButton.label;" class="dialog push" onclick="AbEditCard()"/>	
-				<spring style="height:10px"/>
-				<titledbutton id="view" value="&viewButton.label;" class="dialog push" onclick="SelectAddressViewButton()"/>
 				<spring flex="100%"/>
 			</box>
 			<box align="vertical" flex="50%">

mailnews/addrbook/resources/locale/en-US/abSelectAddressesDialog.dtd

@@ -30,11 +30,7 @@ Rights Reserved.
 	<!ENTITY searchButton.label	".Search..."> 
 	<!ENTITY newButton.label	"New..."> 
 	<!ENTITY editButton.label	"Edit..."> 
-	<!ENTITY viewButton.label	".View"> 
 	<!ENTITY removeButton.label	"Remove"> 
-	<!ENTITY okButton.label		"OK"> 
-	<!ENTITY cancelButton.label	"Cancel"> 
-	<!ENTITY helpButton.label	".Help"> 
 
 <!-- Toolbar items -->  
 	<!ENTITY search.label "Show names containing:">