Changeset 10 for trunk/Forms/UMainForm.pas

Timestamp:

Jun 9, 2011, 9:33:21 AM (13 years ago)

Author:

george

Message:

• Added: Application meta information.
• Added: Empty settings form.
• Modified: Server connect configuration is now stored in system registry.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UMainForm.pas (modified) (12 diffs)

trunk

@@ -3 +3 @@
 chronis
 heaptrclog.trc
+chronis.exe

@@ -3 +3 @@
 chronis
 heaptrclog.trc
+chronis.exe

trunk/Forms/UMainForm.pas

@@ -17 +17 @@
 
   TMainForm = class(TForm)
+    AConnect: TAction;
+    ASettings: TAction;
     AToggleFullscreen: TAction;
     AExit: TAction;
@@ -44 +46 @@
     MenuItem14: TMenuItem;
     MenuItem15: TMenuItem;
+    MenuItem16: TMenuItem;
+    MenuItem17: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
@@ -59 +63 @@
     Splitter1: TSplitter;
     TreeView1: TTreeView;
+    procedure AConnectExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AItemAddExecute(Sender: TObject);
@@ -66 +71 @@
     procedure AObjectGroupAddGroupExecute(Sender: TObject);
     procedure AObjectGroupEditExecute(Sender: TObject);
+    procedure ASettingsExecute(Sender: TObject);
     procedure AToggleFullscreenExecute(Sender: TObject);
     procedure ButtonAddClick(Sender: TObject);
@@ -85 +91 @@
     RegistryKey: string;
     RegistryRootKey: HKEY;
-    procedure LoadConfiguration;
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
+    procedure InitStructure;
   public
     SelectedObjectId: Integer;
@@ -112 +118 @@
 
 uses
-  UItemView, UItemEdit, UItemAdd;
+  UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo;
 
 {$R *.lfm}
 
 { TMainForm }
-
-procedure TMainForm.LoadConfiguration;
-var
-  Config: TXMLDocument;
-  I1: Integer;
-  I2: Integer;
-  I3: Integer;
-begin
-  if FileExists(ConfigFileName) then try
-    ReadXMLFile(Config, ConfigFileName);
-    for I1 := 0 to Config.ChildNodes.Count - 1 do
-    with Config.ChildNodes[I1] do begin
-      if NodeName = 'configuration' then
-      for I2 := 0 to ChildNodes.Count - 1 do
-      with ChildNodes[I2] do begin
-        if NodeName = 'database' then
-        for I3 := 0 to ChildNodes.Count - 1 do
-        with ChildNodes[I3] do begin
-          if NodeName = 'hostname' then
-            System.Database.HostName := TextContent;
-          if NodeName = 'schema' then
-            System.Database.Database := TextContent;
-          if NodeName = 'username' then
-            System.Database.UserName := TextContent;
-          if NodeName = 'password' then
-            System.Database.Password := TextContent;
-        end;
-      end;
-    end;
-  finally
-    Config.Free;
-  end;
-end;
 
 procedure TMainForm.LoadFromRegistry;
@@ -158 +131 @@
     OpenKey(RegistryKey, True);
     Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
+    System.Database.Database := ReadStringWithDefault('DatabaseSchema', 'chronis');
+    System.Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
+    System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
+    System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
   finally
     Free;
@@ -170 +147 @@
     OpenKey(RegistryKey, True);
     WriteInteger('GroupTreeWidth', Panel1.Width);
+    WriteString('DatabaseSchema', System.Database.Database);
+    WriteString('DatabaseHostName', System.Database.Hostname);
+    WriteString('DatabaseUserName', System.Database.UserName);
+    WriteString('DatabasePassword', System.Database.Password);
   finally
     Free;
@@ -175 +156 @@
 end;
 
+procedure TMainForm.InitStructure;
+begin
+
+end;
+
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
   System := TChronisBase.Create;
   System.Database := TSqlDatabase.Create;
-  LoadConfiguration;
-  System.Database.Connect;
   TreeState := TTreeState.Create;
   Report := TReport.Create;
@@ -187 +171 @@
   SelectedObject.Base := System;
   RegistryRootKey := HKEY_CURRENT_USER;
-  RegistryKey := '\Software\Chronosoft\Chronis';
+  RegistryKey := '\Software\' + ApplicationInfo.CompanyName + '\' +
+    ApplicationInfo.Name;
   PersistentForm := TPersistentForm.Create;
   PersistentForm.RegistryKey := RegistryKey;
@@ -237 +222 @@
     ItemEditForm.Show;
   end;
+end;
+
+procedure TMainForm.ASettingsExecute(Sender: TObject);
+begin
+  SettingForm.ShowModal;
 end;
 
@@ -281 +271 @@
 end;
 
+procedure TMainForm.AConnectExecute(Sender: TObject);
+begin
+  LoginForm.ShowModal;
+end;
+
 procedure TMainForm.FormShow(Sender: TObject);
 begin
   PersistentForm.Load(Self);
+  LoadFromRegistry;
+  System.Database.Connect;
+  InitStructure;
   LoadTree;
-  LoadFromRegistry;
 end;
 

@@ -3 +3 @@
 chronis
 heaptrclog.trc
+chronis.exe