Add enum field support (OS) to custom filter

GBM/Forms/frmFilter.Designer.vb

@@ -40,7 +40,7 @@ Partial Class frmFilter
         Me.grpGameFilter = New System.Windows.Forms.GroupBox()
         Me.lblNot = New System.Windows.Forms.Label()
         Me.chkNot = New System.Windows.Forms.CheckBox()
-        Me.cboBoolFilter = New System.Windows.Forms.ComboBox()
+        Me.cboListFilter = New System.Windows.Forms.ComboBox()
         Me.numFilter = New System.Windows.Forms.NumericUpDown()
         Me.cboNumericOps = New System.Windows.Forms.ComboBox()
         Me.lblCurrentFilters = New System.Windows.Forms.Label()
@@ -229,7 +229,7 @@ Partial Class frmFilter
         '
         Me.grpGameFilter.Controls.Add(Me.lblNot)
         Me.grpGameFilter.Controls.Add(Me.chkNot)
-        Me.grpGameFilter.Controls.Add(Me.cboBoolFilter)
+        Me.grpGameFilter.Controls.Add(Me.cboListFilter)
         Me.grpGameFilter.Controls.Add(Me.numFilter)
         Me.grpGameFilter.Controls.Add(Me.cboNumericOps)
         Me.grpGameFilter.Controls.Add(Me.lblCurrentFilters)
@@ -265,14 +265,14 @@ Partial Class frmFilter
         Me.chkNot.TabIndex = 10
         Me.chkNot.UseVisualStyleBackColor = True
         '
-        'cboBoolFilter
+        'cboListFilter
         '
-        Me.cboBoolFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboBoolFilter.FormattingEnabled = True
-        Me.cboBoolFilter.Location = New System.Drawing.Point(187, 36)
-        Me.cboBoolFilter.Name = "cboBoolFilter"
-        Me.cboBoolFilter.Size = New System.Drawing.Size(136, 21)
-        Me.cboBoolFilter.TabIndex = 3
+        Me.cboListFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboListFilter.FormattingEnabled = True
+        Me.cboListFilter.Location = New System.Drawing.Point(187, 36)
+        Me.cboListFilter.Name = "cboListFilter"
+        Me.cboListFilter.Size = New System.Drawing.Size(136, 21)
+        Me.cboListFilter.TabIndex = 3
         '
         'numFilter
         '
@@ -549,7 +549,7 @@ Partial Class frmFilter
     Friend WithEvents lblFields As Label
     Friend WithEvents cboNumericOps As ComboBox
     Friend WithEvents numFilter As NumericUpDown
-    Friend WithEvents cboBoolFilter As ComboBox
+    Friend WithEvents cboListFilter As ComboBox
     Friend WithEvents lblSortFields As Label
     Friend WithEvents Label1 As Label
     Friend WithEvents grpSortOptions As GroupBox

GBM/Forms/frmFilter.vb

@@ -242,6 +242,15 @@ Public Class frmFilter
         oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
         oValidFields.Add(oField)
 
+        'OS
+        oField = New clsGameFilterField
+        oField.FieldName = "OS"
+        oField.FriendlyFieldName = frmFilter_FieldOS
+        oField.Type = clsGameFilterField.eDataType.fEnum
+        oField.EnumField = clsGameFilterField.eEnumFilterField.OS
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
         'IsRegEx
         oField = New clsGameFilterField
         oField.FieldName = "IsRegEx"
@@ -359,7 +368,7 @@ Public Class frmFilter
                         sFilter = oFilter.Field.FriendlyFieldName & " " & frmFilter_lstFilterContains & " """ & oFilter.Data & """"
                     Case clsGameFilterField.eDataType.fNumeric
                         sFilter = oFilter.Field.FriendlyFieldName & " " & oFilter.NumericOperatorAsString & " " & oFilter.Data
-                    Case clsGameFilterField.eDataType.fBool
+                    Case clsGameFilterField.eDataType.fBool, clsGameFilterField.eDataType.fEnum
                         sFilter = oFilter.Field.FriendlyFieldName & " = " & oFilter.Data
                 End Select
 
@@ -413,23 +422,22 @@ Public Class frmFilter
     End Sub
 
     Private Sub ChangeFilterMode()
-        Dim oFilterType As clsGameFilterField.eDataType = DirectCast(cboFilterField.SelectedValue, clsGameFilterField).Type
+        Dim oFilter As clsGameFilterField = DirectCast(cboFilterField.SelectedValue, clsGameFilterField)
 
         'Reset
         cboNumericOps.SelectedIndex = 0
-        cboBoolFilter.SelectedIndex = 0
         numFilter.Value = 0
         txtStringFilter.Text = String.Empty
         chkNot.Checked = False
 
         'Reset Visibilty
-        cboBoolFilter.Visible = False
+        cboListFilter.Visible = False
         cboNumericOps.Visible = False
         numFilter.Visible = False
         txtStringFilter.Visible = False
 
         'Set Visiblity
-        Select Case oFilterType
+        Select Case oFilter.Type
             Case clsGameFilterField.eDataType.fString
                 txtStringFilter.Visible = True
             Case clsGameFilterField.eDataType.fNumeric
@@ -437,7 +445,13 @@ Public Class frmFilter
                 numFilter.Visible = True
                 txtStringFilter.Visible = False
             Case clsGameFilterField.eDataType.fBool
-                cboBoolFilter.Visible = True
+                LoadComboAsBool()
+                cboListFilter.SelectedIndex = 0
+                cboListFilter.Visible = True
+            Case clsGameFilterField.eDataType.fEnum
+                LoadComboAsEnum(oFilter.EnumField)
+                cboListFilter.SelectedIndex = 0
+                cboListFilter.Visible = True
         End Select
 
     End Sub
@@ -458,8 +472,8 @@ Public Class frmFilter
                 oFilter.Data = numFilter.Value
                 oFilter.NumericOperator = DirectCast(cboNumericOps.SelectedValue, clsGameFilter.eNumericOperators)
                 sFilter = oFilter.Field.FriendlyFieldName & " " & oFilter.NumericOperatorAsString & " " & oFilter.Data
-            Case clsGameFilterField.eDataType.fBool
-                oFilter.Data = cboBoolFilter.SelectedValue
+            Case clsGameFilterField.eDataType.fBool, clsGameFilterField.eDataType.fEnum
+                oFilter.Data = cboListFilter.SelectedValue
                 sFilter = oFilter.Field.FriendlyFieldName & " = " & oFilter.Data
         End Select
 
@@ -531,20 +545,40 @@ Public Class frmFilter
 
     End Sub
 
-    Private Sub LoadCombos()
-        Dim oFilterFields As New List(Of KeyValuePair(Of clsGameFilterField, String))
-        Dim oSortFields As New List(Of KeyValuePair(Of String, String))
-        Dim oNumericOperators As New List(Of KeyValuePair(Of clsGameFilter.eNumericOperators, String))
+    Private Sub LoadComboAsBool()
         Dim oBoolOperators As New List(Of KeyValuePair(Of Boolean, String))
 
-        'cboBoolFilter
-        cboBoolFilter.ValueMember = "Key"
-        cboBoolFilter.DisplayMember = "Value"
+        'cboListFilter (Boolean)
+        cboListFilter.ValueMember = "Key"
+        cboListFilter.DisplayMember = "Value"
 
         oBoolOperators.Add(New KeyValuePair(Of Boolean, String)(True, frmFilter_cboBoolFilterEnabled))
         oBoolOperators.Add(New KeyValuePair(Of Boolean, String)(False, frmFilter_cboBoolFilterDisabled))
 
-        cboBoolFilter.DataSource = oBoolOperators
+        cboListFilter.DataSource = oBoolOperators
+    End Sub
+
+    Private Sub LoadComboAsEnum(ByVal eEnum As clsGameFilterField.eEnumFilterField)
+        Dim oEnums As New List(Of KeyValuePair(Of Integer, String))
+
+        'cboListFilter (Enum)
+        cboListFilter.ValueMember = "Key"
+        cboListFilter.DisplayMember = "Value"
+
+        Select Case eEnum
+            Case clsGameFilterField.eEnumFilterField.OS
+                For Each v As Object In [Enum].GetValues(GetType(clsGame.eOS))
+                    oEnums.Add(New KeyValuePair(Of Integer, String)(v, [Enum].GetName(GetType(clsGame.eOS), v)))
+                Next
+        End Select
+
+        cboListFilter.DataSource = oEnums
+    End Sub
+
+    Private Sub LoadCombos()
+        Dim oFilterFields As New List(Of KeyValuePair(Of clsGameFilterField, String))
+        Dim oSortFields As New List(Of KeyValuePair(Of String, String))
+        Dim oNumericOperators As New List(Of KeyValuePair(Of clsGameFilter.eNumericOperators, String))
 
         'cboNumericOps
         cboNumericOps.ValueMember = "Key"