Fix various cosmetic issues with the Mac native installer.

xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl

@@ -3,25 +3,22 @@ License File=License
 
 
 [Dialog Welcome]
-Message0=                 Welcome to Netscape Communicator 5.0
-
-Message1=This is welcome message 2 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort.This is welcome message 2 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. 
-
-Message2=This is welcome message 3 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort.This is welcome message 3 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. 
-
+Message0=                      Welcome to the Mozilla Installer
+Message1=It is strongly recommended that you quit all applications before running this installer.
+Message2=Click Continue to proceed with this installation.
 
 [Dialog Setup Type]
 
 [Setup Type0]
 Description Short=Typical Install
-Description Long=Click continue to install the following component:                                                     <#buildID> Mozilla optimized build
+Description Long=Click Continue to install the following components:
 C0=Component0
 C1=Component1
 C2=Component2
 
 [Setup Type1]
 Description Short=Custom Install
-Description Long=Click continue to select which component(s) to install.                              
+Description Long=Click Continue to select the component(s) to install.
 C0=Component0
 C1=Component1
 C2=Component2
@@ -30,7 +27,7 @@ C2=Component2
 Message0=Please select the components you wish to install:
 
 [Component0]
-Description Short= XPInstall Engine
+Description Short= XPCOM
 Description Long=Installer technology software
 Archive=install.xpi
 URL0=http://sweetlou.mcom.com/products/client/seamonkey/macos/8.x/ppc/<#buildID>/

xpinstall/wizard/mac/macbuild/config.ini_tmpl

@@ -3,25 +3,22 @@ License File=License
 
 
 [Dialog Welcome]
-Message0=                 Welcome to Netscape Communicator 5.0
-
-Message1=This is welcome message 2 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort.This is welcome message 2 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. 
-
-Message2=This is welcome message 3 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort. This is still more text to aid in the former effort.This is welcome message 3 from the config.ini file. This is additional gunk to test auto text wrapping. This is still more text to aid in the former effort. 
-
+Message0=                      Welcome to the Mozilla Installer
+Message1=It is strongly recommended that you quit all applications before running this installer.
+Message2=Click Continue to proceed with this installation.
 
 [Dialog Setup Type]
 
 [Setup Type0]
 Description Short=Typical Install
-Description Long=Click continue to install the following component:                                                     <#buildID> Mozilla optimized build
+Description Long=Click Continue to install the following components:
 C0=Component0
 C1=Component1
 C2=Component2
 
 [Setup Type1]
 Description Short=Custom Install
-Description Long=Click continue to select which component(s) to install.                              
+Description Long=Click Continue to select the component(s) to install.
 C0=Component0
 C1=Component1
 C2=Component2
@@ -30,7 +27,7 @@ C2=Component2
 Message0=Please select the components you wish to install:
 
 [Component0]
-Description Short= XPInstall Engine
+Description Short= XPCOM
 Description Long=Installer technology software
 Archive=install.xpi
 URL0=http://sweetlou.mcom.com/products/client/seamonkey/macos/8.x/ppc/<#buildID>/

xpinstall/wizard/mac/src/EvtHandlers.c

@@ -98,11 +98,14 @@ void HandleMouseDown(EventRecord* evt)
 	}
 }
 
+static sInstallStarted = false;
+
 void HandleKeyDown(EventRecord* evt)
 {
-	char keyPressed;
+	char 			keyPressed;
 	ThreadID		tid;
-	
+	unsigned long 	finalTicks;
+		
 	keyPressed = evt->message & charCodeMask;
 #ifdef MIW_DEBUG
 	if ( (keyPressed == 'z') || (keyPressed == 'Z'))
@@ -113,7 +116,12 @@ void HandleKeyDown(EventRecord* evt)
 		case '\r':
 		case '\3':
 			if (gControls->nextB)
-				TrackControl(gControls->nextB, evt->where, NULL);
+			{
+				HiliteControl(gControls->nextB, 1);
+				Delay(8, &finalTicks);
+				HiliteControl(gControls->nextB, 0);
+			}
+
 			switch(gCurrWin)
 			{
 				case kLicenseID:
@@ -150,7 +158,11 @@ void HandleKeyDown(EventRecord* evt)
 					ShowTerminalWin();
 					return;
 				case kTerminalID:
-					SpawnSDThread(Install, &tid);
+					if (!sInstallStarted)
+					{
+						SpawnSDThread(Install, &tid);
+						sInstallStarted = true;
+					}
 					return;
 				default:
 					break; // never reached
@@ -365,6 +377,4 @@ void React2InContent(EventRecord* evt, WindowPtr wCurrPtr)
 			gDone = true;
 			break;
 	}
-}
-
-
+}

xpinstall/wizard/mac/src/MacInstallWizard.h

@@ -25,6 +25,7 @@
 #define _MIW_H_
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
@@ -582,6 +583,7 @@ void		ShowSetupDescTxt(void);
 void		GetAllVInfo(unsigned char **, short *);
 pascal void OurNavEventFunction(NavEventCallbackMessage callBackSelector, 
 			NavCBRecPtr callBackParms, NavCallBackUserData callBackUD);
+void		InsertCompList(int instChoice);
 void		DrawDiskNFolder(short, unsigned char *);
 void		DrawDiskSpaceMsgs(short);
 char*		DiskSpaceNeeded(void);

xpinstall/wizard/mac/src/SetupTypeWin.c

@@ -102,6 +102,7 @@ ShowSetupTypeWin(void)
 		HLock(gControls->cfg->st[gControls->opt->instChoice - 1].longDesc);
 		txtSize = strlen(*gControls->cfg->st[gControls->opt->instChoice - 1].longDesc);
 		TEInsert( *gControls->cfg->st[gControls->opt->instChoice - 1].longDesc, txtSize, gControls->stw->instDescTxt);
+		InsertCompList(gControls->opt->instChoice - 1);
 		TESetAlignment( teFlushDefault, gControls->stw->instDescTxt);
 		HUnlock(gControls->cfg->st[gControls->opt->instChoice - 1].longDesc);
 
@@ -189,6 +190,7 @@ InSetupTypeContent(EventRecord* evt, WindowPtr wCurrPtr)
 	short				cntlVal;
 	long 				len;
 	ControlHandle 		currCntl;
+	int					instChoice;
 	
 	/* NavChooseFolder vars */
 	NavReplyRecord		reply;	
@@ -218,16 +220,20 @@ InSetupTypeContent(EventRecord* evt, WindowPtr wCurrPtr)
 		part = TrackControl(currCntl, localPt, (ControlActionUPP) -1);
 		
 		gControls->opt->instChoice = GetControlValue(currCntl);
+		instChoice = gControls->opt->instChoice - 1;
 		
 		SetRect(&r, (**(gControls->stw->instDescTxt)).viewRect.left,
 					(**(gControls->stw->instDescTxt)).viewRect.top,
 					(**(gControls->stw->instDescTxt)).viewRect.right,
 					(**(gControls->stw->instDescTxt)).viewRect.bottom);
 					
-		HLock(gControls->cfg->st[gControls->opt->instChoice-1].longDesc);
-		len = strlen(*gControls->cfg->st[gControls->opt->instChoice-1].longDesc);
-		TESetText( *gControls->cfg->st[gControls->opt->instChoice-1].longDesc, len, gControls->stw->instDescTxt);
-		HUnlock(gControls->cfg->st[gControls->opt->instChoice-1].longDesc);
+		HLock(gControls->cfg->st[instChoice].longDesc);
+		len = strlen(*gControls->cfg->st[instChoice].longDesc);
+		TESetText( *gControls->cfg->st[instChoice].longDesc, len, gControls->stw->instDescTxt);
+		HUnlock(gControls->cfg->st[instChoice].longDesc);
+		
+		InsertCompList(instChoice);
+		
 		EraseRect( &r );
 		TEUpdate( &r, gControls->stw->instDescTxt);
 		
@@ -340,6 +346,35 @@ InSetupTypeContent(EventRecord* evt, WindowPtr wCurrPtr)
 	SetPort(oldPort);
 }
 
+void
+InsertCompList(int instChoice)
+{
+	int compsDone, i, len;
+	InstComp currComp;
+	char compName[128];
+	
+	// if not cutsom setup type show components list
+	if (gControls->opt->instChoice < gControls->cfg->numSetupTypes)
+	{
+		compsDone = 0;
+		for(i=0; i<kMaxComponents; i++)
+		{
+			if ( (gControls->cfg->st[instChoice].comp[i] == kInSetupType) &&
+				 (compsDone < gControls->cfg->st[instChoice].numComps) )
+			{
+				currComp = gControls->cfg->comp[i];
+				HLock(currComp.shortDesc);
+				len = strlen(*currComp.shortDesc) + 4;
+				memset(compName, 0, 128);
+				sprintf(compName, "\r ¥ %s", *currComp.shortDesc);
+				TEInsert(compName, len, gControls->stw->instDescTxt);
+				HUnlock(currComp.shortDesc);
+				compsDone++;
+			}
+		}
+	}
+}
+
 void
 DrawDiskNFolder(short vRefNum, unsigned char *folder)
 {