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

Timestamp:

Nov 29, 2017, 2:03:17 PM (7 years ago)

Author:

chronos

Message:

• Added: New rule item type "Terminal range" to hold interval of characters.
• Fixed: Removel of selected items in a list was not working correctly.

File:

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

branches/generator/Forms/UFormRuleItems.pas

@@ -22 +22 @@
     ComboBox1: TComboBox;
     Label1: TLabel;
-    ListView: TListView;
+    ListView1: TListView;
     MenuItem1: TMenuItem;
     MenuItem2: TMenuItem;
@@ -42 +42 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure ListViewData(Sender: TObject; Item: TListItem);
-    procedure ListViewDblClick(Sender: TObject);
-    procedure ListViewKeyPress(Sender: TObject; var Key: char);
-    procedure ListViewSelectItem(Sender: TObject; Item: TListItem;
+    procedure ListView1Data(Sender: TObject; Item: TListItem);
+    procedure ListView1DblClick(Sender: TObject);
+    procedure ListView1KeyPress(Sender: TObject; var Key: char);
+    procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
   private
@@ -68 +68 @@
 { TFormRuleItems }
 
-procedure TFormRuleItems.ListViewData(Sender: TObject; Item: TListItem);
+procedure TFormRuleItems.ListView1Data(Sender: TObject; Item: TListItem);
 begin
   if (Item.Index >= 0) and (Item.Index < RuleItems.Count) then begin
@@ -97 +97 @@
   RuleItem: TRuleItem;
 begin
-  if Assigned(ListView.Selected) then begin
-    RuleItem := TRuleItem(ListView.Selected.Data);
+  if Assigned(ListView1.Selected) then begin
+    RuleItem := TRuleItem(ListView1.Selected.Data);
     FormRuleItem := TFormRuleItem.Create(nil);
     FormRuleItem.LoadData(RuleItem);
@@ -111 +111 @@
 procedure TFormRuleItems.AMoveDownExecute(Sender: TObject);
 begin
-  RuleItems.ParentRule.Items.Move(ListView.Selected.Index, ListView.Selected.Index + 1);
-  ListView.ItemIndex := ListView.Selected.Index + 1;
+  RuleItems.ParentRule.Items.Move(ListView1.Selected.Index, ListView1.Selected.Index + 1);
+  ListView1.ItemIndex := ListView1.Selected.Index + 1;
   ReloadList;
 end;
@@ -118 +118 @@
 procedure TFormRuleItems.AMoveUpExecute(Sender: TObject);
 begin
-  RuleItems.ParentRule.Items.Move(ListView.Selected.Index, ListView.Selected.Index - 1);
-  ListView.ItemIndex := ListView.Selected.Index - 1;
+  RuleItems.ParentRule.Items.Move(ListView1.Selected.Index, ListView1.Selected.Index - 1);
+  ListView1.ItemIndex := ListView1.Selected.Index - 1;
   ReloadList;
 end;
@@ -125 +125 @@
 procedure TFormRuleItems.ARemoveExecute(Sender: TObject);
 var
-  Item: TListItem;
+  I: Integer;
 begin
-  for Item in ListView.Items do
-  if Item.Selected then
-    RuleItems.ParentRule.Items.Remove(TRuleItem(Item.Data));
+  if MessageDlg('Remove item(s)', 'Do you want to remove selected item(s)?',
+    mtConfirmation, mbYesNo, 0) = mrYes then
+  for I := ListView1.Items.Count - 1 downto 0 do
+  if ListView1.Items[I].Selected then
+    RuleItems.ParentRule.Items.Remove(TRuleItem(ListView1.Items[I].Data));
   ReloadList;
 end;
@@ -144 +146 @@
 end;
 
-procedure TFormRuleItems.ListViewDblClick(Sender: TObject);
+procedure TFormRuleItems.ListView1DblClick(Sender: TObject);
 begin
   AModify.Execute;
 end;
 
-procedure TFormRuleItems.ListViewKeyPress(Sender: TObject; var Key: char);
+procedure TFormRuleItems.ListView1KeyPress(Sender: TObject; var Key: char);
 begin
   if Key = #13 then AModify.Execute;
 end;
 
-procedure TFormRuleItems.ListViewSelectItem(Sender: TObject; Item: TListItem;
+procedure TFormRuleItems.ListView1SelectItem(Sender: TObject; Item: TListItem;
   Selected: Boolean);
 begin
@@ -162 +164 @@
 procedure TFormRuleItems.UpdateInterface;
 begin
-  AModify.Enabled := Assigned(ListView.Selected);
-  ARemove.Enabled := Assigned(ListView.Selected);
-  AMoveUp.Enabled := Assigned(ListView.Selected) and (ListView.Selected.Index > 0);
-  AMoveDown.Enabled := Assigned(ListView.Selected) and (ListView.Selected.Index < (ListView.Items.Count - 1));
+  AModify.Enabled := Assigned(ListView1.Selected);
+  ARemove.Enabled := Assigned(ListView1.Selected);
+  AMoveUp.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index > 0);
+  AMoveDown.Enabled := Assigned(ListView1.Selected) and (ListView1.Selected.Index < (ListView1.Items.Count - 1));
 end;
 
 procedure TFormRuleItems.ReloadList;
 begin
-  if Assigned(RuleItems) then ListView.Items.Count := RuleItems.Count
-    else ListView.Items.Count := 0;
-  ListView.Refresh;
+  if Assigned(RuleItems) then ListView1.Items.Count := RuleItems.Count
+    else ListView1.Items.Count := 0;
+  ListView1.Refresh;
 end;