diff -r f1bdf4e5e0b4 -r ceb6bb9078db Tools__ProjectBuilderAssistantApplication.st --- a/Tools__ProjectBuilderAssistantApplication.st Sun Mar 10 17:57:46 2013 +0100 +++ b/Tools__ProjectBuilderAssistantApplication.st Mon Mar 11 19:39:52 2013 +0100 @@ -248,7 +248,7 @@ windowSpecSelector: page5_specifyIncludedClasses enterCallbackSelector: enterContentsSpecification canEnterQuerySelector: #canEnterContentsSelection - infoText: 'Define which (other) classes are to be included. Do not include classes from other packages here. Press "Scan" to include all classes of the package; browse to edit the contents manually.' + infoText: 'Define which (other) classes are to be included. Do not include classes from other packages here. Press "Scan" to include all classes of the package; "Browse" to edit the contents manually.' ) (AssistantPageSpec @@ -256,13 +256,13 @@ windowSpecSelector: page5b_specifyPrerequisitePackages enterCallbackSelector: enterPrerequisitesSpecification canEnterQuerySelector: #canEnterPrerequisitesSelection - infoText: 'Define which packages are needed as prerequisites. Press "Scan" to search for prerequisites; browse to edit the list manually.' + infoText: 'Define which packages are needed as prerequisites. Press "Scan" to search for prerequisites; "Browse" to edit the list manually.' ) (AssistantPageSpec pageTitle: 'Specify Project Attributes' windowSpecSelector: page6a_specifyProjectAttributes - infoText: 'Define additional attributes.' + infoText: 'Define additional attributes. These will be shown during the installation of the deployed pacakge.' enterCallbackSelector: updateProjectAttributes leaveCallbackSelector: #rememberProjectAttributes ) @@ -281,7 +281,7 @@ canEnterQuerySelector: #canEnterBuild enterCallbackSelector: #restoreMakeOutputsContents leaveCallbackSelector: #rememberMakeOutputsContents - infoText: 'Start the build-process. This will run make+bcc/vc to compile all required classes and nsis to generate a self-installable executable. You must have the compiler (borland-bcc or visual-c) and NullSoft NSIS packages installed for this to work.' + infoText: 'Start the build-process. This will run "make"+"bcc/vc/gcc" to compile all required classes and "nsis" to generate a self-installable executable (on windows). You must have the compiler (borland-bcc or visual-c) and NullSoft NSIS packages installed for this to work.' ) (AssistantPageSpec @@ -320,6 +320,24 @@ #existingProjects 'Projects with an existing ProjectDefinition of the chosen type (above).' +#nameOfApplicationClass +'For GUI applications: the name of your application class (subclass of ApplicationModel). +This will be opened by the startup sequence and defines the UI.' + +#createNewApplication +'Create a new simple dummy application (HelloWorld-like). +Press this button to get some template code to play with - but enter a name first.' + +#nameOfStartupClass +'This class contains the main method, in which the show starts when the executable runs. +Its main task is to parse command line arguments (if any) and fire up the real application. +It should inherit from StandaloneStartup.' + +#createNewStartupClass +'Create a new simple startup class which fires up the defined application. +Press this button to get a standard startup class which does not care for command line args. +But enter a name first.' + #browseSelectedProject 'Open a SystemBrowser on the selected Project.' @@ -690,6 +708,7 @@ acceptOnLostFocus: true acceptOnPointerLeave: true emptyFieldReplacementText: 'MyApplication' + activeHelpKey: nameOfApplicationClass ) (ActionButtonSpec label: 'Create' @@ -697,6 +716,7 @@ layout: (LayoutFrame -100 1 6 0 1 1 28 0) translateLabel: true model: createNewApplication + activeHelpKey: createNewApplication ) ) @@ -832,6 +852,7 @@ acceptOnLostFocus: true acceptOnPointerLeave: true emptyFieldReplacementText: 'MyStandAloneStartup' + activeHelpKey: nameOfStartupClass ) (ActionButtonSpec label: 'Create' @@ -839,6 +860,7 @@ layout: (LayoutFrame -100 1 6 0 1 1 28 0) translateLabel: true model: createNewStartupClass + activeHelpKey: createNewStartupClass ) ) @@ -1288,7 +1310,7 @@ (FramedBoxSpec label: 'Make Output' name: 'FramedBox3' - layout: (LayoutFrame 0 0.0 5 0 4 1.0 -60 1) + layout: (LayoutFrame 0 0.0 5 0 4 1.0 -91 1) labelPosition: topLeft translateLabel: true component: @@ -1302,8 +1324,8 @@ hasHorizontalScrollBar: true hasVerticalScrollBar: true hasKeyboardFocusInitially: false + postBuildCallback: postBuildMakeOutputWindow: viewClassName: 'TextCollector' - postBuildCallback: postBuildMakeOutputWindow: ) ) @@ -1877,7 +1899,7 @@ makeProcess := [ [ - self runBuildProcess:'exe' + self runBuildProcess:whichTarget ] ensure:[ self stopMakeButtonVisible value:false. self startMakeButtonEnabled value:true. @@ -2302,7 +2324,7 @@ ! osIsOSX - ^ true "/ OperatingSystem isOSXlike + ^ OperatingSystem isOSXlike ! osIsWindows