[Instantobjects-cvscommit] Source/Core InstantConnectionManager.pas,1.10,1.11 InstantConnectionManagerForm.pas,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30388/Source/Core

Modified Files:
	InstantConnectionManager.pas InstantConnectionManagerForm.pas 
Log Message:
InstantConnectionManagerForm and InstantConnectionManager bug fixing.

Index: InstantConnectionManagerForm.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantConnectionManagerForm.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantConnectionManagerForm.pas	22 Feb 2005 14:25:18 -0000	1.1
--- InstantConnectionManagerForm.pas	22 Feb 2005 17:36:48 -0000	1.2
***************
*** 145,149 ****
      property FileOpenDialog: TOpenDialog read GetOpenDialog;
    public
!     constructor Create(AOwner : TComponent); override;
      function DoBuild(ConnectionDef: TInstantConnectionDef): Boolean; virtual;
      property CurrentConnectionDef: TInstantConnectionDef read GetCurrentConnectionDef write SetCurrentConnectionDef;
--- 145,149 ----
      property FileOpenDialog: TOpenDialog read GetOpenDialog;
    public
!     function isManagerConnected : boolean;
      function DoBuild(ConnectionDef: TInstantConnectionDef): Boolean; virtual;
      property CurrentConnectionDef: TInstantConnectionDef read GetCurrentConnectionDef write SetCurrentConnectionDef;
***************
*** 173,178 ****
    ConnManagerForm : TInstantConnectionManagerForm;
  begin
!   ConnManagerForm := TInstantConnectionManagerForm.Create(ConnectionManager);
    Try
      ConnManagerForm.ShowModal;
    Finally
--- 173,179 ----
    ConnManagerForm : TInstantConnectionManagerForm;
  begin
!   ConnManagerForm := TInstantConnectionManagerForm.Create(nil);
    Try
+     ConnManagerForm.ConnectionManager := ConnectionManager;
      ConnManagerForm.ShowModal;
    Finally
***************
*** 197,201 ****
    ConnectionDef := CurrentConnectionDef;
    HasItem := Assigned(ConnectionDef);
!   Connected := HasItem and IsConnected(ConnectionDef);
    EnableAction(EditAction, HasItem and not Connected);
    EnableAction(RenameAction, HasItem);
--- 198,202 ----
    ConnectionDef := CurrentConnectionDef;
    HasItem := Assigned(ConnectionDef);
!   Connected := IsManagerConnected;
    EnableAction(EditAction, HasItem and not Connected);
    EnableAction(RenameAction, HasItem);
***************
*** 467,471 ****
    Result := False;
    if Assigned(FOnIsConnected) then
!     FOnIsConnected(Self, ConnectionDef, Result);
  end;
  
--- 468,474 ----
    Result := False;
    if Assigned(FOnIsConnected) then
!     FOnIsConnected(Self, ConnectionDef, Result)
!   else if Assigned(ConnectionManager.OnIsConnected) then
!     ConnectionManager.OnIsConnected(ConnectionManager,ConnectionDef,Result);
  end;
  
***************
*** 655,667 ****
  end;
  
- constructor TInstantConnectionManagerForm.Create(AOwner: TComponent);
- begin
-   inherited;
-   if AOwner is TInstantConnectionManager then
-     ConnectionManager := TInstantConnectionManager(AOwner)
-   else
-     ConnectionManager := TInstantConnectionManager.Create(self);
- end;
- 
  procedure TInstantConnectionManagerForm.SetConnectionManager(
    const Value: TInstantConnectionManager);
--- 658,661 ----
***************
*** 706,709 ****
--- 700,708 ----
  end;
  
+ function TInstantConnectionManagerForm.IsManagerConnected: boolean;
+ begin
+   Result := ConnectionManager.isConnected;
+ end;
+ 
  initialization
    RegisterConnectionManagerExecutor(DefaultConnectionManagerExecutor);

Index: InstantConnectionManager.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantConnectionManager.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InstantConnectionManager.pas	22 Feb 2005 14:25:18 -0000	1.10
--- InstantConnectionManager.pas	22 Feb 2005 17:36:47 -0000	1.11
***************
*** 104,107 ****
--- 104,108 ----
      procedure ConnectByName(const ConnectionDefName : string);
      procedure Execute;
+     function isConnected : boolean;
      property Model: TInstantModel read GetModel write SetModel;
      property ConnectionDefs: TInstantConnectionDefs read GetConnectionDefs;
***************
*** 126,130 ****
  
  uses
!   InstantImageUtils, InstantConsts;
  
  var
--- 127,131 ----
  
  uses
!   InstantConsts;
  
  var
***************
*** 377,379 ****
--- 378,397 ----
  end;
  
+ function TInstantConnectionManager.isConnected: boolean;
+ var
+   i : integer;
+   ConnectionDef : TInstantConnectionDef;
+ begin
+   Result := False;
+   if not Assigned(OnIsConnected) then
+     Exit;
+   for i := 0 to ConnectionDefs.Count -1 do
+   begin
+     ConnectionDef := ConnectionDefs.items[i];
+     OnIsConnected(self, ConnectionDef, Result);
+     if Result then
+       break;
+   end;
+ end;
+ 
  end.