Merge branch 'irp50'

MartinDrab · Jan 11, 2020 · 15faf6e · 15faf6e
2 parents b884483 + 48efaf4
commit 15faf6e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/gui/FillterForm.dfm b/gui/FillterForm.dfm
@@ -23,6 +23,7 @@ object FilterFrm: TFilterFrm
     Height = 145
     Align = alTop
     TabOrder = 0
+    ExplicitTop = -6
     object Label1: TLabel
       Left = 0
       Top = 13
@@ -200,6 +201,14 @@ object FilterFrm: TFilterFrm
       TabOrder = 14
       OnClick = AddButtonClick
     end
+    object EphemeralCheckBox: TCheckBox
+      Left = 346
+      Top = 80
+      Width = 73
+      Height = 17
+      Caption = 'Ephemeral'
+      TabOrder = 15
+    end
   end
   object LowerPanel: TPanel
     Left = 0

diff --git a/gui/FillterForm.pas b/gui/FillterForm.pas
@@ -46,6 +46,7 @@
     Label6: TLabel;
     NameEdit: TEdit;
     ApplyButton: TButton;
+    EphemeralCheckBox: TCheckBox;
     Procedure FormCreate(Sender: TObject);
     procedure FilterTypeComboBoxChange(Sender: TObject);
     procedure FilterColumnComboBoxChange(Sender: TObject);
@@ -267,6 +268,9 @@
        Font.Color := ClBlack
     Else Font.Color := ClWhite;
     end;
+
+  If f.Ephemeral Then
+    Font.Style := Font.Style + [fsItalic];
   end;
 
 DefaultDraw := True;
@@ -342,6 +346,7 @@
   HighlightColorColorBox.Selected := f.HighlightColor;
   NegateCheckBox.Checked := f.Negate;
   EnabledCheckBox.Checked := f.Enabled;
+  EphemeralCheckBox.Checked := f.Ephemeral;
   end;
 end;
 
@@ -607,6 +612,7 @@
     end;
 
   f.Enabled := EnabledCheckBox.Checked;
+  f.Ephemeral := EphemeralCheckBox.Checked;
   FilterListViewData(FilterListView, L);
   f := Nil;
 Finally

diff --git a/gui/MainForm.pas b/gui/MainForm.pas
@@ -897,6 +897,7 @@ procedure TMainFrm.PopupFilterClick(Sender: TObject);
   rq := FModel.Selected;
   rf := TRequestFilter.NewInstance(rq.RequestType);
   rf.Enabled := True;
+  rf.Ephemeral := True;
   columnType := ERequestListModelColumnType(M.Tag);
   ret := rq.GetColumnValueRaw(columnType, d, l);
   If ret Then

diff --git a/gui/RequestFilter.pas b/gui/RequestFilter.pas
@@ -69,6 +69,7 @@
     FIntValue : UInt64;
     FRequestType : ERequestType;
     FEnabled : Boolean;
+    FEphemeral : Boolean;
     FAction : EFilterAction;
     FNegate : Boolean;
     FColumnName : WideString;
@@ -105,6 +106,7 @@
     Property IntValue : UInt64 Read FIntValue;
     Property RequestType : ERequesttype Read FRequestType;
     Property Enabled : Boolean Read FEnabled Write SetEnable;
+    Property Ephemeral : Boolean Read FEphemeral Write FEphemeral;
     Property Action : EFilterAction Read FAction;
     Property HighlightColor : Cardinal Read FHighlightColor;
     Property Negate : Boolean Read FNegate Write FNegate;
@@ -307,9 +309,12 @@
 
     For rf  In AList Do
       begin
-      Result := rf.Save(iniFile);
-      If Not Result Then
-        Break;
+      If Not rf.Ephemeral Then
+        begin
+        Result := rf.Save(iniFile);
+        If Not Result Then
+          Break;
+        end;
       end;
   Except
     Result := False;
@@ -701,6 +706,7 @@
   Result.FStringValue := FStringValue;
   Result.FIntValue := FIntValue;
   Result.FEnabled := FEnabled;
+  Result.FEphemeral := FEphemeral;
   Result.FAction := FAction;
   Result.FNegate := FNegate;
   Result.FColumnName := FColumnName;