Changeset 25 for trunk/Forms/UMainForm.pas

Timestamp:

Nov 9, 2011, 1:58:00 PM (13 years ago)

Author:

george

Message:

• Modified: Login form now use connection profile form for selecting connection parameters.
• Added: About application dialog.

File:

• trunk/Forms/UMainForm.pas (modified) (12 diffs)

trunk/Forms/UMainForm.pas

@@ -17 +17 @@
   published
     AConnect: TAction;
+    AAbout: TAction;
     AImportStructure: TAction;
     AInitSystemValues: TAction;
@@ -53 +54 @@
     MenuItem2: TMenuItem;
     MenuItem20: TMenuItem;
+    MenuItem21: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
@@ -67 +69 @@
     Splitter1: TSplitter;
     TreeView1: TTreeView;
+    procedure AAboutExecute(Sender: TObject);
     procedure AConnectExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
@@ -91 +94 @@
     procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
+    procedure MenuItem17Click(Sender: TObject);
     procedure TreeView1Change(Sender: TObject; Node: TTreeNode);
   private
@@ -96 +100 @@
     OriginalWindowState: TWindowState;
     ScreenBounds: TRect;
-    RegistryKey: string;
-    RegistryRootKey: HKEY;
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
@@ -128 +130 @@
 uses
   UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo,
-  UCore, UImportStructureForm;
+  UCore, UImportStructureForm, UAboutForm, ULoginProfileForm;
 
 {$R *.lfm}
@@ -138 +140 @@
   with TRegistryEx.Create do
   try
-    RootKey := RegistryRootKey;
-    OpenKey(RegistryKey, True);
+    RootKey := Core.RegistryRootKey;
+    OpenKey(Core.RegistryKey, True);
     Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
-    Core.System.Database.Database := ReadStringWithDefault('DatabaseSchema', 'chronis');
-    Core.System.Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
-    Core.System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
-    Core.System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
     with Core.CoolTranslator1 do
       Language := Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''));
@@ -156 +154 @@
   with TRegistryEx.Create do
   try
-    RootKey := RegistryRootKey;
-    OpenKey(RegistryKey, True);
+    RootKey := Core.RegistryRootKey;
+    OpenKey(Core.RegistryKey, True);
     WriteInteger('GroupTreeWidth', Panel1.Width);
-    WriteString('DatabaseSchema', Core.System.Database.Database);
-    WriteString('DatabaseHostName', Core.System.Database.Hostname);
-    WriteString('DatabaseUserName', Core.System.Database.UserName);
-    WriteString('DatabasePassword', Core.System.Database.Password);
     with Core.CoolTranslator1 do
       WriteString('LanguageCode', Language.Code);
@@ -520 +514 @@
   SelectedObject := TChronisObject.Create;
   SelectedObject.Base := Core.System;
-  RegistryRootKey := HKEY_CURRENT_USER;
-  RegistryKey := '\Software\' + ApplicationInfo.CompanyName + '\' +
-    ApplicationInfo.Name;
   PersistentForm := TPersistentForm.Create;
-  PersistentForm.RegistryKey := RegistryKey;
+  PersistentForm.RegistryKey := Core.RegistryKey;
 end;
 
@@ -641 +632 @@
 procedure TMainForm.AConnectExecute(Sender: TObject);
 begin
-  LoginForm.ShowModal;
+  Core.Profiles.LoadFromRegistry(Core.RegistryRootKey, Core.RegistryKey);
+  if LoginForm.ShowModal = mrOK then begin
+    with TConnectProfile(Core.Profiles[Core.LastProfile]) do begin
+      Core.System.Database.HostName := HostName;
+      Core.System.Database.Database := Database;
+      Core.System.Database.UserName := Core.LastUserName;
+      Core.System.Database.Password := Core.LastPassword;
+      Core.System.Database.Connect;
+    end;
+    InitStructure;
+    Core.System.LoadTypes;
+    LoadTree;
+  end;
+end;
+
+procedure TMainForm.AAboutExecute(Sender: TObject);
+begin
+  AboutForm.ShowModal;
 end;
 
@@ -648 +656 @@
   PersistentForm.Load(Self);
   LoadFromRegistry;
-  Core.System.Database.Connect;
-  InitStructure;
-  Core.System.LoadTypes;
-  LoadTree;
+  AConnect.Execute;
 end;
 
@@ -696 +701 @@
   AItemView.Enabled := Assigned(ListView1.Selected);
   AItemEdit.Enabled := Assigned(ListView1.Selected);
+end;
+
+procedure TMainForm.MenuItem17Click(Sender: TObject);
+begin
+  LoginForm.ShowModal;
 end;