[Instantobjects-cvscommit] Source/Design InstantAttributeEditor.pas,1.13,1.14 InstantAttributeEditor

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13523

Modified Files:
	InstantAttributeEditor.pas InstantAttributeEditor.dfm 
Log Message:
Removed all of the "with" clauses and renamed the "AutoCheckBox".

Index: InstantAttributeEditor.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.dfm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantAttributeEditor.dfm	24 Feb 2005 00:08:33 -0000	1.6
--- InstantAttributeEditor.dfm	1 Mar 2005 06:48:01 -0000	1.7
***************
*** 157,161 ****
            OnChange = StorageKindEditChange
          end
!         object AutoCheckBox: TCheckBox
            Left = 172
            Top = 212
--- 157,161 ----
            OnChange = StorageKindEditChange
          end
!         object AutoExternalStorageNameCheckBox: TCheckBox
            Left = 172
            Top = 212
***************
*** 165,169 ****
            Caption = 'Auto'
            TabOrder = 7
!           OnClick = AutoCheckBoxClick
          end
        end
--- 165,169 ----
            Caption = 'Auto'
            TabOrder = 7
!           OnClick = AutoExternalStorageNameCheckBoxClick
          end
        end

Index: InstantAttributeEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InstantAttributeEditor.pas	24 Feb 2005 00:08:33 -0000	1.13
--- InstantAttributeEditor.pas	1 Mar 2005 06:48:01 -0000	1.14
***************
*** 94,98 ****
      StorageKindEdit: TDBComboBox;
      StorageKindLabel: TLabel;
!     AutoCheckBox: TCheckBox;
      procedure FormCreate(Sender: TObject);
      procedure NameEditChange(Sender: TObject);
--- 94,98 ----
      StorageKindEdit: TDBComboBox;
      StorageKindLabel: TLabel;
!     AutoExternalStorageNameCheckBox: TCheckBox;
      procedure FormCreate(Sender: TObject);
      procedure NameEditChange(Sender: TObject);
***************
*** 109,113 ****
      procedure ExternalStorageNameEditChange(Sender: TObject);
      procedure StorageNameEditChange(Sender: TObject);
!     procedure AutoCheckBoxClick(Sender: TObject);
    private
      FBaseClassStorageName: string;
--- 109,113 ----
      procedure ExternalStorageNameEditChange(Sender: TObject);
      procedure StorageNameEditChange(Sender: TObject);
!     procedure AutoExternalStorageNameCheckBoxClick(Sender: TObject);
    private
      FBaseClassStorageName: string;
***************
*** 134,142 ****
    public
      property BaseClassStorageName: string read FBaseClassStorageName write
!         FBaseClassStorageName;
      property Limited: Boolean read FLimited write SetLimited;
      property Model: TInstantCodeModel read FModel write SetModel;
      property OnLoadClasses: TInstantStringsEvent read FOnLoadClasses
!         write FOnLoadClasses;
      property Subject: TInstantCodeAttribute read GetSubject write SetSubject;
    end;
--- 134,142 ----
    public
      property BaseClassStorageName: string read FBaseClassStorageName write
!       FBaseClassStorageName;
      property Limited: Boolean read FLimited write SetLimited;
      property Model: TInstantCodeModel read FModel write SetModel;
      property OnLoadClasses: TInstantStringsEvent read FOnLoadClasses
!       write FOnLoadClasses;
      property Subject: TInstantCodeAttribute read GetSubject write SetSubject;
    end;
***************
*** 168,186 ****
    I: Integer;
  begin
!   with ObjectClassEdit do
!   begin
!     Items.BeginUpdate;
!     try
!       Items.Clear;
!       if Assigned(FOnLoadClasses) then
!         FOnLoadClasses(Self, Items)
!       else if Assigned(FModel) then
          for I := 0 to Pred(FModel.ClassCount) do
!           Items.Add(FModel.Classes[I].Name);
!       if Assigned(Field) then
!         ItemIndex := Items.IndexOf(Field.AsString);
!     finally
!       Items.EndUpdate;
!     end;
    end;
  end;
--- 168,185 ----
    I: Integer;
  begin
!   ObjectClassEdit.Items.BeginUpdate;
!   try
!     ObjectClassEdit.Items.Clear;
!     if Assigned(FOnLoadClasses) then
!       FOnLoadClasses(Self, ObjectClassEdit.Items)
!     else
!       if Assigned(FModel) then
          for I := 0 to Pred(FModel.ClassCount) do
!           ObjectClassEdit.Items.Add(FModel.Classes[I].Name);
!     if Assigned(ObjectClassEdit.Field) then
!       ObjectClassEdit.ItemIndex :=
!         ObjectClassEdit.Items.IndexOf(ObjectClassEdit.Field.AsString);
!   finally
!     ObjectClassEdit.Items.EndUpdate;
    end;
  end;
***************
*** 248,253 ****
  procedure TInstantAttributeEditorForm.LoadStorageKind;
  begin
!   with StorageKindEdit do
!     ItemIndex := SubjectExposer.GetFieldStrings(Field, Items);
  end;
  
--- 247,252 ----
  procedure TInstantAttributeEditorForm.LoadStorageKind;
  begin
!   StorageKindEdit.ItemIndex :=
!     SubjectExposer.GetFieldStrings(StorageKindEdit.Field, StorageKindEdit.Items);
  end;
  
***************
*** 256,266 ****
    I: Integer;
  begin
!   with TypeEdit do
!   begin
!     ItemIndex := SubjectExposer.GetFieldStrings(Field, Items);
!     I := Items.IndexOf('Unknown');
!     if I <> -1 then
!       Items.Delete(I);
!   end;
  end;
  
--- 255,263 ----
    I: Integer;
  begin
!   TypeEdit.ItemIndex := SubjectExposer.GetFieldStrings(TypeEdit.Field,
!     TypeEdit.Items);
!   I := TypeEdit.Items.IndexOf('Unknown');
!   if I <> -1 then
!     TypeEdit.Items.Delete(I);
  end;
  
***************
*** 269,293 ****
    I: Integer;
  begin
!   with VisibilityEdit do
    begin
!     SubjectExposer.GetFieldStrings(Field, Items);
!     I := Items.IndexOf('Default');
      if I <> -1 then
!       Items.Delete(I);
!     if Assigned(Subject) and Subject.IsContainer then
!     begin
!       I := Items.IndexOf('Published');
!       if I <> -1 then
!         Items.Delete(I);
!     end;
!     if Assigned(Field) then
!       ItemIndex := Items.IndexOf(Field.AsString);
    end;
  end;
  
  procedure TInstantAttributeEditorForm.NameEditChange(Sender: TObject);
  begin
!   with NameEdit do
!     SubjectExposer.AssignFieldValue(Field, Text);
    UpdateControls;
    ComputeExternalStorageName;
--- 266,287 ----
    I: Integer;
  begin
!   SubjectExposer.GetFieldStrings(VisibilityEdit.Field, VisibilityEdit.Items);
!   I := VisibilityEdit.Items.IndexOf('Default');
!   if I <> -1 then
!     VisibilityEdit.Items.Delete(I);
!   if Assigned(Subject) and Subject.IsContainer then
    begin
!     I := VisibilityEdit.Items.IndexOf('Published');
      if I <> -1 then
!       VisibilityEdit.Items.Delete(I);
    end;
+   if Assigned(VisibilityEdit.Field) then
+     VisibilityEdit.ItemIndex :=
+       VisibilityEdit.Items.IndexOf(VisibilityEdit.Field.AsString);
  end;
  
  procedure TInstantAttributeEditorForm.NameEditChange(Sender: TObject);
  begin
!   SubjectExposer.AssignFieldValue(NameEdit.Field, NameEdit.Text);
    UpdateControls;
    ComputeExternalStorageName;
***************
*** 305,310 ****
  procedure TInstantAttributeEditorForm.ObjectClassEditChange(Sender: TObject);
  begin
!   with ObjectClassEdit do
!     SubjectExposer.AssignFieldValue(Field, Text);
    UpdateControls;
  end;
--- 299,303 ----
  procedure TInstantAttributeEditorForm.ObjectClassEditChange(Sender: TObject);
  begin
!   SubjectExposer.AssignFieldValue(ObjectClassEdit.Field, ObjectClassEdit.Text);
    UpdateControls;
  end;
***************
*** 322,336 ****
  begin
    if Assigned(Subject.Owner) then
!     with Subject.Owner do
!       for I := 0 to Pred(AttributeCount) do
        begin
!         Attribute := Attributes[I];
!         if (Attribute <> Subject) and SameText(Attribute.Name, Subject.Name) then
!         begin
!           ModalResult := mrNone;
!           raise Exception.Create('Name already used');
!         end;
        end;
!       
    inherited;
  end;
--- 315,328 ----
  begin
    if Assigned(Subject.Owner) then
!     for I := 0 to Pred(Subject.Owner.AttributeCount) do
!     begin
!       Attribute := Subject.Owner.Attributes[I];
!       if (Attribute <> Subject) and SameText(Attribute.Name, Subject.Name) then
        begin
!         ModalResult := mrNone;
!         raise Exception.Create('Name already used');
        end;
!     end;
! 
    inherited;
  end;
***************
*** 419,423 ****
      if Write then
        Value := Prefix + Value
!     else begin
        Name := Value;
        Delete(Name, 1, Length(Prefix));
--- 411,416 ----
      if Write then
        Value := Prefix + Value
!     else
!     begin
        Name := Value;
        Delete(Name, 1, Length(Prefix));
***************
*** 429,442 ****
    if Field.FieldName = 'AttributeType' then
      TranslateEnum('at')
!   else if Field.FieldName = 'Visibility' then
!     TranslateEnum('vi')
!   else if Field.FieldName = 'StorageKind' then
!     TranslateEnum('sk');
  end;
  
  procedure TInstantAttributeEditorForm.TypeEditClick(Sender: TObject);
  begin
!   with TypeEdit do
!     SubjectExposer.AssignFieldValue(Field, Text);
    // Controls need to be enabled first to
    // reliably load combo dropdown lists in MM OFExpt
--- 422,436 ----
    if Field.FieldName = 'AttributeType' then
      TranslateEnum('at')
!   else
!     if Field.FieldName = 'Visibility' then
!       TranslateEnum('vi')
!     else
!       if Field.FieldName = 'StorageKind' then
!         TranslateEnum('sk');
  end;
  
  procedure TInstantAttributeEditorForm.TypeEditClick(Sender: TObject);
  begin
!   SubjectExposer.AssignFieldValue(TypeEdit.Field, TypeEdit.Text);
    // Controls need to be enabled first to
    // reliably load combo dropdown lists in MM OFExpt
***************
*** 453,463 ****
      I: Integer;
    begin
!     with Parent do
!       for I := 0 to Pred(ControlCount) do
!       begin
!         Controls[I].Enabled := not Disable;
!         if Controls[I] is TWinControl then
!           DisableSubControls(TWinControl(Controls[I]), Disable);
!       end;
    end;
  
--- 447,456 ----
      I: Integer;
    begin
!     for I := 0 to Pred(Parent.ControlCount) do
!     begin
!       Parent.Controls[I].Enabled := not Disable;
!       if Parent.Controls[I] is TWinControl then
!         DisableSubControls(TWinControl(Parent.Controls[I]), Disable);
!     end;
    end;
  
***************
*** 469,473 ****
  var
    HasName, HasClass, IsComplex, IsContainer, CanBeExternal, IsExternal,
!   IsMaskable, IsString, IsValid: Boolean;
  begin
    CanBeExternal := Subject.AttributeType in [atPart, atParts, atReferences];
--- 462,466 ----
  var
    HasName, HasClass, IsComplex, IsContainer, CanBeExternal, IsExternal,
!     IsMaskable, IsString, IsValid: Boolean;
  begin
    CanBeExternal := Subject.AttributeType in [atPart, atParts, atReferences];
***************
*** 480,484 ****
    HasClass := ObjectClassEdit.Text <> '';
    IsComplex := Subject.IsComplex;
!   IsMaskable := Subject.AttributeType in [atString, atMemo, atFloat, atCurrency, atInteger];
    IsContainer := Subject.IsContainer;
  
--- 473,478 ----
    HasClass := ObjectClassEdit.Text <> '';
    IsComplex := Subject.IsComplex;
!   IsMaskable := Subject.AttributeType in [atString, atMemo, atFloat, atCurrency,
!     atInteger];
    IsContainer := Subject.IsContainer;
  
***************
*** 507,512 ****
      EnableCtrl(StorageKindLabel, CanBeExternal);
    end;
!   EnableCtrl(StorageNameLabel, not IsExternal or (Subject.AttributeType = atPart));
!   EnableCtrl(StorageNameEdit, not IsExternal or (Subject.AttributeType = atPart));
  
    EnableCtrl(ExternalStorageNameLabel, IsExternal
--- 501,508 ----
      EnableCtrl(StorageKindLabel, CanBeExternal);
    end;
!   EnableCtrl(StorageNameLabel, not IsExternal or (Subject.AttributeType =
!     atPart));
!   EnableCtrl(StorageNameEdit, not IsExternal or (Subject.AttributeType =
!     atPart));
  
    EnableCtrl(ExternalStorageNameLabel, IsExternal
***************
*** 514,518 ****
    EnableCtrl(ExternalStorageNameEdit, IsExternal
      and not (Subject.AttributeType = atPart));
!   EnableCtrl(AutoCheckBox, IsExternal
      and not (Subject.AttributeType = atPart));
  
--- 510,514 ----
    EnableCtrl(ExternalStorageNameEdit, IsExternal
      and not (Subject.AttributeType = atPart));
!   EnableCtrl(AutoExternalStorageNameCheckBox, IsExternal
      and not (Subject.AttributeType = atPart));
  
***************
*** 528,549 ****
  procedure TInstantAttributeEditorForm.StorageKindEditChange(Sender: TObject);
  begin
!   with StorageKindEdit do
!     if Text <> '' then
!       SubjectExposer.AssignFieldValue(Field, Text);
    UpdateControls;
    ComputeExternalStorageName;
  end;
  
! procedure TInstantAttributeEditorForm.ExternalStorageNameEditChange(Sender: TObject);
  begin
!   with ExternalStorageNameEdit do
!     if Text <> '' then
!       SubjectExposer.AssignFieldValue(Field, Text);
    UpdateControls;
  end;
  
! procedure TInstantAttributeEditorForm.AutoCheckBoxClick(Sender: TObject);
  begin
!   if AutoCheckBox.Checked then
      ComputeExternalStorageName;
  end;
--- 524,548 ----
  procedure TInstantAttributeEditorForm.StorageKindEditChange(Sender: TObject);
  begin
!   if StorageKindEdit.Text <> '' then
!     SubjectExposer.AssignFieldValue(StorageKindEdit.Field,
!       StorageKindEdit.Text);
    UpdateControls;
    ComputeExternalStorageName;
  end;
  
! procedure TInstantAttributeEditorForm.ExternalStorageNameEditChange(Sender:
!   TObject);
  begin
!   if ExternalStorageNameEdit.Text <> '' then
!     SubjectExposer.AssignFieldValue(ExternalStorageNameEdit.Field,
!       ExternalStorageNameEdit.Text);
    UpdateControls;
  end;
  
! procedure
!   TInstantAttributeEditorForm.AutoExternalStorageNameCheckBoxClick(Sender:
!   TObject);
  begin
!   if AutoExternalStorageNameCheckBox.Checked then
      ComputeExternalStorageName;
  end;
***************
*** 566,580 ****
  
  begin
!   with ExternalStorageNameEdit do
!     if Enabled then
!     begin
!       if (Subject.ExternalStorageName <> '') and not AutoCheckBox.Checked then
!         Text := Subject.ExternalStorageName
!       else
!       if (Text = '') or AutoCheckBox.Checked then
!         Text := Format('%s_%s', [BaseClassStorageName, GetStorageName()]);
!     end
      else
!       Text := '';
  
  end;
--- 565,581 ----
  
  begin
!   if ExternalStorageNameEdit.Enabled then
!   begin
!     if (Subject.ExternalStorageName <> '') and
!       not AutoExternalStorageNameCheckBox.Checked then
!       ExternalStorageNameEdit.Text := Subject.ExternalStorageName
      else
!       if (ExternalStorageNameEdit.Text = '') or
!         AutoExternalStorageNameCheckBox.Checked then
!         ExternalStorageNameEdit.Text :=
!           Format('%s_%s', [BaseClassStorageName, GetStorageName()]);
!   end
!   else
!     ExternalStorageNameEdit.Text := '';
  
  end;
***************
*** 582,595 ****
  end.
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
--- 583,584 ----

[Instantobjects-cvscommit] Source/Design InstantAttributeEditor.pas,1.13,1.14 InstantAttributeEditor

[Instantobjects-cvscommit] Source/Design InstantAttributeEditor.pas,1.13,1.14 InstantAttributeEditor.dfm,1.6,1.7