Changeset 136 for branches/generator/Forms/UFormRuleItems.pas

Timestamp:

Dec 26, 2017, 6:59:40 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for whitespaces in And rule.
• Added: Terminals can be specified as escaped strings with slash.

File:

• branches/generator/Forms/UFormRuleItems.pas (modified) (6 diffs)

branches/generator/Forms/UFormRuleItems.pas

@@ -20 +20 @@
     AMoveUp: TAction;
     ARemove: TAction;
-    ComboBox1: TComboBox;
+    CheckBoxWhiteSpace: TCheckBox;
+    ComboBoxOperator: TComboBox;
     Label1: TLabel;
     ListView1: TListView;
@@ -40 +41 @@
     procedure AMoveUpExecute(Sender: TObject);
     procedure ARemoveExecute(Sender: TObject);
+    procedure ComboBoxOperatorChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -82 +84 @@
   NewRuleItem := TRuleItem.Create;
   NewRuleItem.Grammer := RuleItems.Grammer;
+  NewRuleItem.ParentRule := RuleItems.ParentRule;
   FormRuleItem := TFormRuleItem.Create(nil);
   FormRuleItem.LoadData(NewRuleItem);
@@ -141 +144 @@
 end;
 
+procedure TFormRuleItems.ComboBoxOperatorChange(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormRuleItems.FormCreate(Sender: TObject);
 begin
@@ -174 +182 @@
   AMoveUp.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index > 0);
   AMoveDown.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index < (ListView1.Items.Count - 1));
+  CheckBoxWhiteSpace.Enabled := ComboBoxOperator.ItemIndex = 0;
 end;
 
@@ -186 +195 @@
 begin
   Self.RuleItems := RuleItems;
-  ComboBox1.ItemIndex := Integer(RuleItems.RuleType);
+  ComboBoxOperator.ItemIndex := Integer(RuleItems.RuleType);
+  CheckBoxWhiteSpace.Checked := RuleItems.WithWhiteSpeaces;
 end;
 
 procedure TFormRuleItems.SaveData(RuleItems: TRuleItems);
 begin
-  RuleItems.RuleType := TRuleType(ComboBox1.ItemIndex);
+  RuleItems.RuleType := TRuleType(ComboBoxOperator.ItemIndex);
+  RuleItems.WithWhiteSpeaces := CheckBoxWhiteSpace.Checked;
 end;