Updates to make all functions go through 'command' except generatelist and installbuilder (fix those later)

1999-10-05 23:15:49 +00:00 · 1999-10-05 23:15:49 +00:00 · 757ed9931d
--- a/cck/cckwiz/iniFiles/AccountSetup.ini
+++ b/cck/cckwiz/iniFiles/AccountSetup.ini
@ -247,9 +247,7 @@ dll=NULL

 function=command

-;parameters=ConfigDialog;cmd.exe /c copy NCItemplate %newEntry%;%NCIFileEditor% %newEntry%;inform
-
-parameters=ConfigDialog(_NewNCIFileName);command(cmd.exe /c copy NCItemplate NCIFiles\%_NewNCIFileName%);command(%NCIFileEditor% NCIFiles\%_NewNCIFileName%);inform(_NewNCIFileName);GenerateFileList(NCIFileList,NCIFiles\*.NCI)
+parameters=NewNCIDialog(_NewNCIFileName);command(cmd.exe /c copy NCItemplate NCIFiles\%_NewNCIFileName%);command(%NCIFileEditor% NCIFiles\%_NewNCIFileName%);inform(_NewNCIFileName);GenerateFileList(NCIFileList,NCIFiles\*.NCI)

 Target=NCIFileList

@ -465,7 +463,6 @@ Height=14

 dll=NULL

-;function=BrowseFile
 function=command
 parameters=BrowseFile()
 Target=NCIFileEditor
--- a/cck/cckwiz/iniFiles/Branding_page1.ini
+++ b/cck/cckwiz/iniFiles/Branding_page1.ini
@ -160,7 +160,8 @@ Start_y=140
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=SmallStillPath


@ -222,7 +223,8 @@ Width=50
 Height=14

 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=SmallAnimPath

 [Widget 968]
@ -283,7 +285,8 @@ Start_y=108
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=LargeAnimPath

 [Widget 19]
@ -297,8 +300,8 @@ Start_y=57
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=button.ini
+function=command
+parameters=DisplayImage(button.ini)


 [Widget 12]
@ -374,7 +377,8 @@ Width=50

 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=LargeStillPath

 ;[Widget 15]
@ -440,7 +444,7 @@ Start_y=227
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=coname.ini
+function=command
+parameters=DisplayImage(coname.ini)


--- a/cck/cckwiz/iniFiles/Branding_page2.ini
+++ b/cck/cckwiz/iniFiles/Branding_page2.ini
@ -93,7 +93,8 @@ Start_y=83
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=ShellBgBitmap

 [Widget 768]
@ -117,8 +118,8 @@ Start_y=83
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=shell1.ini
+function=command
+parameters=DisplayImage(shell1.ini)

 [Widget 3]
 Type=Text
@ -147,8 +148,8 @@ Start_y=160
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=shell2.ini
+function=command
+parameters=DisplayImage(shell2.ini)


 [Widget 8]
@ -231,7 +232,8 @@ Start_y=223
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=ShellInstallTextFile

 [Widget 22]
@ -243,8 +245,8 @@ Start_y=223
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=shell4.ini
+function=command
+parameters=DisplayImage(shell4.ini)



--- a/cck/cckwiz/iniFiles/Branding_page3.ini
+++ b/cck/cckwiz/iniFiles/Branding_page3.ini
@ -85,7 +85,8 @@ Start_y=86
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=AcctSetupBgBitmap

 [Widget 15]
@ -97,8 +98,8 @@ Start_y=86
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=accnt1.ini
+function=command
+parameters=DisplayImage(accnt1.ini)


 [Widget 4]
@ -139,8 +140,8 @@ Start_y=152
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=accnt3.ini
+function=command
+parameters=DisplayImage(accnt3.ini)

 [Widget 689]
 Type=Text
@ -189,8 +190,8 @@ Start_y=217
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=accnt2.ini
+function=command
+parameters=DisplayImage(accnt2.ini)


 [Widget 6435]
--- a/cck/cckwiz/iniFiles/Branding_page4.ini
+++ b/cck/cckwiz/iniFiles/Branding_page4.ini
@ -273,9 +273,9 @@ Height=14

 dll=NULL

-function=DisplayImage
+function=command

-parameters=inst.ini
+parameters=DisplayImage(inst.ini)


 [Widget 507]
@ -296,7 +296,8 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=InstallerCustomBitmapPath

 parameters=
@ -320,8 +321,8 @@ Height=14

 dll=NULL

-function=DisplayImage
+function=command

-parameters=splash.ini
+parameters=DisplayImage(splash.ini)


--- a/cck/cckwiz/iniFiles/CheckList.ini
+++ b/cck/cckwiz/iniFiles/CheckList.ini
@ -43,7 +43,8 @@ Start_y=218
 Width=77
 Height=17
 dll=NULL
-function=NewConfig
+function=command
+parameters=NewConfigDialog(_NewConfigName)
 target=CustomizationList

 [Widget 1]
@ -209,5 +210,11 @@ Start_y=218
 Width=77
 Height=17
 dll=NULL
-function=CreateCopy
+function=command
+parameters=SetGlobal(_FromConfigName,%CustomizationList%);NewConfigDialog(_NewConfigName);CopyDir(customizations\%_FromConfigName%,customizations\%_NewConfigName%)
+
+; GenerateFileList not required due to the way NewConfigDialog works,
+; but this should be changed at some point...
+
+target=CustomizationList

--- a/cck/cckwiz/iniFiles/Customize_page1.ini
+++ b/cck/cckwiz/iniFiles/Customize_page1.ini
@ -81,8 +81,8 @@ Start_y=78
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=home.ini
+function=command
+parameters=DisplayImage(home.ini)

 [Widget 4]
 Type=GroupBox
@ -132,8 +132,8 @@ Start_y=221
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=help.ini
+function=command
+parameters=DisplayImage(help.ini)

 [Widget 7]
 Type=Text
@ -212,7 +212,8 @@ Start_y=137
 Width=50
 Height=14
 dll=NULL
-function=BrowseFile
+function=command
+parameters=BrowseFile
 Target=CustomBookmarkFile

 [Widget 21]
@ -224,8 +225,8 @@ Start_y=137
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=bkmk.ini
+function=command
+parameters=DisplayImage(bkmk.ini)



--- a/cck/cckwiz/iniFiles/Customize_page2.ini
+++ b/cck/cckwiz/iniFiles/Customize_page2.ini
@ -94,8 +94,8 @@ Start_y=112
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=string.ini
+function=command
+parameters=DisplayImage(string.ini)


 [Widget 6]
--- a/cck/cckwiz/iniFiles/Customize_page3.ini
+++ b/cck/cckwiz/iniFiles/Customize_page3.ini
@ -257,7 +257,8 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command
+parameters=BrowseFile

 Target=ReadMeFile

@ -299,9 +300,9 @@ Height=14

 dll=NULL

-function=DisplayImage
+function=command

-parameters=start.ini
+parameters=DisplayImage(start.ini)



@ -342,9 +343,9 @@ Height=14

 dll=NULL

-function=DisplayImage
+function=command

-parameters=readme.ini
+parameters=DisplayImage(readme.ini)


 [Widget 118]
--- a/cck/cckwiz/iniFiles/Info.ini
+++ b/cck/cckwiz/iniFiles/Info.ini
@ -132,8 +132,8 @@ Start_y=204
 Width=62
 Height=15
 dll=NULL
-function=DisplayImage
-parameters=string.ini
+function=command
+parameters=DisplayImage(string.ini)


 [Widget 6]
--- a/cck/cckwiz/iniFiles/Installer.ini
+++ b/cck/cckwiz/iniFiles/Installer.ini
@ -209,7 +209,8 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command
+parameters=BrowseFile

 Target=CustomComponent1

@ -251,7 +252,8 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command
+parameters=BrowseFile

 Target=CustomComponent2

@ -505,8 +507,8 @@ Start_y=181
 Width=60
 Height=14
 dll=NULL
-function=DisplayImage
-parameters=net.ini
+function=command
+parameters=DisplayImage(net.ini)



@ -636,7 +638,8 @@ Height=9

 ;dll=IBEngine.dll

-;function=BrowseFile
+;function=command
+;parameters=BrowseFile

 ;Target=???

--- a/cck/cckwiz/iniFiles/build_page1.ini
+++ b/cck/cckwiz/iniFiles/build_page1.ini
@ -227,7 +227,11 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command
+
+parameters=BrowseFile
+
+target=CustomComponent1



@ -354,8 +358,11 @@ Height=14

 dll=NULL

-function=BrowseFile
+function=command

+parameters=BrowseFile
+
+target=CustomComponent137


 [Widget 843]
@ -515,7 +522,8 @@ Height=15

 dll=NULL

-function=ShowSum
+function=command
+parameters=ShowSum()
 ;Type=ProgressBar

 ;Name=myProgBar