Changeset 16 for trunk/Forms
- Timestamp:
- Jul 15, 2015, 8:32:42 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormConsole.pas
r13 r16 62 62 procedure TFormConsole.FormShow(Sender: TObject); 63 63 begin 64 Memo1.Clear;65 64 ButtonAbort.Enabled := False; 66 65 Timer1.Enabled := True; … … 101 100 Aborted := False; 102 101 ButtonAbort.Enabled := True; 102 Log.Clear; 103 Memo1.Clear; 103 104 if WorkingDir <> '' then 104 105 Process.CurrentDirectory := WorkingDir; … … 124 125 Line := Copy(Text, 1, Pos(LineEnding, Text) - 1); 125 126 Delete(Text, 1, Length(Line) + Length(LineEnding)); 126 Memo1.Lines.Add(Line); 127 if Visible then Memo1.Lines.Add(Line); 128 Log.Add(Line); 127 129 end; 128 130 end; … … 136 138 Line := Copy(Text, 1, Pos(LineEnding, Text) - 1); 137 139 Delete(Text, 1, Length(Line) + Length(LineEnding)); 138 Memo1.Lines.Add(Line); 140 if Visible then Memo1.Lines.Add(Line); 141 Log.Add(Line); 139 142 end; 140 143 end; … … 143 146 end; 144 147 finally 145 Memo1.Lines.Add(Text); 148 if Visible then Memo1.Lines.Add(Text); 149 Log.Add(Text); 146 150 FreeAndNil(Process); 147 151 end; 148 Log.Assign(Memo1.Lines);149 152 ButtonAbort.Enabled := False; 150 153 //ModalResult := mrOK;
Note:
See TracChangeset
for help on using the changeset viewer.