Changeset 39


Ignore:
Timestamp:
Feb 25, 2012, 7:41:42 PM (13 years ago)
Author:
chronos
Message:
  • Modified: Reorganized docked forms. Target code is now accessible through main PageControl tab.
  • Added: Store right and bottom panels size.
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Demos/Generics/Generics.pas

    r21 r39  
    55 
    66type
    7   TListInteger = TGList<Integer, Integer>;
     7  TListInteger = TList<Integer>;
    88
    99var
    10   List: TListInteger;
     10  List: TList<Integer>;
    1111  I: Integer;
    1212begin
    1313  try
    14     List := TListInteger.Create;
     14    List := TList<Integer>.Create;
    1515    List.Add(100);
    1616  finally

  • trunk/Demos/Generics/List.pas

    r21 r39  
    44
    55type
    6   TGList<TGListIndex, TGListItem> = class
    7   private
    8     FItems: array of TGListItem;
    9     FCount: TGListIndex;
    10     function Get(Index: TGListIndex): TGListItem;
    11     function GetCapacity: TGListIndex;
    12     function GetLast: TGListItem;
    13     function GetFirst: TGListItem;
    14     procedure SetCapacity(const AValue: TGListIndex);
    15     procedure SetLast(AValue: TGListItem);
    16     procedure SetFirst(AValue: TGListItem);
    17     procedure Put(Index: TGListIndex; const AValue: TGListItem); virtual;
    18     procedure SetCount(const AValue: TGListIndex);
    19     procedure QuickSort(L, R : TGListIndex; Compare: TGListSortCompare);
     6  TList<TItem, TIndex = NativeInt> = class
    207  public
    218    type
    22       TGListSortCompare = function(const Item1, Item2: TGListItem): Integer of object;
    23       TGListStringConverter = function(Item: TGListItem): string;
    24     function Add(Item: TGListItem): TGListIndex;
    25     procedure AddArray(Values: array of TGListItem);
    26     procedure AddList(List: TGList);
    27     procedure Assign(List: TGList);
     9      TSortCompare = function(const Item1, Item2: TItem): Integer of object;
     10      TStringConverter = function(Item: TItem): string;
     11  private
     12    FItems: array of TItem;
     13    FCount: TIndex;
     14    function Get(Index: TIndex): TItem;
     15    function GetCapacity: TIndex;
     16    function GetLast: TItem;
     17    function GetFirst: TItem;
     18    procedure SetCapacity(const AValue: TIndex);
     19    procedure SetLast(AValue: TItem);
     20    procedure SetFirst(AValue: TItem);
     21    procedure Put(Index: TIndex; const AValue: TItem); virtual;
     22    procedure SetCount(const AValue: TIndex);
     23    procedure QuickSort(L, R : TIndex; Compare: TSortCompare);
     24  public
     25    function Add(Item: TItem): TIndex;
     26    procedure AddArray(Values: array of TItem);
     27    procedure AddList(List: TList);
     28    procedure Assign(List: TList);
    2829    procedure Clear; virtual;
    2930    procedure Contract;
    30     procedure Delete(Index: TGListIndex); virtual;
    31     procedure DeleteItems(Index, Count: TGListIndex);
    32     function Equals(List: TGList): Boolean;
     31    procedure Delete(Index: TIndex); virtual;
     32    procedure DeleteItems(Index, Count: TIndex);
     33    function Equals(List: TList): Boolean;
    3334    procedure Expand;
    34     function Extract(Item: TGListItem): TGListItem;
    35     procedure Exchange(Index1, Index2: TGListIndex);
    36     property First: TGListItem read GetFirst write SetFirst;
    37     procedure Fill(Start, Count: TGListIndex; Value: TGListItem);
    38     function Implode(Separator: string; Converter: TGListStringConverter): string;
    39     function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex;
    40     function IndexOfList(List: TGList; Start: TGListIndex = 0): TGListIndex;
    41     procedure Insert(Index: TGListIndex; Item: TGListItem);
    42     procedure InsertList(Index: TGListIndex; List: TGList);
    43     procedure InsertArray(Index: TGListIndex; Values: array of TGListItem);
    44     procedure Move(CurIndex, NewIndex: TGListIndex);
    45     procedure MoveItems(CurIndex, NewIndex, Count: TGListIndex);
    46     function Remove(Item: TGListItem): TGListIndex;
     35    function Extract(Item: TItem): TItem;
     36    procedure Exchange(Index1, Index2: TIndex);
     37    property First: TItem read GetFirst write SetFirst;
     38    procedure Fill(Start, Count: TIndex; Value: TItem);
     39    function Implode(Separator: string; Converter: TStringConverter): string;
     40    function IndexOf(Item: TItem; Start: TIndex = 0): TIndex;
     41    function IndexOfList(List: TList; Start: TIndex = 0): TIndex;
     42    procedure Insert(Index: TIndex; Item: TItem);
     43    procedure InsertList(Index: TIndex; List: TList);
     44    procedure InsertArray(Index: TIndex; Values: array of TItem);
     45    procedure Move(CurIndex, NewIndex: TIndex);
     46    procedure MoveItems(CurIndex, NewIndex, Count: TIndex);
     47    function Remove(Item: TItem): TIndex;
    4748    procedure Reverse;
    48     procedure Sort(Compare: TGListSortCompare);
    49     procedure SetArray(Values: array of TGListItem);
    50     property Count: TGListIndex read FCount write SetCount;
    51     property Capacity: TGListIndex read GetCapacity write SetCapacity;
    52     property Items[Index: TGListIndex]: TGListItem read Get write Put; default;
    53     property Last: TGListItem read GetLast write SetLast;
     49    procedure Sort(Compare: TSortCompare);
     50    procedure SetArray(Values: array of TItem);
     51    property Count: TIndex read FCount write SetCount;
     52    property Capacity: TIndex read GetCapacity write SetCapacity;
     53    property Items[Index: TIndex]: TItem read Get write Put; default;
     54    property Last: TItem read GetLast write SetLast;
    5455  end;
    5556 
    5657implementation
    5758
    58 function TGList.GetCapacity: TGListIndex;
     59function TList.GetCapacity: TIndex;
    5960begin
    6061  Result := Length(FItems);
    6162end;
    6263
    63 procedure TGList.SetCapacity(const AValue: TGListIndex);
     64procedure TList.SetCapacity(const AValue: TIndex);
    6465begin
    6566  SetLength(FItems, AValue);
    6667end;
    6768
    68 function TGList.Get(Index: TGListIndex): TGListItem;
     69function TList.Get(Index: TIndex): TItem;
    6970begin
    7071  Result := FItems[Index];
    7172end;
    7273
    73 procedure TGList.Put(Index: TGListIndex; const AValue: TGListItem);
     74procedure TList.Put(Index: TIndex; const AValue: TItem);
    7475begin
    7576  FItems[Index] := AValue;
    7677end;
    7778
    78 procedure TGList.SetCount(const AValue: TGListIndex);
     79procedure TList.SetCount(const AValue: TIndex);
    7980begin
    8081  SetLength(FItems, AValue);
    … …  
    8283end;
    8384
    84 procedure TGList.QuickSort(L, R: TGListIndex; Compare: TGListSortCompare);
    85 var
    86   I, J: TGListIndex;
    87   P, Q: TGListItem;
     85procedure TList.QuickSort(L, R: TIndex; Compare: TSortCompare);
     86var
     87  I, J: TIndex;
     88  P, Q: TItem;
    8889begin
    8990 repeat
    … …  
    111112end;
    112113
    113 procedure TGList.Assign(List: TGList);
     114procedure TList.Assign(List: TList);
    114115var
    115116  I: Integer;
    … …  
    123124end;
    124125
    125 procedure TGList.Expand;
    126 var
    127   IncSize: TGListIndex;
     126procedure TList.Expand;
     127var
     128  IncSize: TIndex;
    128129begin
    129130  if FCount = Capacity then begin
    … …  
    136137end;
    137138
    138 procedure TGList.Contract;
     139procedure TList.Contract;
    139140begin
    140141  if (Capacity > 256) and (FCount < Capacity shr 2) then
    … …  
    144145end;
    145146
    146 function TGList.Extract(Item: TGListItem): TGListItem;
    147 var
    148   I: TGListIndex;
     147function TList.Extract(Item: TItem): TItem;
     148var
     149  I: TIndex;
    149150begin
    150151  I := IndexOf(Item);
    … …  
    156157end;
    157158
    158 function TGList.IndexOf(Item: TGListItem; Start: TGListIndex): TGListIndex;
     159function TList.IndexOf(Item: TItem; Start: TIndex): TIndex;
    159160begin
    160161  Result := Start;
    161162  while (Result < FCount) and
    162   not CompareMem(Addr(FItems[Result]), Addr(Item), SizeOf(TGListItem)) do
     163  not CompareMem(Addr(FItems[Result]), Addr(Item), SizeOf(TItem)) do
    163164    Result := Result + 1;
    164165  if Result = FCount then Result := -1;
    165166end;
    166167
    167 procedure TGList.Insert(Index: TGListIndex; Item: TGListItem);
     168procedure TList.Insert(Index: TIndex; Item: TItem);
    168169begin
    169170  if (Index < 0) or (Index > FCount ) then
    … …  
    171172  if FCount = Capacity then Expand;
    172173  if Index < FCount then
    173     System.Move(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TGListItem));
     174    System.Move(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TItem));
    174175  FItems[Index] := Item;
    175176  FCount := FCount + 1;
    176177end;
    177178
    178 procedure TGList.InsertList(Index: TGListIndex; List: TGList);
    179 var
    180   I: TGListIndex;
     179procedure TList.InsertList(Index: TIndex; List: TList);
     180var
     181  I: TIndex;
    181182begin
    182183  I := 0;
    … …  
    187188end;
    188189
    189 function TGList.IndexOfList(List: TGList; Start: TGListIndex): TGListIndex;
    190 var
    191   I: TGListIndex;
     190function TList.IndexOfList(List: TList; Start: TIndex): TIndex;
     191var
     192  I: TIndex;
    192193begin
    193194  if List.Count > 0 then begin
    … …  
    196197      I := 1;
    197198      while I < List.Count do begin
    198         if not CompareMem(Addr(FItems[Result + I]), Addr(List.FItems[I]), SizeOf(TGListItem)) then begin
     199        if not CompareMem(Addr(FItems[Result + I]), Addr(List.FItems[I]), SizeOf(TItem)) then begin
    199200          Result := -1;
    200201          Break;
    … …  
    206207end;
    207208
    208 function TGList.GetLast: TGListItem;
     209function TList.GetLast: TItem;
    209210begin
    210211  if FCount = 0 then
    … …  
    214215end;
    215216
    216 procedure TGList.SetLast(AValue: TGListItem);
     217procedure TList.SetLast(AValue: TItem);
    217218begin
    218219  if FCount = 0 then
    … …  
    222223end;
    223224
    224 function TGList.GetFirst: TGListItem;
     225function TList.GetFirst: TItem;
    225226begin
    226227  if FCount = 0 then
    … …  
    230231end;
    231232
    232 procedure TGList.SetFirst(AValue: TGListItem);
     233procedure TList.SetFirst(AValue: TItem);
    233234begin
    234235  if FCount = 0 then
    … …  
    238239end;
    239240
    240 procedure TGList.Move(CurIndex, NewIndex: TGListIndex);
    241 var
    242   Temp: TGListItem;
     241procedure TList.Move(CurIndex, NewIndex: TIndex);
     242var
     243  Temp: TItem;
    243244begin
    244245  if ((CurIndex < 0) or (CurIndex > Count - 1)) then
    … …  
    248249  Temp := FItems[CurIndex];
    249250  if NewIndex > CurIndex then begin
    250     System.Move(FItems[CurIndex + 1], FItems[CurIndex], (NewIndex - CurIndex) * SizeOf(TGListItem));
     251    System.Move(FItems[CurIndex + 1], FItems[CurIndex], (NewIndex - CurIndex) * SizeOf(TItem));
    251252  end else
    252253  if NewIndex < CurIndex then begin
    253     System.Move(FItems[NewIndex], FItems[NewIndex + 1], (CurIndex - NewIndex) * SizeOf(TGListItem));
     254    System.Move(FItems[NewIndex], FItems[NewIndex + 1], (CurIndex - NewIndex) * SizeOf(TItem));
    254255  end;
    255256  FItems[NewIndex] := Temp;
    … …  
    258259end;
    259260
    260 procedure TGList.MoveItems(CurIndex, NewIndex, Count: TGListIndex);
     261procedure TList.MoveItems(CurIndex, NewIndex, Count: TIndex);
    261262var
    262263  S: Integer;
    … …  
    283284end;
    284285
    285 function TGList.Remove(Item: TGListItem): TGListIndex;
     286function TList.Remove(Item: TItem): TIndex;
    286287begin
    287288  Result := IndexOf(Item);
    … …  
    290291end;
    291292
    292 function TGList.Equals(List: TGList): Boolean;
    293 var
    294   I: TGListIndex;
     293function TList.Equals(List: TList): Boolean;
     294var
     295  I: TIndex;
    295296begin
    296297  Result := Count = List.Count;
    … …  
    298299    I := 0;
    299300    while I < Count do begin
    300       if not CompareMem(Addr(FItems[I]), Addr(List.FItems[I]), SizeOf(TGListItem)) then begin
     301      if not CompareMem(Addr(FItems[I]), Addr(List.FItems[I]), SizeOf(TItem)) then begin
    301302        Result := False;
    302303        Break;
    … …  
    307308end;
    308309
    309 procedure TGList.Reverse;
    310 var
    311   I: TGListIndex;
     310procedure TList.Reverse;
     311var
     312  I: TIndex;
    312313begin
    313314  I := 0;
    … …  
    318319end;
    319320
    320 procedure TGList.Sort(Compare: TGListSortCompare);
     321procedure TList.Sort(Compare: TSortCompare);
    321322begin
    322323  if FCount > 1 then
    … …  
    324325end;
    325326
    326 procedure TGList.AddArray(Values: array of TGListItem);
    327 var
    328   I: TGListIndex;
     327procedure TList.AddArray(Values: array of TItem);
     328var
     329  I: TIndex;
    329330begin
    330331  I := 0;
    … …  
    335336end;
    336337
    337 procedure TGList.SetArray(Values: array of TGListItem);
    338 var
    339   I: TGListIndex;
     338procedure TList.SetArray(Values: array of TItem);
     339var
     340  I: TIndex;
    340341begin
    341342  Clear;
    … …  
    347348end;
    348349
    349 procedure TGList.InsertArray(Index: TGListIndex; Values: array of TGListItem);
    350 var
    351   I: TGListIndex;
     350procedure TList.InsertArray(Index: TIndex; Values: array of TItem);
     351var
     352  I: TIndex;
    352353begin
    353354  I := 0;
    … …  
    358359end;
    359360
    360 function TGList.Implode(Separator: string; Converter: TGListStringConverter): string;
    361 var
    362   I: TGListIndex;
     361function TList.Implode(Separator: string; Converter: TStringConverter): string;
     362var
     363  I: TIndex;
    363364begin
    364365  Result := '';
    … …  
    372373end;
    373374
    374 function TGList.Add(Item: TGListItem): TGListIndex;
     375function TList.Add(Item: TItem): TIndex;
    375376begin
    376377  if FCount = Capacity then
    … …  
    381382end;
    382383
    383 procedure TGList.AddList(List: TGList);
    384 var
    385   I: TGListIndex;
     384procedure TList.AddList(List: TList);
     385var
     386  I: TIndex;
    386387begin
    387388  I := 0;
    … …  
    392393end;
    393394
    394 procedure TGList.Clear;
     395procedure TList.Clear;
    395396begin
    396397  Count := 0;
    … …  
    398399end;
    399400
    400 procedure TGList.Delete(Index: TGListIndex);
     401procedure TList.Delete(Index: TIndex);
    401402begin
    402403  if (Index < 0) or (Index >= FCount) then
    403404    raise EListError.CreateFmt(SListIndexError, [Index]);
    404405  FCount := FCount - 1;
    405   System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TGListItem));
     406  System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TItem));
    406407  Contract;
    407408end;
    408409
    409 procedure TGList.DeleteItems(Index, Count: TGListIndex);
    410 var
    411   I: TGListIndex;
     410procedure TList.DeleteItems(Index, Count: TIndex);
     411var
     412  I: TIndex;
    412413begin
    413414  I := Index;
    … …  
    418419end;
    419420
    420 procedure TGList.Fill(Start, Count: TGListIndex; Value: TGListItem);
     421procedure TList.Fill(Start, Count: TIndex; Value: TItem);
    421422begin
    422423  while Count > 0 do begin
    … …  
    427428end;
    428429
    429 procedure TGList.Exchange(Index1, Index2: TGListIndex);
    430 var
    431   Temp: TGListItem;
     430procedure TList.Exchange(Index1, Index2: TIndex);
     431var
     432  Temp: TItem;
    432433begin
    433434  if ((Index1 >= FCount) or (Index1 < 0)) then

  • trunk/IDE/Forms/UCompiledForm.lfm

    r34 r39  
    532532        Command = emcStartDragMove
    533533      end>
    534     Lines.Strings = (
    535       'SynEdit1'
    536     )
    537534    VisibleSpecialChars = [vscSpace, vscTabAtLast]
     535    ReadOnly = True
    538536    BracketHighlightStyle = sbhsBoth
     537    BracketMatchColor.Background = clNone
     538    BracketMatchColor.Foreground = clNone
     539    BracketMatchColor.Style = [fsBold]
     540    FoldedCodeColor.Background = clNone
     541    FoldedCodeColor.Foreground = clGray
     542    FoldedCodeColor.FrameColor = clGray
     543    MouseLinkColor.Background = clNone
     544    MouseLinkColor.Foreground = clBlue
     545    LineHighlightColor.Background = clNone
     546    LineHighlightColor.Foreground = clNone
    539547    inline SynLeftGutterPartList1: TSynGutterPartList
    540548      object SynGutterMarks1: TSynGutterMarks

  • trunk/IDE/Forms/UMainForm.lfm

    r38 r39  
    2525    ResizeAnchor = akBottom
    2626  end
    27   object DockPanel: TPanel
    28     Left = 0
    29     Height = 339
    30     Top = 26
    31     Width = 490
    32     Align = alClient
    33     BevelOuter = bvNone
    34     TabOrder = 1
    35   end
    3627  object ToolBar1: TToolBar
    3728    Left = 0
    … …  
    4233    ParentShowHint = False
    4334    ShowHint = True
    44     TabOrder = 2
     35    TabOrder = 1
    4536    object ToolButton1: TToolButton
    4637      Left = 1
    … …  
    9889    Top = 26
    9990    Width = 200
    100     ActivePage = TabSheet2
     91    ActivePage = TabSheetProject
    10192    Align = alRight
    102     TabIndex = 1
    103     TabOrder = 4
     93    TabIndex = 0
     94    TabOrder = 3
    10495    TabPosition = tpRight
    105     object TabSheet1: TTabSheet
     96    object TabSheetProject: TTabSheet
    10697      Caption = 'Project'
    10798    end
    108     object TabSheet2: TTabSheet
     99    object TabSheetCodeTree: TTabSheet
    109100      Caption = 'Code Tree'
     101    end
     102    object TabSheetCompiledProject: TTabSheet
     103      Caption = 'Target project'
    110104    end
    111105  end
    … …  
    115109    Top = 370
    116110    Width = 695
    117     ActivePage = TabSheet4
     111    ActivePage = TabSheetMessages
    118112    Align = alBottom
    119     TabIndex = 1
    120     TabOrder = 5
     113    TabIndex = 0
     114    TabOrder = 4
    121115    TabPosition = tpBottom
    122     object TabSheet3: TTabSheet
     116    object TabSheetMessages: TTabSheet
    123117      Caption = 'Messages'
    124118    end
    125     object TabSheet4: TTabSheet
    126       Caption = 'Compiled source'
     119    object TabSheetBreakpoints: TTabSheet
     120      Caption = 'Breakpoints'
    127121    end
    128122  end
    … …  
    135129    Align = alBottom
    136130    ResizeAnchor = akBottom
     131  end
     132  object PageControlMain: TPageControl
     133    Left = 0
     134    Height = 339
     135    Top = 26
     136    Width = 490
     137    ActivePage = TabSheetSource
     138    Align = alClient
     139    TabIndex = 0
     140    TabOrder = 6
     141    object TabSheetSource: TTabSheet
     142      Caption = 'Source code'
     143    end
     144    object TabSheetTarget: TTabSheet
     145      Caption = 'Target code'
     146    end
    137147  end
    138148  object MainMenu1: TMainMenu

  • trunk/IDE/Forms/UMainForm.lrt

    r38 r39  
    11TMAINFORM.CAPTION=Transpascal IDE
    2 TMAINFORM.TABSHEET1.CAPTION=Project
    3 TMAINFORM.TABSHEET2.CAPTION=Code Tree
    4 TMAINFORM.TABSHEET3.CAPTION=Messages
    5 TMAINFORM.TABSHEET4.CAPTION=Compiled source
     2TMAINFORM.TABSHEETPROJECT.CAPTION=Project
     3TMAINFORM.TABSHEETCODETREE.CAPTION=Code Tree
     4TMAINFORM.TABSHEETCOMPILEDPROJECT.CAPTION=Target project
     5TMAINFORM.TABSHEETMESSAGES.CAPTION=Messages
     6TMAINFORM.TABSHEETBREAKPOINTS.CAPTION=Breakpoints
     7TMAINFORM.TABSHEETSOURCE.CAPTION=Source code
     8TMAINFORM.TABSHEETTARGET.CAPTION=Target code
    69TMAINFORM.MENUITEM1.CAPTION=Project
    710TMAINFORM.MENUITEMOPENRECENT.CAPTION=Open recent

  • trunk/IDE/Forms/UMainForm.pas

    r38 r39  
    7676    MenuItem7: TMenuItem;
    7777    MenuItem8: TMenuItem;
    78     DockPanel: TPanel;
    7978    MenuItem9: TMenuItem;
    8079    MenuItemOpenRecent: TMenuItem;
    8180    OpenDialog1: TOpenDialog;
     81    PageControlMain: TPageControl;
    8282    PageControlRight: TPageControl;
    8383    PageControlBottom: TPageControl;
    … …  
    8686    Splitter2: TSplitter;
    8787    Splitter3: TSplitter;
    88     TabSheet1: TTabSheet;
    89     TabSheet2: TTabSheet;
    90     TabSheet3: TTabSheet;
    91     TabSheet4: TTabSheet;
     88    TabSheetProject: TTabSheet;
     89    TabSheetCodeTree: TTabSheet;
     90    TabSheetMessages: TTabSheet;
     91    TabSheetBreakpoints: TTabSheet;
     92    TabSheetCompiledProject: TTabSheet;
     93    TabSheetSource: TTabSheet;
     94    TabSheetTarget: TTabSheet;
    9295    ToolBar1: TToolBar;
    9396    ToolButton1: TToolButton;
    … …  
    171174      with TProducer(Producers[I]) do begin
    172175        OpenKey(Key + '\Producers\' + Name, True);
    173         CompilerPAth := ReadStringWithDefault('CompilerPath', CompilerPath);
     176        if ValueExists('CompilerPath') then
     177          CompilerPath := ReadStringWithDefault('CompilerPath', CompilerPath);
    174178      end;
    175179    finally
    … …  
    188192      with TProducer(Producers[I]) do begin
    189193        OpenKey(Key + '\Producers\' + Name, True);
    190         WriteString('CompilerPath', CompilerPath);
     194        if CompilerPath <> '' then WriteString('CompilerPath', CompilerPath)
     195          else DeleteValue('CompilerPath');
    191196      end;
    192197    finally
    … …  
    300305  Container2: TCDConjoinForm;
    301306begin
    302   CodeForm.ManualDock(DockPanel, nil, alClient);
     307  CodeForm.ManualDock(TabSheetSource, nil, alClient);
    303308  CodeForm.Align := alClient;
    304309  CodeForm.Show;
    305   MessagesForm.ManualDock(TabSheet3, nil, alClient);
     310  MessagesForm.ManualDock(TabSheetMessages, nil, alClient);
    306311  MessagesForm.Align := alClient;
    307312  MessagesForm.Show;
    308   ProjectManager.ManualDock(TabSheet1, nil, alClient);
     313  ProjectManager.ManualDock(TabSheetProject, nil, alClient);
    309314  ProjectManager.Align := alClient;
    310315  ProjectManager.Show;
    311   CodeTreeForm.ManualDock(TabSheet2, nil, alClient);
     316  CodeTreeForm.ManualDock(TabSheetCodeTree, nil, alClient);
    312317  CodeTreeForm.Align := alClient;
    313318  CodeTreeForm.Show;
    314   CompiledForm.ManualDock(TabSheet4, nil, alClient);
     319  CompiledForm.ManualDock(TabSheetTarget, nil, alClient);
    315320  CompiledForm.Align := alClient;
    316321  CompiledForm.Show;
    317322  PageControlRight.TabIndex := 0;
    318323  PageControlBottom.TabIndex := 0;
     324  PageControlMain.TabIndex := 0;
    319325
    320326  (*ProjectManager.ManualDock(DockPanel, nil, alLeft);
    … …  
    366372        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
    367373        else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
     374      PageControlRight.Width := ReadIntegerWithDefault('RightPanelWidth', 120);
     375      PageControlBottom.Height := ReadIntegerWithDefault('BottomPanelHeight', 100);
    368376    finally
    369377      Free;
    … …  
    386394        WriteString('LanguageCode', CoolTranslator1.Language.Code)
    387395        else DeleteValue('LanguageCode');
     396      WriteInteger('RightPanelWidth', PageControlRight.Width);
     397      WriteInteger('BottomPanelHeight', PageControlBottom.Height);
    388398    finally
    389399      Free;

  • trunk/IDE/Languages/Transpascal.cs.po

    r37 r39  
    1919
    2020#: tcodeform.caption
     21msgctxt "tcodeform.caption"
    2122msgid "Source code"
    2223msgstr "Zdrojový kód"
    … …  
    240241msgstr "Tvůrce"
    241242
    242 #: tmainform.tabsheet1.caption
    243 msgctxt "tmainform.tabsheet1.caption"
     243#: tmainform.tabsheetbreakpoints.caption
     244msgid "Breakpoints"
     245msgstr ""
     246
     247#: tmainform.tabsheetcodetree.caption
     248msgctxt "tmainform.tabsheetcodetree.caption"
     249msgid "Code Tree"
     250msgstr "Strom kódu"
     251
     252#: tmainform.tabsheetcompiledproject.caption
     253msgid "Target project"
     254msgstr ""
     255
     256#: tmainform.tabsheetmessages.caption
     257msgctxt "tmainform.tabsheetmessages.caption"
     258msgid "Messages"
     259msgstr "Zprávy"
     260
     261#: tmainform.tabsheetproject.caption
     262msgctxt "tmainform.tabsheetproject.caption"
    244263msgid "Project"
    245264msgstr "Projekt"
    246265
    247 #: tmainform.tabsheet2.caption
    248 msgid "Code Tree"
    249 msgstr "Strom kódu"
    250 
    251 #: tmainform.tabsheet3.caption
    252 msgctxt "tmainform.tabsheet3.caption"
    253 msgid "Messages"
    254 msgstr "Zprávy"
    255 
    256 #: tmainform.tabsheet4.caption
    257 msgctxt "tmainform.tabsheet4.caption"
    258 msgid "Compiled source"
    259 msgstr "Přeložený zdroj"
     266#: tmainform.tabsheetsource.caption
     267msgctxt "tmainform.tabsheetsource.caption"
     268msgid "Source code"
     269msgstr "Zdrojový kód"
     270
     271#: tmainform.tabsheettarget.caption
     272msgid "Target code"
     273msgstr ""
    260274
    261275#: tmessagesform.caption

  • trunk/IDE/Languages/Transpascal.po

    r38 r39  
    1111
    1212#: tcodeform.caption
     13msgctxt "tcodeform.caption"
    1314msgid "Source code"
    1415msgstr ""
    … …  
    232233msgstr ""
    233234
    234 #: tmainform.tabsheet1.caption
    235 msgctxt "tmainform.tabsheet1.caption"
     235#: tmainform.tabsheetbreakpoints.caption
     236msgid "Breakpoints"
     237msgstr ""
     238
     239#: tmainform.tabsheetcodetree.caption
     240msgctxt "TMAINFORM.TABSHEETCODETREE.CAPTION"
     241msgid "Code Tree"
     242msgstr ""
     243
     244#: tmainform.tabsheetcompiledproject.caption
     245msgid "Target project"
     246msgstr ""
     247
     248#: tmainform.tabsheetmessages.caption
     249msgctxt "TMAINFORM.TABSHEETMESSAGES.CAPTION"
     250msgid "Messages"
     251msgstr ""
     252
     253#: tmainform.tabsheetproject.caption
     254msgctxt "TMAINFORM.TABSHEETPROJECT.CAPTION"
    236255msgid "Project"
    237256msgstr ""
    238257
    239 #: tmainform.tabsheet2.caption
    240 msgid "Code Tree"
    241 msgstr ""
    242 
    243 #: tmainform.tabsheet3.caption
    244 msgctxt "TMAINFORM.TABSHEET3.CAPTION"
    245 msgid "Messages"
    246 msgstr ""
    247 
    248 #: tmainform.tabsheet4.caption
    249 msgctxt "tmainform.tabsheet4.caption"
    250 msgid "Compiled source"
     258#: tmainform.tabsheetsource.caption
     259msgctxt "TMAINFORM.TABSHEETSOURCE.CAPTION"
     260msgid "Source code"
     261msgstr ""
     262
     263#: tmainform.tabsheettarget.caption
     264msgid "Target code"
    251265msgstr ""
    252266

  • trunk/IDE/UProject.pas

    r38 r39  
    242242begin
    243243  if Assigned(Parent) then Result := Parent.GetDir(IncludeRoot) + Name + DirectorySeparator
    244   else Result := Name + DirectorySeparator;
     244    else Result := Name + DirectorySeparator;
    245245end;
    246246
Note: See TracChangeset for help on using the changeset viewer.