Changeset 45 for trunk/Forms/UFormMain.pas

Timestamp:

Mar 12, 2012, 10:23:40 AM (13 years ago)

Author:

chronos

Message:

• Modified: TChronisBase.Active property control Client connection instead of direct call of Client.Connect and Client.Disconnect methods.

File:

• trunk/Forms/UFormMain.pas (modified) (6 diffs)

trunk/Forms/UFormMain.pas

@@ -61 +61 @@
     Splitter1: TSplitter;
     StatusBar1: TStatusBar;
+    ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
+    ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
     TreeView1: TTreeView;
     procedure AAboutExecute(Sender: TObject);
@@ -69 +75 @@
     procedure AObjectEditExecute(Sender: TObject);
     procedure AObjectGroupAddGroupExecute(Sender: TObject);
+    procedure AObjectGroupDeleteExecute(Sender: TObject);
     procedure AObjectGroupEditExecute(Sender: TObject);
     procedure ASettingsExecute(Sender: TObject);
@@ -154 +161 @@
 
 procedure TMainForm.UpdateInterface;
-begin
-  ADisconnect.Enabled := Assigned(Core.Client) and Core.Client.Connected;
-  AConnect.Enabled := Assigned(Core.Client) and not Core.Client.Connected;
-  AImportStructure.Enabled := Assigned(Core.Client) and Core.Client.Connected;
+var
+  I: Integer;
+begin
+  ADisconnect.Enabled := Core.System.Active;
+  AConnect.Enabled := not Core.System.Active;
+  AImportStructure.Enabled := Core.System.Active;
   if Assigned(MainPanelForm) then
     Caption := MainPanelForm.Caption + ' - ' + ApplicationInfo.Name
     else Caption := ApplicationInfo.Name;
   Application.Title := Caption;
-  if Assigned(Core.Client) then
-  with Core.Client do
+  if Core.System.Active then
+  with Core.System.Client do
     StatusBar1.Panels[0].Text := User + '@' + Host + ':' + IntToStr(Port) + '/' + Schema;
+
+  for I := 0 to ToolBar1.ButtonCount - 1 do
+    ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
 end;
 
@@ -201 +213 @@
 
 procedure TMainForm.AObjectGroupAddGroupExecute(Sender: TObject);
+begin
+
+end;
+
+procedure TMainForm.AObjectGroupDeleteExecute(Sender: TObject);
 begin
 
@@ -270 +287 @@
   try
     LoginForm := TLoginForm.Create(MainForm);
-  Core.Profiles.LoadFromRegistry(Core.RegistryRootKey, Core.RegistryKey);
-  if LoginForm.ShowModal = mrOK then begin
-    with TConnectProfile(Core.Profiles[Core.LastProfile]) do begin
-      FreeAndNil(Core.Client);
-      if Protocol = cpMySQL then Core.Client := TChronisClientMySQL.Create
-        else if Protocol = cpDirect then Core.Client := TChronisClientDirect.Create
-        else if Protocol = cpXMLRPC then Core.Client := TChronisClientXMLRPC.Create;
-      Core.System.Client := Core.Client;
-      Core.System.Client.Host := HostName;
-      Core.System.Client.Schema := Database;
-      Core.System.Client.User := Core.LastUserName;
-      Core.System.Client.Password := Core.LastPassword;
-      Core.System.Client.Port := Port;
+    Core.Profiles.LoadFromRegistry(Core.RegistryRootKey, Core.RegistryKey);
+    if LoginForm.ShowModal = mrOK then begin
+      with TConnectProfile(Core.Profiles[Core.LastProfile]) do begin
+        FreeAndNil(Core.System.Client);
+        if Protocol = cpMySQL then Core.System.Client := TChronisClientMySQL.Create
+          else if Protocol = cpDirect then Core.System.Client := TChronisClientDirect.Create
+          else if Protocol = cpXMLRPC then Core.System.Client := TChronisClientXMLRPC.Create;
+        Core.System.Client.Host := HostName;
+        Core.System.Client.Schema := Database;
+        Core.System.Client.User := Core.LastUserName;
+        Core.System.Client.Password := Core.LastPassword;
+        Core.System.Client.Port := Port;
+      end;
+      try
+        Core.System.Active := True;
+        LoadTree;
+      except
+        on E: Exception do ShowMessage(E.Message);
+      end;
     end;
-    try
-      Core.System.Client.Connect;
-      if Core.System.IsDatabaseEmpty then Core.System.ModuleSystem.Install;
-      Core.System.LoadTypes;
-      LoadTree;
-      UpdateInterface;
-    except
-      on E: Exception do ShowMessage(E.Message);
-    end;
-  end;
   finally
     LoginForm.Free;
+    UpdateInterface;
   end;
 end;
@@ -302 +316 @@
 begin
   if Assigned(Core.System.Client) then
-  if Core.System.Client.Connected then begin
-    Core.System.Client.Disconnect;
+  if Core.System.Active then begin
+    Core.System.Active := False;
     TreeView1.Items.Clear;
-    Core.System.Types.Clear;
-    FreeAndNil(Core.Client);
-    Core.System.Client := Core.Client;
   end;
   UpdateInterface;