Changeset 40 for trunk

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

Files:

• Application/Clients/UChronisClientMySQL.pas (modified) (1 diff)
• Application/UDataTypes.pas (modified) (22 diffs)
• Forms/UItemAdd.pas (modified) (1 diff)
• Forms/UItemList.pas (modified) (2 diffs)
• Forms/UItemView.pas (modified) (3 diffs)
• Forms/ULoginForm.lfm (modified) (5 diffs)
• Forms/ULoginForm.lrt (modified) (1 diff)
• Forms/ULoginForm.pas (modified) (2 diffs)
• Forms/UMainForm.lfm (modified) (1 diff)
• Forms/UMainForm.pas (modified) (1 diff)
• Languages/chronis.cs.po (modified) (2 diffs)
• Languages/chronis.po (modified) (2 diffs)
• UCore.pas (modified) (3 diffs)
• USystem.pas (modified) (1 diff)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -88 +88 @@
       NewObject := TObjectProxy.Create;
       NewObject.Client := AList.Client;
+      NewObject.ObjectName := AList.ObjectName;
+      NewObject.SchemaName := AList.SchemaName;
       NewObject.Properties.Assign(TDictionaryStringString(DbRows[I]));
       AList.Objects.Add(NewObject);

trunk/Application/UDataTypes.pas

@@ -14 +14 @@
 
   TDataType = class
+    Name: string;
     CustomType: Integer;
     Control: TWinControl;
@@ -23 +24 @@
     procedure SetDefault; virtual;
     function GetStringValue: string; virtual;
+    constructor Create; virtual;
   end;
 
@@ -37 +39 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(CustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -49 +52 @@
     function GetControlValue(Control: TWinControl): string; override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -60 +64 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -71 +76 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -86 +92 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(ACustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -99 +106 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(ACustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -112 +120 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -123 +132 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -136 +146 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -144 +155 @@
 
 uses
-  USqlDatabase, USystem, UCore, UItemSelect;
+  USqlDatabase, USystem, UCore, UItemSelect, UMainForm;
 
 function GetDataType(ACustomType: Integer): TDataType;
@@ -216 +227 @@
 end;
 
+constructor TDataTypeDateTime.Create;
+begin
+  inherited Create;
+  Name := 'DateType';
+end;
+
 { TDataTypeRelationMany }
 
 function TDataTypeRelationMany.CreateControl(Owner: TComponent): TWinControl;
 begin
-  Result:=inherited CreateControl(Owner);
+  Result := inherited CreateControl(Owner);
 end;
 
@@ -260 +277 @@
 end;
 
+constructor TDataTypeRelationMany.Create;
+begin
+  inherited Create;
+  Name := 'RelationMany';
+end;
+
 { TDataTypeRelationOne }
 
 procedure TDataTypeRelationOne.ButtonClickExecute(Sender: TObject);
-begin
-  ItemSelectForm.ObjectId := ObjectId;
-  ItemSelectForm.ShowModal;
-  TEditButton(Control).Text := IntToStr(ItemSelectForm.SelectedId)
+var
+  NewSelectForm: TItemSelectForm;
+begin
+  try
+    NewSelectForm := TItemSelectForm.Create(MainForm);
+    NewSelectForm.ObjectId := ObjectId;
+    NewSelectForm.ShowModal;
+    TEditButton(Control).Text := IntToStr(NewSelectForm.SelectedId)
+  finally
+    ItemSelectForm.Free;
+  end;
 end;
 
@@ -309 +339 @@
 end;
 
+constructor TDataTypeRelationOne.Create;
+begin
+  inherited Create;
+  Name := 'RelationOne';
+end;
+
 
 { TDataTypePassword }
@@ -327 +363 @@
 end;
 
+constructor TDataTypePassword.Create;
+begin
+  inherited Create;
+  Name := 'Password';
+end;
+
 { TDataTypeFloat }
 
@@ -349 +391 @@
 end;
 
+constructor TDataTypeFloat.Create;
+begin
+  inherited Create;
+  Name := 'Float';
+end;
+
 { TDataTypeDateTime }
 
@@ -371 +419 @@
 end;
 
+constructor TDataTypeDate.Create;
+begin
+  inherited Create;
+  Name := 'Date';
+end;
+
 { TDataTypeBoolean }
 
@@ -391 +445 @@
 begin
   Value := Boolean(StrToInt(CellValue));
+end;
+
+constructor TDataTypeBoolean.Create;
+begin
+  inherited Create;
+  Name := 'Boolean';
 end;
 
@@ -422 +482 @@
 end;
 
+constructor TDataTypeNumber.Create;
+begin
+  inherited Create;
+  Name := 'Number';
+end;
+
 { TDataTypeString }
 
@@ -444 +510 @@
 end;
 
+constructor TDataTypeString.Create;
+begin
+  inherited Create;
+  Name := 'String';
+end;
+
 { TDataType }
 
@@ -481 +553 @@
 end;
 
+constructor TDataType.Create;
+begin
+  inherited;
+end;
+
 end.
 

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;

trunk/Languages/chronis.cs.po

@@ -176 +176 @@
 msgstr "Přihásit"
 
+#: tloginform.checkboxrememberpassword.caption
+msgid "Remember password"
+msgstr ""
+
 #: tloginform.label1.caption
 msgid "Username:"
@@ -398 +402 @@
 msgstr "Verze"
 
+#: uitemview.sexpectedonerow
+msgid "Expected one row"
+msgstr ""
+
 #: uloginprofileform.sprofile
 msgid "Profile"

trunk/Languages/chronis.po

@@ -162 +162 @@
 msgstr ""
 
+#: tloginform.checkboxrememberpassword.caption
+msgid "Remember password"
+msgstr ""
+
 #: tloginform.label1.caption
 msgid "Username:"
@@ -376 +380 @@
 msgstr ""
 
+#: uitemview.sexpectedonerow
+msgid "Expected one row"
+msgstr ""
+
 #: uloginprofileform.sprofile
 msgid "Profile"

trunk/UCore.pas

@@ -27 +27 @@
     LastProfile: Integer;
     LastPassword: string;
+    RememberPassword: Boolean;
     Profiles: TProfileList;
     RegistryKey: string;
@@ -84 +85 @@
     LastProfile := ReadIntegerWithDefault('LastConnectProfile', -1);
     LastUserName := ReadStringWithDefault('LastUserName', 'admin');
+    LastPassword := ReadStringWithDefault('LastPassword', '');
+    RememberPassword := ReadBoolWithDefault('RememberPassword', False);
   finally
     Free;
@@ -97 +100 @@
     WriteInteger('LastConnectProfile', LastProfile);
     WriteString('LastUserName', LastUserName);
+    if RememberPassword then WriteString('LastPassword', LastPassword)
+      else WriteString('LastPassword', '');
+    WriteBool('RememberPassword', RememberPassword);
   finally
     Free;

trunk/USystem.pas

@@ -233 +233 @@
       Values.ObjectName := Obj.Table;
       Values.SchemaName := Obj.Schema;
+      Values.Condition := Filter;
       Values.Load;