Fixes for both issues 27 and 22 re-wrote setArchiveIcon. Has a bug wh…

…ere users are prompted to select a page even if the page is not part of an archive.

Session/TSSTSessionWindowController.m

@@ -831,17 +831,21 @@ - (IBAction)goToPage:(id)sender
 
 - (IBAction)setArchiveIcon:(id)sender
 {
-	TSSTPage * currentPage = [[pageController selectedObjects] objectAtIndex: 0];
-	TSSTManagedGroup * currentGroup = [currentPage valueForKey: @"group"];
-	if(currentGroup == [currentGroup topLevelGroup])
+	int selection = [pageView selectPage];
+	if(selection != -1)
 	{
-		int selection = [pageView selectPage];
-		if(selection != -1)
+		int index = [pageController selectionIndex];
+		index += selection;
+		TSSTPage * selectedPage = [[pageController arrangedObjects] objectAtIndex: index];
+		TSSTManagedGroup * selectedGroup = [selectedPage valueForKey: @"group"];
+		/* Makes sure that the group is both an archive and not nested */
+		if([selectedGroup class] == [TSSTManagedArchive class] && 
+		   selectedGroup == [selectedGroup topLevelGroup] &&
+		   ![[selectedPage valueForKey: @"text"] boolValue])
 		{
-			int coverIndex = [[currentPage valueForKey: @"index"] intValue];
-			coverIndex += selection;
-			XADString * coverName = [(XADArchive *)[currentGroup instance] rawNameOfEntry: coverIndex];
-			NSString * archivePath = [[currentGroup valueForKey: @"path"] stringByStandardizingPath];
+			int coverIndex = [[selectedPage valueForKey: @"index"] intValue];
+			XADString * coverName = [(XADArchive *)[selectedGroup instance] rawNameOfEntry: coverIndex];
+			NSString * archivePath = [[selectedGroup valueForKey: @"path"] stringByStandardizingPath];
 			[UKXattrMetadataStore setString: [coverName stringWithEncoding: NSNonLossyASCIIStringEncoding]
 									 forKey: @"QCCoverName" 
 									 atPath: archivePath 
@@ -854,9 +858,7 @@ - (IBAction)setArchiveIcon:(id)sender
 
 
 
-/*	This is an archive only method.
-	Finds the index of the page within an archive and then extracts
-	it to a location designated by the user. */
+/*	Saves the selected page to a user specified location. */
 - (IBAction)extractPage:(id)sender
 {
 	/*	selectpage returns prompts the user for which page they wish to use.
@@ -1612,12 +1614,6 @@ - (float)toolbarHeight
 }
 
 
-- (void)toolbarDidRemoveItem:(NSNotification *)notification
-{
-	NSToolbarItem * item = [[notification userInfo] objectForKey: @"item"];
-}
-
-
 - (void)toolbarWillAddItem:(NSNotification *)notification
 {
 	NSToolbarItem * item = [[notification userInfo] objectForKey: @"item"];