Changeset 243


Ignore:
Timestamp:
May 13, 2011, 9:34:51 AM (14 years ago)
Author:
george
Message:
  • Fixed: CoolDocking demo compilation for latest package version.
Location:
Docking/CoolDocking/Demo/Testing
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Docking/CoolDocking/Demo/Testing/Demo.lpi

    r178 r243  
    3030      </local>
    3131    </RunParams>
    32     <RequiredPackages Count="3">
     32    <RequiredPackages Count="2">
    3333      <Item1>
    34         <PackageName Value="LCLBase"/>
    35         <MinVersion Major="1" Release="1" Valid="True"/>
     34        <PackageName Value="CoolDocking"/>
    3635      </Item1>
    3736      <Item2>
    38         <PackageName Value="CoolDocking"/>
     37        <PackageName Value="LCL"/>
    3938      </Item2>
    40       <Item3>
    41         <PackageName Value="LCL"/>
    42       </Item3>
    4339    </RequiredPackages>
    44     <Units Count="82">
     40    <Units Count="85">
    4541      <Unit0>
    4642        <Filename Value="Demo.lpr"/>
    … …  
    5955        <ResourceBaseClass Value="Form"/>
    6056        <UnitName Value="UMainForm"/>
    61         <IsVisibleTab Value="True"/>
    62         <EditorIndex Value="5"/>
    63         <WindowIndex Value="0"/>
    64         <TopLine Value="19"/>
    65         <CursorPos X="22" Y="28"/>
     57        <EditorIndex Value="3"/>
     58        <WindowIndex Value="0"/>
     59        <TopLine Value="69"/>
     60        <CursorPos X="44" Y="84"/>
    6661        <UsageCount Value="201"/>
    6762        <Loaded Value="True"/>
    68         <LoadedDesigner Value="True"/>
    6963        <DefaultSyntaxHighlighter Value="Delphi"/>
    7064      </Unit1>
    … …  
    135129        <ResourceBaseClass Value="Form"/>
    136130        <UnitName Value="UDockForm"/>
    137         <EditorIndex Value="4"/>
    138         <WindowIndex Value="0"/>
    139         <TopLine Value="2"/>
    140         <CursorPos X="23" Y="15"/>
     131        <EditorIndex Value="0"/>
     132        <WindowIndex Value="0"/>
     133        <TopLine Value="1"/>
     134        <CursorPos X="12" Y="9"/>
    141135        <UsageCount Value="200"/>
    142136        <Loaded Value="True"/>
    … …  
    338332        <ResourceBaseClass Value="Form"/>
    339333        <UnitName Value="SampleDockableForm"/>
     334        <IsVisibleTab Value="True"/>
     335        <EditorIndex Value="2"/>
    340336        <WindowIndex Value="0"/>
    341337        <TopLine Value="1"/>
    342         <CursorPos X="34" Y="12"/>
     338        <CursorPos X="22" Y="9"/>
    343339        <UsageCount Value="147"/>
     340        <Loaded Value="True"/>
    344341        <DefaultSyntaxHighlighter Value="Delphi"/>
    345342      </Unit31>
    … …  
    447444        <ResourceBaseClass Value="Form"/>
    448445        <UnitName Value="UComponentTree"/>
    449         <WindowIndex Value="0"/>
    450         <TopLine Value="35"/>
     446        <EditorIndex Value="1"/>
     447        <WindowIndex Value="0"/>
     448        <TopLine Value="1"/>
    451449        <CursorPos X="44" Y="45"/>
    452450        <UsageCount Value="99"/>
     451        <Loaded Value="True"/>
    453452        <DefaultSyntaxHighlighter Value="Delphi"/>
    454453      </Unit44>
    … …  
    617616        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\comctrls.pp"/>
    618617        <UnitName Value="ComCtrls"/>
    619         <EditorIndex Value="0"/>
    620618        <WindowIndex Value="0"/>
    621619        <TopLine Value="289"/>
    622620        <CursorPos X="45" Y="297"/>
    623621        <UsageCount Value="11"/>
    624         <Loaded Value="True"/>
    625622      </Unit64>
    626623      <Unit65>
    … …  
    722719        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\extctrls.pp"/>
    723720        <UnitName Value="ExtCtrls"/>
    724         <EditorIndex Value="2"/>
    725721        <WindowIndex Value="0"/>
    726722        <TopLine Value="214"/>
    727723        <CursorPos X="14" Y="227"/>
    728724        <UsageCount Value="11"/>
    729         <Loaded Value="True"/>
    730725      </Unit78>
    731726      <Unit79>
    … …  
    738733      <Unit80>
    739734        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\include\customnotebook.inc"/>
    740         <EditorIndex Value="3"/>
    741735        <WindowIndex Value="0"/>
    742736        <TopLine Value="707"/>
    743737        <CursorPos X="57" Y="710"/>
    744738        <UsageCount Value="11"/>
    745         <Loaded Value="True"/>
    746739      </Unit80>
    747740      <Unit81>
    748741        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\include\pagecontrol.inc"/>
    749         <EditorIndex Value="1"/>
    750742        <WindowIndex Value="0"/>
    751743        <TopLine Value="46"/>
    752744        <CursorPos X="21" Y="48"/>
    753745        <UsageCount Value="10"/>
     746      </Unit81>
     747      <Unit82>
     748        <Filename Value="..\..\UCDConjoinForm.pas"/>
     749        <UnitName Value="UCDConjoinForm"/>
     750        <EditorIndex Value="5"/>
     751        <WindowIndex Value="0"/>
     752        <TopLine Value="1"/>
     753        <CursorPos X="36" Y="13"/>
     754        <UsageCount Value="10"/>
    754755        <Loaded Value="True"/>
    755       </Unit81>
     756      </Unit82>
     757      <Unit83>
     758        <Filename Value="..\..\UCDCommon.pas"/>
     759        <UnitName Value="UCDCommon"/>
     760        <EditorIndex Value="6"/>
     761        <WindowIndex Value="0"/>
     762        <TopLine Value="1"/>
     763        <CursorPos X="3" Y="11"/>
     764        <UsageCount Value="10"/>
     765        <Loaded Value="True"/>
     766      </Unit83>
     767      <Unit84>
     768        <Filename Value="..\..\UCDManager.pas"/>
     769        <UnitName Value="UCDManager"/>
     770        <EditorIndex Value="4"/>
     771        <WindowIndex Value="0"/>
     772        <TopLine Value="1"/>
     773        <CursorPos X="34" Y="1"/>
     774        <UsageCount Value="10"/>
     775        <Loaded Value="True"/>
     776      </Unit84>
    756777    </Units>
    757     <JumpHistory Count="3" HistoryIndex="2">
     778    <JumpHistory Count="19" HistoryIndex="18">
    758779      <Position1>
    759         <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\comctrls.pp"/>
    760         <Caret Line="329" Column="57" TopLine="316"/>
     780        <Filename Value="UMainForm.pas"/>
     781        <Caret Line="28" Column="22" TopLine="1"/>
    761782      </Position1>
    762783      <Position2>
    763         <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\comctrls.pp"/>
    764         <Caret Line="331" Column="22" TopLine="316"/>
     784        <Filename Value="UMainForm.pas"/>
     785        <Caret Line="9" Column="54" TopLine="1"/>
    765786      </Position2>
    766787      <Position3>
    767         <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\comctrls.pp"/>
    768         <Caret Line="298" Column="59" TopLine="289"/>
     788        <Filename Value="UDockForm.pas"/>
     789        <Caret Line="16" Column="24" TopLine="2"/>
    769790      </Position3>
     791      <Position4>
     792        <Filename Value="UMainForm.pas"/>
     793        <Caret Line="9" Column="74" TopLine="6"/>
     794      </Position4>
     795      <Position5>
     796        <Filename Value="UMainForm.pas"/>
     797        <Caret Line="10" Column="43" TopLine="1"/>
     798      </Position5>
     799      <Position6>
     800        <Filename Value="UMainForm.pas"/>
     801        <Caret Line="72" Column="26" TopLine="58"/>
     802      </Position6>
     803      <Position7>
     804        <Filename Value="UMainForm.pas"/>
     805        <Caret Line="121" Column="32" TopLine="108"/>
     806      </Position7>
     807      <Position8>
     808        <Filename Value="UMainForm.pas"/>
     809        <Caret Line="10" Column="59" TopLine="1"/>
     810      </Position8>
     811      <Position9>
     812        <Filename Value="UMainForm.pas"/>
     813        <Caret Line="76" Column="27" TopLine="63"/>
     814      </Position9>
     815      <Position10>
     816        <Filename Value="UMainForm.pas"/>
     817        <Caret Line="10" Column="71" TopLine="1"/>
     818      </Position10>
     819      <Position11>
     820        <Filename Value="UMainForm.pas"/>
     821        <Caret Line="76" Column="73" TopLine="63"/>
     822      </Position11>
     823      <Position12>
     824        <Filename Value="UMainForm.pas"/>
     825        <Caret Line="80" Column="30" TopLine="67"/>
     826      </Position12>
     827      <Position13>
     828        <Filename Value="UMainForm.pas"/>
     829        <Caret Line="71" Column="28" TopLine="58"/>
     830      </Position13>
     831      <Position14>
     832        <Filename Value="..\..\UCDConjoinForm.pas"/>
     833        <Caret Line="13" Column="36" TopLine="1"/>
     834      </Position14>
     835      <Position15>
     836        <Filename Value="UMainForm.pas"/>
     837        <Caret Line="71" Column="28" TopLine="58"/>
     838      </Position15>
     839      <Position16>
     840        <Filename Value="UMainForm.pas"/>
     841        <Caret Line="80" Column="53" TopLine="67"/>
     842      </Position16>
     843      <Position17>
     844        <Filename Value="..\..\UCDManager.pas"/>
     845        <Caret Line="140" Column="34" TopLine="127"/>
     846      </Position17>
     847      <Position18>
     848        <Filename Value="UMainForm.pas"/>
     849        <Caret Line="11" Column="12" TopLine="1"/>
     850      </Position18>
     851      <Position19>
     852        <Filename Value="SampleDockableForm.pas"/>
     853        <Caret Line="16" Column="24" TopLine="1"/>
     854      </Position19>
    770855    </JumpHistory>
    771856  </ProjectOptions>
    772857  <CompilerOptions>
    773     <Version Value="10"/>
     858    <Version Value="9"/>
    774859    <PathDelim Value="\"/>
    775860    <Target>

  • Docking/CoolDocking/Demo/Testing/SampleDockableForm.lfm

    r177 r243  
    2222    TabOrder = 0
    2323  end
    24   object CoolDockClient1: TCoolDockClient
     24  object CoolDockClient1: TCDClient
    2525    Floatable = False
    2626    Master = MainForm.CoolDockMaster1

  • Docking/CoolDocking/Demo/Testing/SampleDockableForm.pas

    r177 r243  
    77uses
    88  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
    9   StdCtrls, UCoolDocking;
     9  StdCtrls, UCDClient;
    1010
    1111type
    … …  
    1414
    1515  TDockableForm = class(TForm)
    16     CoolDockClient1: TCoolDockClient;
     16    CoolDockClient1: TCDClient;
    1717    ImageList1: TImageList;
    1818    Memo1: TMemo;

  • Docking/CoolDocking/Demo/Testing/UDockForm.lfm

    r177 r243  
    1717    TabOrder = 0
    1818  end
    19   object CoolDockClient1: TCoolDockClient
     19  object CoolDockClient1: TCDClient
    2020    Floatable = False
    2121    Master = MainForm.CoolDockMaster1

  • Docking/CoolDocking/Demo/Testing/UDockForm.pas

    r177 r243  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   UCoolDocking;
     9  UCDClient;
    1010
    1111type
    … …  
    1414
    1515  TDockForm = class(TForm)
    16     CoolDockClient1: TCoolDockClient;
     16    CoolDockClient1: TCDClient;
    1717    Memo1: TMemo;
    1818    procedure FormDestroy(Sender: TObject);

  • Docking/CoolDocking/Demo/Testing/UMainForm.lfm

    r177 r243  
    8585    TabOrder = 2
    8686  end
    87   object CoolDockMaster1: TCoolDockMaster
     87  object CoolDockMaster1: TCDMaster
    8888    TabsEnabled = False
    8989    DefaultTabsPos = hpAuto
    … …  
    9494    left = 384
    9595  end
    96   object CoolDockCustomize1: TCoolDockCustomize
     96  object CoolDockCustomize1: TCDCustomize
    9797    Master = CoolDockMaster1
    9898    left = 472
    9999  end
    100   object CoolDockWindowList1: TCoolDockWindowList
     100  object CoolDockWindowList1: TCDWindowList
    101101    left = 472
    102102    top = 64
    … …  
    119119    end
    120120  end
    121   object CoolDockClient1: TCoolDockClient
     121  object CoolDockClient1: TCDClient
    122122    Dockable = False
    123123    Floatable = False

  • Docking/CoolDocking/Demo/Testing/UMainForm.pas

    r177 r243  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   ComCtrls, ExtCtrls, Buttons, Menus, UCoolDocking, UCoolDockCustomize,
    10   UDockForm, UComponentTree;
     9  ComCtrls, ExtCtrls, Buttons, Menus, UCDMaster, UCDCustomize, UCDClient,
     10  UDockForm, UComponentTree, UCDWindowList, UCDConjoinForm, UCDManager,
     11  UCDCommon;
    1112
    1213type
    … …  
    1718    Button1: TButton;
    1819    Button2: TButton;
    19     CoolDockClient1: TCoolDockClient;
    20     CoolDockCustomize1: TCoolDockCustomize;
    21     CoolDockMaster1: TCoolDockMaster;
    22     CoolDockWindowList1: TCoolDockWindowList;
     20    CoolDockClient1: TCDClient;
     21    CoolDockCustomize1: TCDCustomize;
     22    CoolDockMaster1: TCDMaster;
     23    CoolDockWindowList1: TCDWindowList;
    2324    MainMenu1: TMainMenu;
    2425    MenuItem1: TMenuItem;
    … …  
    6970procedure TMainForm.FormShow(Sender: TObject);
    7071var
    71   ConjoinedDockForm1: TCoolDockConjoinForm;
    72   ConjoinedDockForm2: TCoolDockConjoinForm;
     72  ConjoinedDockForm1: TCDConjoinForm;
     73  ConjoinedDockForm2: TCDConjoinForm;
    7374begin
    7475  NewDockForm.ManualDock(Panel1);
    7576  NewDockForm.ManualDock(Panel1);
    76   ConjoinedDockForm1 := TCoolDockManager(Panel1.DockManager).CreateContainer(alRight);
     77  ConjoinedDockForm1 := TCDManager(Panel1.DockManager).CreateConjoinForm;
    7778  ConjoinedDockForm1.Name := 'Model';;
    7879  //TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).TabsPos := hpLeft;
    7980  ConjoinedDockForm1.ManualDock(Panel1);
    80   TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).DockStyle := dsTabs;
    81   NewDockForm.ManualDock(ConjoinedDockForm1.Panel);
    82   NewDockForm.ManualDock(ConjoinedDockForm1.Panel);
    83   NewDockForm.ManualDock(ConjoinedDockForm1.Panel);
     81  TCDManager(ConjoinedDockForm1.DockManager).DockStyle := dsTabs;
     82  NewDockForm.ManualDock(ConjoinedDockForm1);
     83  NewDockForm.ManualDock(ConjoinedDockForm1);
     84  NewDockForm.ManualDock(ConjoinedDockForm1);
    8485  //NewDockForm.ManualDock(TForm(DockForms[0]));
    8586  //NewDockForm.ManualDock(TForm(DockForms[0]));
Note: See TracChangeset for help on using the changeset viewer.