Changeset 105
- Timestamp:
- May 6, 2019, 10:32:47 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormSourceCode.lfm
r103 r105 1 1 object FormSourceCode: TFormSourceCode 2 2 Left = 459 3 Height = 5893 Height = 491 4 4 Top = 278 5 Width = 6725 Width = 560 6 6 Caption = 'Source code' 7 ClientHeight = 5898 ClientWidth = 6729 DesignTimePPI = 1 447 ClientHeight = 491 8 ClientWidth = 560 9 DesignTimePPI = 120 10 10 OnCreate = FormCreate 11 LCLVersion = '2.0. 0.4'11 LCLVersion = '2.0.2.0' 12 12 inline SynEdit1: TSynEdit 13 13 Left = 0 … … 16 16 Width = 672 17 17 Align = alClient 18 Font.Height = -1 618 Font.Height = -13 19 19 Font.Name = 'Courier New' 20 20 Font.Pitch = fpFixed … … 28 28 OnKeyUp = MemoSourceKeyUp 29 29 OnMouseDown = MemoSourceMouseDown 30 Gutter.Width = 8030 Gutter.Width = 67 31 31 Gutter.MouseActions = <> 32 32 RightGutter.Width = 0 … … 478 478 inline SynLeftGutterPartList1: TSynGutterPartList 479 479 object SynGutterMarks1: TSynGutterMarks 480 Width = 3 6480 Width = 30 481 481 MouseActions = <> 482 482 end 483 483 object SynGutterLineNumber1: TSynGutterLineNumber 484 Width = 21484 Width = 17 485 485 MouseActions = <> 486 486 MarkupInfo.Background = clBtnFace … … 492 492 end 493 493 object SynGutterChanges1: TSynGutterChanges 494 Width = 6494 Width = 5 495 495 MouseActions = <> 496 496 ModifiedColor = 59900 … … 505 505 object SynGutterCodeFolding1: TSynGutterCodeFolding 506 506 AutoSize = False 507 Width = 1 4507 Width = 12 508 508 MouseActions = <> 509 509 MarkupInfo.Background = clNone … … 516 516 object PopupMenuSource: TPopupMenu 517 517 Images = Core.ImageListMain 518 left = 1 54519 top = 1 54518 left = 128 519 top = 128 520 520 object MenuItem23: TMenuItem 521 521 Action = FormMain.ABreakpointToggle … … 590 590 object ActionList1: TActionList 591 591 Images = Core.ImageListMain 592 left = 1 54593 top = 67592 left = 128 593 top = 56 594 594 object AGenerateNumber: TAction 595 595 Caption = 'Generate number' … … 644 644 DefaultFilter = 'Soubory Java (*.java)|*.java' 645 645 Enabled = False 646 left = 4 86647 top = 316646 left = 405 647 top = 263 648 648 end 649 649 end -
trunk/Forms/UFormSourceCode.pas
r97 r105 7 7 uses 8 8 Classes, SysUtils, FileUtil, SynEdit, SynHighlighterIni, Forms, Controls, 9 Graphics, Dialogs, StdCtrls, Menus, ActnList, strutils, SynEditTypes,9 Graphics, Dialogs, StdCtrls, Menus, ActnList, strutils, 10 10 SynEditHighlighter, SynHighlighterAny, SynHighlighterJava, UBFHighlighter; 11 11 -
trunk/Packages/Common/Languages/UJobProgressView.cs.po
r93 r105 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "X-Generator: Poedit 1.8.8\n"12 "X-Generator: Poedit 2.2\n" 13 13 14 14 #: ujobprogressview.sestimatedtime … … 24 24 msgstr "DokonÄené" 25 25 26 #: ujobprogressview.soperations27 msgid "Operations:"28 msgstr ""29 30 26 #: ujobprogressview.spleasewait 31 27 msgid "Please wait..." -
trunk/Packages/Common/Languages/UJobProgressView.po
r93 r105 14 14 msgstr "" 15 15 16 #: ujobprogressview.soperations17 msgid "Operations:"18 msgstr ""19 20 16 #: ujobprogressview.spleasewait 21 17 msgid "Please wait..." -
trunk/Packages/Common/UJobProgressView.lfm
r93 r105 15 15 OnShow = FormShow 16 16 Position = poScreenCenter 17 LCLVersion = ' 1.8.2.0'17 LCLVersion = '2.0.2.0' 18 18 object PanelOperationsTitle: TPanel 19 19 Left = 0 … … 241 241 Interval = 100 242 242 OnTimer = TimerUpdateTimer 243 left = 264243 left = 320 244 244 top = 8 245 245 end -
trunk/Packages/Common/UJobProgressView.pas
r93 r105 175 175 STotalEstimatedTime = 'Total estimated time: %s'; 176 176 SFinished = 'Finished'; 177 SOperations = 'Operations:';178 177 179 178 procedure Register; -
trunk/Packages/Common/UMemory.pas
r93 r105 112 112 procedure TMemory.WriteMemory(Position: Integer; Memory: TMemory); 113 113 begin 114 Move(Memory.FData, PByte( @FData+ Position)^, Memory.Size);114 Move(Memory.FData, PByte(PByte(@FData) + Position)^, Memory.Size); 115 115 end; 116 116 117 117 procedure TMemory.ReadMemory(Position: Integer; Memory: TMemory); 118 118 begin 119 Move(PByte( @FData+ Position)^, Memory.FData, Memory.Size);119 Move(PByte(PByte(@FData) + Position)^, Memory.FData, Memory.Size); 120 120 end; 121 121 -
trunk/Packages/CoolTranslator/CoolTranslator.lpk
r102 r105 15 15 <Parsing> 16 16 <SyntaxOptions> 17 <SyntaxMode Value="Delphi"/> 17 18 <CStyleOperator Value="False"/> 18 19 <AllowLabel Value="False"/> -
trunk/Packages/CoolTranslator/UCoolTranslator.pas
r102 r105 200 200 PropInfo: PPropInfo; 201 201 PropList: PPropList; 202 Excludes: TComponentExcludes;203 202 begin 204 203 Count := GetTypeData(Component.ClassInfo)^.PropCount; … … 253 252 if (UpperCase(PropType.Name) = 'TTRANSLATESTRING') then 254 253 //if not IsExcluded(Component, PropInfo^.Name) then 255 SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, GetWideStrProp(Component, PropInfo)));254 SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, string(GetWideStrProp(Component, PropInfo)))); 256 255 end; 257 256 tkClass: begin … … 415 414 Lang := ParamStr(i + 1); 416 415 end; 417 if Lang = '' then 416 if Lang = '' then begin 417 T := ''; 418 418 LazGetLanguageIDs(Lang, T); 419 end; 419 420 420 421 if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin … … 432 433 function TCoolTranslator.FindLocaleFileName(LCExt: string): string; 433 434 var 434 T: string;435 435 Lang: string; 436 436 begin -
trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc
r93 r105 23 23 function GetItem(Index: TIndex): TGMatrixItem; 24 24 function GetCapacity: TIndex; 25 function GetLast: TGMatrixItem;26 function GetFirst: TGMatrixItem;27 25 procedure SetCapacity(const AValue: TIndex); 28 procedure SetLast(AValue: TGMatrixItem);29 procedure SetFirst(AValue: TGMatrixItem);30 26 procedure PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem); virtual; 31 27 procedure PutItem(Index: TIndex; const AValue: TGMatrixItem); virtual; 32 28 procedure SetCount(const AValue: TIndex); 33 29 public 34 function Add(Item: TGMatrixItem): TIndex;35 procedure AddMatrix(Values: array of TRow);36 procedure AddList(List: TGMatrix);37 30 procedure Assign(Source: TGMatrix); 38 31 procedure Clear; virtual; 39 32 procedure Contract; 40 33 function CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TIndex; 41 procedure Delete(Index: TIndex); virtual;42 procedure DeleteItems(Index, Count: TIndex);43 function EqualTo(List: TGMatrix): Boolean;44 34 procedure Expand; 45 function Extract(Item: TGMatrixItem): TGMatrixItem;46 35 procedure Exchange(Index1, Index2: TIndex); 47 property First: TGMatrixItem read GetFirst write SetFirst;48 36 procedure FillAll(Value: TGMatrixItem); 49 37 procedure Fill(Start, Count: TIndex; Value: TGMatrixItem); 50 38 function Implode(RowSeparator, ColSeparator: string; Converter: TToStringConverter): string; 51 procedure Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);52 function IndexOf(Item: TGMatrixItem; Start: TIndex): TIndex;53 function IndexOfList(List: TGMatrix; Start: TIndex): TIndex;54 procedure Insert(Index: TIndex; Item: TGMatrixItem);55 procedure InsertList(Index: TIndex; List: TGMatrix);56 procedure InsertArray(Index: TIndex; Values: array of TGMatrixItem);57 procedure Move(CurIndex, NewIndex: TIndex);58 procedure MoveItems(CurIndex, NewIndex, Count: TIndex);59 39 procedure Merge(Index: TIndex; Source: TGMatrix; Proc: TMerge); 60 40 procedure Replace(Index: TIndex; Source: TGMatrix); 61 function Remove(Item: TGMatrixItem): TIndex;62 41 procedure Reverse; 63 42 procedure ReverseHorizontal; 64 43 procedure ReverseVertical; 65 procedure Sort(Compare: TSortCompare);66 procedure SetArray(Values: array of TGMatrixItem);67 44 property Count: TIndex read FCount write SetCount; 68 45 property Capacity: TIndex read GetCapacity write SetCapacity; … … 71 48 property Items[Index: TIndex]: TGMatrixItem 72 49 read GetItem write PutItem; 73 property Last: TGMatrixItem read GetLast write SetLast;74 50 end; 75 51 … … 78 54 79 55 {$IFDEF IMPLEMENTATION_USES} 80 81 uses82 RtlConsts;83 56 84 57 resourcestring … … 137 110 138 111 procedure TGMatrix.SetCapacity(const AValue: TIndex); 139 var140 Y: TGMatrixIndexY;141 112 begin 142 113 if (Capacity.X <> AValue.X) and (Capacity.Y <> AValue.Y) then begin 143 (* SetLength(FItems, AValue.Y);144 Y := 0;145 while Y < Length(FItems) do begin146 SetLength(FItems[Y], AValue.X);147 Y := Y + 1;148 end;149 end;150 *)151 114 SetLength(FItems, AValue.Y, AValue.X); 152 115 end; … … 244 207 end; 245 208 246 function TGMatrix.Extract(Item: TGMatrixItem): TGMatrixItem;247 var248 I: TIndex;249 begin250 (* I := IndexOf(Item);251 if I >= 0 then begin252 Result := Item;253 Delete(I);254 end else255 raise EListError.CreateFmt(SListIndexError, [0]);256 *)257 end;258 259 function TGMatrix.IndexOf(Item: TGMatrixItem; Start: TIndex): TIndex;260 begin261 (* Result := Start;262 while (Result < FCount) and263 not CompareMem(Addr(FItems[Result]), Addr(Item), SizeOf(TGMatrixItem)) do264 Result := Result + 1;265 if Result = FCount then Result := -1;266 *)267 end;268 269 procedure TGMatrix.Insert(Index: TIndex; Item: TGMatrixItem);270 begin271 (* if (Index < 0) or (Index > FCount ) then272 raise EListError.CreateFmt(SListIndexError, [Index]);273 if FCount = Capacity then Expand;274 if Index < FCount then275 System.Move(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TGMatrixItem));276 FItems[Index] := Item;277 FCount := FCount + 1;278 *)279 end;280 281 procedure TGMatrix.InsertList(Index: TIndex; List: TGMatrix);282 var283 I: TIndex;284 begin285 (* I := 0;286 while (I < List.Count) do begin287 Insert(Index + I, List[I]);288 I := I + 1;289 end;290 *)291 end;292 293 function TGMatrix.IndexOfList(List: TGMatrix; Start: TIndex): TIndex;294 var295 I: TIndex;296 begin297 (* if List.Count > 0 then begin298 Result := IndexOf(List[0], Start);299 if Result <> -1 then begin300 I := 1;301 while I < List.Count do begin302 if not CompareMem(Addr(FItems[Result + I]), Addr(List.FItems[I]), SizeOf(TGMatrixItem)) then begin303 Result := -1;304 Break;305 end;306 I := I + 1;307 end;308 end;309 end else Result := -1;310 *)311 end;312 313 function TGMatrix.GetLast: TGMatrixItem;314 begin315 (* if FCount = 0 then316 raise EListError.CreateFmt(SListIndexError, [0])317 else318 Result := Items[FCount - 1];319 *)320 end;321 322 procedure TGMatrix.SetLast(AValue: TGMatrixItem);323 begin324 (* if FCount = 0 then325 raise EListError.CreateFmt(SListIndexError, [0])326 else327 Items[FCount - 1] := AValue;328 *)329 end;330 331 function TGMatrix.GetFirst: TGMatrixItem;332 begin333 (* if FCount = 0 then334 raise EListError.CreateFmt(SListIndexError, [0])335 else336 Result := Items[0];337 *)338 end;339 340 procedure TGMatrix.SetFirst(AValue: TGMatrixItem);341 begin342 (* if FCount = 0 then343 raise EListError.CreateFmt(SListIndexError, [0])344 else345 Items[0] := AValue;346 *)347 end;348 349 procedure TGMatrix.Move(CurIndex, NewIndex: TIndex);350 var351 Temp: TGMatrixItem;352 begin353 (* if ((CurIndex < 0) or (CurIndex > Count - 1)) then354 raise EListError.CreateFmt(SListIndexError, [CurIndex]);355 if ((NewIndex < 0) or (NewIndex > Count -1)) then356 raise EListError.CreateFmt(SlistIndexError, [NewIndex]);357 Temp := FItems[CurIndex];358 if NewIndex > CurIndex then begin359 System.Move(FItems[CurIndex + 1], FItems[CurIndex], (NewIndex - CurIndex) * SizeOf(TGMatrixItem));360 end else361 if NewIndex < CurIndex then begin362 System.Move(FItems[NewIndex], FItems[NewIndex + 1], (CurIndex - NewIndex) * SizeOf(TGMatrixItem));363 end;364 FItems[NewIndex] := Temp;365 //Delete(CurIndex);366 //Insert(NewIndex, Temp);*)367 end;368 369 procedure TGMatrix.MoveItems(CurIndex, NewIndex, Count: TIndex);370 var371 S: Integer;372 D: Integer;373 begin374 (* if CurIndex < NewIndex then begin375 S := CurIndex + Count - 1;376 D := NewIndex + Count - 1;377 while S >= CurIndex do begin378 Move(S, D);379 S := S - 1;380 D := D - 1;381 end;382 end else383 if CurIndex > NewIndex then begin384 S := CurIndex;385 D := NewIndex;386 while S < (CurIndex + Count) do begin387 Move(S, D);388 S := S + 1;389 D := D + 1;390 end;391 end;*)392 end;393 394 function TGMatrix.Remove(Item: TGMatrixItem): TIndex;395 begin396 (* Result := IndexOf(Item);397 if Result <> -1 then398 Delete(Result); *)399 end;400 401 function TGMatrix.EqualTo(List: TGMatrix): Boolean;402 var403 I: TIndex;404 begin405 (* Result := Count = List.Count;406 if Result then begin407 I := 0;408 while I < Count do begin409 if not CompareMem(Addr(FItems[I]), Addr(List.FItems[I]), SizeOf(TGMatrixItem)) then begin410 Result := False;411 Break;412 end;413 I := I + 1;414 end;415 end; *)416 end;417 418 209 procedure TGMatrix.Reverse; 419 210 var … … 464 255 end; 465 256 466 procedure TGMatrix.Sort(Compare: TSortCompare);467 begin468 (* if FCount > 1 then469 QuickSort(0, FCount - 1, Compare); *)470 end;471 472 procedure TGMatrix.AddMatrix(Values: array of TRow);473 var474 I: TIndex;475 begin476 (* I := 0;477 while I <= High(Values) do begin478 Add(Values[I]);479 I := I + 1;480 end; *)481 end;482 483 procedure TGMatrix.SetArray(Values: array of TGMatrixItem);484 var485 I: TIndex;486 begin487 (* Clear;488 I := 0;489 while I <= High(Values) do begin490 Add(Values[I]);491 I := I + 1;492 end; *)493 end;494 495 procedure TGMatrix.InsertArray(Index: TIndex; Values: array of TGMatrixItem);496 var497 I: TIndex;498 begin499 (* I := 0;500 while I <= High(Values) do begin501 Insert(Index + I, Values[I]);502 I := I + 1;503 end; *)504 end;505 506 257 function TGMatrix.Implode(RowSeparator, ColSeparator: string; Converter: TToStringConverter): string; 507 258 var … … 525 276 end; 526 277 527 procedure TGMatrix.Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);528 begin529 (* Clear;530 while (Pos(Separator, Text) > 0) and531 ((Count < (SlicesCount - 1)) or (SlicesCount = -1)) do begin532 Add(Converter(Copy(Text, 1, Pos(Separator, Text) - 1)));533 System.Delete(Text, 1, Pos(Separator, Text) + Length(Separator) - 1);534 end;535 Add(Converter(Text)); *)536 end;537 538 function TGMatrix.Add(Item: TGMatrixItem): TIndex;539 begin540 (* if FCount = Capacity then541 Self.Expand;542 FItems[FCount] := Item;543 Result := FCount;544 FCount := FCount + 1; *)545 end;546 547 procedure TGMatrix.AddList(List: TGMatrix);548 var549 I: TIndex;550 begin551 (* I := 0;552 while I < List.Count do begin553 Add(List[I]);554 I := I + 1;555 end; *)556 end;557 558 278 procedure TGMatrix.Clear; 559 279 begin 560 280 Count := CreateIndex(0, 0); 561 281 Capacity := CreateIndex(0, 0); 562 end;563 564 procedure TGMatrix.Delete(Index: TIndex);565 begin566 (* if (Index < 0) or (Index >= FCount) then567 raise EListError.CreateFmt(SListIndexError, [Index]);568 FCount := FCount - 1;569 System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TGMatrixItem));570 Contract;571 *)572 end;573 574 procedure TGMatrix.DeleteItems(Index, Count: TIndex);575 var576 I: TIndex;577 begin578 (* I := Index;579 while I < (Index + Count) do begin580 Delete(Index);581 I := I + 1;582 end;583 *)584 282 end; 585 283 -
trunk/Packages/TemplateGenerics/Specialized/SpecializedStream.pas
r93 r105 113 113 function TMemoryStreamByte.WriteBuffer(var Buffer; Count: Integer): Integer; 114 114 begin 115 115 Result := 0; 116 116 end; 117 117 … … 137 137 function TMemoryStreamByte.ReadBuffer(var Buffer; Count: Integer): Integer; 138 138 begin 139 139 Result := 0; 140 140 end; 141 141 … … 143 143 ): Integer; 144 144 begin 145 145 Result := 0; 146 146 end; 147 147 -
trunk/Packages/TemplateGenerics/TemplateGenerics.lpk
r102 r105 17 17 <Parsing> 18 18 <SyntaxOptions> 19 <SyntaxMode Value="Delphi"/> 19 20 <CStyleOperator Value="False"/> 20 21 <AllowLabel Value="False"/> -
trunk/Target/UTargetC.pas
r87 r105 123 123 Process := TProcess.Create(nil); 124 124 Process.CurrentDirectory := ExtractFilePath(CompilerPath); 125 Process.CommandLine := LongFileName(CompilerPath) + ' ' + LongFileName(CompiledFile) + ' -o ' + 126 LongFileName(ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension); 125 Process.Executable := LongFileName(CompilerPath); 126 Process.Parameters.Add(LongFileName(CompiledFile)); 127 Process.Parameters.Add('-o'); 128 Process.Parameters.Add(LongFileName(ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension)); 127 129 Process.Options := [poWaitOnExit]; 128 130 Process.Execute; -
trunk/UBFHighlighter.pas
r97 r105 53 53 54 54 uses 55 Classes, SysUtils, Graphics, SynEdit Types, SynEditHighlighter;55 Classes, SysUtils, Graphics, SynEditHighlighter; 56 56 57 57 type
Note:
See TracChangeset
for help on using the changeset viewer.