Changeset 40 for trunk/Forms

Timestamp:

Mar 9, 2012, 8:11:13 AM (13 years ago)

Author:

chronos

Message:

• Added: Remember last password in login dialog.
• Fixed: Some Add, Edit, View, Select dialog display.

Location:

trunk/Forms

Files:

• UItemAdd.pas (modified) (1 diff)
• UItemList.pas (modified) (2 diffs)
• UItemView.pas (modified) (3 diffs)
• ULoginForm.lfm (modified) (5 diffs)
• ULoginForm.lrt (modified) (1 diff)
• ULoginForm.pas (modified) (2 diffs)
• UMainForm.lfm (modified) (1 diff)
• UMainForm.pas (modified) (1 diff)

trunk/Forms/UItemAdd.pas

@@ -124 +124 @@
     Panel1.Controls[I].Free;
 
-  Report.Load(SelectedObject, SelectedObject.PrimaryKey + ' = ' +
-    IntToStr(SelectedItemId));
+  //Report.Load(SelectedObject, SelectedObject.PrimaryKey + ' = ' +
+  //  IntToStr(SelectedItemId));
 
   // Load column names

trunk/Forms/UItemList.pas

@@ -117 +117 @@
   NewItemEditForm: TItemEditForm;
 begin
-  if Assigned(ListView1.Selected) then begin
+  if Assigned(ListView1.Selected) then
+  try
     NewItemEditForm := TItemEditForm.Create(nil);
     NewItemEditForm.SelectedObject.Assign(SelectedObject);
     NewItemEditForm.SelectedItemId := Integer(ListView1.Selected.Data);
     NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
-    MainForm.SetMainPanelForm(NewItemEditForm);
+    NewItemEditForm.ShowModal;
+  finally
+    NewItemEditForm.Free;
   end;
 end;
@@ -130 +133 @@
   NewItemAddForm: TItemAddForm;
 begin
-  NewItemAddForm := TItemAddForm.Create(nil);
-  NewItemAddForm.SelectedObject.Assign(SelectedObject);
-  NewItemAddForm.SelectedItemId := Integer(ListView1.Selected.Data);
-  NewItemAddForm.Caption := NewItemAddForm.Caption + ' ' + SelectedObject.Name;
-  MainForm.SetMainPanelForm(NewItemAddForm);
+  try
+    NewItemAddForm := TItemAddForm.Create(nil);
+    NewItemAddForm.SelectedObject.Assign(SelectedObject);
+    //NewItemAddForm.SelectedItemId := Integer(ListView1.Selected.Data);
+    NewItemAddForm.Caption := NewItemAddForm.Caption + ' ' + SelectedObject.Name;
+    NewItemAddForm.ShowModal;
+  finally
+    NewItemAddForm.Free;
+  end;
 end;
 

trunk/Forms/UItemView.pas

@@ -56 +56 @@
 {$R *.lfm}
 
+resourcestring
+  SExpectedOneRow = 'Expected one row';
+
 { TItemViewForm }
 
@@ -106 +109 @@
   NewItemEditForm: TItemEditForm;
 begin
-  Close;
-  NewItemEditForm := TItemEditForm.Create(nil);
-  NewItemEditForm.SelectedObject.Assign(SelectedObject);
-  NewItemEditForm.SelectedItemId := SelectedItemId;
-  NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
-  MainForm.SetMainPanelForm(NewItemEditForm);
+  try
+    NewItemEditForm := TItemEditForm.Create(nil);
+    NewItemEditForm.SelectedObject.Assign(SelectedObject);
+    NewItemEditForm.SelectedItemId := SelectedItemId;
+    NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
+    NewItemEditForm.ShowModal;
+  finally
+    NewItemEditForm.Free;
+  end;
 end;
 
@@ -156 +162 @@
   // Load column names
 
-  if Report.Count = 1 then
+  if Report.Count > 1 then raise Exception.Create(SExpectedOneRow);
+  if Report.Count > 0 then
   for I := 0 to Report.Columns.Count - 1 do begin
     DataType := TReportColumn(Report.Columns[I]).CustomType;

trunk/Forms/ULoginForm.lfm

@@ -1 +1 @@
 object LoginForm: TLoginForm
   Left = 312
-  Height = 163
+  Height = 177
   Top = 186
-  Width = 433
+  Width = 451
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Login'
-  ClientHeight = 163
-  ClientWidth = 433
+  ClientHeight = 177
+  ClientWidth = 451
   OnClose = FormClose
   OnShow = FormShow
@@ -31 +31 @@
     Left = 112
     Height = 25
-    Top = 128
+    Top = 144
     Width = 75
     Caption = 'Close'
     ModalResult = 11
     OnClick = ButtonCancelClick
-    TabOrder = 5
+    TabOrder = 6
   end
   object ButtonLogin: TButton
     Left = 16
     Height = 25
-    Top = 128
+    Top = 144
     Width = 75
     Caption = 'Login'
@@ -47 +47 @@
     ModalResult = 1
     OnClick = ButtonLoginClick
-    TabOrder = 4
+    TabOrder = 5
   end
   object EditUserName: TEdit
@@ -84 +84 @@
   object Image1: TImage
     Left = 272
-    Height = 140
+    Height = 156
     Top = 12
-    Width = 152
+    Width = 168
   end
   object EditPassword: TEdit
@@ -97 +97 @@
     TabOrder = 3
   end
+  object CheckBoxRememberPassword: TCheckBox
+    Left = 16
+    Height = 17
+    Top = 121
+    Width = 120
+    Caption = 'Remember password'
+    TabOrder = 4
+  end
 end

trunk/Forms/ULoginForm.lrt

@@ -6 +6 @@
 TLOGINFORM.LABEL3.CAPTION=Connection:
 TLOGINFORM.BUTTONCHANGE.CAPTION=Change
+TLOGINFORM.CHECKBOXREMEMBERPASSWORD.CAPTION=Remember password

trunk/Forms/ULoginForm.pas

@@ -17 +17 @@
     ButtonCancel: TButton;
     ButtonLogin: TButton;
+    CheckBoxRememberPassword: TCheckBox;
     ComboBoxConnection: TComboBox;
     EditUserName: TEdit;
@@ -50 +51 @@
   Core.LastProfile := ComboBoxConnection.ItemIndex;
   Core.LastPassword := EditPassword.Text;
+  Core.RememberPassword := CheckBoxRememberPassword.Checked;
 end;
 
 procedure TLoginForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  MainForm.PersistentForm.Save(Self);
+  //MainForm.PersistentForm.Save(Self);
 end;
 
 procedure TLoginForm.FormShow(Sender: TObject);
 begin
-  MainForm.PersistentForm.Load(Self);
+  //MainForm.PersistentForm.Load(Self);
   EditUserName.Text := Core.LastUserName;
-  EditPassword.Text := '';
+  EditPassword.Text := Core.LastPassword;
   EditPassword.SetFocus;
+  CheckBoxRememberPassword.Checked := Core.RememberPassword;
   Core.Profiles.FillStrings(ComboBoxConnection.Items);
   ComboBoxConnection.ItemIndex := Core.LastProfile;

trunk/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 307
+  Left = 242
   Height = 446
-  Top = 126
+  Top = 129
   Width = 640
   ActiveControl = PanelMenu

trunk/Forms/UMainForm.pas

@@ -288 +288 @@
     Core.System.Types.Clear;
     FreeAndNil(Core.Client);
+    UpdateInterface;
   end;
 end;