From fdcbe6e6139bdb0239060b192ff51e7ebd94df4b Mon Sep 17 00:00:00 2001 From: "sgehani%netscape.com" Date: Thu, 16 Mar 2000 01:34:48 +0000 Subject: [PATCH] Fix various cosmetic issues with the Mac native installer. [b=29328, 28576, 18874, 31042, 29849; r=ssu] git-svn-id: svn://10.0.0.236/trunk@63116 18797224-902f-48f8-a5cc-f745e15eee43 --- .../Installer Modules/config.ini_tmpl | 15 +++--- .../wizard/mac/macbuild/config.ini_tmpl | 15 +++--- .../xpinstall/wizard/mac/rsrc/MIWCommon.rsrc | Bin 4359 -> 4513 bytes .../xpinstall/wizard/mac/src/EvtHandlers.c | 24 +++++++--- .../wizard/mac/src/MacInstallWizard.h | 2 + .../xpinstall/wizard/mac/src/SetupTypeWin.c | 43 ++++++++++++++++-- 6 files changed, 70 insertions(+), 29 deletions(-) diff --git a/mozilla/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl b/mozilla/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl index 65da618303a..bebeaa39794 100644 --- a/mozilla/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl +++ b/mozilla/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>/ diff --git a/mozilla/xpinstall/wizard/mac/macbuild/config.ini_tmpl b/mozilla/xpinstall/wizard/mac/macbuild/config.ini_tmpl index 65da618303a..bebeaa39794 100644 --- a/mozilla/xpinstall/wizard/mac/macbuild/config.ini_tmpl +++ b/mozilla/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>/ diff --git a/mozilla/xpinstall/wizard/mac/rsrc/MIWCommon.rsrc b/mozilla/xpinstall/wizard/mac/rsrc/MIWCommon.rsrc index 6a92b95e89430658d0d4c6e453c4f70eb62751dd..201eaebdf0ff8124379b5507b0d5814fa084da62 100644 GIT binary patch delta 971 zcmY+DUr1AN6vxl+x6QfvhdDIDKk=hM8iYcFsKKidqke1Dw7;dd@= zo$*}tZYlEtfCHdx6qNxGl%k&iPW)_LbD>3=+hzGfbBp#(BzMcoHi+W?G@N zJJ9D-hK3ZmUe#0)tc~@JUc>5Wsd_rwIy1iKQm12S(O-d{-=mV_ol&TD|sI2Ki%#15CQx!$u&Q#1wD$@r9 z*}Tm}RT6YXt!Kv~ZOx5M%{zB6wN29!$IT9IK()P7VI6`vSm;w^Jt`+8yI&HG{RM|y z?j9*7i8>1^A}?UvFL+C;jI_OyyfUWko&-o+J$UIp-O2g@Lu4^DKFQ+`#z)Sw?=s zIYUDXoF6%-$p~r{=c%I8Tsf_7^Ay=3)Q< delta 807 zcmY+?O=uHA6ae5ivuR>}Y7;b4+hPY}t-YkF2ipoNrL`pzQb{6eP$567u1%A$*`|6i zX;r+Wi8@eG5SoIb-ZcJPJy^Vm2T=q;Q9(Qk#e+pOzMa8?EW`U|=DnFWuyx<%tycnD z-1h*$4&eTVkpU14&M5!~j+VU-!Y`@E1v>8hkb6)eR~v4{rckoTk2y}ScSqHXnljjU zE|XSu{>Jf^Fn-_JVP$^v<10>|%^Fb?>1mZ$ltCV{ex`7UkJ!5`%7A~EC+$O>@s;@G z#J;aP17N}H%@*L%mmVF5!5`bV%fwIijg3CrCff0Tiw$RW#uEvdcV;9M ziQ&9B7L0{3&X0vAj$o{6a{uOZs%X~VNlj^Kj1S==0AF(r=PHn7K;D@Tfdx2=UKOqZ zXFywpuftvR4&f^NMn4r^B)iZbh3llwz|t?gOrE0;2wx&U(enH$q9VNf?L9b`VYXVT3kS~eGf*af|1B%m~k$zviwXYlg`aH&bQS_w@Vus%Cdr? gYuQr;Pb!x+wCs%9ud4;|FY`f9FYorW^EnUu3m7Y~F#rGn diff --git a/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c b/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c index 80bf4b14f88..24ab7dd49ed 100644 --- a/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c +++ b/mozilla/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; } -} - - +} \ No newline at end of file diff --git a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h index 937cca806a8..cb9c5a97db5 100644 --- a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h +++ b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h @@ -25,6 +25,7 @@ #define _MIW_H_ #include +#include #include #include #include @@ -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); diff --git a/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c b/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c index 11bb1bb2aa8..12ba102ed46 100644 --- a/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c +++ b/mozilla/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; icfg->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) {