Cleanup/renames.

Projects/CompFileListWin.dfm → Projects/CompFilesDesigner.dfm

@@ -1,8 +1,8 @@
-object CFLWForm: TCFLWForm
+object FilesDesignerForm: TFilesDesignerForm
   Left = 624
   Top = 375
   BorderStyle = bsDialog
-  Caption = 'Insert File List Field'
+  Caption = '[Files] Entries Designer'
   ClientHeight = 403
   ClientWidth = 575
   Color = clBtnFace

Projects/CompFileListWin.pas → Projects/CompFilesDesigner.pas

@@ -1,4 +1,4 @@
-unit CompFileListWin;
+unit CompFilesDesigner;
 
 interface
 
@@ -7,7 +7,7 @@ uses
   UIStateForm, NewStaticText, DropListBox, CompWizardFilesHelper;
 
 type
-  TCFLWForm = class(TUIStateForm)
+  TFilesDesignerForm = class(TUIStateForm)
     Panel1: TPanel;
     OkButton: TButton;
     CancelButton: TButton;
@@ -32,19 +32,19 @@ implementation
 
 {$R *.dfm}
 
-procedure TCFLWForm.FormCreate(Sender: TObject);
+procedure TFilesDesignerForm.FormCreate(Sender: TObject);
 begin
   FFilesHelper := TWizardFormFilesHelper.Create(Handle,
     NotCreateAppDirCheck, AppFilesListBox, AppFilesAddButton, AppFilesAddDirButton,
     AppFilesEditButton, AppFilesRemoveButton);;
 end;
 
-procedure TCFLWForm.FormDestroy(Sender: TObject);
+procedure TFilesDesignerForm.FormDestroy(Sender: TObject);
 begin
   FFilesHelper.Free;
 end;
 
-function TCFLWForm.GetText: String;
+function TFilesDesignerForm.GetText: String;
 begin
   Result := '';
   FFilesHelper.AddScript(Result);

Projects/CompForm.dfm

@@ -675,15 +675,15 @@ object CompileForm: TCompileForm
         ShortCut = 24647
         OnClick = TGenerateGUIDClick
       end
-      object TInsertMsgBox: TMenuItem
-        Caption = '&MessageBox Designer...'
+      object TMsgBoxDesigner: TMenuItem
+        Caption = '&MsgBox/TaskDialogMsgBox Designer...'
         ShortCut = 24653
-        OnClick = TInsertMsgBoxClick
+        OnClick = TMsgBoxDesignerClick
       end
-      object TInsertFileListField: TMenuItem
-        Caption = '&Insert File List Field'
+      object TFilesDesigner: TMenuItem
+        Caption = '[F&iles] Designer...'
         ShortCut = 24649
-        OnClick = TInsertFileListFieldClick
+        OnClick = TFilesDesignerClick
       end
       object N23: TMenuItem
         Caption = '-'

Projects/CompForm.pas

@@ -104,7 +104,7 @@ type
     SplitPanel: TPanel;
     HWebsite: TMenuItem;
     VToolbar: TMenuItem;
-    TInsertFileListField: TMenuItem;
+    TFilesDesigner: TMenuItem;
     TOptions: TMenuItem;
     HFaq: TMenuItem;
     StatusBar: TStatusBar;
@@ -190,7 +190,7 @@ type
     PListSelectAll: TMenuItem;
     DebugCallStackList: TListBox;
     VDebugCallStack: TMenuItem;
-    TInsertMsgBox: TMenuItem;
+    TMsgBoxDesigner: TMenuItem;
     ToolBarPanel: TPanel;
     HMailingList: TMenuItem;
     MemosTabSet: TNewTabSet; { First tab is the main memo, last tab is the preprocessor output memo }
@@ -295,7 +295,7 @@ type
       State: TOwnerDrawState);
     procedure VDebugCallStackClick(Sender: TObject);
     procedure HMailingListClick(Sender: TObject);
-    procedure TInsertMsgBoxClick(Sender: TObject);
+    procedure TMsgBoxDesignerClick(Sender: TObject);
     procedure MemosTabSetClick(Sender: TObject);
     procedure FSaveAllClick(Sender: TObject);
     procedure RStepOutClick(Sender: TObject);
@@ -310,7 +310,7 @@ type
       State: TOwnerDrawState);
     procedure FindResultsListDblClick(Sender: TObject);
     procedure FPrintClick(Sender: TObject);
-    procedure TInsertFileListFieldClick(Sender: TObject);
+    procedure TFilesDesignerClick(Sender: TObject);
   private
     { Private declarations }
     FMemos: TList<TCompScintEdit>;                      { FMemos[0] is the main memo and FMemos[1] the preprocessor output memo - also see MemosTabSet comment above }
@@ -521,7 +521,7 @@ uses
   HtmlHelpFunc, TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
   CompOptions, CompStartup, CompWizard, CompSignTools, CompTypes, CompInputQueryCombo,
-  CompMessageBoxDesigner, CompFileListWin;
+  CompMsgBoxDesigner, CompFilesDesigner;
 
 {$R *.DFM}
 
@@ -1002,16 +1002,16 @@ begin
   end;
 end;
 
-procedure TCompileForm.TInsertFileListFieldClick(Sender: TObject);
+procedure TCompileForm.TFilesDesignerClick(Sender: TObject);
 var
-  CFLWForm: TCFLWForm;
+  FilesDesignerForm: TFilesDesignerForm;
 begin
-  CFLWForm := TCFLWForm.Create(Application);
+  FilesDesignerForm := TFilesDesignerForm.Create(Application);
   try
-    if CFLWForm.ShowModal = mrOk then
-      FActiveMemo.SelText := CFLWForm.Text;
+    if FilesDesignerForm.ShowModal = mrOk then
+      FActiveMemo.SelText := FilesDesignerForm.Text;
   finally
-    CFLWForm.Free;
+    FilesDesignerForm.Free;
   end;
 end;
 
@@ -2893,7 +2893,8 @@ var
 begin
   MemoIsReadOnly := FActiveMemo.ReadOnly;
   TGenerateGUID.Enabled := not MemoIsReadOnly;
-  TInsertMsgBox.Enabled := not MemoIsReadOnly;
+  TMsgBoxDesigner.Enabled := not MemoIsReadOnly;
+  TFilesDesigner.Enabled := not MemoIsReadOnly;
 end;
 
 procedure TCompileForm.TAddRemoveProgramsClick(Sender: TObject);
@@ -2908,11 +2909,11 @@ begin
     FActiveMemo.SelText := GenerateGuid;
 end;
 
-procedure TCompileForm.TInsertMsgBoxClick(Sender: TObject);
+procedure TCompileForm.TMsgBoxDesignerClick(Sender: TObject);
 var
-  MsgBoxForm: TMBDForm;
+  MsgBoxForm: TMsgBoxDesignerForm;
 begin
-  MsgBoxForm := TMBDForm.Create(Application);
+  MsgBoxForm := TMsgBoxDesignerForm.Create(Application);
   try
     if MsgBoxForm.ShowModal = mrOk then
       FActiveMemo.SelText := MsgBoxForm.Text;

Projects/CompMessageBoxDesigner.dfm → Projects/CompMsgBoxDesigner.dfm

@@ -1,8 +1,8 @@
-object MBDForm: TMBDForm
+object MsgBoxDesignerForm: TMsgBoxDesignerForm
   Left = 0
   Top = 0
   BorderStyle = bsDialog
-  Caption = 'MessageBox Designer'
+  Caption = 'MsgBox/TaskDialogMsgBox Designer'
   ClientHeight = 380
   ClientWidth = 548
   Color = clBtnFace

Projects/CompMessageBoxDesigner.pas → Projects/CompMsgBoxDesigner.pas

@@ -1,4 +1,4 @@
-unit CompMessageBoxDesigner;
+unit CompMsgBoxDesigner;
 
 {
   Inno Setup
@@ -18,7 +18,7 @@ uses
   UIStateForm, StdCtrls, ExtCtrls, NewStaticText, ComCtrls, pngimage;
 
 type
-  TMBDForm = class(TUIStateForm)
+  TMsgBoxDesignerForm = class(TUIStateForm)
     IMGmbInformation: TImage;
     IMGmbConfirmation: TImage;
     IMGmbError: TImage;
@@ -114,7 +114,7 @@ uses
 
 {$R *.DFM}
 
-procedure TMBDForm.FormCreate(Sender: TObject);
+procedure TMsgBoxDesignerForm.FormCreate(Sender: TObject);
 begin
   InitFormFont(Self);
 
@@ -141,7 +141,7 @@ begin
   Button2Label.Visible := False;
 end;
 
-procedure TMBDForm.rbMB_OKClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_OKClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -201,7 +201,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.rbMB_YESNOClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_YESNOClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -264,7 +264,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.rbMB_OKCANCELClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_OKCANCELClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -327,7 +327,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.rbMB_RETRYCANCELClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_RETRYCANCELClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -390,7 +390,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.rbMB_YESNOCANCELClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_YESNOCANCELClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -453,7 +453,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.rbMB_ABORTRETRYIGNOREClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rbMB_ABORTRETRYIGNOREClick(Sender: TObject);
 begin
   cb_IDOK.Checked := False;
   cb_IDCANCEL.Checked := False;
@@ -516,12 +516,12 @@ begin
   end;
 end;
 
-procedure TMBDForm.UpDown1Changing(Sender: TObject; var AllowChange: Boolean);
+procedure TMsgBoxDesignerForm.UpDown1Changing(Sender: TObject; var AllowChange: Boolean);
 begin
    AllowChange := True;
 end;
 
-procedure TMBDForm.cb_MsgBoxClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.cb_MsgBoxClick(Sender: TObject);
 begin
    IMGmbConfirmation.Visible := True;
    cb_MB_SETFOREGROUND.Enabled := True;
@@ -574,7 +574,7 @@ begin
    rbMB_OKClick(Self);
 end;
 
-procedure TMBDForm.cb_SuppressibleClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.cb_SuppressibleClick(Sender: TObject);
 begin
    if cb_Suppressible.Checked then begin
      cb_DefIDOK.Visible := True;
@@ -617,7 +617,7 @@ begin
    if rbMB_ABORTRETRYIGNORE.Checked then rbMB_ABORTRETRYIGNOREClick(Self);
 end;
 
-procedure TMBDForm.cb_TaskDialogMsgBoxClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.cb_TaskDialogMsgBoxClick(Sender: TObject);
 begin
    IMGmbConfirmation.Visible := False;
    cb_MB_SETFOREGROUND.Enabled := False;
@@ -681,13 +681,13 @@ begin
    rbMB_OKClick(Self);
 end;
 
-procedure TMBDForm.rb_IDOKClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDOKClick(Sender: TObject);
 begin
    if rb_IDOK.Checked then
       rb_IDCANCEL.Checked := False;
 end;
 
-procedure TMBDForm.rb_IDCANCELClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDCANCELClick(Sender: TObject);
 begin
    if rb_IDCANCEL.Checked then begin
       rb_IDOK.Checked := False;
@@ -697,7 +697,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.rb_IDYESClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDYESClick(Sender: TObject);
 begin
    if rb_IDYES.Checked then begin
       rb_IDNO.Checked := False;
@@ -705,7 +705,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.rb_IDNOClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDNOClick(Sender: TObject);
 begin
    if rb_IDNO.Checked then begin
       rb_IDYES.Checked := False;
@@ -713,7 +713,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.rb_IDRETRYClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDRETRYClick(Sender: TObject);
 begin
    if rb_IDRETRY.Checked then begin
       rb_IDCANCEL.Checked := False;
@@ -722,7 +722,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.rb_IDIGNOREClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDIGNOREClick(Sender: TObject);
 begin
    if rb_IDIGNORE.Checked then begin
       rb_IDABORT.Checked := False;
@@ -730,7 +730,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.rb_IDABORTClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.rb_IDABORTClick(Sender: TObject);
 begin
    if rb_IDABORT.Checked then begin
       rb_IDIGNORE.Checked := False;
@@ -738,7 +738,7 @@ begin
    end;
 end;
 
-procedure TMBDForm.MBDButtonPreviewClick(Sender: TObject);
+procedure TMsgBoxDesignerForm.MBDButtonPreviewClick(Sender: TObject);
 var
   ButtonsBtn : Cardinal;
   TypeIcon : TMsgBoxType;
@@ -834,7 +834,7 @@ begin
   end;
 end;
 
-procedure TMBDForm.MSGTextKeyPress(Sender: TObject; var Key: Char);
+procedure TMsgBoxDesignerForm.MSGTextKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #27 then begin
     MBDButtonCancel.Click;
@@ -842,7 +842,7 @@ begin
   end;
 end;
 
-function TMBDForm.GetText: String;
+function TMsgBoxDesignerForm.GetText: String;
 
    { MsgBox / SuppressibleMsgBox }
    function TextMsg(M: Integer; a, b, c, d, e, f: String): String;

Projects/Compil32.dpr

@@ -36,9 +36,9 @@ uses
   ScintEdit in '..\Components\ScintEdit.pas',
   ScintStylerInnoSetup in '..\Components\ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  CompMessageBoxDesigner in 'CompMessageBoxDesigner.pas' {MBDForm},
+  CompMsgBoxDesigner in 'CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
   CompScintEdit in 'CompScintEdit.pas',
-  CompFileListWin in 'CompFileListWin.pas' {CFLWForm},
+  CompFilesDesigner in 'CompFilesDesigner.pas' {FilesDesignerForm},
   CompWizardFilesHelper in 'CompWizardFilesHelper.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}

Projects/Compil32.dproj

@@ -110,12 +110,12 @@
         <DCCReference Include="..\Components\ScintEdit.pas"/>
         <DCCReference Include="..\Components\ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="CompMessageBoxDesigner.pas">
-            <Form>MBDForm</Form>
+        <DCCReference Include="CompMsgBoxDesigner.pas">
+            <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
         <DCCReference Include="CompScintEdit.pas"/>
-        <DCCReference Include="CompFileListWin.pas">
-            <Form>CFLWForm</Form>
+        <DCCReference Include="CompFilesDesigner.pas">
+            <Form>FilesDesignerForm</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="CompWizardFilesHelper.pas"/>