Changeset 43 for trunk/Forms/UFormMain.pas

Timestamp:

Mar 9, 2012, 1:09:52 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Selection of available protocols in profile manager.
• Modified: Initialization of persistent data structures rewrited to more native structures.

File:

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

trunk/Forms/UFormMain.pas

@@ -9 +9 @@
   StdCtrls, ActnList, Menus, ExtCtrls, USqlDatabase, DOM, XMLRead, XMLWrite,
   UPersistentForm, UTreeState, SpecializedList, SpecializedDictionary,
-  URegistry, USystem, UFormItemList;
+  URegistry, UCoolTranslator, USystem, UFormItemList;
 
 type
@@ -112 +112 @@
   UFormItemView, UFormItemEdit, UFormItemAdd, UFormLogin, UFormSetting, UApplicationInfo,
   UCore, UFormImportStructure, UFormAbout, UFormLoginProfile, UChronisClientDirect,
-  UChronisClient;
+  UChronisClient, UChronisClientMySQL, UChronisClientXMLRPC;
 
 {$R *.lfm}
@@ -155 +155 @@
 procedure TMainForm.UpdateInterface;
 begin
-  ADisconnect.Enabled := Core.System.Client.Connected;
-  AConnect.Enabled := not Core.System.Client.Connected;
-  AImportStructure.Enabled := Core.System.Client.Connected;
+  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;
   if Assigned(MainPanelForm) then
     Caption := MainPanelForm.Caption + ' - ' + ApplicationInfo.Name
-    else Caption :=  ApplicationInfo.Name;
+    else Caption := ApplicationInfo.Name;
   Application.Title := Caption;
-  if Assigned(Core.System.Client) then
-  with Core.System.Client do
+  if Assigned(Core.Client) then
+  with Core.Client do
     StatusBar1.Panels[0].Text := User + '@' + Host + ':' + IntToStr(Port) + '/' + Schema;
 end;
@@ -258 +258 @@
 procedure TMainForm.AImportStructureExecute(Sender: TObject);
 begin
-  ImportStructureForm.ShowModal;
+  try
+    ImportStructureForm := TImportStructureForm.Create(MainForm);
+    ImportStructureForm.ShowModal;
+  finally
+    ImportStructureForm.Free;
+  end;
 end;
 
@@ -268 +273 @@
   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;
@@ -273 +283 @@
       Core.System.Client.Password := Core.LastPassword;
       Core.System.Client.Port := Port;
-      if Protocol = cpDirect then Core.Client := TChronisClientDirect.Create;
     end;
     try
@@ -292 +301 @@
 procedure TMainForm.ADisconnectExecute(Sender: TObject);
 begin
+  if Assigned(Core.System.Client) then
   if Core.System.Client.Connected then begin
     Core.System.Client.Disconnect;