Preparing for additions dialog feature. Also, fixing control highlighting bugs when the app is suspended and resumed: for controls on the setup type and welcome dialogs.

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

@@ -3,6 +3,8 @@ License File=License
 
 
 [Dialog Welcome]
+Readme Filename=README
+Readme App Creator Type=ttxt
 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. 
@@ -20,10 +22,7 @@ C0=Component0
 [Setup Type1]
 Description Short=Custom Install
 Description Long=Click continue to select from a list of components.                              
-C0=Component0
-C1=Component2
-C2=Component1
-C3=Component3
+C0=Component1
 
 [Dialog Select Components]
 Message0=Please select the components you wish to install:
@@ -39,11 +38,11 @@ Attributes=SELECTED
 [Component1]
 Description Short=XPInstall Engine
 Description Long=The "core file" with xpinstall, xpcom, nspr20, etc.
-Archive=xpiengine.xpi
+Archive=install.xpi
 URL0=http://dolfin.mcom.com/nsinstall/mac/xpiengine/debug/
 URL1=http://dolfin.mcom.com/nsinstall/mac/xpiengine/debug/
 Install Size=3229
-Attributes=SELECTED|INVISIBLE
+Attributes=SELECTED
 
 [Component2]
 Description Short=Mozilla Binary Internal
@@ -64,7 +63,7 @@ Message0=Click the Install button to download and install the components selecte
 
 
 [SmartDownload-Netscape Install]
-core_file=xpiengine.xpi
+core_file=install.xpi
 no_ads=true
 silent=false
 execution=false

xpinstall/wizard/mac/macbuild/config.ini

@@ -3,6 +3,8 @@ License File=License
 
 
 [Dialog Welcome]
+Readme Filename=README
+Readme App Creator Type=ttxt
 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. 
@@ -20,10 +22,7 @@ C0=Component0
 [Setup Type1]
 Description Short=Custom Install
 Description Long=Click continue to select from a list of components.                              
-C0=Component0
-C1=Component2
-C2=Component1
-C3=Component3
+C0=Component1
 
 [Dialog Select Components]
 Message0=Please select the components you wish to install:
@@ -39,11 +38,11 @@ Attributes=SELECTED
 [Component1]
 Description Short=XPInstall Engine
 Description Long=The "core file" with xpinstall, xpcom, nspr20, etc.
-Archive=xpiengine.xpi
+Archive=install.xpi
 URL0=http://dolfin.mcom.com/nsinstall/mac/xpiengine/debug/
 URL1=http://dolfin.mcom.com/nsinstall/mac/xpiengine/debug/
 Install Size=3229
-Attributes=SELECTED|INVISIBLE
+Attributes=SELECTED
 
 [Component2]
 Description Short=Mozilla Binary Internal
@@ -64,7 +63,7 @@ Message0=Click the Install button to download and install the components selecte
 
 
 [SmartDownload-Netscape Install]
-core_file=xpiengine.xpi
+core_file=install.xpi
 no_ads=true
 silent=false
 execution=false

xpinstall/wizard/mac/src/EvtHandlers.c

@@ -138,6 +138,15 @@ void HandleKeyDown(EventRecord* evt)
 					gControls->cw->compListBox.top = 0;
 					EraseRect(&gControls->cw->compListBox);
 					ClearDiskSpaceMsgs();
+					// if additions exist				// XXX_ADD
+						// show additions dialog
+					// else
+						ShowTerminalWin();
+					return;
+				case kAdditionsID:
+					KillControls(gWPtr);
+					// reinit top of listbox
+					// erase any thing and clear disk space msgs
 					ShowTerminalWin();
 					return;
 				case kTerminalID:
@@ -218,6 +227,9 @@ void HandleUpdateEvt(EventRecord* evt)
 			case kComponentsID:
 				UpdateCompWin();
 				break;
+			case kAdditionsID:
+				UpdateAdditionsWin();
+				break;
 			case kTerminalID:
 				UpdateTerminalWin();
 				break;
@@ -272,6 +284,9 @@ void HandleOSEvt(EventRecord* evt)
 					case kComponentsID:
 						EnableComponentsWin();
 						break;
+					case kAdditionsID:
+						EnableAdditionsWin();
+						break;
 					case kTerminalID:
 						EnableTerminalWin();
 						break;
@@ -295,6 +310,9 @@ void HandleOSEvt(EventRecord* evt)
 					case kComponentsID:
 						DisableComponentsWin();
 						break;
+					case kAdditionsID:
+						DisableAdditionsWin();
+						break;
 					case kTerminalID:
 						DisableTerminalWin();
 						break;
@@ -335,6 +353,10 @@ void React2InContent(EventRecord* evt, WindowPtr wCurrPtr)
 			InComponentsContent(evt, gWPtr);
 			break;
 		
+		case kAdditionsID:
+			InAdditionsContent(evt, gWPtr);
+			break;
+			
 		case kTerminalID:
 			InTerminalContent(evt, gWPtr);
 			break;
@@ -344,6 +366,5 @@ void React2InContent(EventRecord* evt, WindowPtr wCurrPtr)
 			break;
 	}
 }
-			
-			
-			
+
+

xpinstall/wizard/mac/src/MacInstallWizard.h

@@ -82,7 +82,8 @@ if (err) 								\
 #define kWelcomeID		1
 #define kSetupTypeID	2
 #define kComponentsID	3
-#define	kTerminalID		4
+#define kAdditionsID	4
+#define	kTerminalID		5
 
 #define kMIWMagic		0x0F00BAA0
 
@@ -319,9 +320,10 @@ typedef struct Config {
 	SetupType	st[kMaxSetupTypes];
 	short   	numSetupTypes;
 	
-	/* ComponentsWin */
+	/* ComponentsWin and AdditionsWin */
 	short		numComps;
 	Handle		selCompMsg;
+	Handle 		selAddMsg;
 	InstComp	comp[kMaxComponents];
 	
 	/* TerminalWin */
@@ -345,7 +347,7 @@ typedef struct Options {
 	long			dirID;
 	unsigned char*	folder;
 		
-	/* from ComponentsWin */
+	/* from ComponentsWin and AdditionsWin */
 	short			compSelected[ kMaxComponents ];
 	short			numCompSelected;
 		/* NOTE: if instChoice is not last (i.e. not Custom) then populate
@@ -556,6 +558,15 @@ void		UpdateDependencies(int, EventRecord*);
 void		EnableComponentsWin(void);
 void		DisableComponentsWin(void);
 
+/*-----------------------------------------------------------*
+ *   AdditionsWin
+ *-----------------------------------------------------------*/
+void		ShowAdditionsWin(void); 
+void		InAdditionsContent(EventRecord*, WindowPtr);
+void		UpdateAdditionsWin(void);
+void		EnableAdditionsWin(void);
+void		DisableAdditionsWin(void);
+ 
 /*-----------------------------------------------------------*
  *   TerminalWin
  *-----------------------------------------------------------*/

xpinstall/wizard/mac/src/SetupTypeWin.c

@@ -741,7 +741,10 @@ EnableSetupTypeWin(void)
 {
 	EnableNavButtons();
 
-	// TO DO
+	if (gControls->stw->instType)
+		HiliteControl(gControls->stw->instType, kEnableControl);
+	if (gControls->stw->destLoc)
+		HiliteControl(gControls->stw->destLoc, kEnableControl);
 }
 
 void
@@ -749,5 +752,8 @@ DisableSetupTypeWin(void)
 {
 	DisableNavButtons();
 	
-	// TO DO
+	if (gControls->stw->instType)
+		HiliteControl(gControls->stw->instType, kDisableControl);
+	if (gControls->stw->destLoc)
+		HiliteControl(gControls->stw->destLoc, kDisableControl);
 }

xpinstall/wizard/mac/src/WelcomeWin.c

@@ -288,6 +288,10 @@ void
 EnableWelcomeWin(void)
 {
 	EnableNavButtons();
+	
+	if (gControls->cfg->bReadme)
+		if (gControls->ww->readmeButton)
+			HiliteControl(gControls->ww->readmeButton, kEnableControl);
 
 	if(gControls->ww->scrollBar)
 		HiliteControl(gControls->ww->scrollBar, kEnableControl);
@@ -298,6 +302,10 @@ DisableWelcomeWin(void)
 {
 	DisableNavButtons();
 	
+	if (gControls->cfg->bReadme)
+		if (gControls->ww->readmeButton)
+			HiliteControl(gControls->ww->readmeButton, kDisableControl);
+			
 	if(gControls->ww->scrollBar)
 		HiliteControl(gControls->ww->scrollBar, kDisableControl);
 }