Changeset 12 for trunk/Forms

Timestamp:

Jun 9, 2011, 1:04:45 PM (13 years ago)

Author:

george

Message:

• Fixed: Display edit controls according property type.
• Added: Interface language translation.

Location:

trunk/Forms

Files:

• UItemAdd.lfm (modified) (1 diff)
• UItemAdd.lrt (modified) (1 diff)
• UItemAdd.pas (modified) (1 diff)
• UItemEdit.lfm (modified) (1 diff)
• UItemEdit.lrt (modified) (1 diff)
• UItemEdit.pas (modified) (1 diff)
• UItemView.lfm (modified) (1 diff)
• UItemView.lrt (modified) (1 diff)
• UItemView.pas (modified) (1 diff)
• UMainForm.pas (modified) (4 diffs)
• USettingForm.lfm (modified) (2 diffs)
• USettingForm.lrt (modified) (1 diff)
• USettingForm.pas (modified) (3 diffs)

trunk/Forms/UItemAdd.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object Panel1: TPanel
     Left = 0

trunk/Forms/UItemAdd.lrt

@@ -1 @@
-TITEMADDFORM.ITEMADDFORM.CAPTION=Add item
+TITEMADDFORM.CAPTION=Add item
 TITEMADDFORM.BUTTONCANCEL.CAPTION=Cancel
 TITEMADDFORM.BUTTONSAVE.CAPTION=Add

trunk/Forms/UItemAdd.pas

@@ -103 +103 @@
       TLabel(NewControl).Caption := TReportColumn(Report.Columns[I]).Caption + ':';
 
-      ValueType := TReportColumn(Report.Columns[I]).TypeId;
+      ValueType := TReportColumn(Report.Columns[I]).TypeDef.TypeIndex;
       if ValueType = Integer(vtInteger) then begin
         NewControl := TSpinEdit.Create(Panel1);

trunk/Forms/UItemEdit.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object Panel1: TPanel
     Left = 0

trunk/Forms/UItemEdit.lrt

@@ -1 @@
-TITEMEDITFORM.ITEMEDITFORM.CAPTION=Edit item
+TITEMEDITFORM.CAPTION=Edit item
 TITEMEDITFORM.BUTTONCANCEL.CAPTION=Cancel
 TITEMEDITFORM.BUTTONSAVE.CAPTION=Save

trunk/Forms/UItemEdit.pas

@@ -106 +106 @@
       TLabel(NewControl).Caption := TReportColumn(Report.Columns[I]).Caption + ':';
 
-      ValueType := TReportColumn(Report.Columns[I]).TypeId;
+      ValueType := TReportColumn(Report.Columns[I]).TypeDef.TypeIndex;
       if ValueType = Integer(vtInteger) then begin
         NewControl := TSpinEdit.Create(Panel1);

trunk/Forms/UItemView.lfm

@@ -11 +11 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object ButtonClose: TButton
     Left = 546

trunk/Forms/UItemView.lrt

@@ -1 @@
-TITEMVIEWFORM.ITEMVIEWFORM.CAPTION=View item
+TITEMVIEWFORM.CAPTION=View item
 TITEMVIEWFORM.BUTTONCLOSE.CAPTION=Close
 TITEMVIEWFORM.BUTTONEDIT.CAPTION=Edit

trunk/Forms/UItemView.pas

@@ -108 +108 @@
   if Report.Count = 1 then
   for I := 0 to Report.Columns.Count - 1 do
-  if TReportColumn(Report.Columns[I]).TypeId = 20 then begin
+  if TReportColumn(Report.Columns[I]).TypeDef.TypeIndex = Integer(vtPointer) then begin
     TabControl1.Tabs.Add(TReportColumn(Report.Columns[I]).Caption);
   end else begin

trunk/Forms/UMainForm.pas

@@ -121 +121 @@
 
 uses
-  UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo;
+  UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo,
+  UCore;
 
 {$R *.lfm}
@@ -138 +139 @@
     System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
     System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
-  finally
+    with Core.CoolTranslator1 do
+      Language := Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''));
+ finally
     Free;
   end;
@@ -154 +157 @@
     WriteString('DatabaseUserName', System.Database.UserName);
     WriteString('DatabasePassword', System.Database.Password);
+    with Core.CoolTranslator1 do
+      WriteString('LanguageCode', Language.Code);
   finally
     Free;
@@ -434 +439 @@
   System.Database.Connect;
   InitStructure;
+  System.LoadTypes;
   LoadTree;
 end;

trunk/Forms/USettingForm.lfm

@@ -7 +7 @@
   ClientHeight = 328
   ClientWidth = 446
+  OnClose = FormClose
+  OnShow = FormShow
   LCLVersion = '0.9.31'
   object Label1: TLabel
@@ -43 +45 @@
     TabOrder = 2
   end
+  object Label2: TLabel
+    Left = 9
+    Height = 14
+    Top = 38
+    Width = 52
+    Caption = 'Language:'
+    ParentColor = False
+  end
+  object ComboBoxLanguage: TComboBox
+    Left = 116
+    Height = 21
+    Top = 32
+    Width = 132
+    ItemHeight = 13
+    TabOrder = 3
+    Text = 'ComboBoxLanguage'
+  end
 end

trunk/Forms/USettingForm.lrt

@@ -3 +3 @@
 TSETTINGFORM.BUTTONSAVE.CAPTION=Save
 TSETTINGFORM.BUTTONCANCEL.CAPTION=Cancel
+TSETTINGFORM.LABEL2.CAPTION=Language:
+TSETTINGFORM.COMBOBOXLANGUAGE.TEXT=ComboBoxLanguage

trunk/Forms/USettingForm.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  CoolTranslator, ULanguages;
 
 type
@@ -15 +16 @@
     ButtonSave: TButton;
     ButtonCancel: TButton;
+    ComboBoxLanguage: TComboBox;
     Edit1: TEdit;
     Label1: TLabel;
+    Label2: TLabel;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormShow(Sender: TObject);
   private
-    { private declarations }
+    procedure Save;
+    procedure Load;
   public
     { public declarations }
@@ -30 +36 @@
 {$R *.lfm}
 
+uses
+  UCore, UMainForm;
+
+{ TSettingForm }
+
+procedure TSettingForm.FormShow(Sender: TObject);
+begin
+  MainForm.PersistentForm.Load(Self);
+
+  Load;
+end;
+
+procedure TSettingForm.FormClose(Sender: TObject; var CloseAction: TCloseAction
+  );
+begin
+  if ModalResult = mrOK then Save;
+  MainForm.PersistentForm.Save(Self);
+end;
+
+procedure TSettingForm.Save;
+begin
+  with Core.CoolTranslator1 do
+    Language := TLanguage(Languages[ComboBoxLanguage.ItemIndex]);
+end;
+
+procedure TSettingForm.Load;
+begin
+  with Core.CoolTranslator1 do begin
+    LanguageListToStrings(ComboBoxLanguage.Items);
+    if Assigned(Language) then begin
+      ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Language);
+      // Select automatic if no other match
+      if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+    end else ComboBoxLanguage.ItemIndex := 0;
+  end;
+end;
+
 end.