Changeset 181 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Mar 9, 2011, 10:56:47 AM (14 years ago)

Author:

george

Message:

• Added: Store/Restore conjoined dock forms.

File:

• Docking/CoolDocking/UCoolDocking.pas (modified) (16 diffs)

Docking/CoolDocking/UCoolDocking.pas

@@ -13 +13 @@
   DateUtils, UCoolDockStyleTabs, UCoolDockStyleRegions, UCoolDockStylePopupTabs,
   UCoolDockStylePopupRegions, UCoolDockStyle, UCoolDockClientPanel,
-  UCoolDockPopupMenu, UCoolDockLayout;
+  UCoolDockPopupMenu;
 
 const
@@ -22 +22 @@
 
   TCoolDockManager = class;
-  TCoolDockCustomize = class;
   TCoolDockClient = class;
   TCoolDockMaster = class;
@@ -28 +27 @@
   { TCoolDockConjoinForm }
 
-  TCoolDockConjoinForm = class(TForm)
+  TCoolDockConjoinForm = class(TCoolDockConjoinFormBase)
+  public
     Panel: TPanel;
     CoolDockClient: TCoolDockClient;
@@ -36 +36 @@
     destructor Destroy; override;
   private
+    procedure SetName(const NewName: TComponentName); override;
     procedure PanelVisibleChange(Sender: TObject);
   end;
@@ -107 +108 @@
   { TCoolDockMaster }
 
-  TCoolDockMaster = class(TComponent)
+  TCoolDockMaster = class(TCoolDockMasterBase)
   private
-    FCoolDockCustomize: TCoolDockCustomize;
     FDefaultHeaderPos: THeaderPos;
     FDefaultMoveSpeed: Integer;
@@ -117 +117 @@
     FClients: TObjectList;
     function GetClient(Index: Integer): TCoolDockClient;
-    procedure SetCustomize(const AValue: TCoolDockCustomize);
     procedure SetShowIcons(const AValue: Boolean);
     procedure SetTabsEnabled(const AValue: Boolean);
@@ -138 +137 @@
     property DefaultMoveSpeed: Integer read FDefaultMoveSpeed
       write FDefaultMoveSpeed;
-    property Customize: TCoolDockCustomize read FCoolDockCustomize
-      write SetCustomize;
     property ShowIcons: Boolean read FShowIcons
       write SetShowIcons;
@@ -168 +165 @@
   end;
 
-  { TCoolDockCustomize }
-
-  TCoolDockCustomize = class(TComponent)
-  private
-    FLayoutList: TCoolDockLayoutList;
-    FMaster: TCoolDockMaster;
-    Form: TCoolDockCustomizeForm;
-    procedure SetLayoutList(const AValue: TCoolDockLayoutList);
-    procedure SetMaster(const AValue: TCoolDockMaster);
-  public
-    function Execute: Boolean;
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property Master: TCoolDockMaster read FMaster write SetMaster;
-    property LayoutList: TCoolDockLayoutList read FLayoutList write SetLayoutList;
-  end;
 
 procedure Register;
@@ -198 +178 @@
   RegisterComponents('CoolDocking', [TCoolDockClient]);
   RegisterComponents('CoolDocking', [TCoolDockCustomize]);
+end;
+
+function GetUniqueName(BaseName: string): string;
+var
+  I: Integer;
+begin
+  I := 1;
+  while Assigned(FindGlobalComponent(BaseName + IntToStr(I))) do Inc(I);
+  Result := BaseName + IntToStr(I);
 end;
 
@@ -481 +470 @@
 begin
   NewConjoinDockForm := TCoolDockConjoinForm.Create(Application);
+  NewConjoinDockForm.Name := GetUniqueName('ConjoinForm');
   NewConjoinDockForm.Visible := True;
   NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
@@ -566 +556 @@
 constructor TCoolDockConjoinForm.Create(TheOwner: TComponent);
 begin
-  inherited Create(TheOwner);
+  inherited CreateNew(TheOwner);
   Panel := TPanel.Create(Self);
   with Panel do begin
     Parent := Self;
-    Name := Parent.Name + '_Panel';
     Caption := '';
     DockSite := True;
@@ -582 +571 @@
   with CoolDockClient do begin
     Panel := Self.Panel;
-    Name := Owner.Name + '_CoolDockClient';
   end;
   OnShow := FormShow;
@@ -596 +584 @@
 end;
 
+procedure TCoolDockConjoinForm.SetName(const NewName: TComponentName);
+begin
+  inherited SetName(NewName);
+  Panel.Name := Name + '_Panel';
+  Panel.Caption := '';
+  CoolDockClient.Name := Name + '_CoolDockClient';
+end;
+
 procedure TCoolDockConjoinForm.PanelVisibleChange(Sender: TObject);
 begin
@@ -607 +603 @@
   if FTabsEnabled = AValue then Exit;
   FTabsEnabled := AValue;
-end;
-
-procedure TCoolDockMaster.SetCustomize(const AValue: TCoolDockCustomize
-  );
-var
-  OldCustomize: TCoolDockCustomize;
-begin
-  if FCoolDockCustomize = AValue then Exit;
-  OldCustomize := FCoolDockCustomize;
-  FCoolDockCustomize := AValue;
-  if Assigned(AValue) then begin
-    FCoolDockCustomize.Master := Self;
-  end else begin
-    OldCustomize.Master := nil;
-  end;
 end;
 
@@ -773 +754 @@
   end;
 end;
-
-{ TCoolDockCustomize }
-
-procedure TCoolDockCustomize.SetMaster(const AValue: TCoolDockMaster);
-var
-  OldMaster: TCoolDockMaster;
-begin
-  if FMaster = AValue then Exit;
-  OldMaster := FMaster;
-  FMaster := AValue;
-  if Assigned(AValue) then begin
-    FMaster.Customize := Self;
-  end else begin
-    OldMaster.Customize := nil;
-  end;
-end;
-
-procedure TCoolDockCustomize.SetLayoutList(const AValue: TCoolDockLayoutList);
-begin
-  if FLayoutList=AValue then exit;
-  FLayoutList:=AValue;
-end;
-
-function TCoolDockCustomize.Execute: Boolean;
-begin
-  Form := TCoolDockCustomizeForm.Create(Self);
-  if Assigned(Master) then begin
-    Form.SpinEdit1.Value := Master.DefaultMoveSpeed;
-    Form.ComboBox1.ItemIndex := Integer(Master.DefaultTabsPos);
-    Form.ComboBox2.ItemIndex := Integer(Master.DefaultHeaderPos);
-    Form.LayoutList := FLayoutList;
-  end;
-  Form.ShowModal;
-  if Assigned(Master) then begin
-    Master.DefaultMoveSpeed := Form.SpinEdit1.Value;
-    Master.DefaultTabsPos := THeaderPos(Form.ComboBox1.ItemIndex);
-    Master.DefaultHeaderPos := THeaderPos(Form.ComboBox2.ItemIndex);
-  end;
-  Form.Free;
-  Result := True;
-end;
-
-constructor TCoolDockCustomize.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-end;
-
-destructor TCoolDockCustomize.Destroy;
-begin
-  Master := nil;
-  inherited Destroy;
-end;
-
 
 { TCoolDockClient }
@@ -916 +844 @@
 end;
 
+initialization
+
+RegisterClass(TCoolDockConjoinForm);
+
+finalization
+
+UnRegisterClass(TCoolDockConjoinForm);
+
 
 end.