Fixed some export issues

Change deb DESTDIR

.gitignore

@@ -185,4 +185,7 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+/.vs/slnx.sqlite
+/.vs/VSWorkspaceState.json
+/.vs/Game Backup Monitor/v15

GBM/Classes/XML Serialize Classes/ExportData.vb

@@ -0,0 +1,63 @@
+Imports System.Xml.Serialization
+
+<XmlRoot("gbm")>
+Public Class ExportData
+    Dim oConfigs As List(Of Game)
+    Private dExported As Int64
+    Private iTotalConfigs As Integer
+    Private iAppVer As Integer
+
+    <XmlAttribute("Exported")>
+    Property Exported As Int64
+        Set(value As Int64)
+            dExported = value
+        End Set
+        Get
+            Return dExported
+        End Get
+    End Property
+
+    <XmlAttribute("TotalConfigurations")>
+    Property TotalConfigurations As Integer
+        Set(value As Integer)
+            iTotalConfigs = value
+        End Set
+        Get
+            Return iTotalConfigs
+        End Get
+    End Property
+
+    <XmlAttribute("AppVer")>
+    Property AppVer As Integer
+        Set(value As Integer)
+            iAppVer = value
+        End Set
+        Get
+            Return iAppVer
+        End Get
+    End Property
+
+    <XmlElement("Game")>
+    Property Configurations As List(Of Game)
+        Set(value As List(Of Game))
+            oConfigs = value
+        End Set
+        Get
+            Return oConfigs
+        End Get
+    End Property
+
+    Public Sub New()
+        dExported = 0
+        iTotalConfigs = 0
+        iAppVer = 0
+        oConfigs = New List(Of Game)
+    End Sub
+
+    Public Sub New(ByVal dInitExported As Int64, ByVal iInitTotalConfigs As Integer, ByVal iInitAppVer As Integer, ByVal oInitConfigs As List(Of Game))
+        dExported = dInitExported
+        iTotalConfigs = iInitTotalConfigs
+        iAppVer = iInitAppVer
+        oConfigs = oInitConfigs
+    End Sub
+End Class

GBM/Classes/XML Serialize Classes/Game.vb

@@ -7,6 +7,8 @@
     Private bFolderSave As Boolean
     Private sFileType As String
     Private sExcludeList As String
+    Private bMonitorOnly As Boolean
+    Private sComments As String
     Private oTags As List(Of Tag)
 
     Property Name As String
@@ -81,6 +83,24 @@
         End Get
     End Property
 
+    Property MonitorOnly As Boolean
+        Set(value As Boolean)
+            bMonitorOnly = value
+        End Set
+        Get
+            Return bMonitorOnly
+        End Get
+    End Property
+
+    Property Comments As String
+        Set(value As String)
+            sComments = value
+        End Set
+        Get
+            Return sComments
+        End Get
+    End Property
+
     Property Tags As List(Of Tag)
         Get
             Return oTags

GBM/Classes/XML Serialize Classes/Session.vb

@@ -0,0 +1,49 @@
+Imports System.Xml.Serialization
+
+<XmlRoot("Session")>
+Public Class Session
+    Private sGame As String
+    Private sStart As String
+    Private sEnd As String
+    Private sHours As String
+
+    <XmlElement("Game")>
+    Public Property GameName As String
+        Set(value As String)
+            sGame = value
+        End Set
+        Get
+            Return sGame
+        End Get
+    End Property
+
+    <XmlElement("Start")>
+    Public Property StartDate As String
+        Set(value As String)
+            sStart = value
+        End Set
+        Get
+            Return sStart
+        End Get
+    End Property
+
+    <XmlElement("End")>
+    Public Property EndDate As String
+        Set(value As String)
+            sEnd = value
+        End Set
+        Get
+            Return sEnd
+        End Get
+    End Property
+
+    <XmlElement("Hours")>
+    Public Property Hours As String
+        Set(value As String)
+            sHours = value
+        End Set
+        Get
+            Return sHours
+        End Get
+    End Property
+End Class

GBM/Classes/XML Serialize Classes/Tag.vb

@@ -1,4 +1,5 @@
-Public Class Tag
+<Serializable()>
+Public Class Tag
     Private sTagName As String
 
     Property Name As String

GBM/Classes/clsGame.vb

@@ -1,4 +1,5 @@
-Public Class clsGame
+<Serializable()>
+Public Class clsGame
     Private sGameID As String = Guid.NewGuid.ToString
     Private sGameName As String = String.Empty
     Private sProcessName As String = String.Empty
@@ -18,6 +19,7 @@
     Private sCompany As String = String.Empty
     Private bEnabled As Boolean = True
     Private bMonitorOnly As Boolean = False
+    Private sComments As String = String.Empty
     Private bDuplicate As Boolean = False
     Private bTempGame As Boolean = False
     Private oImportTags As New List(Of Tag)
@@ -201,7 +203,7 @@
         End Set
     End Property
 
-    Property Enabled As Boolean        
+    Property Enabled As Boolean
         Get
             Return bEnabled
         End Get
@@ -210,7 +212,7 @@
         End Set
     End Property
 
-    Property MonitorOnly As Boolean        
+    Property MonitorOnly As Boolean
         Get
             Return bMonitorOnly
         End Get
@@ -219,6 +221,15 @@
         End Set
     End Property
 
+    Property Comments As String
+        Get
+            Return sComments
+        End Get
+        Set(value As String)
+            sComments = value
+        End Set
+    End Property
+
     Property Duplicate As Boolean
         Get
             Return bDuplicate
@@ -323,6 +334,9 @@
             If MonitorOnly <> oGame.MonitorOnly Then
                 Return False
             End If
+            If Comments <> oGame.Comments Then
+                Return False
+            End If
 
             'Optional Sync Fields
             If (eSyncFields And eOptionalSyncFields.Company) = eOptionalSyncFields.Company Then
@@ -405,4 +419,12 @@
         Return sProcessName
     End Function
 
+    Public Shared Function SetSyncField(ByVal eSyncFields As eOptionalSyncFields, ByVal eSyncField As eOptionalSyncFields) As eOptionalSyncFields
+        Return eSyncFields Or eSyncField
+    End Function
+
+    Public Shared Function RemoveSyncField(ByVal eSyncFields As eOptionalSyncFields, ByVal eSyncField As eOptionalSyncFields) As eOptionalSyncFields
+        Return eSyncFields And (Not eSyncField)
+    End Function
+
 End Class

GBM/Classes/clsGameFilter.vb

@@ -0,0 +1,81 @@
+Public Class clsGameFilter
+
+    Private sID As String
+    Private oField As clsGameFilterField
+    Private bNot As Boolean
+    Private oData As Object
+    Private eNumericOperator As eNumericOperators = eNumericOperators.Equals
+
+    Public Enum eNumericOperators
+        Equals = 1
+        Greater = 2
+        Lesser = 3
+        GreaterEquals = 4
+        LesserEquals = 5
+    End Enum
+
+    Public Property ID As String
+        Get
+            Return sID
+        End Get
+        Set(value As String)
+            sID = value
+        End Set
+    End Property
+
+    Public Property Field As clsGameFilterField
+        Get
+            Return oField
+        End Get
+        Set(value As clsGameFilterField)
+            oField = value
+        End Set
+    End Property
+
+    Public Property NotCondition As Boolean
+        Get
+            Return bNot
+        End Get
+        Set(value As Boolean)
+            bNot = value
+        End Set
+    End Property
+
+    Public Property Data As Object
+        Get
+            Return oData
+        End Get
+        Set(value As Object)
+            oData = value
+        End Set
+    End Property
+
+    Public Property NumericOperator As eNumericOperators
+        Get
+            Return eNumericOperator
+        End Get
+        Set(value As eNumericOperators)
+            eNumericOperator = value
+        End Set
+    End Property
+
+    Public ReadOnly Property NumericOperatorAsString As String
+        Get
+            Select Case eNumericOperator
+                Case eNumericOperators.Equals
+                    Return "="
+                Case eNumericOperators.Greater
+                    Return ">"
+                Case eNumericOperators.GreaterEquals
+                    Return ">="
+                Case eNumericOperators.Lesser
+                    Return "<"
+                Case eNumericOperators.LesserEquals
+                    Return "<="
+                Case Else
+                    Return String.Empty
+            End Select
+        End Get
+    End Property
+
+End Class

GBM/Classes/clsGameFilterField.vb

@@ -0,0 +1,77 @@
+Public Class clsGameFilterField
+
+    Public Enum eDataType As Integer
+        fString = 1
+        fNumeric = 2
+        fBool = 3
+    End Enum
+
+    <Flags()> Public Enum eFieldStatus
+        None = 0
+        ValidFilter = 1
+        ValidSort = 2
+    End Enum
+
+    Private sFieldName As String
+    Private sFriendlyFieldName As String
+    Private eType As eDataType
+    Private eStatus As eFieldStatus
+
+    Public Property FieldName As String
+        Get
+            Return sFieldName
+        End Get
+        Set(value As String)
+            sFieldName = value
+        End Set
+    End Property
+
+    Public Property FriendlyFieldName As String
+        Get
+            Return sFriendlyFieldName
+        End Get
+        Set(value As String)
+            sFriendlyFieldName = value
+        End Set
+    End Property
+
+    Public Property Type As eDataType
+        Get
+            Return eType
+        End Get
+        Set(value As eDataType)
+            eType = value
+        End Set
+    End Property
+
+    'This is a flag property - Setting a value will toggle that flag on and off.
+    Public Property Status As eFieldStatus
+        Get
+            Return eStatus
+        End Get
+        Set(value As eFieldStatus)
+            If (eStatus And value) = value Then
+                eStatus = RemoveFieldStatus(value)
+            Else
+                eStatus = SetFieldStatus(value)
+            End If
+        End Set
+    End Property
+
+    Private Function SetFieldStatus(ByVal eFlag As eFieldStatus) As eFieldStatus
+        Return eStatus Or eFlag
+    End Function
+
+    Private Function RemoveFieldStatus(ByVal eFlag As eFieldStatus) As eFieldStatus
+        Return eStatus And (Not eFlag)
+    End Function
+
+    Public Function CheckStatus(ByVal eFlag As eFieldStatus) As Boolean
+        If (eStatus And eFlag) = eFlag Then
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+End Class

GBM/Classes/clsSession.vb

@@ -0,0 +1,57 @@
+Public Class clsSession
+
+    Private sMonitorID As String
+    Private iStart As Int64
+    Private iEnd As Int64
+
+    Public Property MonitorID As String
+        Set(value As String)
+            sMonitorID = value
+        End Set
+        Get
+            Return sMonitorID
+        End Get
+    End Property
+
+    Public Property SessionStart As Int64
+        Set(value As Int64)
+            iStart = value
+        End Set
+        Get
+            Return iStart
+        End Get
+    End Property
+
+    Public WriteOnly Property SessionStartFromDate As DateTime
+        Set(value As DateTime)
+            iStart = mgrCommon.DateToUnix(value)
+        End Set
+    End Property
+
+    Public ReadOnly Property SessionStartFormatted As DateTime
+        Get
+            Return mgrCommon.UnixToDate(iStart)
+        End Get
+    End Property
+
+    Public Property SessionEnd As Int64
+        Set(value As Int64)
+            iEnd = value
+        End Set
+        Get
+            Return iEnd
+        End Get
+    End Property
+
+    Public WriteOnly Property SessionEndFromDate As DateTime
+        Set(value As DateTime)
+            iEnd = mgrCommon.DateToUnix(value)
+        End Set
+    End Property
+
+    Public ReadOnly Property SessionEndFormatted As DateTime
+        Get
+            Return mgrCommon.UnixToDate(iEnd)
+        End Get
+    End Property
+End Class

GBM/Forms/frmAdvancedImport.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmAdvancedImport
     Inherits System.Windows.Forms.Form
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmAdvancedImport
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.btnImport = New System.Windows.Forms.Button()
         Me.chkSelectAll = New System.Windows.Forms.CheckBox()
@@ -44,7 +44,7 @@ Partial Class frmAdvancedImport
         'chkSelectAll
         '
         Me.chkSelectAll.AutoSize = True
-        Me.chkSelectAll.Location = New System.Drawing.Point(12, 12)
+        Me.chkSelectAll.Location = New System.Drawing.Point(12, 11)
         Me.chkSelectAll.Name = "chkSelectAll"
         Me.chkSelectAll.Size = New System.Drawing.Size(70, 17)
         Me.chkSelectAll.TabIndex = 0
@@ -98,9 +98,9 @@ Partial Class frmAdvancedImport
         '
         'lblFilter
         '
-        Me.lblFilter.Location = New System.Drawing.Point(307, 12)
+        Me.lblFilter.Location = New System.Drawing.Point(371, 12)
         Me.lblFilter.Name = "lblFilter"
-        Me.lblFilter.Size = New System.Drawing.Size(103, 14)
+        Me.lblFilter.Size = New System.Drawing.Size(39, 14)
         Me.lblFilter.TabIndex = 0
         Me.lblFilter.Text = "Filter:"
         Me.lblFilter.TextAlign = System.Drawing.ContentAlignment.TopRight

GBM/Forms/frmAdvancedImport.vb

@@ -1,14 +1,25 @@
 Imports GBM.My.Resources
+Imports System.IO
 
 Public Class frmAdvancedImport
 
+    Private oImportData As ExportData
     Private hshImportData As Hashtable
     Private hshFinalData As New Hashtable
-    Private bSelectAll As Boolean = False
+    Private bSelectAll As Boolean = True
     Private bIsLoading As Boolean = False
     Private iCurrentSort As Integer = 0
     Private WithEvents tmFilterTimer As Timer
 
+    Public Property ImportInfo As ExportData
+        Set(value As ExportData)
+            oImportData = value
+        End Set
+        Get
+            Return oImportData
+        End Get
+    End Property
+
     Public Property ImportData As Hashtable
         Set(value As Hashtable)
             hshImportData = value
@@ -44,7 +55,7 @@ Public Class frmAdvancedImport
         End If
     End Sub
 
-    Private Sub LoadData(Optional ByVal sFilter As String = "")
+    Private Sub LoadData(Optional ByVal sFilter As String = "", Optional ByVal bAutoDetect As Boolean = False)
         Dim oApp As clsGame
         Dim oListViewItem As ListViewItem
         Dim sTags As String
@@ -79,6 +90,19 @@ Public Class frmAdvancedImport
                 oListViewItem.Checked = False
             End If
 
+            If bAutoDetect Then
+                If oApp.AbsolutePath Then
+                    If Directory.Exists(oApp.Path) Then
+                        oListViewItem.Checked = True
+                        SaveChecked(oListViewItem)
+                    Else
+                        oListViewItem.Checked = False
+                    End If
+                Else
+                    oListViewItem.Checked = False
+                End If
+            End If
+
             If sFilter = String.Empty Then
                 bAddItem = True
             Else
@@ -121,6 +145,11 @@ Public Class frmAdvancedImport
         'Set Form Name
         Me.Text = frmAdvancedImport_FormName
 
+        'Add configuration date to title if applicable
+        If ImportInfo.Exported <> 0 Then
+            Me.Text &= " [" & mgrCommon.UnixToDate(ImportInfo.Exported).Date & "]"
+        End If
+
         'Set Form Text
         lblFilter.Text = frmAdvancedImport_lblFilter
         btnCancel.Text = frmAdvancedImport_btnCancel
@@ -142,8 +171,7 @@ Public Class frmAdvancedImport
     Private Sub frmAdvancedImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         bIsLoading = True
         SetForm()
-        LoadData()
-        SelectToggle()
+        LoadData(String.Empty, True)
         bIsLoading = False
     End Sub
 
@@ -184,6 +212,7 @@ Public Class frmAdvancedImport
         tmFilterTimer.Stop()
         tmFilterTimer.Enabled = False
     End Sub
+
 End Class
 
 ' Column Sorter

GBM/Forms/frmFilter.Designer.vb

@@ -22,75 +22,117 @@ Partial Class frmFilter
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.optGameInfo = New System.Windows.Forms.RadioButton()
-        Me.optTag = New System.Windows.Forms.RadioButton()
         Me.grpTagFilter = New System.Windows.Forms.GroupBox()
+        Me.lblExcludeTags = New System.Windows.Forms.Label()
+        Me.btnExcludeRemove = New System.Windows.Forms.Button()
+        Me.btnExcludeAdd = New System.Windows.Forms.Button()
+        Me.lstExcludeTags = New System.Windows.Forms.ListBox()
         Me.grpTagOptions = New System.Windows.Forms.GroupBox()
         Me.optAll = New System.Windows.Forms.RadioButton()
         Me.optAny = New System.Windows.Forms.RadioButton()
-        Me.lblGameTags = New System.Windows.Forms.Label()
+        Me.lblIncludeTags = New System.Windows.Forms.Label()
         Me.lblTags = New System.Windows.Forms.Label()
-        Me.btnRemove = New System.Windows.Forms.Button()
-        Me.btnAdd = New System.Windows.Forms.Button()
-        Me.lstFilter = New System.Windows.Forms.ListBox()
+        Me.btnIncludeRemove = New System.Windows.Forms.Button()
+        Me.btnIncludeAdd = New System.Windows.Forms.Button()
+        Me.lstIncludeTags = New System.Windows.Forms.ListBox()
         Me.lstTags = New System.Windows.Forms.ListBox()
         Me.btnOK = New System.Windows.Forms.Button()
         Me.grpGameFilter = New System.Windows.Forms.GroupBox()
-        Me.grpGameInfoOptions = 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.numFilter = New System.Windows.Forms.NumericUpDown()
+        Me.cboNumericOps = New System.Windows.Forms.ComboBox()
+        Me.lblCurrentFilters = New System.Windows.Forms.Label()
+        Me.lblFilterData = New System.Windows.Forms.Label()
+        Me.lblFields = New System.Windows.Forms.Label()
+        Me.btnRemoveFilter = New System.Windows.Forms.Button()
+        Me.lstFilter = New System.Windows.Forms.ListBox()
+        Me.btnAddFilter = New System.Windows.Forms.Button()
+        Me.cboFilterField = New System.Windows.Forms.ComboBox()
+        Me.grpFilterType = New System.Windows.Forms.GroupBox()
         Me.optOr = New System.Windows.Forms.RadioButton()
         Me.optAnd = New System.Windows.Forms.RadioButton()
-        Me.txtCompany = New System.Windows.Forms.TextBox()
-        Me.lblCompany = New System.Windows.Forms.Label()
-        Me.txtProcess = New System.Windows.Forms.TextBox()
-        Me.lblProcess = New System.Windows.Forms.Label()
-        Me.lblName = New System.Windows.Forms.Label()
-        Me.txtName = New System.Windows.Forms.TextBox()
+        Me.txtStringFilter = New System.Windows.Forms.TextBox()
+        Me.grpSorting = New System.Windows.Forms.GroupBox()
+        Me.grpSortOptions = New System.Windows.Forms.GroupBox()
+        Me.optSortAsc = New System.Windows.Forms.RadioButton()
+        Me.optSortDesc = New System.Windows.Forms.RadioButton()
+        Me.lblSortFields = New System.Windows.Forms.Label()
+        Me.cboSortField = New System.Windows.Forms.ComboBox()
+        Me.chkTag = New System.Windows.Forms.CheckBox()
+        Me.chkGameInfo = New System.Windows.Forms.CheckBox()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.grpTagFilter.SuspendLayout()
         Me.grpTagOptions.SuspendLayout()
         Me.grpGameFilter.SuspendLayout()
-        Me.grpGameInfoOptions.SuspendLayout()
+        CType(Me.numFilter, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.grpFilterType.SuspendLayout()
+        Me.grpSorting.SuspendLayout()
+        Me.grpSortOptions.SuspendLayout()
         Me.SuspendLayout()
         '
-        'optGameInfo
-        '
-        Me.optGameInfo.AutoSize = True
-        Me.optGameInfo.Location = New System.Drawing.Point(12, 12)
-        Me.optGameInfo.Name = "optGameInfo"
-        Me.optGameInfo.Size = New System.Drawing.Size(108, 17)
-        Me.optGameInfo.TabIndex = 0
-        Me.optGameInfo.Text = "Game Information"
-        Me.optGameInfo.UseVisualStyleBackColor = True
-        '
-        'optTag
-        '
-        Me.optTag.AutoSize = True
-        Me.optTag.Location = New System.Drawing.Point(12, 190)
-        Me.optTag.Name = "optTag"
-        Me.optTag.Size = New System.Drawing.Size(44, 17)
-        Me.optTag.TabIndex = 2
-        Me.optTag.Text = "Tag"
-        Me.optTag.UseVisualStyleBackColor = True
-        '
         'grpTagFilter
         '
+        Me.grpTagFilter.Controls.Add(Me.lblExcludeTags)
+        Me.grpTagFilter.Controls.Add(Me.btnExcludeRemove)
+        Me.grpTagFilter.Controls.Add(Me.btnExcludeAdd)
+        Me.grpTagFilter.Controls.Add(Me.lstExcludeTags)
         Me.grpTagFilter.Controls.Add(Me.grpTagOptions)
-        Me.grpTagFilter.Controls.Add(Me.lblGameTags)
+        Me.grpTagFilter.Controls.Add(Me.lblIncludeTags)
         Me.grpTagFilter.Controls.Add(Me.lblTags)
-        Me.grpTagFilter.Controls.Add(Me.btnRemove)
-        Me.grpTagFilter.Controls.Add(Me.btnAdd)
-        Me.grpTagFilter.Controls.Add(Me.lstFilter)
+        Me.grpTagFilter.Controls.Add(Me.btnIncludeRemove)
+        Me.grpTagFilter.Controls.Add(Me.btnIncludeAdd)
+        Me.grpTagFilter.Controls.Add(Me.lstIncludeTags)
         Me.grpTagFilter.Controls.Add(Me.lstTags)
-        Me.grpTagFilter.Location = New System.Drawing.Point(12, 213)
+        Me.grpTagFilter.Location = New System.Drawing.Point(12, 236)
         Me.grpTagFilter.Name = "grpTagFilter"
-        Me.grpTagFilter.Size = New System.Drawing.Size(385, 265)
+        Me.grpTagFilter.Size = New System.Drawing.Size(410, 198)
         Me.grpTagFilter.TabIndex = 3
         Me.grpTagFilter.TabStop = False
         '
+        'lblExcludeTags
+        '
+        Me.lblExcludeTags.AutoSize = True
+        Me.lblExcludeTags.Location = New System.Drawing.Point(313, 16)
+        Me.lblExcludeTags.Name = "lblExcludeTags"
+        Me.lblExcludeTags.Size = New System.Drawing.Size(72, 13)
+        Me.lblExcludeTags.TabIndex = 10
+        Me.lblExcludeTags.Text = "Exclude Tags"
+        '
+        'btnExcludeRemove
+        '
+        Me.btnExcludeRemove.Location = New System.Drawing.Point(261, 91)
+        Me.btnExcludeRemove.Name = "btnExcludeRemove"
+        Me.btnExcludeRemove.Size = New System.Drawing.Size(31, 23)
+        Me.btnExcludeRemove.TabIndex = 9
+        Me.btnExcludeRemove.Text = "<"
+        Me.btnExcludeRemove.UseVisualStyleBackColor = True
+        '
+        'btnExcludeAdd
+        '
+        Me.btnExcludeAdd.Location = New System.Drawing.Point(261, 62)
+        Me.btnExcludeAdd.Name = "btnExcludeAdd"
+        Me.btnExcludeAdd.Size = New System.Drawing.Size(31, 23)
+        Me.btnExcludeAdd.TabIndex = 8
+        Me.btnExcludeAdd.Text = ">"
+        Me.btnExcludeAdd.UseVisualStyleBackColor = True
+        '
+        'lstExcludeTags
+        '
+        Me.lstExcludeTags.FormattingEnabled = True
+        Me.lstExcludeTags.Location = New System.Drawing.Point(298, 32)
+        Me.lstExcludeTags.Name = "lstExcludeTags"
+        Me.lstExcludeTags.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
+        Me.lstExcludeTags.Size = New System.Drawing.Size(103, 108)
+        Me.lstExcludeTags.Sorted = True
+        Me.lstExcludeTags.TabIndex = 7
+        '
         'grpTagOptions
         '
         Me.grpTagOptions.Controls.Add(Me.optAll)
         Me.grpTagOptions.Controls.Add(Me.optAny)
-        Me.grpTagOptions.Location = New System.Drawing.Point(6, 211)
+        Me.grpTagOptions.Location = New System.Drawing.Point(6, 146)
         Me.grpTagOptions.Name = "grpTagOptions"
         Me.grpTagOptions.Size = New System.Drawing.Size(150, 46)
         Me.grpTagOptions.TabIndex = 6
@@ -118,176 +160,342 @@ Partial Class frmFilter
         Me.optAny.Text = "Any Tag"
         Me.optAny.UseVisualStyleBackColor = True
         '
-        'lblGameTags
+        'lblIncludeTags
         '
-        Me.lblGameTags.AutoSize = True
-        Me.lblGameTags.Location = New System.Drawing.Point(271, 16)
-        Me.lblGameTags.Name = "lblGameTags"
-        Me.lblGameTags.Size = New System.Drawing.Size(66, 13)
-        Me.lblGameTags.TabIndex = 4
-        Me.lblGameTags.Text = "Current Filter"
+        Me.lblIncludeTags.AutoSize = True
+        Me.lblIncludeTags.Location = New System.Drawing.Point(23, 16)
+        Me.lblIncludeTags.Name = "lblIncludeTags"
+        Me.lblIncludeTags.Size = New System.Drawing.Size(69, 13)
+        Me.lblIncludeTags.TabIndex = 4
+        Me.lblIncludeTags.Text = "Include Tags"
         '
         'lblTags
         '
         Me.lblTags.AutoSize = True
-        Me.lblTags.Location = New System.Drawing.Point(43, 16)
+        Me.lblTags.Location = New System.Drawing.Point(165, 16)
         Me.lblTags.Name = "lblTags"
         Me.lblTags.Size = New System.Drawing.Size(77, 13)
         Me.lblTags.TabIndex = 0
         Me.lblTags.Text = "Available Tags"
         '
-        'btnRemove
+        'btnIncludeRemove
         '
-        Me.btnRemove.Location = New System.Drawing.Point(162, 122)
-        Me.btnRemove.Name = "btnRemove"
-        Me.btnRemove.Size = New System.Drawing.Size(61, 23)
-        Me.btnRemove.TabIndex = 3
-        Me.btnRemove.Text = "<"
-        Me.btnRemove.UseVisualStyleBackColor = True
+        Me.btnIncludeRemove.Location = New System.Drawing.Point(115, 91)
+        Me.btnIncludeRemove.Name = "btnIncludeRemove"
+        Me.btnIncludeRemove.Size = New System.Drawing.Size(31, 23)
+        Me.btnIncludeRemove.TabIndex = 3
+        Me.btnIncludeRemove.Text = ">"
+        Me.btnIncludeRemove.UseVisualStyleBackColor = True
         '
-        'btnAdd
+        'btnIncludeAdd
         '
-        Me.btnAdd.Location = New System.Drawing.Point(162, 93)
-        Me.btnAdd.Name = "btnAdd"
-        Me.btnAdd.Size = New System.Drawing.Size(61, 23)
-        Me.btnAdd.TabIndex = 2
-        Me.btnAdd.Text = ">"
-        Me.btnAdd.UseVisualStyleBackColor = True
+        Me.btnIncludeAdd.Location = New System.Drawing.Point(115, 62)
+        Me.btnIncludeAdd.Name = "btnIncludeAdd"
+        Me.btnIncludeAdd.Size = New System.Drawing.Size(31, 23)
+        Me.btnIncludeAdd.TabIndex = 2
+        Me.btnIncludeAdd.Text = "<"
+        Me.btnIncludeAdd.UseVisualStyleBackColor = True
         '
-        'lstFilter
+        'lstIncludeTags
         '
-        Me.lstFilter.FormattingEnabled = True
-        Me.lstFilter.Location = New System.Drawing.Point(229, 32)
-        Me.lstFilter.Name = "lstFilter"
-        Me.lstFilter.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
-        Me.lstFilter.Size = New System.Drawing.Size(150, 173)
-        Me.lstFilter.Sorted = True
-        Me.lstFilter.TabIndex = 5
+        Me.lstIncludeTags.FormattingEnabled = True
+        Me.lstIncludeTags.Location = New System.Drawing.Point(6, 32)
+        Me.lstIncludeTags.Name = "lstIncludeTags"
+        Me.lstIncludeTags.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
+        Me.lstIncludeTags.Size = New System.Drawing.Size(103, 108)
+        Me.lstIncludeTags.Sorted = True
+        Me.lstIncludeTags.TabIndex = 5
         '
         'lstTags
         '
         Me.lstTags.FormattingEnabled = True
-        Me.lstTags.Location = New System.Drawing.Point(6, 32)
+        Me.lstTags.Location = New System.Drawing.Point(152, 32)
         Me.lstTags.Name = "lstTags"
         Me.lstTags.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
-        Me.lstTags.Size = New System.Drawing.Size(150, 173)
+        Me.lstTags.Size = New System.Drawing.Size(103, 108)
         Me.lstTags.Sorted = True
         Me.lstTags.TabIndex = 1
         '
         'btnOK
         '
-        Me.btnOK.Location = New System.Drawing.Point(322, 484)
+        Me.btnOK.Location = New System.Drawing.Point(347, 526)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(75, 23)
-        Me.btnOK.TabIndex = 4
+        Me.btnOK.TabIndex = 6
         Me.btnOK.Text = "&OK"
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'grpGameFilter
         '
-        Me.grpGameFilter.Controls.Add(Me.grpGameInfoOptions)
-        Me.grpGameFilter.Controls.Add(Me.txtCompany)
-        Me.grpGameFilter.Controls.Add(Me.lblCompany)
-        Me.grpGameFilter.Controls.Add(Me.txtProcess)
-        Me.grpGameFilter.Controls.Add(Me.lblProcess)
-        Me.grpGameFilter.Controls.Add(Me.lblName)
-        Me.grpGameFilter.Controls.Add(Me.txtName)
+        Me.grpGameFilter.Controls.Add(Me.lblNot)
+        Me.grpGameFilter.Controls.Add(Me.chkNot)
+        Me.grpGameFilter.Controls.Add(Me.cboBoolFilter)
+        Me.grpGameFilter.Controls.Add(Me.numFilter)
+        Me.grpGameFilter.Controls.Add(Me.cboNumericOps)
+        Me.grpGameFilter.Controls.Add(Me.lblCurrentFilters)
+        Me.grpGameFilter.Controls.Add(Me.lblFilterData)
+        Me.grpGameFilter.Controls.Add(Me.lblFields)
+        Me.grpGameFilter.Controls.Add(Me.btnRemoveFilter)
+        Me.grpGameFilter.Controls.Add(Me.lstFilter)
+        Me.grpGameFilter.Controls.Add(Me.btnAddFilter)
+        Me.grpGameFilter.Controls.Add(Me.cboFilterField)
+        Me.grpGameFilter.Controls.Add(Me.grpFilterType)
+        Me.grpGameFilter.Controls.Add(Me.txtStringFilter)
         Me.grpGameFilter.Location = New System.Drawing.Point(12, 35)
         Me.grpGameFilter.Name = "grpGameFilter"
-        Me.grpGameFilter.Size = New System.Drawing.Size(385, 150)
+        Me.grpGameFilter.Size = New System.Drawing.Size(410, 172)
         Me.grpGameFilter.TabIndex = 1
         Me.grpGameFilter.TabStop = False
         '
-        'grpGameInfoOptions
+        'lblNot
         '
-        Me.grpGameInfoOptions.Controls.Add(Me.optOr)
-        Me.grpGameInfoOptions.Controls.Add(Me.optAnd)
-        Me.grpGameInfoOptions.Location = New System.Drawing.Point(14, 97)
-        Me.grpGameInfoOptions.Name = "grpGameInfoOptions"
-        Me.grpGameInfoOptions.Size = New System.Drawing.Size(106, 46)
-        Me.grpGameInfoOptions.TabIndex = 6
-        Me.grpGameInfoOptions.TabStop = False
-        Me.grpGameInfoOptions.Text = "Options"
+        Me.lblNot.AutoSize = True
+        Me.lblNot.Location = New System.Drawing.Point(161, 20)
+        Me.lblNot.Name = "lblNot"
+        Me.lblNot.Size = New System.Drawing.Size(24, 13)
+        Me.lblNot.TabIndex = 11
+        Me.lblNot.Text = "Not"
+        '
+        'chkNot
+        '
+        Me.chkNot.AutoSize = True
+        Me.chkNot.Location = New System.Drawing.Point(166, 39)
+        Me.chkNot.Name = "chkNot"
+        Me.chkNot.Size = New System.Drawing.Size(15, 14)
+        Me.chkNot.TabIndex = 10
+        Me.chkNot.UseVisualStyleBackColor = True
+        '
+        'cboBoolFilter
+        '
+        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
+        '
+        'numFilter
+        '
+        Me.numFilter.DecimalPlaces = 1
+        Me.numFilter.Location = New System.Drawing.Point(258, 37)
+        Me.numFilter.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0})
+        Me.numFilter.Name = "numFilter"
+        Me.numFilter.Size = New System.Drawing.Size(65, 20)
+        Me.numFilter.TabIndex = 4
+        '
+        'cboNumericOps
+        '
+        Me.cboNumericOps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboNumericOps.FormattingEnabled = True
+        Me.cboNumericOps.Location = New System.Drawing.Point(188, 36)
+        Me.cboNumericOps.Name = "cboNumericOps"
+        Me.cboNumericOps.Size = New System.Drawing.Size(65, 21)
+        Me.cboNumericOps.TabIndex = 3
+        '
+        'lblCurrentFilters
+        '
+        Me.lblCurrentFilters.AutoSize = True
+        Me.lblCurrentFilters.Location = New System.Drawing.Point(94, 65)
+        Me.lblCurrentFilters.Name = "lblCurrentFilters"
+        Me.lblCurrentFilters.Size = New System.Drawing.Size(71, 13)
+        Me.lblCurrentFilters.TabIndex = 6
+        Me.lblCurrentFilters.Text = "Current Filters"
+        '
+        'lblFilterData
+        '
+        Me.lblFilterData.AutoSize = True
+        Me.lblFilterData.Location = New System.Drawing.Point(239, 20)
+        Me.lblFilterData.Name = "lblFilterData"
+        Me.lblFilterData.Size = New System.Drawing.Size(32, 13)
+        Me.lblFilterData.TabIndex = 2
+        Me.lblFilterData.Text = "Filter "
+        '
+        'lblFields
+        '
+        Me.lblFields.AutoSize = True
+        Me.lblFields.Location = New System.Drawing.Point(41, 20)
+        Me.lblFields.Name = "lblFields"
+        Me.lblFields.Size = New System.Drawing.Size(80, 13)
+        Me.lblFields.TabIndex = 0
+        Me.lblFields.Text = "Available Fields"
+        '
+        'btnRemoveFilter
+        '
+        Me.btnRemoveFilter.Location = New System.Drawing.Point(259, 140)
+        Me.btnRemoveFilter.Name = "btnRemoveFilter"
+        Me.btnRemoveFilter.Size = New System.Drawing.Size(75, 23)
+        Me.btnRemoveFilter.TabIndex = 9
+        Me.btnRemoveFilter.Text = "Remove"
+        Me.btnRemoveFilter.UseVisualStyleBackColor = True
+        '
+        'lstFilter
+        '
+        Me.lstFilter.FormattingEnabled = True
+        Me.lstFilter.Location = New System.Drawing.Point(6, 81)
+        Me.lstFilter.Name = "lstFilter"
+        Me.lstFilter.Size = New System.Drawing.Size(247, 82)
+        Me.lstFilter.TabIndex = 7
+        '
+        'btnAddFilter
+        '
+        Me.btnAddFilter.Location = New System.Drawing.Point(329, 34)
+        Me.btnAddFilter.Name = "btnAddFilter"
+        Me.btnAddFilter.Size = New System.Drawing.Size(75, 23)
+        Me.btnAddFilter.TabIndex = 5
+        Me.btnAddFilter.Text = "Add"
+        Me.btnAddFilter.UseVisualStyleBackColor = True
+        '
+        'cboFilterField
+        '
+        Me.cboFilterField.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFilterField.FormattingEnabled = True
+        Me.cboFilterField.Location = New System.Drawing.Point(6, 36)
+        Me.cboFilterField.Name = "cboFilterField"
+        Me.cboFilterField.Size = New System.Drawing.Size(150, 21)
+        Me.cboFilterField.TabIndex = 1
+        '
+        'grpFilterType
+        '
+        Me.grpFilterType.Controls.Add(Me.optOr)
+        Me.grpFilterType.Controls.Add(Me.optAnd)
+        Me.grpFilterType.Location = New System.Drawing.Point(259, 81)
+        Me.grpFilterType.Name = "grpFilterType"
+        Me.grpFilterType.Size = New System.Drawing.Size(105, 46)
+        Me.grpFilterType.TabIndex = 8
+        Me.grpFilterType.TabStop = False
+        Me.grpFilterType.Text = "Filter Type"
         '
         'optOr
         '
-        Me.optOr.Location = New System.Drawing.Point(56, 19)
+        Me.optOr.Checked = True
+        Me.optOr.Location = New System.Drawing.Point(6, 19)
         Me.optOr.Name = "optOr"
-        Me.optOr.Size = New System.Drawing.Size(36, 17)
-        Me.optOr.TabIndex = 1
+        Me.optOr.Size = New System.Drawing.Size(44, 17)
+        Me.optOr.TabIndex = 0
         Me.optOr.TabStop = True
-        Me.optOr.Text = "Or"
+        Me.optOr.Text = "Any"
         Me.optOr.UseVisualStyleBackColor = True
         '
         'optAnd
         '
-        Me.optAnd.Checked = True
-        Me.optAnd.Location = New System.Drawing.Point(6, 19)
+        Me.optAnd.Location = New System.Drawing.Point(56, 19)
         Me.optAnd.Name = "optAnd"
         Me.optAnd.Size = New System.Drawing.Size(44, 17)
-        Me.optAnd.TabIndex = 0
-        Me.optAnd.TabStop = True
-        Me.optAnd.Text = "And"
+        Me.optAnd.TabIndex = 1
+        Me.optAnd.Text = "All"
         Me.optAnd.UseVisualStyleBackColor = True
         '
-        'txtCompany
+        'txtStringFilter
         '
-        Me.txtCompany.Location = New System.Drawing.Point(70, 71)
-        Me.txtCompany.Name = "txtCompany"
-        Me.txtCompany.Size = New System.Drawing.Size(309, 20)
-        Me.txtCompany.TabIndex = 5
+        Me.txtStringFilter.Location = New System.Drawing.Point(187, 36)
+        Me.txtStringFilter.Name = "txtStringFilter"
+        Me.txtStringFilter.Size = New System.Drawing.Size(136, 20)
+        Me.txtStringFilter.TabIndex = 3
         '
-        'lblCompany
+        'grpSorting
         '
-        Me.lblCompany.AutoSize = True
-        Me.lblCompany.Location = New System.Drawing.Point(11, 74)
-        Me.lblCompany.Name = "lblCompany"
-        Me.lblCompany.Size = New System.Drawing.Size(54, 13)
-        Me.lblCompany.TabIndex = 4
-        Me.lblCompany.Text = "Company:"
+        Me.grpSorting.Controls.Add(Me.grpSortOptions)
+        Me.grpSorting.Controls.Add(Me.lblSortFields)
+        Me.grpSorting.Controls.Add(Me.cboSortField)
+        Me.grpSorting.Location = New System.Drawing.Point(12, 440)
+        Me.grpSorting.Name = "grpSorting"
+        Me.grpSorting.Size = New System.Drawing.Size(410, 80)
+        Me.grpSorting.TabIndex = 4
+        Me.grpSorting.TabStop = False
+        Me.grpSorting.Text = "Sorting"
         '
-        'txtProcess
+        'grpSortOptions
         '
-        Me.txtProcess.Location = New System.Drawing.Point(70, 45)
-        Me.txtProcess.Name = "txtProcess"
-        Me.txtProcess.Size = New System.Drawing.Size(309, 20)
-        Me.txtProcess.TabIndex = 3
+        Me.grpSortOptions.Controls.Add(Me.optSortAsc)
+        Me.grpSortOptions.Controls.Add(Me.optSortDesc)
+        Me.grpSortOptions.Location = New System.Drawing.Point(162, 19)
+        Me.grpSortOptions.Name = "grpSortOptions"
+        Me.grpSortOptions.Size = New System.Drawing.Size(189, 43)
+        Me.grpSortOptions.TabIndex = 3
+        Me.grpSortOptions.TabStop = False
+        Me.grpSortOptions.Text = "Sort Options"
         '
-        'lblProcess
+        'optSortAsc
         '
-        Me.lblProcess.AutoSize = True
-        Me.lblProcess.Location = New System.Drawing.Point(11, 48)
-        Me.lblProcess.Name = "lblProcess"
-        Me.lblProcess.Size = New System.Drawing.Size(48, 13)
-        Me.lblProcess.TabIndex = 2
-        Me.lblProcess.Text = "Process:"
+        Me.optSortAsc.AutoSize = True
+        Me.optSortAsc.Location = New System.Drawing.Point(6, 17)
+        Me.optSortAsc.Name = "optSortAsc"
+        Me.optSortAsc.Size = New System.Drawing.Size(75, 17)
+        Me.optSortAsc.TabIndex = 0
+        Me.optSortAsc.TabStop = True
+        Me.optSortAsc.Text = "Ascending"
+        Me.optSortAsc.UseVisualStyleBackColor = True
         '
-        'lblName
+        'optSortDesc
         '
-        Me.lblName.AutoSize = True
-        Me.lblName.Location = New System.Drawing.Point(11, 22)
-        Me.lblName.Name = "lblName"
-        Me.lblName.Size = New System.Drawing.Size(38, 13)
-        Me.lblName.TabIndex = 0
-        Me.lblName.Text = "Name:"
+        Me.optSortDesc.AutoSize = True
+        Me.optSortDesc.Location = New System.Drawing.Point(90, 17)
+        Me.optSortDesc.Name = "optSortDesc"
+        Me.optSortDesc.Size = New System.Drawing.Size(82, 17)
+        Me.optSortDesc.TabIndex = 1
+        Me.optSortDesc.TabStop = True
+        Me.optSortDesc.Text = "Descending"
+        Me.optSortDesc.UseVisualStyleBackColor = True
         '
-        'txtName
+        'lblSortFields
         '
-        Me.txtName.Location = New System.Drawing.Point(70, 19)
-        Me.txtName.Name = "txtName"
-        Me.txtName.Size = New System.Drawing.Size(309, 20)
-        Me.txtName.TabIndex = 1
+        Me.lblSortFields.AutoSize = True
+        Me.lblSortFields.Location = New System.Drawing.Point(41, 19)
+        Me.lblSortFields.Name = "lblSortFields"
+        Me.lblSortFields.Size = New System.Drawing.Size(80, 13)
+        Me.lblSortFields.TabIndex = 1
+        Me.lblSortFields.Text = "Available Fields"
+        '
+        'cboSortField
+        '
+        Me.cboSortField.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboSortField.FormattingEnabled = True
+        Me.cboSortField.Location = New System.Drawing.Point(6, 35)
+        Me.cboSortField.Name = "cboSortField"
+        Me.cboSortField.Size = New System.Drawing.Size(150, 21)
+        Me.cboSortField.TabIndex = 2
+        '
+        'chkTag
+        '
+        Me.chkTag.AutoSize = True
+        Me.chkTag.Location = New System.Drawing.Point(12, 213)
+        Me.chkTag.Name = "chkTag"
+        Me.chkTag.Size = New System.Drawing.Size(45, 17)
+        Me.chkTag.TabIndex = 2
+        Me.chkTag.Text = "Tag"
+        Me.chkTag.UseVisualStyleBackColor = True
+        '
+        'chkGameInfo
+        '
+        Me.chkGameInfo.AutoSize = True
+        Me.chkGameInfo.Location = New System.Drawing.Point(12, 12)
+        Me.chkGameInfo.Name = "chkGameInfo"
+        Me.chkGameInfo.Size = New System.Drawing.Size(109, 17)
+        Me.chkGameInfo.TabIndex = 0
+        Me.chkGameInfo.Text = "Game Information"
+        Me.chkGameInfo.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 531)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(249, 13)
+        Me.Label1.TabIndex = 5
+        Me.Label1.Text = "* Indicates a field that may give unexpected results."
         '
         'frmFilter
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(409, 516)
+        Me.ClientSize = New System.Drawing.Size(434, 561)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.grpSorting)
+        Me.Controls.Add(Me.chkTag)
         Me.Controls.Add(Me.grpGameFilter)
+        Me.Controls.Add(Me.chkGameInfo)
         Me.Controls.Add(Me.grpTagFilter)
         Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.optTag)
-        Me.Controls.Add(Me.optGameInfo)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.MaximizeBox = False
         Me.MinimizeBox = False
@@ -300,32 +508,55 @@ Partial Class frmFilter
         Me.grpTagOptions.ResumeLayout(False)
         Me.grpGameFilter.ResumeLayout(False)
         Me.grpGameFilter.PerformLayout()
-        Me.grpGameInfoOptions.ResumeLayout(False)
+        CType(Me.numFilter, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.grpFilterType.ResumeLayout(False)
+        Me.grpSorting.ResumeLayout(False)
+        Me.grpSorting.PerformLayout()
+        Me.grpSortOptions.ResumeLayout(False)
+        Me.grpSortOptions.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-    Friend WithEvents optGameInfo As System.Windows.Forms.RadioButton
-    Friend WithEvents optTag As System.Windows.Forms.RadioButton
     Friend WithEvents grpTagFilter As System.Windows.Forms.GroupBox
     Friend WithEvents grpTagOptions As System.Windows.Forms.GroupBox
     Friend WithEvents optAll As System.Windows.Forms.RadioButton
     Friend WithEvents optAny As System.Windows.Forms.RadioButton
-    Friend WithEvents lblGameTags As System.Windows.Forms.Label
+    Friend WithEvents lblIncludeTags As System.Windows.Forms.Label
     Friend WithEvents lblTags As System.Windows.Forms.Label
-    Friend WithEvents btnRemove As System.Windows.Forms.Button
-    Friend WithEvents btnAdd As System.Windows.Forms.Button
-    Friend WithEvents lstFilter As System.Windows.Forms.ListBox
+    Friend WithEvents btnIncludeRemove As System.Windows.Forms.Button
+    Friend WithEvents btnIncludeAdd As System.Windows.Forms.Button
+    Friend WithEvents lstIncludeTags As System.Windows.Forms.ListBox
     Friend WithEvents lstTags As System.Windows.Forms.ListBox
     Friend WithEvents btnOK As System.Windows.Forms.Button
     Friend WithEvents grpGameFilter As System.Windows.Forms.GroupBox
-    Friend WithEvents txtProcess As System.Windows.Forms.TextBox
-    Friend WithEvents lblProcess As System.Windows.Forms.Label
-    Friend WithEvents lblName As System.Windows.Forms.Label
-    Friend WithEvents txtName As System.Windows.Forms.TextBox
-    Friend WithEvents txtCompany As System.Windows.Forms.TextBox
-    Friend WithEvents lblCompany As System.Windows.Forms.Label
-    Friend WithEvents grpGameInfoOptions As System.Windows.Forms.GroupBox
+    Friend WithEvents txtStringFilter As System.Windows.Forms.TextBox
+    Friend WithEvents grpFilterType As System.Windows.Forms.GroupBox
     Friend WithEvents optOr As System.Windows.Forms.RadioButton
     Friend WithEvents optAnd As System.Windows.Forms.RadioButton
+    Friend WithEvents grpSorting As GroupBox
+    Friend WithEvents optSortDesc As RadioButton
+    Friend WithEvents optSortAsc As RadioButton
+    Friend WithEvents cboSortField As ComboBox
+    Friend WithEvents chkTag As CheckBox
+    Friend WithEvents chkGameInfo As CheckBox
+    Friend WithEvents cboFilterField As ComboBox
+    Friend WithEvents lstFilter As ListBox
+    Friend WithEvents btnAddFilter As Button
+    Friend WithEvents btnRemoveFilter As Button
+    Friend WithEvents lblCurrentFilters As Label
+    Friend WithEvents lblFilterData As Label
+    Friend WithEvents lblFields As Label
+    Friend WithEvents cboNumericOps As ComboBox
+    Friend WithEvents numFilter As NumericUpDown
+    Friend WithEvents cboBoolFilter As ComboBox
+    Friend WithEvents lblSortFields As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents grpSortOptions As GroupBox
+    Friend WithEvents lblExcludeTags As Label
+    Friend WithEvents btnExcludeRemove As Button
+    Friend WithEvents btnExcludeAdd As Button
+    Friend WithEvents lstExcludeTags As ListBox
+    Friend WithEvents lblNot As Label
+    Friend WithEvents chkNot As CheckBox
 End Class

GBM/Forms/frmFilter.vb

@@ -3,45 +3,93 @@
 Public Class frmFilter
 
     Public Enum eFilterType As Integer
-        NoFilter = 1
+        BaseFilter = 1
         AnyTag = 2
         AllTags = 3
         NoTags = 4
-        FieldAnd = 5
-        FieldOr = 6
     End Enum
 
-    Dim oTagFilters As New List(Of clsTag)
-    Dim hshStringFilters As New Hashtable
-    Dim eCurrentFilterType As eFilterType = eFilterType.AnyTag
+    Dim oIncludeTagFilters As New List(Of clsTag)
+    Dim oExcludeTagFilters As New List(Of clsTag)
+    Dim oGameFilters As New List(Of clsGameFilter)
+    Dim oValidFields As New List(Of clsGameFilterField)
+    Dim eCurrentFilterType As eFilterType = eFilterType.BaseFilter
+    Dim bAndOperator As Boolean = False
+    Dim bSortAsc As Boolean = True
+    Dim sSortField As String = "Name"
     Dim hshTags As New Hashtable
     Dim bShutdown As Boolean = False
 
-    Public ReadOnly Property StringFilters As Hashtable
+    Public Property GameFilters As List(Of clsGameFilter)
         Get
-            Return hshStringFilters
+            Return oGameFilters
         End Get
+        Set(value As List(Of clsGameFilter))
+            oGameFilters = value
+        End Set
     End Property
 
-    Public ReadOnly Property TagFilters As List(Of clsTag)
+    Public Property IncludeTagFilters As List(Of clsTag)
         Get
-            Return oTagFilters
+            Return oIncludeTagFilters
         End Get
+        Set(value As List(Of clsTag))
+            oIncludeTagFilters = value
+        End Set
     End Property
 
-    Public ReadOnly Property FilterType As eFilterType
+    Public Property ExcludeTagFilters As List(Of clsTag)
+        Get
+            Return oExcludeTagFilters
+        End Get
+        Set(value As List(Of clsTag))
+            oExcludeTagFilters = value
+        End Set
+    End Property
+
+    Public Property FilterType As eFilterType
         Get
             Return eCurrentFilterType
         End Get
+        Set(value As eFilterType)
+            eCurrentFilterType = value
+        End Set
     End Property
 
-    Private Sub AddTag()
+    Public Property AndOperator As Boolean
+        Get
+            Return bAndOperator
+        End Get
+        Set(value As Boolean)
+            bAndOperator = value
+        End Set
+    End Property
+
+    Public Property SortAsc As Boolean
+        Get
+            Return bSortAsc
+        End Get
+        Set(value As Boolean)
+            bSortAsc = value
+        End Set
+    End Property
+
+    Public Property SortField As String
+        Get
+            Return sSortField
+        End Get
+        Set(value As String)
+            sSortField = value
+        End Set
+    End Property
+
+    Private Sub AddTag(ByRef lst As ListBox)
         Dim oData As KeyValuePair(Of String, String)
         Dim oTags As List(Of KeyValuePair(Of String, String))
 
         If lstTags.SelectedItems.Count = 1 Then
             oData = lstTags.SelectedItems(0)
-            lstFilter.Items.Add(oData)
+            lst.Items.Add(oData)
             lstTags.Items.Remove(oData)
         ElseIf lstTags.SelectedItems.Count > 1 Then
             oTags = New List(Of KeyValuePair(Of String, String))
@@ -51,37 +99,192 @@ Public Class frmFilter
             Next
 
             For Each kp As KeyValuePair(Of String, String) In oTags
-                lstFilter.Items.Add(kp)
+                lst.Items.Add(kp)
                 lstTags.Items.Remove(kp)
             Next
         End If
 
     End Sub
 
-    Private Sub RemoveTag()
+    Private Sub RemoveTag(ByRef lst As ListBox)
         Dim oData As KeyValuePair(Of String, String)
         Dim oTags As List(Of KeyValuePair(Of String, String))
 
-        If lstFilter.SelectedItems.Count = 1 Then
-            oData = lstFilter.SelectedItems(0)
-            lstFilter.Items.Remove(oData)
+        If lst.SelectedItems.Count = 1 Then
+            oData = lst.SelectedItems(0)
+            lst.Items.Remove(oData)
             lstTags.Items.Add(oData)
-        ElseIf lstFilter.SelectedItems.Count > 1 Then
+        ElseIf lst.SelectedItems.Count > 1 Then
             oTags = New List(Of KeyValuePair(Of String, String))
 
-            For Each oData In lstFilter.SelectedItems
+            For Each oData In lst.SelectedItems
                 oTags.Add(oData)
             Next
 
             For Each kp As KeyValuePair(Of String, String) In oTags
-                lstFilter.Items.Remove(kp)
+                lst.Items.Remove(kp)
                 lstTags.Items.Add(kp)
             Next
         End If
 
     End Sub
 
-    Private Sub LoadData()
+    Private Sub LoadFilterFields()
+        Dim oField As clsGameFilterField
+
+        'Name
+        oField = New clsGameFilterField
+        oField.FieldName = "Name"
+        oField.FriendlyFieldName = frmFilter_FieldName
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Process
+        oField = New clsGameFilterField
+        oField.FieldName = "Process"
+        oField.FriendlyFieldName = frmFilter_FieldProcess
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Parameter
+        oField = New clsGameFilterField
+        oField.FieldName = "Parameter"
+        oField.FriendlyFieldName = frmFilter_FieldParameter
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Save Path
+        oField = New clsGameFilterField
+        oField.FieldName = "Path"
+        oField.FriendlyFieldName = frmFilter_FieldPath
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Include Items
+        oField = New clsGameFilterField
+        oField.FieldName = "FileType"
+        oField.FriendlyFieldName = frmFilter_FieldFileType
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Exclude Items
+        oField = New clsGameFilterField
+        oField.FieldName = "ExcludeList"
+        oField.FriendlyFieldName = frmFilter_FieldExcludeList
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Save Entire Folder
+        oField = New clsGameFilterField
+        oField.FieldName = "FolderSave"
+        oField.FriendlyFieldName = frmFilter_FieldFolderSave
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Delete Folder on Restore
+        oField = New clsGameFilterField
+        oField.FieldName = "CleanFolder"
+        oField.FriendlyFieldName = frmFilter_FieldCleanFolder
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Save Multiple Backups
+        oField = New clsGameFilterField
+        oField.FieldName = "TimeStamp"
+        oField.FriendlyFieldName = frmFilter_FieldTimeStamp
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Backup Limit
+        oField = New clsGameFilterField
+        oField.FieldName = "BackupLimit"
+        oField.FriendlyFieldName = frmFilter_FieldBackupLimit
+        oField.Type = clsGameFilterField.eDataType.fNumeric
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Comments
+        oField = New clsGameFilterField
+        oField.FieldName = "Comments"
+        oField.FriendlyFieldName = frmFilter_FieldComments
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Game Path
+        oField = New clsGameFilterField
+        oField.FieldName = "ProcessPath"
+        oField.FriendlyFieldName = frmFilter_FieldProcessPath
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Company
+        oField = New clsGameFilterField
+        oField.FieldName = "Company"
+        oField.FriendlyFieldName = frmFilter_FieldCompany
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Version
+        oField = New clsGameFilterField
+        oField.FieldName = "Version"
+        oField.FriendlyFieldName = frmFilter_FieldVersion
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Icon
+        oField = New clsGameFilterField
+        oField.FieldName = "Icon"
+        oField.FriendlyFieldName = frmFilter_FieldIcon
+        oField.Type = clsGameFilterField.eDataType.fString
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Hours
+        oField = New clsGameFilterField
+        oField.FieldName = "Hours"
+        oField.FriendlyFieldName = frmFilter_FieldHours
+        oField.Type = clsGameFilterField.eDataType.fNumeric
+        oField.Status = clsGameFilterField.eFieldStatus.ValidSort
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Enabled
+        oField = New clsGameFilterField
+        oField.FieldName = "Enabled"
+        oField.FriendlyFieldName = frmFilter_FieldEnabled
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+        'Monitor Only
+        oField = New clsGameFilterField
+        oField.FieldName = "MonitorOnly"
+        oField.FriendlyFieldName = frmFilter_FieldMonitorOnly
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
+    End Sub
+
+    Private Sub LoadTagData()
         Dim oTag As clsTag
         Dim oData As KeyValuePair(Of String, String)
 
@@ -90,12 +293,17 @@ Public Class frmFilter
 
         'Handle Lists
         lstTags.Items.Clear()
-        lstFilter.Items.Clear()
+        lstIncludeTags.Items.Clear()
+        lstExcludeTags.Items.Clear()
 
         lstTags.ValueMember = "Key"
         lstTags.DisplayMember = "Value"
-        lstFilter.ValueMember = "Key"
-        lstFilter.DisplayMember = "Value"
+
+        lstIncludeTags.ValueMember = "Key"
+        lstIncludeTags.DisplayMember = "Value"
+
+        lstExcludeTags.ValueMember = "Key"
+        lstExcludeTags.DisplayMember = "Value"
 
         For Each de As DictionaryEntry In hshTags
             oTag = DirectCast(de.Value, clsTag)
@@ -105,38 +313,178 @@ Public Class frmFilter
 
     End Sub
 
+    Private Sub LoadExistingFilters()
+        Dim sFilter As String = String.Empty
+        Dim oListTag As KeyValuePair(Of String, String)
+
+        'Game Filters
+        If bAndOperator Then
+            optAnd.Checked = True
+        Else
+            optOr.Checked = True
+        End If
+
+        If oGameFilters.Count > 0 Then
+            chkGameInfo.Checked = True
+            For Each oFilter As clsGameFilter In oGameFilters
+                Select Case oFilter.Field.Type
+                    Case clsGameFilterField.eDataType.fString
+                        sFilter = oFilter.Field.FriendlyFieldName & " " & frmFilter_lstFilterContains & " """ & oFilter.Data & """"
+                    Case clsGameFilterField.eDataType.fNumeric
+                        sFilter = oFilter.Field.FriendlyFieldName & " " & oFilter.NumericOperatorAsString & " " & oFilter.Data
+                    Case clsGameFilterField.eDataType.fBool
+                        sFilter = oFilter.Field.FriendlyFieldName & " = " & oFilter.Data
+                End Select
+
+                If oFilter.NotCondition Then
+                    sFilter &= " (" & frmFilter_lblNot & ")"
+                End If
+
+                lstFilter.Items.Add(New KeyValuePair(Of clsGameFilter, String)(oFilter, sFilter))
+            Next
+        End If
+
+        'Tag Filters
+        If oIncludeTagFilters.Count > 0 Then
+            chkTag.Checked = True
+            For Each oTag As clsTag In oIncludeTagFilters
+                oListTag = New KeyValuePair(Of String, String)(oTag.ID, oTag.Name)
+                lstIncludeTags.Items.Add(oListTag)
+                lstTags.Items.Remove(oListTag)
+            Next
+
+            If eCurrentFilterType = eFilterType.AllTags Then
+                optAll.Checked = True
+            Else
+                optAny.Checked = True
+            End If
+        End If
+
+        If oExcludeTagFilters.Count > 0 Then
+            chkTag.Checked = True
+            For Each oTag As clsTag In oExcludeTagFilters
+                oListTag = New KeyValuePair(Of String, String)(oTag.ID, oTag.Name)
+                lstExcludeTags.Items.Add(oListTag)
+                lstTags.Items.Remove(oListTag)
+            Next
+
+            If eCurrentFilterType = eFilterType.AllTags Then
+                optAll.Checked = True
+            Else
+                optAny.Checked = True
+            End If
+        End If
+
+        'Sorting
+        cboSortField.SelectedValue = sSortField
+        If bSortAsc Then
+            optSortAsc.Checked = True
+        Else
+            optSortDesc.Checked = True
+        End If
+
+    End Sub
+
+    Private Sub ChangeFilterMode()
+        Dim oFilterType As clsGameFilterField.eDataType = DirectCast(cboFilterField.SelectedValue, clsGameFilterField).Type
+
+        'Reset
+        cboNumericOps.SelectedIndex = 0
+        cboBoolFilter.SelectedIndex = 0
+        numFilter.Value = 0
+        txtStringFilter.Text = String.Empty
+        chkNot.Checked = False
+
+        'Reset Visibilty
+        cboBoolFilter.Visible = False
+        cboNumericOps.Visible = False
+        numFilter.Visible = False
+        txtStringFilter.Visible = False
+
+        'Set Visiblity
+        Select Case oFilterType
+            Case clsGameFilterField.eDataType.fString
+                txtStringFilter.Visible = True
+            Case clsGameFilterField.eDataType.fNumeric
+                cboNumericOps.Visible = True
+                numFilter.Visible = True
+                txtStringFilter.Visible = False
+            Case clsGameFilterField.eDataType.fBool
+                cboBoolFilter.Visible = True
+        End Select
+
+    End Sub
+
+    Private Sub AddFilter()
+        Dim oFilter As New clsGameFilter
+        Dim sFilter As String = String.Empty
+
+        'Build Filter
+        oFilter.ID = Guid.NewGuid.ToString.Split("-")(0)
+        oFilter.Field = cboFilterField.SelectedValue
+
+        Select Case oFilter.Field.Type
+            Case clsGameFilterField.eDataType.fString
+                oFilter.Data = txtStringFilter.Text
+                sFilter = oFilter.Field.FriendlyFieldName & " " & frmFilter_lstFilterContains & " """ & oFilter.Data & """"
+            Case clsGameFilterField.eDataType.fNumeric
+                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
+                sFilter = oFilter.Field.FriendlyFieldName & " = " & oFilter.Data
+        End Select
+
+        If chkNot.Checked Then
+            oFilter.NotCondition = True
+            sFilter &= " (" & frmFilter_lblNot & ")"
+        Else
+            oFilter.NotCondition = False
+        End If
+
+        oGameFilters.Add(oFilter)
+        lstFilter.Items.Add(New KeyValuePair(Of clsGameFilter, String)(oFilter, sFilter))
+
+    End Sub
+
+    Private Sub RemoveFilter()
+        Dim oFilter As Object
+
+        If lstFilter.SelectedIndex <> -1 Then
+            oFilter = lstFilter.SelectedItem
+            oGameFilters.Remove(DirectCast(oFilter, KeyValuePair(Of clsGameFilter, String)).Key)
+            lstFilter.Items.Remove(oFilter)
+        End If
+
+    End Sub
+
     Private Sub GetFilters()
         Dim oData As KeyValuePair(Of String, String)
         Dim oTag As clsTag
 
 
-        If optGameInfo.Checked Then
-            'Set Filter Type
-            If optAnd.Checked Then
-                eCurrentFilterType = eFilterType.FieldAnd
-            Else
-                eCurrentFilterType = eFilterType.FieldOr
-            End If
+        If chkGameInfo.Checked Then
+            'Set Filter Type(s)
+            eCurrentFilterType = eFilterType.BaseFilter
+            bAndOperator = optAnd.Checked
+        End If
 
-            'Set String Filter
-            If txtName.Text <> String.Empty Then
-                hshStringFilters.Add("Name", txtName.Text)
-            End If
-            If txtProcess.Text <> String.Empty Then
-                hshStringFilters.Add("Process", txtProcess.Text)
-            End If
-            If txtCompany.Text <> String.Empty Then
-                hshStringFilters.Add("Company", txtCompany.Text)
-            End If
-        Else
+        If chkTag.Checked Then
             'Set Tags
-            For Each oData In lstFilter.Items
+            IncludeTagFilters.Clear()
+            For Each oData In lstIncludeTags.Items
                 oTag = DirectCast(hshTags(oData.Value), clsTag)
-                TagFilters.Add(oTag)
+                IncludeTagFilters.Add(oTag)
+            Next
+            ExcludeTagFilters.Clear()
+            For Each oData In lstExcludeTags.Items
+                oTag = DirectCast(hshTags(oData.Value), clsTag)
+                ExcludeTagFilters.Add(oTag)
             Next
 
             'Set Filter Type
-            If TagFilters.Count = 0 Then
+            If IncludeTagFilters.Count = 0 And ExcludeTagFilters.Count = 0 Then
                 eCurrentFilterType = eFilterType.NoTags
             ElseIf optAll.Checked Then
                 eCurrentFilterType = eFilterType.AllTags
@@ -145,6 +493,72 @@ Public Class frmFilter
             End If
         End If
 
+        'Sorting
+        If optSortAsc.Checked Then
+            bSortAsc = True
+        Else
+            bSortAsc = False
+        End If
+
+        sSortField = cboSortField.SelectedValue
+
+    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))
+        Dim oBoolOperators As New List(Of KeyValuePair(Of Boolean, String))
+
+        'cboBoolFilter
+        cboBoolFilter.ValueMember = "Key"
+        cboBoolFilter.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
+
+        'cboNumericOps
+        cboNumericOps.ValueMember = "Key"
+        cboNumericOps.DisplayMember = "Value"
+
+        oNumericOperators.Add(New KeyValuePair(Of clsGameFilter.eNumericOperators, String)(clsGameFilter.eNumericOperators.Equals, "="))
+        oNumericOperators.Add(New KeyValuePair(Of clsGameFilter.eNumericOperators, String)(clsGameFilter.eNumericOperators.Greater, ">"))
+        oNumericOperators.Add(New KeyValuePair(Of clsGameFilter.eNumericOperators, String)(clsGameFilter.eNumericOperators.Lesser, "<"))
+        oNumericOperators.Add(New KeyValuePair(Of clsGameFilter.eNumericOperators, String)(clsGameFilter.eNumericOperators.GreaterEquals, ">="))
+        oNumericOperators.Add(New KeyValuePair(Of clsGameFilter.eNumericOperators, String)(clsGameFilter.eNumericOperators.LesserEquals, "<="))
+
+        cboNumericOps.DataSource = oNumericOperators
+
+        'cboFilterField
+        cboFilterField.ValueMember = "Key"
+        cboFilterField.DisplayMember = "Value"
+
+        For Each oField As clsGameFilterField In oValidFields
+            If oField.CheckStatus(clsGameFilterField.eFieldStatus.ValidFilter) Then
+                oFilterFields.Add(New KeyValuePair(Of clsGameFilterField, String)(oField, oField.FriendlyFieldName))
+            End If
+        Next
+
+        cboFilterField.DataSource = oFilterFields
+
+        'cboSortField
+        cboSortField.ValueMember = "Key"
+        cboSortField.DisplayMember = "Value"
+
+        For Each oField As clsGameFilterField In oValidFields
+            If oField.CheckStatus(clsGameFilterField.eFieldStatus.ValidSort) Then
+                oSortFields.Add(New KeyValuePair(Of String, String)(oField.FieldName, oField.FriendlyFieldName))
+            End If
+        Next
+
+        cboSortField.DataSource = oSortFields
+
+        'Select Defaults
+        cboNumericOps.SelectedIndex = 0
+        cboFilterField.SelectedIndex = 0
+        cboSortField.SelectedIndex = 0
     End Sub
 
     Private Sub SetForm()
@@ -154,26 +568,48 @@ Public Class frmFilter
         'Set Form Text
         optOr.Text = frmFilter_optOr
         optAnd.Text = frmFilter_optAnd
-        lblCompany.Text = frmFilter_lblCompany
-        lblProcess.Text = frmFilter_lblProcess
-        lblName.Text = frmFilter_lblName
-        grpGameInfoOptions.Text = frmFilter_grpGameInfoOptions
+        grpFilterType.Text = frmFilter_grpFilterType
         optAll.Text = frmFilter_optAll
         optAny.Text = frmFilter_optAny
-        lblGameTags.Text = frmFilter_lblGameTags
+        lblIncludeTags.Text = frmFilter_lblIncludeTags
+        lblExcludeTags.Text = frmFilter_lblExcludeTags
         lblTags.Text = frmFilter_lblTags
-        btnRemove.Text = frmFilter_btnRemove
-        btnAdd.Text = frmFilter_btnAdd
+        btnIncludeRemove.Text = frmFilter_btnIncludeRemove
+        btnIncludeAdd.Text = frmFilter_btnIncludeAdd
+        btnExcludeRemove.Text = frmFilter_btnExcludeRemove
+        btnExcludeAdd.Text = frmFilter_btnExcludeAdd
         btnOK.Text = frmFilter_btnOK
         grpTagOptions.Text = frmFilter_grpTagOptions
-        optTag.Text = frmFilter_optTag
-        optGameInfo.Text = frmFilter_optGameInfo
+        chkTag.Text = frmFilter_chkTag
+        chkGameInfo.Text = frmFilter_chkGameInfo
+        grpSorting.Text = frmFilter_grpSorting
+        lblSortFields.Text = frmFilter_lblSortsFields
+        optSortAsc.Text = frmFilter_optSortAsc
+        optSortDesc.Text = frmFilter_optSortDesc
+        btnAddFilter.Text = frmFilter_btnAddFilter
+        btnRemoveFilter.Text = frmFilter_btnRemoveFilter
+        lblCurrentFilters.Text = frmFilter_lblCurrentFilters
+        lblFields.Text = frmFilter_lblFields
+        lblFilterData.Text = frmFilter_lblFilterData
+        grpSortOptions.Text = frmFilter_grpSortOptions
+
+        'Defaults
+        optOr.Checked = True
+        optSortAsc.Checked = True
+        grpGameFilter.Enabled = False
+        grpTagFilter.Enabled = False
+
+        'Init Game Filter        
+        lstFilter.ValueMember = "Key"
+        lstFilter.DisplayMember = "Value"
     End Sub
 
     Private Sub frmGameTags_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         SetForm()
-        optGameInfo.Checked = True
-        LoadData()
+        LoadFilterFields()
+        LoadCombos()
+        LoadTagData()
+        LoadExistingFilters()
     End Sub
 
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
@@ -182,12 +618,20 @@ Public Class frmFilter
         Me.Close()
     End Sub
 
-    Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
-        AddTag()
+    Private Sub btnIncludeAdd_Click(sender As Object, e As EventArgs) Handles btnIncludeAdd.Click
+        AddTag(lstIncludeTags)
     End Sub
 
-    Private Sub btnRemove_Click(sender As Object, e As EventArgs) Handles btnRemove.Click
-        RemoveTag()
+    Private Sub btnExcludeAdd_Click(sender As Object, e As EventArgs) Handles btnExcludeAdd.Click
+        AddTag(lstExcludeTags)
+    End Sub
+
+    Private Sub btnExcludeRemove_Click(sender As Object, e As EventArgs) Handles btnExcludeRemove.Click
+        RemoveTag(lstExcludeTags)
+    End Sub
+
+    Private Sub btnIncludeRemove_Click(sender As Object, e As EventArgs) Handles btnIncludeRemove.Click
+        RemoveTag(lstIncludeTags)
     End Sub
 
     Private Sub frmFilter_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
@@ -196,13 +640,37 @@ Public Class frmFilter
         End If
     End Sub
 
-    Private Sub optGameInfo_Click(sender As Object, e As EventArgs) Handles optGameInfo.Click, optTag.Click
-        If optGameInfo.Checked = True Then
+    Private Sub chkGameInfo_CheckedChanged(sender As Object, e As EventArgs) Handles chkGameInfo.CheckedChanged
+        If chkGameInfo.Checked Then
             grpGameFilter.Enabled = True
-            grpTagFilter.Enabled = False
         Else
+            optOr.Checked = True
             grpGameFilter.Enabled = False
-            grpTagFilter.Enabled = True
+            oGameFilters.Clear()
+            lstFilter.Items.Clear()
         End If
     End Sub
+
+    Private Sub chkTag_CheckedChanged(sender As Object, e As EventArgs) Handles chkTag.CheckedChanged
+        If chkTag.Checked Then
+            grpTagFilter.Enabled = True
+        Else
+            grpTagFilter.Enabled = False
+            oIncludeTagFilters.Clear()
+            LoadTagData()
+        End If
+    End Sub
+
+    Private Sub btnAddFilter_Click(sender As Object, e As EventArgs) Handles btnAddFilter.Click
+        AddFilter()
+    End Sub
+
+    Private Sub btnRemoveFilter_Click(sender As Object, e As EventArgs) Handles btnRemoveFilter.Click
+        RemoveFilter()
+    End Sub
+
+    Private Sub cboFilterField_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFilterField.SelectedIndexChanged
+        ChangeFilterMode()
+    End Sub
+
 End Class

GBM/Forms/frmGameManager.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmGameManager
     Inherits System.Windows.Forms.Form
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmGameManager
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Me.btnAdd = New System.Windows.Forms.Button()
@@ -28,6 +28,8 @@ Partial Class frmGameManager
         Me.btnBackup = New System.Windows.Forms.Button()
         Me.btnClose = New System.Windows.Forms.Button()
         Me.grpConfig = New System.Windows.Forms.GroupBox()
+        Me.lblComments = New System.Windows.Forms.Label()
+        Me.txtComments = New System.Windows.Forms.TextBox()
         Me.txtParameter = New System.Windows.Forms.TextBox()
         Me.lblParameter = New System.Windows.Forms.Label()
         Me.chkCleanFolder = New System.Windows.Forms.CheckBox()
@@ -113,7 +115,7 @@ Partial Class frmGameManager
         '
         Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnAdd.Location = New System.Drawing.Point(12, 526)
+        Me.btnAdd.Location = New System.Drawing.Point(12, 586)
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(30, 23)
         Me.btnAdd.TabIndex = 4
@@ -124,7 +126,7 @@ Partial Class frmGameManager
         '
         Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnDelete.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnDelete.Location = New System.Drawing.Point(48, 526)
+        Me.btnDelete.Location = New System.Drawing.Point(48, 586)
         Me.btnDelete.Name = "btnDelete"
         Me.btnDelete.Size = New System.Drawing.Size(30, 23)
         Me.btnDelete.TabIndex = 5
@@ -134,26 +136,28 @@ Partial Class frmGameManager
         'btnBackup
         '
         Me.btnBackup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnBackup.Location = New System.Drawing.Point(616, 526)
+        Me.btnBackup.Location = New System.Drawing.Point(616, 586)
         Me.btnBackup.Name = "btnBackup"
         Me.btnBackup.Size = New System.Drawing.Size(75, 23)
-        Me.btnBackup.TabIndex = 19
+        Me.btnBackup.TabIndex = 18
         Me.btnBackup.Text = "&Backup"
         Me.btnBackup.UseVisualStyleBackColor = True
         '
         'btnClose
         '
         Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnClose.Location = New System.Drawing.Point(697, 526)
+        Me.btnClose.Location = New System.Drawing.Point(697, 586)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.Size = New System.Drawing.Size(75, 23)
-        Me.btnClose.TabIndex = 20
+        Me.btnClose.TabIndex = 19
         Me.btnClose.Text = "C&lose"
         Me.btnClose.UseVisualStyleBackColor = True
         '
         'grpConfig
         '
         Me.grpConfig.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.grpConfig.Controls.Add(Me.lblComments)
+        Me.grpConfig.Controls.Add(Me.txtComments)
         Me.grpConfig.Controls.Add(Me.txtParameter)
         Me.grpConfig.Controls.Add(Me.lblParameter)
         Me.grpConfig.Controls.Add(Me.chkCleanFolder)
@@ -177,11 +181,29 @@ Partial Class frmGameManager
         Me.grpConfig.Enabled = False
         Me.grpConfig.Location = New System.Drawing.Point(247, 12)
         Me.grpConfig.Name = "grpConfig"
-        Me.grpConfig.Size = New System.Drawing.Size(525, 157)
+        Me.grpConfig.Size = New System.Drawing.Size(525, 215)
         Me.grpConfig.TabIndex = 8
         Me.grpConfig.TabStop = False
         Me.grpConfig.Text = "Configuration"
         '
+        'lblComments
+        '
+        Me.lblComments.AutoSize = True
+        Me.lblComments.Location = New System.Drawing.Point(7, 157)
+        Me.lblComments.Name = "lblComments"
+        Me.lblComments.Size = New System.Drawing.Size(59, 13)
+        Me.lblComments.TabIndex = 18
+        Me.lblComments.Text = "Comments:"
+        '
+        'txtComments
+        '
+        Me.txtComments.Location = New System.Drawing.Point(70, 154)
+        Me.txtComments.Multiline = True
+        Me.txtComments.Name = "txtComments"
+        Me.txtComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtComments.Size = New System.Drawing.Size(413, 54)
+        Me.txtComments.TabIndex = 17
+        '
         'txtParameter
         '
         Me.txtParameter.Location = New System.Drawing.Point(333, 45)
@@ -363,7 +385,7 @@ Partial Class frmGameManager
         'chkMonitorOnly
         '
         Me.chkMonitorOnly.AutoSize = True
-        Me.chkMonitorOnly.Location = New System.Drawing.Point(362, 340)
+        Me.chkMonitorOnly.Location = New System.Drawing.Point(363, 398)
         Me.chkMonitorOnly.Name = "chkMonitorOnly"
         Me.chkMonitorOnly.Size = New System.Drawing.Size(83, 17)
         Me.chkMonitorOnly.TabIndex = 11
@@ -387,7 +409,7 @@ Partial Class frmGameManager
         Me.grpExtra.Controls.Add(Me.txtAppPath)
         Me.grpExtra.Controls.Add(Me.nudHours)
         Me.grpExtra.Controls.Add(Me.lblHours)
-        Me.grpExtra.Location = New System.Drawing.Point(247, 175)
+        Me.grpExtra.Location = New System.Drawing.Point(248, 233)
         Me.grpExtra.Name = "grpExtra"
         Me.grpExtra.Size = New System.Drawing.Size(525, 155)
         Me.grpExtra.TabIndex = 9
@@ -518,7 +540,7 @@ Partial Class frmGameManager
         '
         'btnTags
         '
-        Me.btnTags.Location = New System.Drawing.Point(535, 336)
+        Me.btnTags.Location = New System.Drawing.Point(535, 394)
         Me.btnTags.Name = "btnTags"
         Me.btnTags.Size = New System.Drawing.Size(75, 23)
         Me.btnTags.TabIndex = 12
@@ -539,7 +561,7 @@ Partial Class frmGameManager
         Me.grpStats.Controls.Add(Me.lblBackupFile)
         Me.grpStats.Controls.Add(Me.lblRemote)
         Me.grpStats.Controls.Add(Me.lblLocalData)
-        Me.grpStats.Location = New System.Drawing.Point(247, 365)
+        Me.grpStats.Location = New System.Drawing.Point(247, 423)
         Me.grpStats.Name = "grpStats"
         Me.grpStats.Size = New System.Drawing.Size(525, 154)
         Me.grpStats.TabIndex = 15
@@ -654,27 +676,27 @@ Partial Class frmGameManager
         'btnMarkAsRestored
         '
         Me.btnMarkAsRestored.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 526)
+        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 586)
         Me.btnMarkAsRestored.Name = "btnMarkAsRestored"
         Me.btnMarkAsRestored.Size = New System.Drawing.Size(100, 23)
-        Me.btnMarkAsRestored.TabIndex = 17
+        Me.btnMarkAsRestored.TabIndex = 16
         Me.btnMarkAsRestored.Text = "&Mark as Restored"
         Me.btnMarkAsRestored.UseVisualStyleBackColor = True
         '
         'btnRestore
         '
         Me.btnRestore.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnRestore.Location = New System.Drawing.Point(535, 526)
+        Me.btnRestore.Location = New System.Drawing.Point(535, 586)
         Me.btnRestore.Name = "btnRestore"
         Me.btnRestore.Size = New System.Drawing.Size(75, 23)
-        Me.btnRestore.TabIndex = 18
+        Me.btnRestore.TabIndex = 17
         Me.btnRestore.Text = "&Restore"
         Me.btnRestore.UseVisualStyleBackColor = True
         '
         'btnSave
         '
         Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnSave.Location = New System.Drawing.Point(616, 336)
+        Me.btnSave.Location = New System.Drawing.Point(616, 394)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(75, 23)
         Me.btnSave.TabIndex = 13
@@ -687,13 +709,13 @@ Partial Class frmGameManager
         Me.lstGames.Location = New System.Drawing.Point(12, 160)
         Me.lstGames.Name = "lstGames"
         Me.lstGames.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
-        Me.lstGames.Size = New System.Drawing.Size(228, 355)
+        Me.lstGames.Size = New System.Drawing.Size(228, 420)
         Me.lstGames.TabIndex = 3
         '
         'btnCancel
         '
         Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnCancel.Location = New System.Drawing.Point(697, 336)
+        Me.btnCancel.Location = New System.Drawing.Point(697, 394)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
         Me.btnCancel.TabIndex = 14
@@ -703,7 +725,7 @@ Partial Class frmGameManager
         'chkEnabled
         '
         Me.chkEnabled.AutoSize = True
-        Me.chkEnabled.Location = New System.Drawing.Point(247, 340)
+        Me.chkEnabled.Location = New System.Drawing.Point(248, 398)
         Me.chkEnabled.Name = "chkEnabled"
         Me.chkEnabled.Size = New System.Drawing.Size(109, 17)
         Me.chkEnabled.TabIndex = 10
@@ -769,7 +791,7 @@ Partial Class frmGameManager
         '
         'btnImport
         '
-        Me.btnImport.Location = New System.Drawing.Point(84, 526)
+        Me.btnImport.Location = New System.Drawing.Point(84, 586)
         Me.btnImport.Name = "btnImport"
         Me.btnImport.Size = New System.Drawing.Size(75, 23)
         Me.btnImport.TabIndex = 6
@@ -778,7 +800,7 @@ Partial Class frmGameManager
         '
         'btnExport
         '
-        Me.btnExport.Location = New System.Drawing.Point(165, 526)
+        Me.btnExport.Location = New System.Drawing.Point(165, 586)
         Me.btnExport.Name = "btnExport"
         Me.btnExport.Size = New System.Drawing.Size(75, 23)
         Me.btnExport.TabIndex = 7
@@ -843,7 +865,7 @@ Partial Class frmGameManager
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(784, 561)
+        Me.ClientSize = New System.Drawing.Size(784, 621)
         Me.Controls.Add(Me.lblQuickFilter)
         Me.Controls.Add(Me.txtQuickFilter)
         Me.Controls.Add(Me.btnExport)
@@ -963,4 +985,6 @@ Partial Class frmGameManager
     Friend WithEvents chkCleanFolder As CheckBox
     Friend WithEvents txtParameter As TextBox
     Friend WithEvents lblParameter As Label
+    Friend WithEvents lblComments As Label
+    Friend WithEvents txtComments As TextBox
 End Class

GBM/Forms/frmGameManager.vb

@@ -1,4 +1,5 @@
 Imports GBM.My.Resources
+Imports System.Collections.Specialized
 Imports System.IO
 
 Public Class frmGameManager
@@ -13,14 +14,18 @@ Public Class frmGameManager
     Private bTriggerRestore As Boolean = False
     Private oBackupList As New List(Of clsGame)
     Private oRestoreList As New Hashtable
-    Private oAppData As Hashtable
+    Private oGameData As OrderedDictionary
     Private oLocalBackupData As SortedList
     Private oRemoteBackupData As SortedList
     Private bIsDirty As Boolean = False
     Private bIsLoading As Boolean = False
-    Private oCurrentTagFilters As New List(Of clsTag)
-    Private oCurrentStringFilters As New Hashtable
-    Private eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
+    Private oCurrentIncludeTagFilters As New List(Of clsTag)
+    Private oCurrentExcludeTagFilters As New List(Of clsTag)
+    Private oCurrentFilters As New List(Of clsGameFilter)
+    Private eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.BaseFilter
+    Private bCurrentAndOperator As Boolean = False
+    Private bCurrentSortAsc As Boolean = True
+    Private sCurrentSortField As String = "Name"
     Private WithEvents tmFilterTimer As Timer
 
     Private Enum eModes As Integer
@@ -70,12 +75,12 @@ Public Class frmGameManager
         End Set
     End Property
 
-    Private Property AppData As Hashtable
+    Private Property GameData As OrderedDictionary
         Get
-            Return oAppData
+            Return oGameData
         End Get
-        Set(value As Hashtable)
-            oAppData = value
+        Set(value As OrderedDictionary)
+            oGameData = value
         End Set
     End Property
 
@@ -222,41 +227,58 @@ Public Class frmGameManager
         If optCustom.Checked Then
             If Not bRetainFilter Then
                 frm = New frmFilter
+
+                frm.IncludeTagFilters = oCurrentIncludeTagFilters
+                frm.ExcludeTagFilters = oCurrentExcludeTagFilters
+                frm.GameFilters = oCurrentFilters
+                frm.FilterType = eCurrentFilter
+                frm.AndOperator = bCurrentAndOperator
+                frm.SortAsc = bCurrentSortAsc
+                frm.SortField = sCurrentSortField
+
                 frm.ShowDialog()
-                oCurrentTagFilters = frm.TagFilters
-                oCurrentStringFilters = frm.StringFilters
+
+                oCurrentIncludeTagFilters = frm.IncludeTagFilters
+                oCurrentExcludeTagFilters = frm.ExcludeTagFilters
+                oCurrentFilters = frm.GameFilters
                 eCurrentFilter = frm.FilterType
+                bCurrentAndOperator = frm.AndOperator
+                bCurrentSortAsc = frm.SortAsc
+                sCurrentSortField = frm.SortField
             End If
         Else
-            oCurrentTagFilters.Clear()
-            oCurrentStringFilters.Clear()
-            eCurrentFilter = frmFilter.eFilterType.NoFilter
+            oCurrentIncludeTagFilters.Clear()
+            oCurrentExcludeTagFilters.Clear()
+            oCurrentFilters.Clear()
+            eCurrentFilter = frmFilter.eFilterType.BaseFilter
+            bCurrentSortAsc = True
+            sCurrentSortField = "Name"
         End If
 
-        AppData = mgrMonitorList.ReadFilteredList(oCurrentTagFilters, oCurrentStringFilters, eCurrentFilter)
+        GameData = mgrMonitorList.ReadFilteredList(oCurrentIncludeTagFilters, oCurrentExcludeTagFilters, oCurrentFilters, eCurrentFilter, bCurrentAndOperator, bCurrentSortAsc, sCurrentSortField)
 
         If optPendingRestores.Checked Then
             oRestoreData = mgrRestore.CompareManifests
 
             'Only show games with data to restore
-            Dim oTemporaryList As Hashtable = AppData.Clone
+            Dim oTemporaryList As OrderedDictionary = mgrCommon.GenericClone(GameData)
             For Each de As DictionaryEntry In oTemporaryList
                 oGame = DirectCast(de.Value, clsGame)
                 If Not oRestoreData.ContainsKey(oGame.Name) Then
-                    AppData.Remove(de.Key)
+                    GameData.Remove(de.Key)
                 Else
                     oRestoreData.Remove(oGame.Name)
                 End If
             Next
         ElseIf optBackupData.Checked Then
             'Only show games with backup data
-            Dim oTemporaryList As Hashtable = AppData.Clone
+            Dim oTemporaryList As OrderedDictionary = mgrCommon.GenericClone(GameData)
             oRestoreData = oRemoteBackupData.Clone
 
             For Each de As DictionaryEntry In oTemporaryList
                 oGame = DirectCast(de.Value, clsGame)
                 If Not oRemoteBackupData.ContainsKey(oGame.Name) Then
-                    AppData.Remove(de.Key)
+                    GameData.Remove(de.Key)
                 Else
                     oRestoreData.Remove(oGame.Name)
                 End If
@@ -269,7 +291,7 @@ Public Class frmGameManager
                 oGame = New clsGame
                 oGame.Name = oBackup.Name
                 oGame.Temporary = True
-                AppData.Add(oGame.ID, oGame)
+                GameData.Add(oGame.ID, oGame)
             Next
         End If
 
@@ -387,7 +409,7 @@ Public Class frmGameManager
         Dim oList As New List(Of KeyValuePair(Of String, String))
         Dim sFilter As String = txtQuickFilter.Text
 
-        For Each de As DictionaryEntry In AppData
+        For Each de As DictionaryEntry In GameData
             oApp = DirectCast(de.Value, clsGame)
             oData = New KeyValuePair(Of String, String)(oApp.ID, oApp.Name)
             'Apply the quick filter if applicable
@@ -400,8 +422,6 @@ Public Class frmGameManager
             End If
         Next
 
-        oList.Sort(AddressOf mgrCommon.CompareByListBoxItemByValue)
-
         lstGames.BeginUpdate()
         lstGames.ValueMember = "Key"
         lstGames.DisplayMember = "Value"
@@ -545,7 +565,7 @@ Public Class frmGameManager
             frm.TagList = oTagsToSave
         Else
             For Each oData In lstGames.SelectedItems
-                oApp = DirectCast(AppData(oData.Key), clsGame)
+                oApp = DirectCast(GameData(oData.Key), clsGame)
                 sMonitorIDs.Add(oApp.ID)
             Next
             frm.GameName = CurrentGame.Name
@@ -731,7 +751,7 @@ Public Class frmGameManager
         IsLoading = True
 
         Dim oData As KeyValuePair(Of String, String) = lstGames.SelectedItems(0)
-        Dim oApp As clsGame = DirectCast(AppData(oData.Key), clsGame)
+        Dim oApp As clsGame = DirectCast(GameData(oData.Key), clsGame)
 
         'Core
         txtID.Text = oApp.ID
@@ -745,6 +765,7 @@ Public Class frmGameManager
         chkCleanFolder.Checked = oApp.CleanFolder
         chkTimeStamp.Checked = oApp.AppendTimeStamp
         nudLimit.Value = oApp.BackupLimit
+        txtComments.Text = oApp.Comments
         chkEnabled.Checked = oApp.Enabled
         chkMonitorOnly.Checked = oApp.MonitorOnly
 
@@ -1028,6 +1049,27 @@ Public Class frmGameManager
         VerifyCleanFolder()
     End Sub
 
+    Private Sub MonitorOnlyModeChange()
+        If chkMonitorOnly.Checked Then
+            chkFolderSave.Enabled = False
+            chkTimeStamp.Enabled = False
+            lblSavePath.Enabled = False
+            txtSavePath.Enabled = False
+            btnSavePathBrowse.Enabled = False
+            btnInclude.Enabled = False
+            btnExclude.Enabled = False
+        Else
+            chkFolderSave.Enabled = True
+            chkTimeStamp.Enabled = True
+            lblSavePath.Enabled = True
+            txtSavePath.Enabled = True
+            btnSavePathBrowse.Enabled = True
+            btnInclude.Enabled = True
+            btnExclude.Enabled = True
+        End If
+        VerifyCleanFolder()
+    End Sub
+
     Private Sub TimeStampModeChange()
         If chkTimeStamp.Checked Then
             nudLimit.Visible = True
@@ -1042,7 +1084,7 @@ Public Class frmGameManager
 
     Private Sub VerifyCleanFolder()
         If Not bIsLoading Then
-            If chkFolderSave.Checked = True And txtExclude.Text = String.Empty And txtSavePath.Text <> String.Empty Then
+            If (chkFolderSave.Checked = True And txtExclude.Text = String.Empty And txtSavePath.Text <> String.Empty) And Not chkMonitorOnly.Checked Then
                 chkCleanFolder.Enabled = True
             Else
                 chkCleanFolder.Checked = False
@@ -1137,6 +1179,7 @@ Public Class frmGameManager
         oApp.CleanFolder = chkCleanFolder.Checked
         oApp.AppendTimeStamp = chkTimeStamp.Checked
         oApp.BackupLimit = nudLimit.Value
+        oApp.Comments = txtComments.Text
         oApp.Enabled = chkEnabled.Checked
         oApp.MonitorOnly = chkMonitorOnly.Checked
         oApp.ProcessPath = txtAppPath.Text
@@ -1195,7 +1238,7 @@ Public Class frmGameManager
 
         If lstGames.SelectedItems.Count = 1 Then
             oData = lstGames.SelectedItems(0)
-            oApp = DirectCast(AppData(oData.Key), clsGame)
+            oApp = DirectCast(GameData(oData.Key), clsGame)
 
             If mgrCommon.ShowMessage(frmGameManager_ConfirmGameDelete, oApp.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                 mgrMonitorList.DoListDelete(oApp.ID)
@@ -1207,7 +1250,7 @@ Public Class frmGameManager
             Dim sMonitorIDs As New List(Of String)
 
             For Each oData In lstGames.SelectedItems
-                oApp = DirectCast(AppData(oData.Key), clsGame)
+                oApp = DirectCast(GameData(oData.Key), clsGame)
                 sMonitorIDs.Add(oApp.ID)
             Next
 
@@ -1247,7 +1290,7 @@ Public Class frmGameManager
             Return False
         End If
 
-        If chkFolderSave.Checked = False And txtFileType.Text = String.Empty Then
+        If (chkFolderSave.Checked = False And txtFileType.Text = String.Empty) And Not chkMonitorOnly.Checked Then
             mgrCommon.ShowMessage(frmGameManager_ErrorNoItems, MsgBoxStyle.Exclamation)
             btnInclude.Focus()
             Return False
@@ -1334,8 +1377,8 @@ Public Class frmGameManager
             BackupList.Clear()
 
             For Each oData In lstGames.SelectedItems
-                oGame = DirectCast(AppData(oData.Key), clsGame)
-                BackupList.Add(oGame)
+                oGame = DirectCast(GameData(oData.Key), clsGame)
+                If Not oGame.MonitorOnly Then BackupList.Add(oGame)
             Next
 
             If BackupList.Count = 1 Then
@@ -1372,17 +1415,14 @@ Public Class frmGameManager
         If lstGames.SelectedItems.Count > 0 Then
             RestoreList.Clear()
 
-            If lstGames.SelectedItems.Count = 1 Then
-                RestoreList.Add(CurrentGame, CurrentBackupItem)
-            Else
-                For Each oData In lstGames.SelectedItems
-                    If oRemoteBackupData.Contains(oData.Value) Then
-                        oGame = DirectCast(AppData(oData.Key), clsGame)
-                        oBackup = DirectCast(oRemoteBackupData(oData.Value), clsBackup)
-                        RestoreList.Add(oGame, oBackup)
-                    End If
-                Next
-            End If
+
+            For Each oData In lstGames.SelectedItems
+                If oRemoteBackupData.Contains(oData.Value) Then
+                    oGame = DirectCast(GameData(oData.Key), clsGame)
+                    oBackup = DirectCast(oRemoteBackupData(oData.Value), clsBackup)
+                    If Not oGame.MonitorOnly Then RestoreList.Add(oGame, oBackup)
+                End If
+            Next
 
             If RestoreList.Count = 1 Then
                 bDoRestore = True
@@ -1713,4 +1753,8 @@ Public Class frmGameManager
     Private Sub frmGameManager_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         txtQuickFilter.Focus()
     End Sub
+
+    Private Sub chkMonitorOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkMonitorOnly.CheckedChanged
+        MonitorOnlyModeChange()
+    End Sub
 End Class

GBM/Forms/frmMain.Designer.vb

@@ -68,6 +68,7 @@ Partial Class frmMain
         Me.gMonToolsLog = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonLogClear = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonLogSave = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonToolsSessions = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelp = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelpWebSite = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelpManual = New System.Windows.Forms.ToolStripMenuItem()
@@ -84,6 +85,7 @@ Partial Class frmMain
         Me.lblStatus2 = New System.Windows.Forms.Label()
         Me.lblStatus3 = New System.Windows.Forms.Label()
         Me.pbTime = New System.Windows.Forms.PictureBox()
+        Me.gMonTrayToolsSessions = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonTrayMenu.SuspendLayout()
         Me.gMonStatusStrip.SuspendLayout()
         Me.gMonMainMenu.SuspendLayout()
@@ -103,7 +105,7 @@ Partial Class frmMain
         '
         Me.gMonTrayMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayNotification, Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit})
         Me.gMonTrayMenu.Name = "gMonTrayMenu"
-        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 170)
+        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 192)
         '
         'gMonTrayNotification
         '
@@ -168,7 +170,7 @@ Partial Class frmMain
         '
         'gMonTrayTools
         '
-        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCleanMan, Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog})
+        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCleanMan, Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog, Me.gMonTrayToolsSessions})
         Me.gMonTrayTools.Name = "gMonTrayTools"
         Me.gMonTrayTools.Size = New System.Drawing.Size(161, 22)
         Me.gMonTrayTools.Text = "&Tools"
@@ -195,13 +197,13 @@ Partial Class frmMain
         'gMonTrayLogClear
         '
         Me.gMonTrayLogClear.Name = "gMonTrayLogClear"
-        Me.gMonTrayLogClear.Size = New System.Drawing.Size(101, 22)
+        Me.gMonTrayLogClear.Size = New System.Drawing.Size(152, 22)
         Me.gMonTrayLogClear.Text = "&Clear"
         '
         'gMonTrayLogSave
         '
         Me.gMonTrayLogSave.Name = "gMonTrayLogSave"
-        Me.gMonTrayLogSave.Size = New System.Drawing.Size(101, 22)
+        Me.gMonTrayLogSave.Size = New System.Drawing.Size(152, 22)
         Me.gMonTrayLogSave.Text = "&Save"
         '
         'gMonTraySep1
@@ -348,7 +350,7 @@ Partial Class frmMain
         '
         'gMonTools
         '
-        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCleanMan, Me.gMonToolsCompact, Me.gMonToolsLog})
+        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCleanMan, Me.gMonToolsCompact, Me.gMonToolsLog, Me.gMonToolsSessions})
         Me.gMonTools.Name = "gMonTools"
         Me.gMonTools.Size = New System.Drawing.Size(47, 20)
         Me.gMonTools.Text = "&Tools"
@@ -384,6 +386,12 @@ Partial Class frmMain
         Me.gMonLogSave.Size = New System.Drawing.Size(101, 22)
         Me.gMonLogSave.Text = "&Save"
         '
+        'gMonToolsSessions
+        '
+        Me.gMonToolsSessions.Name = "gMonToolsSessions"
+        Me.gMonToolsSessions.Size = New System.Drawing.Size(184, 22)
+        Me.gMonToolsSessions.Text = "&Session Viewer..."
+        '
         'gMonHelp
         '
         Me.gMonHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonHelpWebSite, Me.gMonHelpManual, Me.gMonHelpCheckforUpdates, Me.gMonHelpAbout})
@@ -524,6 +532,12 @@ Partial Class frmMain
         Me.pbTime.TabIndex = 18
         Me.pbTime.TabStop = False
         '
+        'gMonTrayToolsSessions
+        '
+        Me.gMonTrayToolsSessions.Name = "gMonTrayToolsSessions"
+        Me.gMonTrayToolsSessions.Size = New System.Drawing.Size(184, 22)
+        Me.gMonTrayToolsSessions.Text = "&Session Viewer..."
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -621,4 +635,6 @@ Partial Class frmMain
     Friend WithEvents gMonTrayLogSave As ToolStripMenuItem
     Friend WithEvents gMonStripAdminButton As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents gMonStripStatusButton As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents gMonToolsSessions As ToolStripMenuItem
+    Friend WithEvents gMonTrayToolsSessions As ToolStripMenuItem
 End Class

GBM/Forms/frmMain.vb

@@ -294,7 +294,7 @@ Public Class frmMain
         OperationStarted(False)
 
         If oProcess.GameInfo.MonitorOnly = False Then
-            If SupressBackup() Then
+            If SupressSession() Then
                 bDoBackup = False
                 UpdateLog(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.Name), False)
                 SetLastAction(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.CroppedName))
@@ -714,7 +714,21 @@ Public Class frmMain
         UpdateTimeSpent(dCurrentHours, oProcess.TimeSpent.TotalHours)
     End Sub
 
-    Private Function SupressBackup() As Boolean
+    Private Sub HandleSession()
+        Dim oSession As clsSession
+
+        If Not SupressSession() Then
+            'Record Session
+            oSession = New clsSession
+            oSession.MonitorID = oProcess.GameInfo.ID
+            oSession.SessionStartFromDate = oProcess.StartTime
+            oSession.SessionEndFromDate = oProcess.EndTime
+
+            mgrSessions.AddSession(oSession)
+        End If
+    End Sub
+
+    Private Function SupressSession() As Boolean
         Dim iSession As Integer
         If oSettings.SupressBackup Then
             iSession = Math.Ceiling(oProcess.TimeSpent.TotalMinutes)
@@ -813,14 +827,13 @@ Public Class frmMain
 
     Private Sub OpenAbout()
         Dim iProcessType As System.Reflection.ProcessorArchitecture = System.Reflection.AssemblyName.GetAssemblyName(Application.ExecutablePath()).ProcessorArchitecture
-        Dim sVersion As String = My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor & "." & My.Application.Info.Version.Build
         Dim sProcessType = [Enum].GetName(GetType(System.Reflection.ProcessorArchitecture), iProcessType)
         Dim sRevision As String = My.Application.Info.Version.Revision
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSqliteVersion As String = oDatabase.ReportVersion
         Dim sConstCopyright As String = Chr(169) & mgrCommon.FormatString(App_Copyright, Now.Year.ToString)
 
-        mgrCommon.ShowMessage(frmMain_About, New String() {sVersion, sProcessType, sRevision, sSqliteVersion, sConstCopyright}, MsgBoxStyle.Information)
+        mgrCommon.ShowMessage(frmMain_About, New String() {mgrCommon.DisplayAppVersion, sProcessType, sRevision, sSqliteVersion, sConstCopyright}, MsgBoxStyle.Information)
     End Sub
 
     Private Sub OpenTags()
@@ -868,6 +881,20 @@ Public Class frmMain
         ResumeScan()
     End Sub
 
+    Private Sub OpenSessions()
+        Dim frm As New frmSessions
+        PauseScan()
+        If oSettings.SessionTracking = False Then
+            mgrCommon.ShowMessage(frmMain_WarningSessionsDisabled, MsgBoxStyle.Exclamation)
+        End If
+        If mgrSessions.CountRows > 0 Then
+            frm.ShowDialog()
+        Else
+            mgrCommon.ShowMessage(frmMain_ErrorNoSessions, MsgBoxStyle.Information)
+        End If
+        ResumeScan()
+    End Sub
+
     Private Sub OpenGameWizard()
         Dim frm As New frmAddWizard
         PauseScan()
@@ -1032,14 +1059,20 @@ Public Class frmMain
         'Toggle State with Tray Clicks        
         If Not bShowToggle Then
             bShowToggle = True
+            Me.Visible = True
             Me.WindowState = wState
             Me.ShowInTaskbar = True
             Me.Focus()
         Else
-            bShowToggle = False
-            wState = Me.WindowState
-            Me.WindowState = FormWindowState.Minimized
-            Me.ShowInTaskbar = False
+            If Me.CanFocus Then
+                bShowToggle = False
+                wState = Me.WindowState
+                Me.WindowState = FormWindowState.Minimized
+                Me.ShowInTaskbar = False
+                Me.Visible = False
+            Else
+                gMonTray.ShowBalloonTip(5000, App_NameLong, App_ErrorFocus, ToolTipIcon.Info)
+            End If
         End If
     End Sub
 
@@ -1130,7 +1163,7 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub ToggleMenuEnable()
+    Private Sub ToggleMenuEnable(Optional ByVal bGameDetected As Boolean = False)
         If bMenuEnabled Then
             ToggleMenuItems(False, gMonFile)
             ToggleMenuItems(False, gMonSetup)
@@ -1142,6 +1175,11 @@ Public Class frmMain
             gMonNotification.Enabled = False
             gMonTrayNotification.Enabled = False
             gMonTraySettings.Enabled = False
+            If Not bGameDetected Then
+                gMonTrayMon.Enabled = False
+                gMonTrayShow.Enabled = False
+                gMonTrayExit.Enabled = False
+            End If
             bMenuEnabled = False
         Else
             ToggleMenuItems(True, gMonFile)
@@ -1154,6 +1192,9 @@ Public Class frmMain
             gMonNotification.Enabled = True
             gMonTrayNotification.Enabled = True
             gMonTraySettings.Enabled = True
+            gMonTrayMon.Enabled = True
+            gMonTrayShow.Enabled = True
+            gMonTrayExit.Enabled = True
             bMenuEnabled = True
         End If
     End Sub
@@ -1263,6 +1304,7 @@ Public Class frmMain
         gMonToolsCleanMan.Text = frmMain_gMonToolsCleanMan
         gMonToolsCompact.Text = frmMain_gMonToolsCompact
         gMonToolsLog.Text = frmMain_gMonToolsLog
+        gMonToolsSessions.Text = frmMain_gMonToolsSessions
         gMonLogClear.Text = frmMain_gMonLogClear
         gMonLogSave.Text = frmMain_gMonLogSave
         gMonHelp.Text = frmMain_gMonHelp
@@ -1284,6 +1326,7 @@ Public Class frmMain
         gMonTrayToolsCleanMan.Text = frmMain_gMonToolsCleanMan
         gMonTrayToolsCompact.Text = frmMain_gMonToolsCompact
         gMonTrayToolsLog.Text = frmMain_gMonToolsLog
+        gMonTrayToolsSessions.Text = frmMain_gMonToolsSessions
         gMonTrayLogClear.Text = frmMain_gMonLogClear
         gMonTrayLogSave.Text = frmMain_gMonLogSave
         gMonTrayExit.Text = frmMain_gMonFileExit
@@ -1336,7 +1379,7 @@ Public Class frmMain
         ToggleMenuText()
     End Sub
 
-    Private Sub PauseScan()
+    Private Sub PauseScan(Optional ByVal bGameDetected As Boolean = False)
         If eCurrentStatus = eStatus.Running Then
             StopSyncWatcher()
             tmScanTimer.Stop()
@@ -1346,7 +1389,7 @@ Public Class frmMain
             gMonTray.Icon = GBM_Tray_Detected
         End If
         ToggleMenuText()
-        ToggleMenuEnable()
+        ToggleMenuEnable(bGameDetected)
     End Sub
 
     Private Sub ResumeScan()
@@ -1607,6 +1650,10 @@ Public Class frmMain
         SaveLog()
     End Sub
 
+    Private Sub gMonToolsSessions_Click(sender As Object, e As EventArgs) Handles gMonToolsSessions.Click, gMonTrayToolsSessions.Click
+        OpenSessions()
+    End Sub
+
     Private Sub gMonNotification_Click(sender As Object, e As EventArgs) Handles gMonNotification.Click, gMonTrayNotification.Click
         gMonNotification.Visible = False
         gMonTrayNotification.Visible = False
@@ -1623,13 +1670,6 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub gMonTray_BalloonTipClicked(sender As System.Object, e As System.EventArgs) Handles gMonTray.BalloonTipClicked
-        bShowToggle = True
-        Me.Visible = True
-        Me.ShowInTaskbar = True
-        Me.Focus()
-    End Sub
-
     Private Sub btnCancelOperation_Click(sender As Object, e As EventArgs) Handles btnCancelOperation.Click
         OperationCancel()
     End Sub
@@ -1658,6 +1698,7 @@ Public Class frmMain
                         wState = Me.WindowState
                         Me.WindowState = FormWindowState.Minimized
                         Me.ShowInTaskbar = False
+                        Me.Visible = False
                     End If
                 End If
             Case CloseReason.TaskManagerClosing, CloseReason.WindowsShutDown
@@ -1679,7 +1720,7 @@ Public Class frmMain
         Dim sErrorMessage As String = String.Empty
 
         If oProcess.SearchRunningProcesses(hshScanList, bNeedsPath, iErrorCode, bProcessDebugMode) Then
-            PauseScan()
+            PauseScan(True)
 
             If bNeedsPath Then
                 bContinue = False
@@ -1757,6 +1798,7 @@ Public Class frmMain
                 Else
                     bContinue = False
                     If oSettings.TimeTracking Then HandleTimeSpent()
+                    If oSettings.SessionTracking Then HandleSession()
                     UpdateLog(mgrCommon.FormatString(frmMain_ErrorBackupUnknownPath, oProcess.GameInfo.Name), False)
                     oProcess.GameInfo = Nothing
                     ResetGameInfo()
@@ -1768,6 +1810,7 @@ Public Class frmMain
                 If DoMultiGameCheck() Then
                     UpdateLog(mgrCommon.FormatString(frmMain_GameEnded, oProcess.GameInfo.Name), False)
                     If oSettings.TimeTracking Then HandleTimeSpent()
+                    If oSettings.SessionTracking Then HandleSession()
                     RunBackup()
                 Else
                     UpdateLog(frmMain_UnknownGameEnded, False)

GBM/Forms/frmSessionExport.Designer.vb

@@ -0,0 +1,180 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmSessionExport
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.btnExport = New System.Windows.Forms.Button()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.grpExportType = New System.Windows.Forms.GroupBox()
+        Me.grpDateType = New System.Windows.Forms.GroupBox()
+        Me.optCSV = New System.Windows.Forms.RadioButton()
+        Me.optXML = New System.Windows.Forms.RadioButton()
+        Me.optCurrentLocale = New System.Windows.Forms.RadioButton()
+        Me.optUnix = New System.Windows.Forms.RadioButton()
+        Me.grpOptions = New System.Windows.Forms.GroupBox()
+        Me.chkCSVHeaders = New System.Windows.Forms.CheckBox()
+        Me.grpExportType.SuspendLayout()
+        Me.grpDateType.SuspendLayout()
+        Me.grpOptions.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'btnExport
+        '
+        Me.btnExport.Location = New System.Drawing.Point(116, 226)
+        Me.btnExport.Name = "btnExport"
+        Me.btnExport.Size = New System.Drawing.Size(75, 23)
+        Me.btnExport.TabIndex = 3
+        Me.btnExport.Text = "&Export"
+        Me.btnExport.UseVisualStyleBackColor = True
+        '
+        'btnCancel
+        '
+        Me.btnCancel.Location = New System.Drawing.Point(197, 226)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 4
+        Me.btnCancel.Text = "&Cancel"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'grpExportType
+        '
+        Me.grpExportType.Controls.Add(Me.optXML)
+        Me.grpExportType.Controls.Add(Me.optCSV)
+        Me.grpExportType.Location = New System.Drawing.Point(12, 12)
+        Me.grpExportType.Name = "grpExportType"
+        Me.grpExportType.Size = New System.Drawing.Size(260, 70)
+        Me.grpExportType.TabIndex = 0
+        Me.grpExportType.TabStop = False
+        Me.grpExportType.Text = "Export Type"
+        '
+        'grpDateType
+        '
+        Me.grpDateType.Controls.Add(Me.optUnix)
+        Me.grpDateType.Controls.Add(Me.optCurrentLocale)
+        Me.grpDateType.Location = New System.Drawing.Point(12, 88)
+        Me.grpDateType.Name = "grpDateType"
+        Me.grpDateType.Size = New System.Drawing.Size(260, 70)
+        Me.grpDateType.TabIndex = 1
+        Me.grpDateType.TabStop = False
+        Me.grpDateType.Text = "Date Type"
+        '
+        'optCSV
+        '
+        Me.optCSV.AutoSize = True
+        Me.optCSV.Location = New System.Drawing.Point(6, 19)
+        Me.optCSV.Name = "optCSV"
+        Me.optCSV.Size = New System.Drawing.Size(46, 17)
+        Me.optCSV.TabIndex = 0
+        Me.optCSV.TabStop = True
+        Me.optCSV.Text = "CSV"
+        Me.optCSV.UseVisualStyleBackColor = True
+        '
+        'optXML
+        '
+        Me.optXML.AutoSize = True
+        Me.optXML.Location = New System.Drawing.Point(6, 42)
+        Me.optXML.Name = "optXML"
+        Me.optXML.Size = New System.Drawing.Size(47, 17)
+        Me.optXML.TabIndex = 1
+        Me.optXML.TabStop = True
+        Me.optXML.Text = "XML"
+        Me.optXML.UseVisualStyleBackColor = True
+        '
+        'optCurrentLocale
+        '
+        Me.optCurrentLocale.AutoEllipsis = True
+        Me.optCurrentLocale.Location = New System.Drawing.Point(6, 19)
+        Me.optCurrentLocale.Name = "optCurrentLocale"
+        Me.optCurrentLocale.Size = New System.Drawing.Size(248, 17)
+        Me.optCurrentLocale.TabIndex = 0
+        Me.optCurrentLocale.TabStop = True
+        Me.optCurrentLocale.Text = "Current Locale"
+        Me.optCurrentLocale.UseVisualStyleBackColor = True
+        '
+        'optUnix
+        '
+        Me.optUnix.AutoEllipsis = True
+        Me.optUnix.Location = New System.Drawing.Point(6, 42)
+        Me.optUnix.Name = "optUnix"
+        Me.optUnix.Size = New System.Drawing.Size(248, 17)
+        Me.optUnix.TabIndex = 1
+        Me.optUnix.TabStop = True
+        Me.optUnix.Text = "Unix Timestamp"
+        Me.optUnix.UseVisualStyleBackColor = True
+        '
+        'grpOptions
+        '
+        Me.grpOptions.Controls.Add(Me.chkCSVHeaders)
+        Me.grpOptions.Location = New System.Drawing.Point(12, 164)
+        Me.grpOptions.Name = "grpOptions"
+        Me.grpOptions.Size = New System.Drawing.Size(260, 45)
+        Me.grpOptions.TabIndex = 2
+        Me.grpOptions.TabStop = False
+        Me.grpOptions.Text = "Other Options"
+        '
+        'chkCSVHeaders
+        '
+        Me.chkCSVHeaders.AutoSize = True
+        Me.chkCSVHeaders.Location = New System.Drawing.Point(6, 19)
+        Me.chkCSVHeaders.Name = "chkCSVHeaders"
+        Me.chkCSVHeaders.Size = New System.Drawing.Size(167, 17)
+        Me.chkCSVHeaders.TabIndex = 0
+        Me.chkCSVHeaders.Text = "Export Column Headers (CSV)"
+        Me.chkCSVHeaders.UseVisualStyleBackColor = True
+        '
+        'frmSessionExport
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(284, 261)
+        Me.Controls.Add(Me.grpOptions)
+        Me.Controls.Add(Me.grpDateType)
+        Me.Controls.Add(Me.grpExportType)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.btnExport)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmSessionExport"
+        Me.ShowIcon = False
+        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Session Export Options"
+        Me.grpExportType.ResumeLayout(False)
+        Me.grpExportType.PerformLayout()
+        Me.grpDateType.ResumeLayout(False)
+        Me.grpOptions.ResumeLayout(False)
+        Me.grpOptions.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents btnExport As Button
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents grpExportType As GroupBox
+    Friend WithEvents optXML As RadioButton
+    Friend WithEvents optCSV As RadioButton
+    Friend WithEvents grpDateType As GroupBox
+    Friend WithEvents optUnix As RadioButton
+    Friend WithEvents optCurrentLocale As RadioButton
+    Friend WithEvents grpOptions As GroupBox
+    Friend WithEvents chkCSVHeaders As CheckBox
+End Class

GBM/Forms/frmSessionExport.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GBM/Forms/frmSessionExport.vb

@@ -0,0 +1,90 @@
+Imports GBM.My.Resources
+
+Public Class frmSessionExport
+
+    Private bXML As Boolean = True
+    Private bUnix As Boolean = False
+    Private bCSVHeaders As Boolean = True
+
+    Public ReadOnly Property XML As Boolean
+        Get
+            Return bXML
+        End Get
+    End Property
+
+    Public ReadOnly Property Unix As Boolean
+        Get
+            Return bUnix
+        End Get
+    End Property
+
+    Public ReadOnly Property Headers As Boolean
+        Get
+            Return bCSVHeaders
+        End Get
+    End Property
+
+    Private Sub SetOptions()
+        If optXML.Checked Then
+            bXML = True
+        Else
+            bXML = False
+        End If
+
+        If optUnix.Checked Then
+            bUnix = True
+        Else
+            bUnix = False
+        End If
+
+        If chkCSVHeaders.Checked Then
+            bCSVHeaders = True
+        Else
+            bCSVHeaders = False
+        End If
+    End Sub
+
+    Private Sub SetForm()
+        Me.Text = frmSessionExport_FormName
+
+        grpExportType.Text = frmSessionExport_grpExportType
+        grpDateType.Text = frmSessionExport_grpDateType
+        grpOptions.Text = frmSessionExport_grpOptions
+
+        optCSV.Text = frmSessionExport_optCSV
+        optXML.Text = frmSessionExport_optXML
+        optCurrentLocale.Text = frmSessionExport_optCurrentLocale & " - " & Now
+        optUnix.Text = frmSessionExport_optUnix & " - " & mgrCommon.DateToUnix(Now)
+
+        chkCSVHeaders.Text = frmSessionExport_chkCSVHeaders
+
+        btnExport.Text = frmSessionExport_btnExport
+        btnCancel.Text = frmSessionExport_btnCancel
+
+        optCSV.Checked = True
+        optCurrentLocale.Checked = True
+    End Sub
+
+    Private Sub frmSessionExport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SetForm()
+    End Sub
+
+    Private Sub btnExport_Click(sender As Object, e As EventArgs) Handles btnExport.Click
+        SetOptions()
+        Me.DialogResult = DialogResult.OK
+    End Sub
+
+    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+        Me.DialogResult = DialogResult.Cancel
+    End Sub
+
+    Private Sub optCSV_CheckedChanged(sender As Object, e As EventArgs) Handles optCSV.CheckedChanged
+        If Not optCSV.Checked Then
+            chkCSVHeaders.Checked = False
+            chkCSVHeaders.Enabled = False
+        Else
+            chkCSVHeaders.Checked = True
+            chkCSVHeaders.Enabled = True
+        End If
+    End Sub
+End Class

GBM/Forms/frmSessions.Designer.vb

@@ -0,0 +1,200 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmSessions
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.lblFilter = New System.Windows.Forms.Label()
+        Me.txtFilter = New System.Windows.Forms.TextBox()
+        Me.dgSessions = New System.Windows.Forms.DataGridView()
+        Me.dtpStart = New System.Windows.Forms.DateTimePicker()
+        Me.dtpEnd = New System.Windows.Forms.DateTimePicker()
+        Me.lblTo = New System.Windows.Forms.Label()
+        Me.btnReset = New System.Windows.Forms.Button()
+        Me.btnDelete = New System.Windows.Forms.Button()
+        Me.btnClose = New System.Windows.Forms.Button()
+        Me.lblDateRange = New System.Windows.Forms.Label()
+        Me.lblTotalHours = New System.Windows.Forms.Label()
+        Me.btnExport = New System.Windows.Forms.Button()
+        CType(Me.dgSessions, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'lblFilter
+        '
+        Me.lblFilter.AutoSize = True
+        Me.lblFilter.Location = New System.Drawing.Point(12, 9)
+        Me.lblFilter.Name = "lblFilter"
+        Me.lblFilter.Size = New System.Drawing.Size(63, 13)
+        Me.lblFilter.TabIndex = 1
+        Me.lblFilter.Text = "Game Filter:"
+        '
+        'txtFilter
+        '
+        Me.txtFilter.Location = New System.Drawing.Point(80, 6)
+        Me.txtFilter.Name = "txtFilter"
+        Me.txtFilter.Size = New System.Drawing.Size(190, 20)
+        Me.txtFilter.TabIndex = 1
+        '
+        'dgSessions
+        '
+        Me.dgSessions.AllowUserToAddRows = False
+        Me.dgSessions.AllowUserToDeleteRows = False
+        Me.dgSessions.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dgSessions.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgSessions.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2
+        Me.dgSessions.Location = New System.Drawing.Point(12, 32)
+        Me.dgSessions.Name = "dgSessions"
+        Me.dgSessions.ReadOnly = True
+        Me.dgSessions.RowHeadersVisible = False
+        Me.dgSessions.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgSessions.Size = New System.Drawing.Size(760, 488)
+        Me.dgSessions.TabIndex = 6
+        '
+        'dtpStart
+        '
+        Me.dtpStart.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dtpStart.Location = New System.Drawing.Point(384, 6)
+        Me.dtpStart.Name = "dtpStart"
+        Me.dtpStart.Size = New System.Drawing.Size(175, 20)
+        Me.dtpStart.TabIndex = 3
+        '
+        'dtpEnd
+        '
+        Me.dtpEnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.dtpEnd.Location = New System.Drawing.Point(597, 6)
+        Me.dtpEnd.Name = "dtpEnd"
+        Me.dtpEnd.Size = New System.Drawing.Size(175, 20)
+        Me.dtpEnd.TabIndex = 5
+        '
+        'lblTo
+        '
+        Me.lblTo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblTo.Location = New System.Drawing.Point(565, 9)
+        Me.lblTo.Name = "lblTo"
+        Me.lblTo.Size = New System.Drawing.Size(26, 17)
+        Me.lblTo.TabIndex = 4
+        Me.lblTo.Text = "to"
+        Me.lblTo.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'btnReset
+        '
+        Me.btnReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnReset.Location = New System.Drawing.Point(591, 526)
+        Me.btnReset.Name = "btnReset"
+        Me.btnReset.Size = New System.Drawing.Size(100, 23)
+        Me.btnReset.TabIndex = 10
+        Me.btnReset.Text = "&Reset Filters"
+        Me.btnReset.UseVisualStyleBackColor = True
+        '
+        'btnDelete
+        '
+        Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnDelete.Location = New System.Drawing.Point(12, 526)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(100, 23)
+        Me.btnDelete.TabIndex = 7
+        Me.btnDelete.Text = "&Delete Session"
+        Me.btnDelete.UseVisualStyleBackColor = True
+        '
+        'btnClose
+        '
+        Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnClose.Location = New System.Drawing.Point(697, 526)
+        Me.btnClose.Name = "btnClose"
+        Me.btnClose.Size = New System.Drawing.Size(75, 23)
+        Me.btnClose.TabIndex = 11
+        Me.btnClose.Text = "&Close"
+        Me.btnClose.UseVisualStyleBackColor = True
+        '
+        'lblDateRange
+        '
+        Me.lblDateRange.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblDateRange.AutoSize = True
+        Me.lblDateRange.Location = New System.Drawing.Point(310, 9)
+        Me.lblDateRange.Name = "lblDateRange"
+        Me.lblDateRange.Size = New System.Drawing.Size(68, 13)
+        Me.lblDateRange.TabIndex = 2
+        Me.lblDateRange.Text = "Date Range:"
+        '
+        'lblTotalHours
+        '
+        Me.lblTotalHours.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblTotalHours.Location = New System.Drawing.Point(118, 531)
+        Me.lblTotalHours.Name = "lblTotalHours"
+        Me.lblTotalHours.Size = New System.Drawing.Size(361, 13)
+        Me.lblTotalHours.TabIndex = 8
+        Me.lblTotalHours.Text = "Total Hours:"
+        Me.lblTotalHours.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'btnExport
+        '
+        Me.btnExport.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnExport.Location = New System.Drawing.Point(485, 526)
+        Me.btnExport.Name = "btnExport"
+        Me.btnExport.Size = New System.Drawing.Size(100, 23)
+        Me.btnExport.TabIndex = 9
+        Me.btnExport.Text = "&Export Grid"
+        Me.btnExport.UseVisualStyleBackColor = True
+        '
+        'frmSessions
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(784, 561)
+        Me.Controls.Add(Me.btnExport)
+        Me.Controls.Add(Me.lblTotalHours)
+        Me.Controls.Add(Me.lblDateRange)
+        Me.Controls.Add(Me.btnClose)
+        Me.Controls.Add(Me.btnDelete)
+        Me.Controls.Add(Me.btnReset)
+        Me.Controls.Add(Me.lblTo)
+        Me.Controls.Add(Me.dtpEnd)
+        Me.Controls.Add(Me.dtpStart)
+        Me.Controls.Add(Me.dgSessions)
+        Me.Controls.Add(Me.lblFilter)
+        Me.Controls.Add(Me.txtFilter)
+        Me.Name = "frmSessions"
+        Me.ShowIcon = False
+        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Session Viewer"
+        CType(Me.dgSessions, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents lblFilter As Label
+    Friend WithEvents txtFilter As TextBox
+    Friend WithEvents dgSessions As DataGridView
+    Friend WithEvents dtpStart As DateTimePicker
+    Friend WithEvents dtpEnd As DateTimePicker
+    Friend WithEvents lblTo As Label
+    Friend WithEvents btnReset As Button
+    Friend WithEvents btnDelete As Button
+    Friend WithEvents btnClose As Button
+    Friend WithEvents lblDateRange As Label
+    Friend WithEvents lblTotalHours As Label
+    Friend WithEvents btnExport As Button
+End Class

GBM/Forms/frmSessions.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GBM/Forms/frmSessions.vb

@@ -0,0 +1,306 @@
+Imports GBM.My.Resources
+Imports System.Globalization
+Imports System.ComponentModel
+
+Public Class frmSessions
+
+    Private bInitFinished As Boolean = False
+    Private WithEvents tmFilterTimer As Timer
+    Private bStartSortAsc As Boolean = True
+    Private iStartDataCol As Integer
+    Private iStartDisplayCol As Integer
+    Private bEndSortAsc As Boolean = True
+    Private iEndDataCol As Integer
+    Private iEndDisplayCol As Integer
+    Private bHoursSortAsc As Boolean = True
+    Private iHoursCol As Integer
+
+    Private Sub FormatGrid()
+        'Build Columns
+        dgSessions.Columns.Add("MonitorID", frmSessions_ColumnMonitorID)
+        dgSessions.Columns.Add("Name", frmSessions_ColumnGameName)
+        dgSessions.Columns.Add("StartUnix", frmSessions_ColumnStart)
+        dgSessions.Columns.Add("Start", frmSessions_ColumnStart)
+        dgSessions.Columns.Add("EndUnix", frmSessions_ColumnEnd)
+        dgSessions.Columns.Add("End", frmSessions_ColumnEnd)
+        dgSessions.Columns.Add("Hours", frmSessions_ColumnHours)
+
+        'Get Column Indexes
+        iStartDataCol = dgSessions.Columns.IndexOf(dgSessions.Columns("StartUnix"))
+        iStartDisplayCol = dgSessions.Columns.IndexOf(dgSessions.Columns("Start"))
+        iEndDataCol = dgSessions.Columns.IndexOf(dgSessions.Columns("EndUnix"))
+        iEndDisplayCol = dgSessions.Columns.IndexOf(dgSessions.Columns("End"))
+        iHoursCol = dgSessions.Columns.IndexOf(dgSessions.Columns("Hours"))
+
+        'Set Sorting
+        dgSessions.Columns("Start").SortMode = DataGridViewColumnSortMode.Programmatic
+        dgSessions.Columns("End").SortMode = DataGridViewColumnSortMode.Programmatic
+        dgSessions.Columns("Hours").SortMode = DataGridViewColumnSortMode.Programmatic
+
+        'Hide Columns
+        dgSessions.Columns("MonitorID").Visible = False
+        dgSessions.Columns("StartUnix").Visible = False
+        dgSessions.Columns("EndUnix").Visible = False
+    End Sub
+
+    Private Sub LoadData()
+        Dim oData As DataSet
+        Dim sFilter As String
+        Dim dStart As DateTime
+        Dim dEnd As DateTime
+        Dim dHours As Double
+        Dim dTotalHours As Double
+
+        If txtFilter.Text = String.Empty Then
+            oData = mgrSessions.GetSessionRange(dtpStart.Value, dtpEnd.Value)
+        Else
+            sFilter = txtFilter.Text.ToLower
+            oData = mgrSessions.GetSessionsByGameNameAndRange(sFilter, dtpStart.Value, dtpEnd.Value)
+        End If
+
+        dgSessions.Rows.Clear()
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            dStart = mgrCommon.UnixToDate(dr("Start"))
+            dEnd = mgrCommon.UnixToDate(dr("End"))
+            dHours = Math.Round(dEnd.Subtract(dStart).TotalHours, 2)
+            dTotalHours += dHours
+            dgSessions.Rows.Add(New Object() {dr("MonitorID"), dr("Name"), dr("Start"), dStart, dr("End"), dEnd, dHours})
+        Next
+
+        lblTotalHours.Text = mgrCommon.FormatString(frmSessions_lblTotalHours, dTotalHours)
+
+        dgSessions.AutoResizeColumns()
+    End Sub
+
+    Private Sub SetForm()
+        Me.Text = frmSessions_Name
+
+        'Init Labels
+        lblFilter.Text = frmSessions_lblFilter
+        lblDateRange.Text = frmSessions_lblDateRange
+        btnDelete.Text = frmSessions_btnDelete
+        btnReset.Text = frmSessions_btnReset
+        btnClose.Text = frmSessions_btnClose
+
+        'Init Filter Timer
+        tmFilterTimer = New Timer()
+        tmFilterTimer.Interval = 1000
+        tmFilterTimer.Enabled = False
+
+    End Sub
+
+    Private Sub ResetFilterFields()
+        Dim dtMinDate As DateTime = mgrSessions.GetMinimumDateTime
+        Dim dtMaxDate As DateTime = mgrSessions.GetMaximumDateTime
+        Dim dtRecent As DateTime = dtMaxDate.Subtract(TimeSpan.FromDays(7))
+        Dim sDateTimeFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern & " " & CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern
+
+        If dtRecent < dtMinDate Then
+            dtRecent = dtMinDate
+        End If
+
+        bInitFinished = False
+
+        'Init Date Fields
+        dtpStart.Format = DateTimePickerFormat.Custom
+        dtpEnd.Format = DateTimePickerFormat.Custom
+        dtpStart.CustomFormat = sDateTimeFormat
+        dtpEnd.CustomFormat = sDateTimeFormat
+
+        'Setting max or min dates breaks the control in Mono
+        If Not mgrCommon.IsUnix Then
+            dtpStart.MinDate = dtMinDate
+            dtpStart.MaxDate = dtMaxDate
+            dtpEnd.MinDate = dtMinDate
+            dtpEnd.MaxDate = dtMaxDate
+        End If
+
+        dtpStart.Value = dtRecent
+        dtpEnd.Value = dtMaxDate
+
+        'Init Text Filter
+        txtFilter.Text = String.Empty
+
+        bInitFinished = True
+    End Sub
+
+    Private Sub Reset()
+        ClearManualSortGlyphs()
+        ResetFilterFields()
+        LoadData()
+    End Sub
+
+    Private Sub DeleteSession()
+        Dim oSession As clsSession
+        Dim oSessions As New List(Of clsSession)
+
+        For Each dgvRow As DataGridViewRow In dgSessions.SelectedRows
+            oSession = New clsSession
+            oSession.MonitorID = dgvRow.Cells(0).Value
+            oSession.SessionStart = CInt(dgvRow.Cells(iStartDataCol).Value)
+            oSession.SessionEnd = CInt(dgvRow.Cells(iEndDataCol).Value)
+            oSessions.Add(oSession)
+        Next
+
+        If oSessions.Count > 0 Then
+            mgrSessions.DeleteSession(oSessions)
+        End If
+    End Sub
+
+    Private Sub ClearManualSortGlyphs()
+        dgSessions.Columns(iStartDisplayCol).HeaderCell.SortGlyphDirection = SortOrder.None
+        dgSessions.Columns(iEndDisplayCol).HeaderCell.SortGlyphDirection = SortOrder.None
+        dgSessions.Columns(iHoursCol).HeaderCell.SortGlyphDirection = SortOrder.None
+    End Sub
+
+    Private Sub DoSort(ByRef bToggle As Boolean, ByVal iCol As Integer, ByVal iType As RowCompareHelper.iDataType)
+        bToggle = Not bToggle
+        If bToggle Then
+            dgSessions.Sort(New RowCompareHelper(SortOrder.Ascending, iCol, iType))
+            dgSessions.Columns(iCol).HeaderCell.SortGlyphDirection = SortOrder.Ascending
+        Else
+            dgSessions.Sort(New RowCompareHelper(SortOrder.Descending, iCol, iType))
+            dgSessions.Columns(iCol).HeaderCell.SortGlyphDirection = SortOrder.Descending
+        End If
+    End Sub
+
+    Private Sub HandleSort(ByVal iCol As Integer)
+        ClearManualSortGlyphs()
+
+        Select Case iCol
+            Case iStartDisplayCol
+                DoSort(bStartSortAsc, iStartDisplayCol, RowCompareHelper.iDataType.DateTimeType)
+            Case iEndDisplayCol
+                DoSort(bEndSortAsc, iEndDisplayCol, RowCompareHelper.iDataType.DateTimeType)
+            Case iHoursCol
+                DoSort(bHoursSortAsc, iHoursCol, RowCompareHelper.iDataType.DecimalType)
+        End Select
+    End Sub
+
+    Private Sub ExportGrid()
+        Dim frm As New frmSessionExport
+        Dim sLocation As String
+
+        frm.ShowDialog()
+
+        If frm.DialogResult = DialogResult.OK Then
+
+            If frm.XML Then
+                sLocation = mgrCommon.SaveFileBrowser("Session_Export", frmSessions_ChooseExportLocation, "xml", frmSessions_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmSessions_DefaultExportFileName)
+            Else
+                sLocation = mgrCommon.SaveFileBrowser("Session_Export", frmSessions_ChooseExportLocation, "csv", frmSessions_CSV, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmSessions_DefaultExportFileName)
+            End If
+
+            If sLocation <> String.Empty Then
+                If frm.XML Then
+                    mgrSessions.ExportAsXML(sLocation, frm.Unix, dgSessions)
+                Else
+                    mgrSessions.ExportAsCSV(sLocation, frm.Unix, frm.Headers, dgSessions)
+                End If
+            End If
+        End If
+    End Sub
+
+    Private Sub frmSession_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SetForm()
+        ResetFilterFields()
+        FormatGrid()
+        LoadData()
+    End Sub
+
+    Private Sub tmFilterTimer_Tick(sender As Object, ByVal e As EventArgs) Handles tmFilterTimer.Tick
+        LoadData()
+        tmFilterTimer.Stop()
+        tmFilterTimer.Enabled = False
+    End Sub
+
+    Private Sub txtFilter_TextChanged(sender As Object, e As EventArgs) Handles txtFilter.TextChanged
+        If Not tmFilterTimer.Enabled Then
+            tmFilterTimer.Enabled = True
+            tmFilterTimer.Start()
+        End If
+    End Sub
+
+    Private Sub dtpStart_ValueChanged(sender As Object, e As EventArgs) Handles dtpStart.ValueChanged
+        If bInitFinished Then LoadData()
+    End Sub
+
+    Private Sub dtpEnd_ValueChanged(sender As Object, e As EventArgs) Handles dtpEnd.ValueChanged
+        If bInitFinished Then LoadData()
+    End Sub
+
+    Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click
+        Reset()
+    End Sub
+
+    Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+        Me.Close()
+    End Sub
+
+    Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+        If dgSessions.SelectedRows.Count > 0 Then
+            If mgrCommon.ShowMessage(frmSessions_ConfirmDelete, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                DeleteSession()
+                LoadData()
+            End If
+        End If
+    End Sub
+
+    Private Sub btnExport_Click(sender As Object, e As EventArgs) Handles btnExport.Click
+        ExportGrid()
+    End Sub
+
+    Private Sub dgSessions_ColumnHeaderMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgSessions.ColumnHeaderMouseClick
+        HandleSort(e.ColumnIndex)
+    End Sub
+
+    'The Mono version of the DataGridView control automatically treats all data as a string for sorting purposes.
+    'This class manually handles column sorting by data type.
+    Private Class RowCompareHelper
+        Implements System.Collections.IComparer
+
+        'We need to manually define data types as the column ValueType doesn't work in Mono either.
+        Public Enum iDataType As Integer
+            StringType = 1
+            DateTimeType = 2
+            IntType = 3
+            DecimalType = 4
+        End Enum
+
+        Private iSortOrderModifier As Integer = 1
+        Private iSortCol As Integer = 0
+        Private iDataTypeCol As iDataType = iDataType.StringType
+
+        Public Sub New(ByVal sortOrder As SortOrder, ByVal iCol As Integer, ByVal iType As iDataType)
+            iSortCol = iCol
+            iDataTypeCol = iType
+
+            If sortOrder = SortOrder.Descending Then
+                iSortOrderModifier = -1
+            ElseIf sortOrder = SortOrder.Ascending Then
+                iSortOrderModifier = 1
+            End If
+        End Sub
+
+        Public Function Compare(ByVal x As Object, ByVal y As Object) As Integer Implements System.Collections.IComparer.Compare
+            Dim iCompareResult As Integer
+            Dim dgRow1 As DataGridViewRow = CType(x, DataGridViewRow)
+            Dim dgRow2 As DataGridViewRow = CType(y, DataGridViewRow)
+
+            Select Case iDataTypeCol
+                Case iDataType.DecimalType
+                    iCompareResult = If(CDec(dgRow1.Cells(iSortCol).Value) < CDec(dgRow2.Cells(iSortCol).Value), -1, 1)
+                Case iDataType.IntType
+                    iCompareResult = If(CInt(dgRow1.Cells(iSortCol).Value) < CInt(dgRow2.Cells(iSortCol).Value), -1, 1)
+                Case iDataType.StringType
+                    iCompareResult = String.Compare(CStr(dgRow1.Cells(iSortCol).Value), CStr(dgRow2.Cells(iSortCol).Value))
+                Case iDataType.DateTimeType
+                    iCompareResult = Date.Compare(CDate(dgRow1.Cells(iSortCol).Value), CDate(dgRow2.Cells(iSortCol).Value))
+            End Select
+
+            Return iCompareResult * iSortOrderModifier
+        End Function
+    End Class
+
+End Class

GBM/Forms/frmSettings.Designer.vb

@@ -50,9 +50,6 @@ Partial Class frmSettings
         Me.lbl7zProduct = New System.Windows.Forms.Label()
         Me.btnDefaults = New System.Windows.Forms.Button()
         Me.pnlBackup = New System.Windows.Forms.Panel()
-        Me.lblMinutes = New System.Windows.Forms.Label()
-        Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown()
-        Me.chkSupressBackup = New System.Windows.Forms.CheckBox()
         Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
         Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
         Me.grpBackupHandling = New System.Windows.Forms.GroupBox()
@@ -63,18 +60,22 @@ Partial Class frmSettings
         Me.grp7zAdvanced = New System.Windows.Forms.GroupBox()
         Me.grp7zInformation = New System.Windows.Forms.GroupBox()
         Me.pnlGeneral = New System.Windows.Forms.Panel()
+        Me.lblMinutes = New System.Windows.Forms.Label()
+        Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown()
+        Me.chkSupressBackup = New System.Windows.Forms.CheckBox()
         Me.grpGameData = New System.Windows.Forms.GroupBox()
+        Me.chkSessionTracking = New System.Windows.Forms.CheckBox()
         Me.lstSettings = New System.Windows.Forms.ListBox()
         Me.grpStartup.SuspendLayout()
         Me.grpFolderOptions.SuspendLayout()
         Me.grp7zGeneral.SuspendLayout()
         Me.pnlBackup.SuspendLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpBackupHandling.SuspendLayout()
         Me.pnl7z.SuspendLayout()
         Me.grp7zAdvanced.SuspendLayout()
         Me.grp7zInformation.SuspendLayout()
         Me.pnlGeneral.SuspendLayout()
+        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpGameData.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -123,19 +124,19 @@ Partial Class frmSettings
         'chkAutoSaveLog
         '
         Me.chkAutoSaveLog.AutoSize = True
-        Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204)
+        Me.chkAutoSaveLog.Location = New System.Drawing.Point(12, 251)
         Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
         Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
-        Me.chkAutoSaveLog.TabIndex = 3
+        Me.chkAutoSaveLog.TabIndex = 5
         Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
         Me.chkAutoSaveLog.UseVisualStyleBackColor = True
         '
         'btnOptionalFields
         '
-        Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38)
+        Me.btnOptionalFields.Location = New System.Drawing.Point(103, 61)
         Me.btnOptionalFields.Name = "btnOptionalFields"
         Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23)
-        Me.btnOptionalFields.TabIndex = 2
+        Me.btnOptionalFields.TabIndex = 3
         Me.btnOptionalFields.Text = "Choose &Optional Fields..."
         Me.btnOptionalFields.UseVisualStyleBackColor = True
         '
@@ -152,20 +153,20 @@ Partial Class frmSettings
         'chkSync
         '
         Me.chkSync.AutoSize = True
-        Me.chkSync.Location = New System.Drawing.Point(6, 42)
+        Me.chkSync.Location = New System.Drawing.Point(6, 65)
         Me.chkSync.Name = "chkSync"
         Me.chkSync.Size = New System.Drawing.Size(98, 17)
-        Me.chkSync.TabIndex = 1
+        Me.chkSync.TabIndex = 2
         Me.chkSync.Text = "Enable syncing"
         Me.chkSync.UseVisualStyleBackColor = True
         '
         'chkShowDetectionTips
         '
         Me.chkShowDetectionTips.AutoSize = True
-        Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181)
+        Me.chkShowDetectionTips.Location = New System.Drawing.Point(12, 228)
         Me.chkShowDetectionTips.Name = "chkShowDetectionTips"
         Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17)
-        Me.chkShowDetectionTips.TabIndex = 2
+        Me.chkShowDetectionTips.TabIndex = 4
         Me.chkShowDetectionTips.Text = "Show detection notifications"
         Me.chkShowDetectionTips.UseVisualStyleBackColor = True
         '
@@ -336,9 +337,6 @@ Partial Class frmSettings
         '
         'pnlBackup
         '
-        Me.pnlBackup.Controls.Add(Me.lblMinutes)
-        Me.pnlBackup.Controls.Add(Me.nudSupressBackupThreshold)
-        Me.pnlBackup.Controls.Add(Me.chkSupressBackup)
         Me.pnlBackup.Controls.Add(Me.chkBackupConfirm)
         Me.pnlBackup.Controls.Add(Me.chkOverwriteWarning)
         Me.pnlBackup.Controls.Add(Me.grpBackupHandling)
@@ -348,37 +346,10 @@ Partial Class frmSettings
         Me.pnlBackup.Size = New System.Drawing.Size(367, 314)
         Me.pnlBackup.TabIndex = 3
         '
-        'lblMinutes
-        '
-        Me.lblMinutes.AutoSize = True
-        Me.lblMinutes.Location = New System.Drawing.Point(286, 228)
-        Me.lblMinutes.Name = "lblMinutes"
-        Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
-        Me.lblMinutes.TabIndex = 14
-        Me.lblMinutes.Text = "minutes"
-        '
-        'nudSupressBackupThreshold
-        '
-        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 226)
-        Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
-        Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
-        Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20)
-        Me.nudSupressBackupThreshold.TabIndex = 5
-        '
-        'chkSupressBackup
-        '
-        Me.chkSupressBackup.AutoSize = True
-        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 228)
-        Me.chkSupressBackup.Name = "chkSupressBackup"
-        Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17)
-        Me.chkSupressBackup.TabIndex = 4
-        Me.chkSupressBackup.Text = "Backup only when session time exceeds"
-        Me.chkSupressBackup.UseVisualStyleBackColor = True
-        '
         'chkBackupConfirm
         '
         Me.chkBackupConfirm.AutoSize = True
-        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 180)
+        Me.chkBackupConfirm.Location = New System.Drawing.Point(14, 180)
         Me.chkBackupConfirm.Name = "chkBackupConfirm"
         Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
         Me.chkBackupConfirm.TabIndex = 2
@@ -388,7 +359,7 @@ Partial Class frmSettings
         'chkOverwriteWarning
         '
         Me.chkOverwriteWarning.AutoSize = True
-        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 204)
+        Me.chkOverwriteWarning.Location = New System.Drawing.Point(14, 203)
         Me.chkOverwriteWarning.Name = "chkOverwriteWarning"
         Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17)
         Me.chkOverwriteWarning.TabIndex = 3
@@ -478,6 +449,9 @@ Partial Class frmSettings
         '
         'pnlGeneral
         '
+        Me.pnlGeneral.Controls.Add(Me.lblMinutes)
+        Me.pnlGeneral.Controls.Add(Me.nudSupressBackupThreshold)
+        Me.pnlGeneral.Controls.Add(Me.chkSupressBackup)
         Me.pnlGeneral.Controls.Add(Me.chkAutoSaveLog)
         Me.pnlGeneral.Controls.Add(Me.grpGameData)
         Me.pnlGeneral.Controls.Add(Me.chkShowDetectionTips)
@@ -487,18 +461,56 @@ Partial Class frmSettings
         Me.pnlGeneral.Size = New System.Drawing.Size(367, 314)
         Me.pnlGeneral.TabIndex = 1
         '
+        'lblMinutes
+        '
+        Me.lblMinutes.AutoSize = True
+        Me.lblMinutes.Location = New System.Drawing.Point(232, 205)
+        Me.lblMinutes.Name = "lblMinutes"
+        Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
+        Me.lblMinutes.TabIndex = 17
+        Me.lblMinutes.Text = "minutes"
+        '
+        'nudSupressBackupThreshold
+        '
+        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(176, 203)
+        Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
+        Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
+        Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20)
+        Me.nudSupressBackupThreshold.TabIndex = 3
+        '
+        'chkSupressBackup
+        '
+        Me.chkSupressBackup.AutoSize = True
+        Me.chkSupressBackup.Location = New System.Drawing.Point(12, 204)
+        Me.chkSupressBackup.Name = "chkSupressBackup"
+        Me.chkSupressBackup.Size = New System.Drawing.Size(158, 17)
+        Me.chkSupressBackup.TabIndex = 2
+        Me.chkSupressBackup.Text = "Ignore sessions shorter than"
+        Me.chkSupressBackup.UseVisualStyleBackColor = True
+        '
         'grpGameData
         '
+        Me.grpGameData.Controls.Add(Me.chkSessionTracking)
         Me.grpGameData.Controls.Add(Me.chkTimeTracking)
         Me.grpGameData.Controls.Add(Me.chkSync)
         Me.grpGameData.Controls.Add(Me.btnOptionalFields)
         Me.grpGameData.Location = New System.Drawing.Point(6, 106)
         Me.grpGameData.Name = "grpGameData"
-        Me.grpGameData.Size = New System.Drawing.Size(354, 69)
+        Me.grpGameData.Size = New System.Drawing.Size(354, 92)
         Me.grpGameData.TabIndex = 1
         Me.grpGameData.TabStop = False
         Me.grpGameData.Text = "Game Data"
         '
+        'chkSessionTracking
+        '
+        Me.chkSessionTracking.AutoSize = True
+        Me.chkSessionTracking.Location = New System.Drawing.Point(6, 42)
+        Me.chkSessionTracking.Name = "chkSessionTracking"
+        Me.chkSessionTracking.Size = New System.Drawing.Size(138, 17)
+        Me.chkSessionTracking.TabIndex = 1
+        Me.chkSessionTracking.Text = "Enable session tracking"
+        Me.chkSessionTracking.UseVisualStyleBackColor = True
+        '
         'lstSettings
         '
         Me.lstSettings.FormattingEnabled = True
@@ -535,7 +547,6 @@ Partial Class frmSettings
         Me.grp7zGeneral.PerformLayout()
         Me.pnlBackup.ResumeLayout(False)
         Me.pnlBackup.PerformLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grpBackupHandling.ResumeLayout(False)
         Me.grpBackupHandling.PerformLayout()
         Me.pnl7z.ResumeLayout(False)
@@ -544,6 +555,7 @@ Partial Class frmSettings
         Me.grp7zInformation.ResumeLayout(False)
         Me.pnlGeneral.ResumeLayout(False)
         Me.pnlGeneral.PerformLayout()
+        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grpGameData.ResumeLayout(False)
         Me.grpGameData.PerformLayout()
         Me.ResumeLayout(False)
@@ -583,13 +595,14 @@ Partial Class frmSettings
     Friend WithEvents lstSettings As ListBox
     Friend WithEvents grp7zAdvanced As GroupBox
     Friend WithEvents grp7zInformation As GroupBox
-    Friend WithEvents lblMinutes As Label
-    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
-    Friend WithEvents chkSupressBackup As CheckBox
     Friend WithEvents chkBackupConfirm As CheckBox
     Friend WithEvents chkOverwriteWarning As CheckBox
     Friend WithEvents grpBackupHandling As GroupBox
     Friend WithEvents chkAutoMark As CheckBox
     Friend WithEvents chkAutoRestore As CheckBox
     Friend WithEvents chkRestoreNotify As CheckBox
+    Friend WithEvents chkSessionTracking As CheckBox
+    Friend WithEvents lblMinutes As Label
+    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
+    Friend WithEvents chkSupressBackup As CheckBox
 End Class

GBM/Forms/frmSettings.vb

@@ -34,6 +34,11 @@ Public Class frmSettings
 
     Private Function ValidateSettings() As Boolean
 
+        'Show Start with Windows warning if running as admin
+        If chkStartWindows.Checked And mgrCommon.IsElevated Then
+            mgrCommon.ShowMessage(frmSettings_WarningAdminStart, MsgBoxStyle.Exclamation)
+        End If
+
         'Only modify registry key when the value changed
         If chkStartWindows.Checked <> oSettings.StartWithWindows Then
             HandleRegistryUpdate(chkStartWindows.Checked)
@@ -51,6 +56,7 @@ Public Class frmSettings
         oSettings.AutoRestore = chkAutoRestore.Checked
         oSettings.AutoMark = chkAutoMark.Checked
         oSettings.TimeTracking = chkTimeTracking.Checked
+        oSettings.SessionTracking = chkSessionTracking.Checked
         oSettings.SupressBackup = chkSupressBackup.Checked
         oSettings.SupressBackupThreshold = nudSupressBackupThreshold.Value
         oSettings.CompressionLevel = cboCompression.SelectedValue
@@ -177,6 +183,7 @@ Public Class frmSettings
         txtBackupFolder.Text = oSettings.BackupFolder
         chkSync.Checked = oSettings.Sync
         chkTimeTracking.Checked = oSettings.TimeTracking
+        chkSessionTracking.Checked = oSettings.SessionTracking
         chkSupressBackup.Checked = oSettings.SupressBackup
         nudSupressBackupThreshold.Value = oSettings.SupressBackupThreshold
         nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
@@ -289,6 +296,7 @@ Public Class frmSettings
         grpStartup.Text = frmSettings_grpStartup
         grpGameData.Text = frmSettings_grpGameData
         chkTimeTracking.Text = frmSettings_chkTimeTracking
+        chkSessionTracking.Text = frmSettings_chkSessionTracking
         chkStartWindows.Text = frmSettings_chkStartWindows
         chkSync.Text = frmSettings_chkSync
         chkShowDetectionTips.Text = frmSettings_chkShowDetectionTips

GBM/Forms/frmSyncFields.vb

@@ -67,49 +67,49 @@ Public Class frmSyncFields
 
     Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged
         If chkTimeStamp.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.TimeStamp)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.TimeStamp)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.TimeStamp)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.TimeStamp)
         End If
     End Sub
 
     Private Sub chkGamePath_CheckedChanged(sender As Object, e As EventArgs) Handles chkGamePath.CheckedChanged
         If chkGamePath.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.GamePath)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.GamePath)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.GamePath)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.GamePath)
         End If
     End Sub
 
     Private Sub chkCompany_CheckedChanged(sender As Object, e As EventArgs) Handles chkCompany.CheckedChanged
         If chkCompany.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Company)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Company)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Company)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Company)
         End If
     End Sub
 
     Private Sub chkVersion_CheckedChanged(sender As Object, e As EventArgs) Handles chkVersion.CheckedChanged
         If chkVersion.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Version)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Version)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Version)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Version)
         End If
     End Sub
 
     Private Sub chkIcon_CheckedChanged(sender As Object, e As EventArgs) Handles chkIcon.CheckedChanged
         If chkIcon.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Icon)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.Icon)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Icon)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.Icon)
         End If
     End Sub
 
     Private Sub chkMonitorGame_CheckedChanged(sender As Object, e As EventArgs) Handles chkMonitorGame.CheckedChanged
         If chkMonitorGame.Checked Then
-            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.MonitorGame)
+            SyncFields = clsGame.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.MonitorGame)
         Else
-            SyncFields = mgrCommon.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.MonitorGame)
+            SyncFields = clsGame.RemoveSyncField(SyncFields, clsGame.eOptionalSyncFields.MonitorGame)
         End If
     End Sub
 End Class

GBM/Game Backup Monitor.vbproj

@@ -122,7 +122,12 @@
     <Import Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Classes\clsGameFilter.vb" />
+    <Compile Include="Classes\clsGameFilterField.vb" />
     <Compile Include="Classes\clsSavedPath.vb" />
+    <Compile Include="Classes\clsSession.vb" />
+    <Compile Include="Classes\XML Serialize Classes\ExportData.vb" />
+    <Compile Include="Classes\XML Serialize Classes\Session.vb" />
     <Compile Include="Classes\XML Serialize Classes\Tag.vb" />
     <Compile Include="Classes\XML Serialize Classes\Game.vb" />
     <Compile Include="Classes\clsGameTag.vb" />
@@ -166,6 +171,18 @@
     <Compile Include="Forms\frmIncludeExclude.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\frmSessionExport.Designer.vb">
+      <DependentUpon>frmSessionExport.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\frmSessionExport.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\frmSessions.Designer.vb">
+      <DependentUpon>frmSessions.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\frmSessions.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\frmStartUpWizard.Designer.vb">
       <DependentUpon>frmStartUpWizard.vb</DependentUpon>
     </Compile>
@@ -223,6 +240,7 @@
     <Compile Include="Managers\mgrPath.vb" />
     <Compile Include="Managers\mgrRestore.vb" />
     <Compile Include="Managers\mgrSavedPath.vb" />
+    <Compile Include="Managers\mgrSessions.vb" />
     <Compile Include="Managers\mgrSettings.vb" />
     <Compile Include="Managers\mgrBackup.vb" />
     <Compile Include="Managers\mgrSQLite.vb" />
@@ -265,6 +283,12 @@
     <EmbeddedResource Include="Forms\frmIncludeExclude.resx">
       <DependentUpon>frmIncludeExclude.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\frmSessionExport.resx">
+      <DependentUpon>frmSessionExport.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\frmSessions.resx">
+      <DependentUpon>frmSessions.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\frmStartUpWizard.resx">
       <DependentUpon>frmStartUpWizard.vb</DependentUpon>
       <SubType>Designer</SubType>

GBM/License/credits.txt

@@ -1,5 +1,12 @@
 Game Backup Monitor would like to credit the following people/organizations:
 
-7-zip - Igor Pavlov
+Contributors:
+
+Michael J. Seiferling (MikeMaximus) - Design, Programming and Windows Game Configuration Maintainer.
+Sebastian Riedel (basxto) - Linux Packaging, Installation and Game Configuration Maintainer.
+
+Special Thanks:
+
+7-Zip - Igor Pavlov
 Sixpack Status Icons - JankoAtWarpSpeed.com
 Primo Icon Set - webdesignerdepot.com

GBM/Managers/mgrBackup.vb

@@ -85,14 +85,38 @@ Public Class mgrBackup
         End Try
     End Sub
 
+    Private Function VerifySavePath(ByVal oGame As clsGame) As String
+        Dim sSavePath As String
+
+        If oGame.AbsolutePath = False Then
+            If oGame.Path <> String.Empty Then
+                sSavePath = oGame.ProcessPath & Path.DirectorySeparatorChar & oGame.Path
+            Else
+                sSavePath = oGame.ProcessPath
+            End If
+        Else
+            sSavePath = oGame.Path
+        End If
+
+        Return sSavePath
+    End Function
+
     Public Function CheckBackupPrereq(ByVal oGame As clsGame) As Boolean
         Dim sBackupFile As String = oSettings.BackupFolder
-        Dim lAvailableSpace As Long = mgrCommon.GetAvailableDiskSpace(sBackupFile)
-        Dim lFolderSize As Long = mgrCommon.GetFolderSize(oGame.Path, oGame.IncludeArray, oGame.ExcludeArray)
+        Dim sSavePath As String
+        Dim lAvailableSpace As Long
+        Dim lFolderSize As Long
 
         If oSettings.CreateSubFolder Then sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name
         sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z"
 
+        'Verify saved game path
+        sSavePath = VerifySavePath(oGame)
+
+        'Calculate space
+        lAvailableSpace = mgrCommon.GetAvailableDiskSpace(oSettings.BackupFolder)
+        lFolderSize = mgrCommon.GetFolderSize(sSavePath, oGame.IncludeArray, oGame.ExcludeArray)
+
         'Show Available Space
         RaiseEvent UpdateLog(mgrCommon.FormatString(mgrCommon_AvailableDiskSpace, mgrCommon.FormatDiskSpace(lAvailableSpace)), False, ToolTipIcon.Info, True)
 
@@ -194,15 +218,8 @@ Public Class mgrBackup
             End If
 
             If bDoBackup Then
-                If oGame.AbsolutePath = False Then
-                    If oGame.Path <> String.Empty Then
-                        sSavePath = oGame.ProcessPath & Path.DirectorySeparatorChar & oGame.Path
-                    Else
-                        sSavePath = oGame.ProcessPath
-                    End If
-                Else
-                    sSavePath = oGame.Path
-                End If
+
+                sSavePath = VerifySavePath(oGame)
 
                 If oGame.FolderSave = True Then
                     BuildFileList(sSavePath, "*", mgrPath.IncludeFileLocation)

GBM/Managers/mgrCommon.vb

@@ -3,6 +3,8 @@ Imports System.Net
 Imports System.IO
 Imports System.Security.Principal
 Imports System.Text.RegularExpressions
+Imports System.Runtime.Serialization
+Imports System.Runtime.Serialization.Formatters.Binary
 
 Public Class mgrCommon
 
@@ -35,6 +37,34 @@ Public Class mgrCommon
         End Get
     End Property
 
+    Public Shared ReadOnly Property DisplayAppVersion As String
+        Get
+            Return My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor & "." & My.Application.Info.Version.Build
+        End Get
+    End Property
+
+    'Source - https://stackoverflow.com/questions/18873152/deep-copy-of-ordereddictionary
+    Public Shared Function GenericClone(ByVal oOriginal As Object) As Object
+        'Construct a temporary memory stream
+        Dim oStream As MemoryStream = New MemoryStream()
+
+        'Construct a serialization formatter that does all the hard work
+        Dim oFormatter As BinaryFormatter = New BinaryFormatter()
+
+        'This line Is explained in the "Streaming Contexts" section
+        oFormatter.Context = New StreamingContext(StreamingContextStates.Clone)
+
+        'Serialize the object graph into the memory stream
+        oFormatter.Serialize(oStream, oOriginal)
+
+        'Seek back to the start of the memory stream before deserializing
+        oStream.Position = 0
+
+        'Deserialize the graph into a New set of objects
+        'Return the root of the graph (deep copy) to the caller
+        Return oFormatter.Deserialize(oStream)
+    End Function
+
     Public Shared Function CheckAddress(ByVal URL As String) As Boolean
         Try
             Dim request As WebRequest = WebRequest.Create(URL)
@@ -213,14 +243,6 @@ Public Class mgrCommon
         oProcess.Start()
     End Sub
 
-    Public Shared Function SetSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
-        Return eSyncFields Or eSyncField
-    End Function
-
-    Public Shared Function RemoveSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
-        Return eSyncFields And (Not eSyncField)
-    End Function
-
     'Get a file size
     Public Shared Function GetFileSize(ByVal sFile As String) As Long
         Dim oFileInfo As FileInfo
@@ -253,25 +275,27 @@ Public Class mgrCommon
     End Function
 
     'Calculate the current size of a folder
-    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String())
+    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String()) As Long
         Dim oFolder As DirectoryInfo
         Dim bInclude As Boolean
         Dim bExclude As Boolean
         Dim lSize As Long = 0
 
         Try
+            If Not Directory.Exists(sPath) Then Return lSize
+
             oFolder = New DirectoryInfo(sPath)
 
             'Files
             For Each fi As FileInfo In oFolder.EnumerateFiles()
                 If sInclude.Length > 0 Then
-                    bInclude = CompareValueToArrayRegEx(fi.Name, sInclude) Or CompareValueToArrayRegEx(Path.GetDirectoryName(sPath), sInclude)
+                    bInclude = CompareValueToArrayRegEx(fi.Name, sInclude) Or CompareValueToArrayRegEx(fi.DirectoryName, sInclude)
                 Else
                     bInclude = True
                 End If
 
                 If sExclude.Length > 0 Then
-                    bExclude = CompareValueToArrayRegEx(fi.Name, sExclude) Or CompareValueToArrayRegEx(Path.GetDirectoryName(sPath), sExclude)
+                    bExclude = CompareValueToArrayRegEx(fi.Name, sExclude) Or CompareValueToArrayRegEx(fi.DirectoryName, sExclude)
                 Else
                     bExclude = False
                 End If
@@ -322,8 +346,31 @@ Public Class mgrCommon
         Return lSize
     End Function
 
-    'Get available disk space on a drive
-    Public Shared Function GetAvailableDiskSpace(ByVal sPath As String) As Long
+    'Get available disk space on a drive (Unix)
+    Private Shared Function GetAvailableDiskSpaceUnix(ByVal sPath As String) As Long
+        Dim prsdf As Process
+        Dim sOutput As String
+        Dim sAvailableSpace As String
+        Try
+            prsdf = New Process
+            prsdf.StartInfo.FileName = "/bin/df"
+            prsdf.StartInfo.Arguments = sPath
+            prsdf.StartInfo.UseShellExecute = False
+            prsdf.StartInfo.RedirectStandardOutput = True
+            prsdf.StartInfo.CreateNoWindow = True
+            prsdf.Start()
+            sOutput = prsdf.StandardOutput.ReadToEnd
+            'Parse df output to grab "Available" value
+            sAvailableSpace = sOutput.Split(vbLf)(1).Split(New Char() {" "}, StringSplitOptions.RemoveEmptyEntries)(3)
+            'Return value in bytes
+            Return CLng(sAvailableSpace) * 1024
+        Catch
+            Return 0
+        End Try
+    End Function
+
+    'Get available disk space on a drive (Windows)
+    Private Shared Function GetAvailableDiskSpaceWindows(ByVal sPath As String) As Long
         Dim oDrive As DriveInfo
         Dim lAvailableSpace As Long = 0
         Try
@@ -335,6 +382,15 @@ Public Class mgrCommon
         Return lAvailableSpace
     End Function
 
+    'Get available disk space on a drive 
+    Public Shared Function GetAvailableDiskSpace(ByVal sPath As String) As Long
+        If IsUnix() Then
+            Return GetAvailableDiskSpaceUnix(sPath)
+        Else
+            Return GetAvailableDiskSpaceWindows(sPath)
+        End If
+    End Function
+
     'Delete file based on OS type
     Public Shared Sub DeleteFile(ByVal sPath As String, Optional ByVal bRecycle As Boolean = True)
         If File.Exists(sPath) Then

GBM/Managers/mgrMonitorList.vb

@@ -1,4 +1,5 @@
 Imports GBM.My.Resources
+Imports System.Collections.Specialized
 Imports System.IO
 
 Public Class mgrMonitorList
@@ -32,6 +33,7 @@ Public Class mgrMonitorList
         oGame.BackupLimit = CInt(dr("BackupLimit"))
         oGame.CleanFolder = CBool(dr("CleanFolder"))
         If Not IsDBNull(dr("Parameter")) Then oGame.Parameter = CStr(dr("Parameter"))
+        If Not IsDBNull(dr("Comments")) Then oGame.Comments = CStr(dr("Comments"))
 
         Return oGame
     End Function
@@ -58,6 +60,7 @@ Public Class mgrMonitorList
         hshParams.Add("BackupLimit", oGame.BackupLimit)
         hshParams.Add("CleanFolder", oGame.CleanFolder)
         hshParams.Add("Parameter", oGame.Parameter)
+        hshParams.Add("Comments", oGame.Comments)
 
         Return hshParams
     End Function
@@ -98,7 +101,7 @@ Public Class mgrMonitorList
         Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO monitorlist VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, @TimeStamp, "
-        sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit, @CleanFolder, @Parameter)"
+        sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit, @CleanFolder, @Parameter, @Comments)"
 
         'Parameters
         hshParams = SetCoreParameters(oGame)
@@ -114,7 +117,7 @@ Public Class mgrMonitorList
 
         sSQL = "UPDATE monitorlist SET Name=@Name, Process=@Process, Path=@Path, AbsolutePath=@AbsolutePath, FolderSave=@FolderSave, "
         sSQL &= "FileType=@FileType, TimeStamp=@TimeStamp, ExcludeList=@ExcludeList, ProcessPath=@ProcessPath, Icon=@Icon, "
-        sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly, BackupLimit=@BackupLimit, CleanFolder=@CleanFolder, Parameter=@Parameter WHERE MonitorID=@ID"
+        sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly, BackupLimit=@BackupLimit, CleanFolder=@CleanFolder, Parameter=@Parameter, Comments=@Comments WHERE MonitorID=@ID"
 
         'Parameters
         hshParams = SetCoreParameters(oGame)
@@ -155,6 +158,10 @@ Public Class mgrMonitorList
 
         sSQL = "DELETE FROM gametags "
         sSQL &= "WHERE MonitorID = @MonitorID;"
+        If iSelectDB = mgrSQLite.Database.Local Then
+            sSQL &= "DELETE FROM sessions "
+            sSQL &= "WHERE MonitorID = @MonitorID;"
+        End If
         sSQL &= "DELETE FROM monitorlist "
         sSQL &= "WHERE MonitorID = @MonitorID;"
 
@@ -182,6 +189,20 @@ Public Class mgrMonitorList
         sSQL = sSQL.TrimEnd(",")
         sSQL &= ");"
 
+        If iSelectDB = mgrSQLite.Database.Local Then
+            sSQL &= "DELETE FROM sessions "
+            sSQL &= "WHERE MonitorID IN ("
+
+            For Each s As String In sMonitorIDs
+                sSQL &= "@MonitorID" & iCounter & ","
+                hshParams.Add("MonitorID" & iCounter, s)
+                iCounter += 1
+            Next
+
+            sSQL = sSQL.TrimEnd(",")
+            sSQL &= ");"
+        End If
+
         sSQL &= "DELETE FROM monitorlist "
         sSQL &= "WHERE MonitorID IN ("
 
@@ -344,11 +365,11 @@ Public Class mgrMonitorList
             sVersion = "(SELECT Version FROM monitorlist WHERE MonitorID=@ID)"
         End If
 
-        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter) "
+        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments) "
         sSQL &= "VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, "
         sSQL &= sTimeStamp & ", @ExcludeList, " & sGamePath & ", "
         sSQL &= sIcon & ", @Hours, " & sVersion & ", "
-        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, " & sBackupLimit & ", @CleanFolder, @Parameter);"
+        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, " & sBackupLimit & ", @CleanFolder, @Parameter, @Comments);"
 
         For Each oGame As clsGame In hshGames.Values
             hshParams = New Hashtable
@@ -366,6 +387,7 @@ Public Class mgrMonitorList
             hshParams.Add("MonitorOnly", oGame.MonitorOnly)
             hshParams.Add("CleanFolder", oGame.CleanFolder)
             hshParams.Add("Parameter", oGame.Parameter)
+            hshParams.Add("Comments", oGame.Comments)
 
             'Optional Parameters
             If (eSyncFields And clsGame.eOptionalSyncFields.Company) = clsGame.eOptionalSyncFields.Company Then
@@ -403,6 +425,10 @@ Public Class mgrMonitorList
 
         sSQL = "DELETE FROM gametags "
         sSQL &= "WHERE MonitorID = @MonitorID;"
+        If iSelectDB = mgrSQLite.Database.Local Then
+            sSQL &= "DELETE FROM sessions "
+            sSQL &= "WHERE MonitorID = @MonitorID;"
+        End If
         sSQL &= "DELETE FROM monitorlist "
         sSQL &= "WHERE Name = @Name AND Process= @Process;"
 
@@ -496,93 +522,181 @@ Public Class mgrMonitorList
     End Sub
 
     'Filter Functions
-    Private Shared Function BuildFilterQuery(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, ByRef hshParams As Hashtable) As String
+    Private Shared Function BuildFilterQuery(ByVal oIncludeTagFilters As List(Of clsTag), ByVal oExcludeTagFilters As List(Of clsTag), ByVal oFilters As List(Of clsGameFilter),
+                                             ByVal eFilterType As frmFilter.eFilterType, ByVal bAndOperator As Boolean, ByVal bSortAsc As Boolean, ByVal sSortField As String,
+                                             ByRef hshParams As Hashtable) As String
         Dim sSQL As String = String.Empty
         Dim iCounter As Integer = 0
+        Dim sBaseSelect As String = "MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments FROM monitorlist"
+        Dim sSort As String = " ORDER BY " & sSortField
+
+        If bSortAsc Then
+            sSort &= " ASC"
+        Else
+            sSort &= " DESC"
+        End If
 
         Select Case eFilterType
-            Case frmFilter.eFilterType.NoFilter
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter FROM monitorlist ORDER BY Name Asc"
-            Case frmFilter.eFilterType.FieldAnd, frmFilter.eFilterType.FieldOr
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter FROM monitorlist"
-
-                If hshStringFilters.Count > 0 Then
-                    sSQL &= " WHERE ("
-                    For Each de As DictionaryEntry In hshStringFilters
-                        sSQL &= de.Key & " LIKE @" & de.Key
-                        hshParams.Add(de.Key, "%" & de.Value.ToString & "%")
-                        iCounter += 1
-                        If iCounter <> hshStringFilters.Count Then
-                            Select Case eFilterType
-                                Case frmFilter.eFilterType.FieldAnd
-                                    sSQL &= " AND "
-                                Case frmFilter.eFilterType.FieldOr
-                                    sSQL &= " OR "
-                            End Select
-                        End If
-
-                    Next
-                    sSQL &= ")"
-                End If
-                sSQL &= " ORDER BY Name Asc"
+            Case frmFilter.eFilterType.BaseFilter
+                sSQL = "SELECT " & sBaseSelect
             Case frmFilter.eFilterType.AnyTag
-                sSQL = "SELECT DISTINCT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter FROM monitorlist "
-                sSQL &= "NATURAL JOIN gametags WHERE gametags.TagID IN ("
 
-                For Each oTag As clsTag In oTagFilters
-                    sSQL &= "@TagID" & iCounter & ","
-                    hshParams.Add("TagID" & iCounter, oTag.ID)
-                    iCounter += 1
-                Next
+                If oExcludeTagFilters.Count > 0 And oIncludeTagFilters.Count = 0 Then
+                    sSQL = "SELECT " & sBaseSelect
 
-                sSQL = sSQL.TrimEnd(",")
-                sSQL &= ") ORDER BY Name Asc"
-            Case frmFilter.eFilterType.AllTags
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter FROM monitorlist WHERE MonitorID IN "
+                    sSQL &= " WHERE MonitorID NOT IN (SELECT MonitorID FROM monitorlist NATURAL JOIN gametags WHERE gametags.TagID IN ("
 
-                For Each oTag As clsTag In oTagFilters
-                    sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
-                    If iCounter <> oTagFilters.Count - 1 Then
-                        sSQL &= " AND MonitorID IN "
+                    For Each oTag As clsTag In oExcludeTagFilters
+                        sSQL &= "@TagID" & iCounter & ","
+                        hshParams.Add("TagID" & iCounter, oTag.ID)
+                        iCounter += 1
+                    Next
+
+                    sSQL = sSQL.TrimEnd(",")
+                    sSQL &= "))"
+                Else
+                    sSQL = "SELECT DISTINCT " & sBaseSelect
+
+                    sSQL &= " NATURAL JOIN gametags WHERE gametags.TagID IN ("
+
+                    For Each oTag As clsTag In oIncludeTagFilters
+                        sSQL &= "@TagID" & iCounter & ","
+                        hshParams.Add("TagID" & iCounter, oTag.ID)
+                        iCounter += 1
+                    Next
+
+                    sSQL = sSQL.TrimEnd(",")
+                    sSQL &= ")"
+
+                    If oExcludeTagFilters.Count > 0 Then
+                        sSQL &= " AND MonitorID NOT IN (SELECT MonitorID FROM monitorlist NATURAL JOIN gametags WHERE gametags.TagID IN ("
+
+                        For Each oTag As clsTag In oExcludeTagFilters
+                            sSQL &= "@TagID" & iCounter & ","
+                            hshParams.Add("TagID" & iCounter, oTag.ID)
+                            iCounter += 1
+                        Next
+
+                        sSQL = sSQL.TrimEnd(",")
+                        sSQL &= "))"
                     End If
-                    hshParams.Add("TagID" & iCounter, oTag.ID)
-                    iCounter += 1
-                Next
+                End If
+
+            Case frmFilter.eFilterType.AllTags
+
+                If oExcludeTagFilters.Count > 0 And oIncludeTagFilters.Count = 0 Then
+                    sSQL = "SELECT " & sBaseSelect & " WHERE MonitorID NOT IN "
+
+                    For Each oTag As clsTag In oExcludeTagFilters
+                        sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
+                        If iCounter <> oExcludeTagFilters.Count - 1 Then
+                            sSQL &= " AND MonitorID IN "
+                        End If
+                        hshParams.Add("TagID" & iCounter, oTag.ID)
+                        iCounter += 1
+                    Next
+                Else
+                    sSQL = "SELECT " & sBaseSelect & " WHERE MonitorID IN "
+
+                    For Each oTag As clsTag In oIncludeTagFilters
+                        sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
+                        If iCounter <> oIncludeTagFilters.Count - 1 Then
+                            sSQL &= " AND MonitorID IN "
+                        End If
+                        hshParams.Add("TagID" & iCounter, oTag.ID)
+                        iCounter += 1
+                    Next
+
+                    If oExcludeTagFilters.Count > 0 Then
+                        sSQL &= " AND MonitorID NOT IN (SELECT MonitorID FROM monitorlist NATURAL JOIN gametags WHERE gametags.TagID IN ("
+
+                        For Each oTag As clsTag In oExcludeTagFilters
+                            sSQL &= "@TagID" & iCounter & ","
+                            hshParams.Add("TagID" & iCounter, oTag.ID)
+                            iCounter += 1
+                        Next
+
+                        sSQL = sSQL.TrimEnd(",")
+                        sSQL &= "))"
+                    End If
+                End If
 
-                sSQL &= " ORDER BY Name Asc"
             Case frmFilter.eFilterType.NoTags
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter FROM monitorlist WHERE MonitorID NOT IN (SELECT MonitorID FROM gametags) ORDER BY Name Asc"
+                sSQL = "SELECT " & sBaseSelect & " WHERE MonitorID NOT IN (SELECT MonitorID FROM gametags)"
         End Select
 
+        'Handle Other Filters
+        If oFilters.Count > 0 Then
+            If eFilterType = frmFilter.eFilterType.BaseFilter Then
+                sSQL &= " WHERE ("
+            Else
+                sSQL &= " AND ("
+            End If
+
+            iCounter = 0
+            For Each oFilter As clsGameFilter In oFilters
+                If oFilter.NotCondition Then
+                    sSQL &= " NOT "
+                End If
+
+                Select Case oFilter.Field.Type
+                    Case clsGameFilterField.eDataType.fString
+                        sSQL &= oFilter.Field.FieldName & " LIKE @" & oFilter.ID
+                        hshParams.Add(oFilter.ID, "%" & oFilter.Data & "%")
+                    Case clsGameFilterField.eDataType.fNumeric
+                        sSQL &= oFilter.Field.FieldName & " " & oFilter.NumericOperatorAsString & " @" & oFilter.ID
+                        hshParams.Add(oFilter.ID, oFilter.Data)
+                    Case clsGameFilterField.eDataType.fBool
+                        sSQL &= oFilter.Field.FieldName & " = @" & oFilter.ID
+                        hshParams.Add(oFilter.ID, oFilter.Data)
+                End Select
+
+                iCounter += 1
+                If iCounter <> oFilters.Count Then
+                    If bAndOperator Then
+                        sSQL &= " AND "
+                    Else
+                        sSQL &= " OR "
+                    End If
+                End If
+            Next
+            sSQL &= ")"
+        End If
+
+        'Handle Sorting
+        sSQL &= sSort
+
         Return sSQL
 
     End Function
 
-    Public Shared Function ReadFilteredList(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Hashtable
+    Public Shared Function ReadFilteredList(ByVal oIncludeTagFilters As List(Of clsTag), ByVal oExcludeTagFilters As List(Of clsTag), ByVal oFilters As List(Of clsGameFilter), ByVal eFilterType As frmFilter.eFilterType, ByVal bAndOperator As Boolean,
+                                            ByVal bSortAsc As Boolean, ByVal sSortField As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As OrderedDictionary
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String = String.Empty
-        Dim hshList As New Hashtable
+        Dim oList As New OrderedDictionary
         Dim oGame As clsGame
         Dim hshParams As New Hashtable
         Dim iCounter As Integer = 0
 
-        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
+        sSQL = BuildFilterQuery(oIncludeTagFilters, oExcludeTagFilters, oFilters, eFilterType, bAndOperator, bSortAsc, sSortField, hshParams)
 
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
             oGame = MapToObject(dr)
 
-            hshList.Add(oGame.ID, oGame)
+            oList.Add(oGame.ID, oGame)
         Next
 
-        Return hshList
+        Return oList
     End Function
 
 
     'Import / Export Functions
-    Public Shared Function ReadListForExport(ByVal oTagFilters As List(Of clsTag), ByVal hshStringFilters As Hashtable, ByVal eFilterType As frmFilter.eFilterType, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As List(Of Game)
+    Public Shared Function ReadListForExport(ByVal oIncludeTagFilters As List(Of clsTag), ByVal oExcludeTagFilters As List(Of clsTag), ByVal oFilters As List(Of clsGameFilter), ByVal eFilterType As frmFilter.eFilterType, ByVal bAndOperator As Boolean,
+                                             ByVal bSortAsc As Boolean, ByVal sSortField As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As List(Of Game)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String = String.Empty
@@ -591,7 +705,7 @@ Public Class mgrMonitorList
         Dim oGame As Game
         Dim hshParams As New Hashtable
 
-        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
+        sSQL = BuildFilterQuery(oIncludeTagFilters, oExcludeTagFilters, oFilters, eFilterType, bAndOperator, bSortAsc, sSortField, hshParams)
 
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
@@ -605,7 +719,9 @@ Public Class mgrMonitorList
             oGame.FolderSave = CBool(dr("FolderSave"))
             If Not IsDBNull(dr("FileType")) Then oGame.FileType = CStr(dr("FileType"))
             If Not IsDBNull(dr("ExcludeList")) Then oGame.ExcludeList = CStr(dr("ExcludeList"))
+            oGame.MonitorOnly = CBool(dr("MonitorOnly"))
             If Not IsDBNull(dr("Parameter")) Then oGame.Parameter = CStr(dr("Parameter"))
+            If Not IsDBNull(dr("Comments")) Then oGame.Comments = CStr(dr("Comments"))
             oGame.Tags = mgrGameTags.GetTagsByGameForExport(sID)
             oList.Add(oGame)
         Next
@@ -641,11 +757,12 @@ Public Class mgrMonitorList
         Dim hshSyncItems As Hashtable
         Dim oFromItem As clsGame
         Dim oToItem As clsGame
+        Dim oExportInfo As New ExportData
 
         Cursor.Current = Cursors.WaitCursor
 
         'Add / Update Sync
-        hshCompareFrom = mgrXML.ReadMonitorList(sLocation, bWebRead)
+        hshCompareFrom = mgrXML.ReadMonitorList(sLocation, oExportInfo, bWebRead)
         hshCompareTo = ReadList(eListTypes.FullList, mgrSQLite.Database.Local)
 
         hshSyncItems = hshCompareFrom.Clone
@@ -663,6 +780,7 @@ Public Class mgrMonitorList
 
         If hshSyncItems.Count > 0 Then
             Dim frm As New frmAdvancedImport
+            frm.ImportInfo = oExportInfo
             frm.ImportData = hshSyncItems
             If frm.ShowDialog() = DialogResult.OK Then
                 Cursor.Current = Cursors.WaitCursor
@@ -683,19 +801,27 @@ Public Class mgrMonitorList
     Public Shared Sub ExportMonitorList(ByVal sLocation As String)
         Dim oList As List(Of Game)
         Dim bSuccess As Boolean = False
-        Dim oTagFilters As New List(Of clsTag)
-        Dim oStringFilters As New Hashtable
-        Dim eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
+        Dim oIncludeTagFilters As New List(Of clsTag)
+        Dim oExcludeTagFilters As New List(Of clsTag)
+        Dim oFilters As New List(Of clsGameFilter)
+        Dim eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.BaseFilter
+        Dim bAndOperator As Boolean = True
+        Dim bSortAsc As Boolean = True
+        Dim sSortField As String = "Name"
 
         If mgrCommon.ShowMessage(mgrMonitorList_ConfirmApplyFilter, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
             Dim frm As New frmFilter
             frm.ShowDialog()
-            oTagFilters = frm.TagFilters
-            oStringFilters = frm.StringFilters
+            oIncludeTagFilters = frm.IncludeTagFilters
+            oExcludeTagFilters = frm.ExcludeTagFilters
+            oFilters = frm.GameFilters
             eCurrentFilter = frm.FilterType
+            bAndOperator = frm.AndOperator
+            bSortAsc = frm.SortAsc
+            sSortField = frm.SortField
         End If
 
-        oList = ReadListForExport(oTagFilters, oStringFilters, eCurrentFilter)
+        oList = ReadListForExport(oIncludeTagFilters, oExcludeTagFilters, oFilters, eCurrentFilter, bAndOperator, bSortAsc, sSortField)
 
         bSuccess = mgrXML.SerializeAndExport(oList, sLocation)
 

GBM/Managers/mgrProcesses.vb

@@ -167,8 +167,11 @@ Public Class mgrProcesses
         Dim sProcessCheck As String = String.Empty
         Dim sProcessList As String = String.Empty
         Dim bWineProcess As Boolean = False
+        Dim bPass As Boolean
 
         For Each prsCurrent As Process In prsList
+            bPass = False
+
             'This needs to be wrapped due to issues with Mono.
             Try
                 sProcessCheck = prsCurrent.ProcessName
@@ -194,9 +197,11 @@ Public Class mgrProcesses
                 'Do Nothing
             End Try
 
+            'Detection Pass 1
             If hshScanList.ContainsKey(sProcessCheck) Then
                 prsFoundProcess = prsCurrent
                 oGame = DirectCast(hshScanList.Item(sProcessCheck), clsGame).ShallowCopy
+                bPass = True
 
                 If mgrCommon.IsUnix Then
                     GetUnixCommand(prsCurrent)
@@ -214,10 +219,15 @@ Public Class mgrProcesses
                     oDuplicateGames.Clear()
                 End If
 
-                If Duplicate And DuplicateList.Count = 0 Then Return False
+                If Duplicate And DuplicateList.Count = 0 Then bPass = False
 
-                If oGame.Parameter <> String.Empty And Not Duplicate And Not FullCommand.Contains(oGame.Parameter) Then Return False
+                If oGame.Parameter <> String.Empty And Not Duplicate And Not FullCommand.Contains(oGame.Parameter) Then bPass = False
 
+            End If
+
+            'Detection Pass 2
+            If bPass Then
+                'Determine the process path if we need it
                 If Not oGame.AbsolutePath Or oGame.Duplicate Then
                     Try
                         If Not bWineProcess Then
@@ -238,12 +248,12 @@ Public Class mgrProcesses
                         Else
                             If bDebugMode Then mgrCommon.ShowMessage(exWin32.NativeErrorCode & " " & exWin32.Message & vbCrLf & vbCrLf & exWin32.StackTrace, MsgBoxStyle.Critical)
                             'A different failure occured,  drop out and continue to scan.
-                            Return False
+                            bPass = False
                         End If
                     Catch exAll As Exception
                         If bDebugMode Then mgrCommon.ShowMessage(exAll.Message & vbCrLf & vbCrLf & exAll.StackTrace, MsgBoxStyle.Critical)
                         'A different failure occured,  drop out and continue to scan.
-                        Return False
+                        bPass = False
                     End Try
                 End If
 

GBM/Managers/mgrSQLite.vb

@@ -74,7 +74,7 @@ Public Class mgrSQLite
                    "DisableConfirmation BOOLEAN NOT NULL, CreateSubFolder BOOLEAN NOT NULL, ShowOverwriteWarning BOOLEAN NOT NULL, RestoreOnLaunch BOOLEAN NOT NULL, " &
                    "BackupFolder TEXT NOT NULL, Sync BOOLEAN NOT NULL, StartWithWindows BOOLEAN NOT NULL, TimeTracking BOOLEAN NOT NULL, " &
                    "SupressBackup BOOLEAN NOT NULL, SupressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " &
-                   "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL);"
+                   "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL, SessionTracking BOOLEAN NOT NULL);"
 
             'Add Tables (SavedPath)
             sSql &= "CREATE TABLE savedpath (PathName TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);"
@@ -83,7 +83,7 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, PRIMARY KEY(Name, Process));"
 
             'Add Tables (Tags)
             sSql &= "CREATE TABLE tags (TagID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY); "
@@ -98,6 +98,9 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
+            'Add Tables (Sessions)
+            sSql &= "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, PRIMARY KEY(MonitorID, Start));"
+
             'Set Version
             sSql &= "PRAGMA user_version=" & mgrCommon.AppVersion
 
@@ -120,7 +123,7 @@ Public Class mgrSQLite
             sSql = "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, PRIMARY KEY(Name, Process));"
 
             'Add Tables (Remote Manifest)
             sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
@@ -170,6 +173,15 @@ Public Class mgrSQLite
         db.Close()
     End Sub
 
+    Private Sub RollBack(ByRef trans As SqliteTransaction)
+        Try
+            trans.Rollback()
+        Catch
+            'SQLite may or may not perform an auto-rollback when certain failures occur, such as disk full or out of memory.
+            'Multiple rollbacks will cause an exception, therefore lets just do nothing when that happens.
+        End Try
+    End Sub
+
     Private Sub BuildParams(ByRef command As SqliteCommand, ByRef hshParams As Hashtable)
         For Each de As DictionaryEntry In hshParams
             command.Parameters.AddWithValue(de.Key, de.Value)
@@ -189,7 +201,7 @@ Public Class mgrSQLite
             command.ExecuteNonQuery()
             trans.Commit()
         Catch ex As Exception
-            trans.Rollback()
+            RollBack(trans)
             mgrCommon.ShowMessage(mgrSQLite_ErrorQueryFailure, New String() {sSQL, ex.Message}, MsgBoxStyle.Exclamation)
             Return False
         Finally
@@ -215,7 +227,7 @@ Public Class mgrSQLite
             Next
             trans.Commit()
         Catch ex As Exception
-            trans.Rollback()
+            RollBack(trans)
             mgrCommon.ShowMessage(mgrSQLite_ErrorQueryFailure, New String() {sSQL, ex.Message}, MsgBoxStyle.Exclamation)
             Return False
         Finally
@@ -249,6 +261,27 @@ Public Class mgrSQLite
         Return oData
     End Function
 
+    Public Function ReadSingleValue(ByVal sSQL As String, ByVal hshParams As Hashtable) As Object
+
+        Dim command As SqliteCommand
+        Dim oResult As New Object
+
+        Connect()
+        Command = New SqliteCommand(sSQL, db)
+        BuildParams(command, hshParams)
+
+        Try
+            oResult = command.ExecuteScalar()
+        Catch ex As Exception
+            mgrCommon.ShowMessage(mgrSQLite_ErrorQueryFailure, New String() {sSQL, ex.Message}, MsgBoxStyle.Information)
+        Finally
+            command.Dispose()
+            Disconnect()
+        End Try
+
+        Return oResult
+    End Function
+
     Private Function GetDatabaseVersion() As Integer
         Dim sSQL As String
         Dim iVer As Integer
@@ -671,6 +704,36 @@ Public Class mgrSQLite
             End If
         End If
 
+        '1.05 Upgrade
+        If GetDatabaseVersion() < 105 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v102")
+
+                'Add Tables (Sessions)
+                sSQL = "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, PRIMARY KEY(MonitorID, Start));"
+
+                'Add new field(s)
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN SessionTracking BOOLEAN DEFAULT 0;"
+
+                sSQL &= "PRAGMA user_version=105"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v102")
+
+                'Add new field(s)
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
+
+                sSQL &= "PRAGMA user_version=105"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
+
     End Sub
 
     Public Function GetDBSize() As Long

GBM/Managers/mgrSessions.vb

@@ -0,0 +1,251 @@
+Imports GBM.My.Resources
+Imports System.IO
+Imports System.Xml.Serialization
+Imports System.Globalization
+
+
+Public Class mgrSessions
+
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsSession
+        Dim oSession As New clsSession
+
+        oSession.MonitorID = CStr(dr("MonitorID"))
+        oSession.SessionStart = CInt(dr("Start"))
+        oSession.SessionEnd = CInt(dr("End"))
+
+        Return oSession
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oSession As clsSession) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("MonitorID", oSession.MonitorID)
+        hshParams.Add("Start", oSession.SessionStart)
+        hshParams.Add("End", oSession.SessionEnd)
+
+        Return hshParams
+    End Function
+
+    Public Shared Sub AddSession(ByVal oSession As clsSession, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As Hashtable
+
+        sSQL = "INSERT INTO sessions (MonitorID, Start, End) VALUES (@MonitorID, @Start, @End);"
+
+        hshParams = SetCoreParameters(oSession)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+    End Sub
+
+    Public Shared Function GetSessions(Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DataSet
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT sessions.MonitorID, monitorlist.Name, Start, End FROM sessions NATURAL JOIN monitorlist;"
+
+        Return oDatabase.ReadParamData(sSQL, hshParams)
+    End Function
+
+    Public Shared Function GetSessionRange(ByVal dtStart As DateTime, ByVal dtEnd As DateTime, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DataSet
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT sessions.MonitorID, monitorlist.Name, Start, End FROM sessions NATURAL JOIN monitorlist WHERE Start >= @Start AND End <= @End;"
+
+        hshParams.Add("Start", mgrCommon.DateToUnix(dtStart))
+        hshParams.Add("End", mgrCommon.DateToUnix(dtEnd))
+
+        Return oDatabase.ReadParamData(sSQL, hshParams)
+    End Function
+
+    Public Shared Function GetSessionsByGameNameAndRange(ByVal sGameName As String, ByVal dtStart As DateTime, ByVal dtEnd As DateTime, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DataSet
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT sessions.MonitorID, monitorlist.Name, Start, End FROM sessions NATURAL JOIN monitorlist WHERE monitorlist.Name LIKE @Name AND (Start >= @Start AND End <= @End);"
+
+        hshParams.Add("Name", "%" & sGameName & "%")
+        hshParams.Add("Start", mgrCommon.DateToUnix(dtStart))
+        hshParams.Add("End", mgrCommon.DateToUnix(dtEnd))
+
+        Return oDatabase.ReadParamData(sSQL, hshParams)
+    End Function
+
+    Public Shared Sub DeleteSession(ByVal oSessions As List(Of clsSession), Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As Hashtable
+        Dim oParamList As New List(Of Hashtable)
+
+        sSQL = "DELETE FROM sessions WHERE MonitorID = @MonitorID AND Start = @Start;"
+
+        For Each oSession As clsSession In oSessions
+            hshParams = New Hashtable
+            hshParams.Add("MonitorID", oSession.MonitorID)
+            hshParams.Add("Start", oSession.SessionStart)
+            oParamList.Add(hshParams)
+        Next
+
+        oDatabase.RunMassParamQuery(sSQL, oParamList)
+    End Sub
+
+    Public Shared Function GetMinimumDateTime(Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DateTime
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim iUnixDate As Int64
+
+        sSQL = "SELECT Start FROM sessions ORDER BY Start ASC LIMIT 1"
+
+        iUnixDate = CInt(oDatabase.ReadSingleValue(sSQL, hshParams))
+        Return mgrCommon.UnixToDate(iUnixDate)
+    End Function
+
+    Public Shared Function GetMaximumDateTime(Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DateTime
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim iUnixDate As Int64
+
+        sSQL = "SELECT End FROM sessions ORDER BY Start DESC LIMIT 1"
+
+        iUnixDate = CInt(oDatabase.ReadSingleValue(sSQL, hshParams))
+        Return mgrCommon.UnixToDate(iUnixDate)
+    End Function
+
+    Public Shared Function CountRows(Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As Integer
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim iRowCount As Integer
+
+        sSQL = "SELECT COUNT(MonitorID) FROM sessions;"
+
+        iRowCount = CInt(oDatabase.ReadSingleValue(sSQL, hshParams))
+
+        Return iRowCount
+    End Function
+
+    Public Shared Function ExportAsCSV(ByVal sLocation As String, ByVal bUnixTime As Boolean, ByVal bHeaders As Boolean, ByRef dg As DataGridView) As Boolean
+        Dim oWriter As StreamWriter
+        Dim sHeader As String
+        Dim sCurrentRow As String
+        Dim dDecimal As Decimal
+        Dim oBannedColumns As New List(Of DataGridViewColumn)
+        Dim oDecimalColumns As New List(Of DataGridViewColumn)
+        Dim oNfi As New NumberFormatInfo
+
+        'We want to force a specific decimal seperator when exporting CSV files due to certain regions using a comma.
+        oNfi.NumberDecimalSeparator = "."
+
+        Try
+            oWriter = New StreamWriter(sLocation)
+
+            'Set Decimal Columns
+            oDecimalColumns.Add(dg.Columns("Hours"))
+
+            'Set Ban Columns
+            oBannedColumns.Add(dg.Columns("MonitorID"))
+
+            If bUnixTime Then
+                oBannedColumns.Add(dg.Columns("Start"))
+                oBannedColumns.Add(dg.Columns("End"))
+            Else
+                oBannedColumns.Add(dg.Columns("StartUnix"))
+                oBannedColumns.Add(dg.Columns("EndUnix"))
+            End If
+
+            'Handle Headers
+            If bHeaders Then
+                sHeader = String.Empty
+                For Each dgCol As DataGridViewColumn In dg.Columns
+                    If Not oBannedColumns.Contains(dgCol) Then
+                        sHeader &= dgCol.HeaderText & ","
+                    End If
+                Next
+                sHeader = sHeader.TrimEnd(",")
+
+                oWriter.WriteLine(sHeader)
+            End If
+
+            'Handle Rows
+            For Each dgRow As DataGridViewRow In dg.Rows
+                sCurrentRow = String.Empty
+                For Each dgCell As DataGridViewCell In dgRow.Cells
+                    If Not oBannedColumns.Contains(dg.Columns(dgCell.ColumnIndex)) Then
+                        If oDecimalColumns.Contains(dg.Columns(dgCell.ColumnIndex)) Then
+                            dDecimal = CDec(dgCell.Value)
+                            sCurrentRow &= dDecimal.ToString(oNfi) & ","
+                        Else
+                            sCurrentRow &= dgCell.Value.ToString & ","
+                        End If
+
+                    End If
+                Next
+                sCurrentRow = sCurrentRow.TrimEnd(",")
+
+                'Don't write a LF on the last row
+                If dg.Rows.Count = (dgRow.Index + 1) Then
+                    oWriter.Write(sCurrentRow)
+                Else
+                    oWriter.WriteLine(sCurrentRow)
+                End If
+            Next
+
+            'Finish up
+            oWriter.Flush()
+            oWriter.Close()
+
+            mgrCommon.ShowMessage(mgrSessions_ExportSuccess, MsgBoxStyle.Information)
+            Return True
+        Catch ex As Exception
+            mgrCommon.ShowMessage(mgrSessions_ErrorExportFailure, ex.Message, MsgBoxStyle.Exclamation)
+            Return False
+        End Try
+    End Function
+
+    Public Shared Function ExportAsXML(ByVal sLocation As String, ByVal bUnixTime As Boolean, ByRef dg As DataGridView) As Boolean
+        Dim oSerializer As XmlSerializer
+        Dim oWriter As StreamWriter
+        Dim oCurrentSession As Session
+        Dim oSessions As New List(Of Session)
+        Dim oBannedColumns As New List(Of DataGridViewColumn)
+
+        Try
+            'Format data for export
+            For Each dgRow As DataGridViewRow In dg.Rows
+                oCurrentSession = New Session
+                oCurrentSession.GameName = dgRow.Cells("Name").Value.ToString
+                If bUnixTime Then
+                    oCurrentSession.StartDate = dgRow.Cells("StartUnix").Value.ToString
+                    oCurrentSession.EndDate = dgRow.Cells("EndUnix").Value.ToString
+                Else
+                    oCurrentSession.StartDate = dgRow.Cells("Start").Value.ToString
+                    oCurrentSession.EndDate = dgRow.Cells("End").Value.ToString
+                End If
+                oCurrentSession.Hours = dgRow.Cells("Hours").Value.ToString
+                oSessions.Add(oCurrentSession)
+            Next
+
+            'Serialize
+            oSerializer = New XmlSerializer(oSessions.GetType, New XmlRootAttribute("Sessions"))
+            oWriter = New StreamWriter(sLocation)
+            oSerializer.Serialize(oWriter.BaseStream, oSessions)
+
+            'Finish up
+            oWriter.Flush()
+            oWriter.Close()
+
+            mgrCommon.ShowMessage(mgrSessions_ExportSuccess, MsgBoxStyle.Information)
+            Return True
+        Catch ex As Exception
+            mgrCommon.ShowMessage(mgrSessions_ErrorExportFailure, ex.Message, MsgBoxStyle.Exclamation)
+            Return False
+        End Try
+    End Function
+
+End Class

GBM/Managers/mgrSettings.vb

@@ -13,6 +13,7 @@ Public Class mgrSettings
     Private bAutoMark As Boolean = False
     Private bSync As Boolean = True
     Private bTimeTracking As Boolean = True
+    Private bSessionTracking As Boolean = False
     Private bSupressBackup As Boolean = False
     Private iSupressBackupThreshold As Integer = 10
     Private iCompressionLevel As Integer = 5
@@ -130,6 +131,15 @@ Public Class mgrSettings
         End Set
     End Property
 
+    Property SessionTracking As Boolean
+        Get
+            Return bSessionTracking
+        End Get
+        Set(value As Boolean)
+            bSessionTracking = value
+        End Set
+    End Property
+
     Property SupressBackup As Boolean
         Get
             Return bSupressBackup
@@ -261,7 +271,7 @@ Public Class mgrSettings
         sSQL = "INSERT INTO settings VALUES (1, @MonitorOnStartup, @StartToTray, @ShowDetectionToolTips, @DisableConfirmation, "
         sSQL &= "@CreateSubFolder, @ShowOverwriteWarning, @RestoreOnLaunch, @BackupFolder, @Sync, @StartWithWindows, "
         sSQL &= "@TimeTracking, @SupressBackup, @SupressBackupThreshold, @CompressionLevel, @Custom7zArguments, @Custom7zLocation, "
-        sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark)"
+        sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark, @SessionTracking)"
 
         hshParams.Add("MonitorOnStartup", MonitorOnStartup)
         hshParams.Add("StartToTray", StartToTray)
@@ -283,6 +293,7 @@ Public Class mgrSettings
         hshParams.Add("AutoSaveLog", AutoSaveLog)
         hshParams.Add("AutoRestore", AutoRestore)
         hshParams.Add("AutoMark", AutoMark)
+        hshParams.Add("SessionTracking", SessionTracking)
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
@@ -317,6 +328,7 @@ Public Class mgrSettings
             AutoSaveLog = CBool(dr("AutoSaveLog"))
             AutoRestore = CBool(dr("AutoRestore"))
             AutoMark = CBool(dr("AutoMark"))
+            SessionTracking = CBool(dr("SessionTracking"))
         Next
 
         oDatabase.Disconnect()

GBM/Managers/mgrXML.vb

@@ -6,18 +6,22 @@ Imports System.Net
 
 Public Class mgrXML
 
-    Public Shared Function ReadMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) As Hashtable
+    Public Shared Function ReadMonitorList(ByVal sLocation As String, ByRef oExportInfo As ExportData, Optional ByVal bWebRead As Boolean = False) As Hashtable
         Dim oList As List(Of Game)
         Dim hshList As New Hashtable
         Dim hshDupeList As New Hashtable
+        Dim oExportData As ExportData
         Dim oGame As clsGame
 
+
         'If the file doesn't exist return an empty list
         If Not File.Exists(sLocation) And Not bWebRead Then
             Return hshList
         End If
 
-        oList = ImportandDeserialize(sLocation, bWebRead)
+        oExportData = ImportandDeserialize(sLocation, bWebRead)
+        oList = oExportData.Configurations
+        oExportInfo = oExportData
 
         For Each g As Game In oList
             oGame = New clsGame
@@ -28,7 +32,9 @@ Public Class mgrXML
             oGame.FolderSave = g.FolderSave
             oGame.FileType = g.FileType
             oGame.ExcludeList = g.ExcludeList
+            oGame.MonitorOnly = g.MonitorOnly
             oGame.Parameter = g.Parameter
+            oGame.Comments = g.Comments
             For Each t As Tag In g.Tags
                 oGame.ImportTags.Add(t)
             Next
@@ -44,38 +50,56 @@ Public Class mgrXML
         Return hshList
     End Function
 
-    Public Shared Function ImportandDeserialize(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) As List(Of Game)
+    Private Shared Function ReadImportData(ByVal sLocation As String, ByVal bWebRead As Boolean)
         Dim oReader As StreamReader
         Dim oWebClient As WebClient
+
+        If bWebRead Then
+            oWebClient = New WebClient
+            oReader = New StreamReader(oWebClient.OpenRead(sLocation))
+        Else
+            oReader = New StreamReader(sLocation)
+        End If
+
+        Return oReader
+    End Function
+
+    Public Shared Function ImportandDeserialize(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) As ExportData
+        Dim oReader As StreamReader
         Dim oSerializer As XmlSerializer
-        Dim oList As New List(Of Game)
+        Dim oExportData As New ExportData
 
         Try
-            If bWebRead Then
-                oWebClient = New WebClient
-                oReader = New StreamReader(oWebClient.OpenRead(sLocation))
-            Else
-                oReader = New StreamReader(sLocation)
+            oReader = ReadImportData(sLocation, bWebRead)
+            oSerializer = New XmlSerializer(GetType(ExportData), New XmlRootAttribute("gbm"))
+            oExportData = oSerializer.Deserialize(oReader)
+            oReader.Close()
+
+            'Compatability Mode
+            If oExportData.AppVer = 0 Then
+                oReader = ReadImportData(sLocation, bWebRead)
+                oSerializer = New XmlSerializer(GetType(List(Of Game)), New XmlRootAttribute("gbm"))
+                oExportData.Configurations = oSerializer.Deserialize(oReader)
+                oReader.Close()
             End If
 
-            oSerializer = New XmlSerializer(oList.GetType(), New XmlRootAttribute("gbm"))
-            oList = oSerializer.Deserialize(oReader)
-            oReader.Close()
         Catch ex As Exception
             mgrCommon.ShowMessage(mgrXML_ErrorImportFailure, ex.Message, MsgBoxStyle.Exclamation)
         End Try
 
-        Return oList
+        Return oExportData
     End Function
 
     Public Shared Function SerializeAndExport(ByVal oList As List(Of Game), ByVal sLocation As String) As Boolean
         Dim oSerializer As XmlSerializer
         Dim oWriter As StreamWriter
+        Dim oExportData As ExportData
 
         Try
-            oSerializer = New XmlSerializer(oList.GetType(), New XmlRootAttribute("gbm"))
+            oExportData = New ExportData(mgrCommon.DateToUnix(Now), oList.Count, mgrCommon.AppVersion, oList)
+            oSerializer = New XmlSerializer(oExportData.GetType())
             oWriter = New StreamWriter(sLocation)
-            oSerializer.Serialize(oWriter.BaseStream, oList)
+            oSerializer.Serialize(oWriter.BaseStream, oExportData)
             oWriter.Flush()
             oWriter.Close()
             Return True

GBM/My Project/Application.Designer.vb

@@ -24,7 +24,7 @@ Namespace My
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Public Sub New()
             MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
-            Me.IsSingleInstance = false
+            Me.IsSingleInstance = true
             Me.EnableVisualStyles = true
             Me.SaveMySettingsOnExit = false
             Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses

GBM/My Project/Application.myapp

@@ -2,7 +2,7 @@
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <MySubMain>true</MySubMain>
   <MainForm>frmMain</MainForm>
-  <SingleInstance>false</SingleInstance>
+  <SingleInstance>true</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>

GBM/My Project/AssemblyInfo.vb

@@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("Game Backup Monitor")> 
 <Assembly: AssemblyCompany("Michael J. Seiferling")> 
 <Assembly: AssemblyProduct("Game Backup Monitor")>
-<Assembly: AssemblyCopyright("Copyright © 2017 Michael J. Seiferling")>
+<Assembly: AssemblyCopyright("Copyright © 2018 Michael J. Seiferling")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)> 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.2.*")>
-<Assembly: AssemblyFileVersion("1.0.2.0")>
+<Assembly: AssemblyVersion("1.0.7.*")>
+<Assembly: AssemblyFileVersion("1.0.7.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 

GBM/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -78,6 +78,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to GBM is busy with an open window on your desktop..
+        '''</summary>
+        Friend ReadOnly Property App_ErrorFocus() As String
+            Get
+                Return ResourceManager.GetString("App_ErrorFocus", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to This function is currently not available on a Unix based operating system..
         '''</summary>
@@ -906,12 +915,48 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Add.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_btnAddFilter() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_btnAddFilter", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to &gt;.
         '''</summary>
-        Friend ReadOnly Property frmFilter_btnAdd() As String
+        Friend ReadOnly Property frmFilter_btnExcludeAdd() As String
             Get
-                Return ResourceManager.GetString("frmFilter_btnAdd", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_btnExcludeAdd", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &lt;.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_btnExcludeRemove() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_btnExcludeRemove", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &lt;.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_btnIncludeAdd() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_btnIncludeAdd", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &gt;.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_btnIncludeRemove() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_btnIncludeRemove", resourceCulture)
             End Get
         End Property
         
@@ -925,11 +970,209 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to &lt;.
+        '''  Looks up a localized string similar to Remove.
         '''</summary>
-        Friend ReadOnly Property frmFilter_btnRemove() As String
+        Friend ReadOnly Property frmFilter_btnRemoveFilter() As String
             Get
-                Return ResourceManager.GetString("frmFilter_btnRemove", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_btnRemoveFilter", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Disabled.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_cboBoolFilterDisabled() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_cboBoolFilterDisabled", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enabled.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_cboBoolFilterEnabled() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_cboBoolFilterEnabled", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Game Information.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_chkGameInfo() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_chkGameInfo", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Tag.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_chkTag() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_chkTag", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Backup Limit *.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldBackupLimit() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldBackupLimit", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Delete Folder on Restore.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldCleanFolder() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldCleanFolder", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Comments.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldComments() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldComments", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Company.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldCompany() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldCompany", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Monitor Game.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldEnabled() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldEnabled", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Exclude Items.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldExcludeList() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldExcludeList", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Include Items.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldFileType() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldFileType", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Save Entire Folder.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldFolderSave() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldFolderSave", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Hours.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldHours() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldHours", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Icon.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldIcon() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldIcon", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Monitor Only.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldMonitorOnly() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldMonitorOnly", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Name.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldName() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Parameter.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldParameter() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldParameter", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Save Path *.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldPath() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldPath", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Process.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldProcess() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldProcess", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Game Path.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldProcessPath() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldProcessPath", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Save Multiple Backups.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldTimeStamp() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldTimeStamp", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Version.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldVersion() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldVersion", resourceCulture)
             End Get
         End Property
         
@@ -943,16 +1186,34 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Options.
+        '''  Looks up a localized string similar to Filter Type.
         '''</summary>
-        Friend ReadOnly Property frmFilter_grpGameInfoOptions() As String
+        Friend ReadOnly Property frmFilter_grpFilterType() As String
             Get
-                Return ResourceManager.GetString("frmFilter_grpGameInfoOptions", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_grpFilterType", resourceCulture)
             End Get
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Options.
+        '''  Looks up a localized string similar to Sorting.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_grpSorting() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_grpSorting", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Sort Options.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_grpSortOptions() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_grpSortOptions", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Include Options.
         '''</summary>
         Friend ReadOnly Property frmFilter_grpTagOptions() As String
             Get
@@ -961,38 +1222,65 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Company:.
+        '''  Looks up a localized string similar to Current Filters.
         '''</summary>
-        Friend ReadOnly Property frmFilter_lblCompany() As String
+        Friend ReadOnly Property frmFilter_lblCurrentFilters() As String
             Get
-                Return ResourceManager.GetString("frmFilter_lblCompany", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_lblCurrentFilters", resourceCulture)
             End Get
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Current Filter.
+        '''  Looks up a localized string similar to Exclude Tags.
         '''</summary>
-        Friend ReadOnly Property frmFilter_lblGameTags() As String
+        Friend ReadOnly Property frmFilter_lblExcludeTags() As String
             Get
-                Return ResourceManager.GetString("frmFilter_lblGameTags", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_lblExcludeTags", resourceCulture)
             End Get
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Name:.
+        '''  Looks up a localized string similar to Available Fields.
         '''</summary>
-        Friend ReadOnly Property frmFilter_lblName() As String
+        Friend ReadOnly Property frmFilter_lblFields() As String
             Get
-                Return ResourceManager.GetString("frmFilter_lblName", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_lblFields", resourceCulture)
             End Get
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Process:.
+        '''  Looks up a localized string similar to Filter.
         '''</summary>
-        Friend ReadOnly Property frmFilter_lblProcess() As String
+        Friend ReadOnly Property frmFilter_lblFilterData() As String
             Get
-                Return ResourceManager.GetString("frmFilter_lblProcess", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_lblFilterData", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Include Tags.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblIncludeTags() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblIncludeTags", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Not.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblNot() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblNot", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Available Fields.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblSortsFields() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblSortsFields", resourceCulture)
             End Get
         End Property
         
@@ -1005,6 +1293,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to * Indicates a field that may give unexpected results..
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblWarning() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblWarning", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to contains.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lstFilterContains() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lstFilterContains", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to All Tags.
         '''</summary>
@@ -1015,7 +1321,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to And.
+        '''  Looks up a localized string similar to All.
         '''</summary>
         Friend ReadOnly Property frmFilter_optAnd() As String
             Get
@@ -1033,16 +1339,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Game Information.
-        '''</summary>
-        Friend ReadOnly Property frmFilter_optGameInfo() As String
-            Get
-                Return ResourceManager.GetString("frmFilter_optGameInfo", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Or.
+        '''  Looks up a localized string similar to Any.
         '''</summary>
         Friend ReadOnly Property frmFilter_optOr() As String
             Get
@@ -1051,11 +1348,20 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Tag.
+        '''  Looks up a localized string similar to Ascending.
         '''</summary>
-        Friend ReadOnly Property frmFilter_optTag() As String
+        Friend ReadOnly Property frmFilter_optSortAsc() As String
             Get
-                Return ResourceManager.GetString("frmFilter_optTag", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_optSortAsc", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Descending.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_optSortDesc() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_optSortDesc", resourceCulture)
             End Get
         End Property
         
@@ -2643,6 +2949,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to There is currently no session data to display..
+        '''</summary>
+        Friend ReadOnly Property frmMain_ErrorNoSessions() As String
+            Get
+                Return ResourceManager.GetString("frmMain_ErrorNoSessions", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to [PARAM] uses a relative path and has never been detected on this computer..
         '''</summary>
@@ -2931,6 +3246,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Session Viewer....
+        '''</summary>
+        Friend ReadOnly Property frmMain_gMonToolsSessions() As String
+            Get
+                Return ResourceManager.GetString("frmMain_gMonToolsSessions", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Show / Hide.
         '''</summary>
@@ -3291,6 +3615,276 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Session tracking is currently disabled.[BR][BR]Enable session tracking in Settings if you&apos;d like to track data for individual gaming sessions..
+        '''</summary>
+        Friend ReadOnly Property frmMain_WarningSessionsDisabled() As String
+            Get
+                Return ResourceManager.GetString("frmMain_WarningSessionsDisabled", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Cancel.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_btnCancel() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_btnCancel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Export.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_btnExport() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_btnExport", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Export Column Headers (CSV).
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_chkCSVHeaders() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_chkCSVHeaders", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Session Export Options.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_FormName() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_FormName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Date Type.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_grpDateType() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_grpDateType", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Export Type.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_grpExportType() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_grpExportType", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Other Options.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_grpOptions() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_grpOptions", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to CSV.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_optCSV() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_optCSV", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Current Locale.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_optCurrentLocale() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_optCurrentLocale", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Unix Timestamp.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_optUnix() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_optUnix", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to XML.
+        '''</summary>
+        Friend ReadOnly Property frmSessionExport_optXML() As String
+            Get
+                Return ResourceManager.GetString("frmSessionExport_optXML", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Close.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_btnClose() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_btnClose", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Delete Session.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_btnDelete() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_btnDelete", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Export Grid.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_btnExport() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_btnExport", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to &amp;Reset Filters.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_btnReset() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_btnReset", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Choose a location for the export file.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ChooseExportLocation() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ChooseExportLocation", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to End.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ColumnEnd() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ColumnEnd", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Game.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ColumnGameName() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ColumnGameName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Hours.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ColumnHours() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ColumnHours", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to MonitorID.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ColumnMonitorID() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ColumnMonitorID", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Start.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ColumnStart() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ColumnStart", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Are you sure you want to delete the selected session(s)?  This cannot be undone..
+        '''</summary>
+        Friend ReadOnly Property frmSessions_ConfirmDelete() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_ConfirmDelete", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to CSV.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_CSV() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_CSV", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Game Session Export.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_DefaultExportFileName() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_DefaultExportFileName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Date Range:.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_lblDateRange() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_lblDateRange", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Game Filter:.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_lblFilter() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_lblFilter", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Total Hours: [PARAM].
+        '''</summary>
+        Friend ReadOnly Property frmSessions_lblTotalHours() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_lblTotalHours", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Session Viewer.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_Name() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_Name", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to XML.
+        '''</summary>
+        Friend ReadOnly Property frmSessions_XML() As String
+            Get
+                Return ResourceManager.GetString("frmSessions_XML", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Executable.
         '''</summary>
@@ -3489,6 +4083,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Enable session tracking.
+        '''</summary>
+        Friend ReadOnly Property frmSettings_chkSessionTracking() As String
+            Get
+                Return ResourceManager.GetString("frmSettings_chkSessionTracking", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Show detection notifications.
         '''</summary>
@@ -3517,7 +4120,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Backup only when session time exceeds.
+        '''  Looks up a localized string similar to Ignore sessions shorter than.
         '''</summary>
         Friend ReadOnly Property frmSettings_chkSupressBackup() As String
             Get
@@ -3714,6 +4317,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Please note that GBM will not &quot;Start with Windows&quot; as Administrator.[BR][BR]See the Online Manual in the Help menu for details..
+        '''</summary>
+        Friend ReadOnly Property frmSettings_WarningAdminStart() As String
+            Get
+                Return ResourceManager.GetString("frmSettings_WarningAdminStart", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Invalid or poorly formatted 7-Zip arguments can cause backup or restore operations to fail.[BR][BR]If problems occur, clear the custom arguments and try again..
         '''</summary>
@@ -5059,6 +5671,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to An error occured exporting the session data.[BR][BR][PARAM].
+        '''</summary>
+        Friend ReadOnly Property mgrSessions_ErrorExportFailure() As String
+            Get
+                Return ResourceManager.GetString("mgrSessions_ErrorExportFailure", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The data has been exported successfully..
+        '''</summary>
+        Friend ReadOnly Property mgrSessions_ExportSuccess() As String
+            Get
+                Return ResourceManager.GetString("mgrSessions_ExportSuccess", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to An error occured creating a backup of the database file at [PARAM][BR][BR][PARAM].
         '''</summary>

GBM/My Project/Resources.resx

@@ -883,29 +883,20 @@
   <data name="frmFileFolderSearch_SwitchDrives" xml:space="preserve">
     <value>Do you wish to search the [PARAM] drive?</value>
   </data>
-  <data name="frmFilter_btnAdd" xml:space="preserve">
-    <value>&gt;</value>
+  <data name="frmFilter_btnIncludeAdd" xml:space="preserve">
+    <value>&lt;</value>
   </data>
   <data name="frmFilter_btnOK" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
-  <data name="frmFilter_btnRemove" xml:space="preserve">
-    <value>&lt;</value>
+  <data name="frmFilter_btnIncludeRemove" xml:space="preserve">
+    <value>&gt;</value>
   </data>
   <data name="frmFilter_FormName" xml:space="preserve">
     <value>Custom Filter</value>
   </data>
-  <data name="frmFilter_lblCompany" xml:space="preserve">
-    <value>Company:</value>
-  </data>
-  <data name="frmFilter_lblGameTags" xml:space="preserve">
-    <value>Current Filter</value>
-  </data>
-  <data name="frmFilter_lblName" xml:space="preserve">
-    <value>Name:</value>
-  </data>
-  <data name="frmFilter_lblProcess" xml:space="preserve">
-    <value>Process:</value>
+  <data name="frmFilter_lblIncludeTags" xml:space="preserve">
+    <value>Include Tags</value>
   </data>
   <data name="frmFilter_lblTags" xml:space="preserve">
     <value>Available Tags</value>
@@ -914,18 +905,18 @@
     <value>All Tags</value>
   </data>
   <data name="frmFilter_optAnd" xml:space="preserve">
-    <value>And</value>
+    <value>All</value>
   </data>
   <data name="frmFilter_optAny" xml:space="preserve">
     <value>Any Tag</value>
   </data>
-  <data name="frmFilter_optGameInfo" xml:space="preserve">
+  <data name="frmFilter_chkGameInfo" xml:space="preserve">
     <value>Game Information</value>
   </data>
   <data name="frmFilter_optOr" xml:space="preserve">
-    <value>Or</value>
+    <value>Any</value>
   </data>
-  <data name="frmFilter_optTag" xml:space="preserve">
+  <data name="frmFilter_chkTag" xml:space="preserve">
     <value>Tag</value>
   </data>
   <data name="frmGameTags_btnAdd" xml:space="preserve">
@@ -1015,11 +1006,11 @@
   <data name="frmIncludeExclude_ToolTipTitle" xml:space="preserve">
     <value>Saved Game Explorer</value>
   </data>
-  <data name="frmFilter_grpGameInfoOptions" xml:space="preserve">
-    <value>Options</value>
+  <data name="frmFilter_grpFilterType" xml:space="preserve">
+    <value>Filter Type</value>
   </data>
   <data name="frmFilter_grpTagOptions" xml:space="preserve">
-    <value>Options</value>
+    <value>Include Options</value>
   </data>
   <data name="frmGameManager_grpConfig" xml:space="preserve">
     <value>Configuration</value>
@@ -1091,7 +1082,7 @@
     <value>Start with Windows</value>
   </data>
   <data name="frmSettings_chkSupressBackup" xml:space="preserve">
-    <value>Backup only when session time exceeds</value>
+    <value>Ignore sessions shorter than</value>
   </data>
   <data name="frmSettings_chkSync" xml:space="preserve">
     <value>Enable syncing</value>
@@ -1798,4 +1789,223 @@
   <data name="mgrBackup_7zFatalError" xml:space="preserve">
     <value>[PARAM] backup failed due to an error.</value>
   </data>
+  <data name="App_ErrorFocus" xml:space="preserve">
+    <value>GBM is busy with an open window on your desktop.</value>
+  </data>
+  <data name="frmFilter_grpSorting" xml:space="preserve">
+    <value>Sorting</value>
+  </data>
+  <data name="frmFilter_optSortAsc" xml:space="preserve">
+    <value>Ascending</value>
+  </data>
+  <data name="frmFilter_optSortDesc" xml:space="preserve">
+    <value>Descending</value>
+  </data>
+  <data name="frmFilter_FieldCompany" xml:space="preserve">
+    <value>Company</value>
+  </data>
+  <data name="frmFilter_FieldHours" xml:space="preserve">
+    <value>Hours</value>
+  </data>
+  <data name="frmFilter_FieldName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="frmFilter_FieldProcess" xml:space="preserve">
+    <value>Process</value>
+  </data>
+  <data name="frmFilter_btnAddFilter" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="frmFilter_btnRemoveFilter" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="frmFilter_FieldParameter" xml:space="preserve">
+    <value>Parameter</value>
+  </data>
+  <data name="frmFilter_FieldVersion" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="frmFilter_lblCurrentFilters" xml:space="preserve">
+    <value>Current Filters</value>
+  </data>
+  <data name="frmFilter_lblFields" xml:space="preserve">
+    <value>Available Fields</value>
+  </data>
+  <data name="frmFilter_lblFilterData" xml:space="preserve">
+    <value>Filter</value>
+  </data>
+  <data name="frmFilter_cboBoolFilterDisabled" xml:space="preserve">
+    <value>Disabled</value>
+  </data>
+  <data name="frmFilter_cboBoolFilterEnabled" xml:space="preserve">
+    <value>Enabled</value>
+  </data>
+  <data name="frmFilter_FieldBackupLimit" xml:space="preserve">
+    <value>Backup Limit *</value>
+  </data>
+  <data name="frmFilter_FieldCleanFolder" xml:space="preserve">
+    <value>Delete Folder on Restore</value>
+  </data>
+  <data name="frmFilter_FieldEnabled" xml:space="preserve">
+    <value>Monitor Game</value>
+  </data>
+  <data name="frmFilter_FieldExcludeList" xml:space="preserve">
+    <value>Exclude Items</value>
+  </data>
+  <data name="frmFilter_FieldFileType" xml:space="preserve">
+    <value>Include Items</value>
+  </data>
+  <data name="frmFilter_FieldFolderSave" xml:space="preserve">
+    <value>Save Entire Folder</value>
+  </data>
+  <data name="frmFilter_FieldIcon" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="frmFilter_FieldMonitorOnly" xml:space="preserve">
+    <value>Monitor Only</value>
+  </data>
+  <data name="frmFilter_FieldPath" xml:space="preserve">
+    <value>Save Path *</value>
+  </data>
+  <data name="frmFilter_FieldProcessPath" xml:space="preserve">
+    <value>Game Path</value>
+  </data>
+  <data name="frmFilter_FieldTimeStamp" xml:space="preserve">
+    <value>Save Multiple Backups</value>
+  </data>
+  <data name="frmFilter_lblSortsFields" xml:space="preserve">
+    <value>Available Fields</value>
+  </data>
+  <data name="frmFilter_lblWarning" xml:space="preserve">
+    <value>* Indicates a field that may give unexpected results.</value>
+  </data>
+  <data name="frmFilter_lstFilterContains" xml:space="preserve">
+    <value>contains</value>
+  </data>
+  <data name="frmFilter_grpSortOptions" xml:space="preserve">
+    <value>Sort Options</value>
+  </data>
+  <data name="frmFilter_FieldComments" xml:space="preserve">
+    <value>Comments</value>
+  </data>
+  <data name="frmFilter_btnExcludeAdd" xml:space="preserve">
+    <value>&gt;</value>
+  </data>
+  <data name="frmFilter_btnExcludeRemove" xml:space="preserve">
+    <value>&lt;</value>
+  </data>
+  <data name="frmFilter_lblExcludeTags" xml:space="preserve">
+    <value>Exclude Tags</value>
+  </data>
+  <data name="frmFilter_lblNot" xml:space="preserve">
+    <value>Not</value>
+  </data>
+  <data name="frmMain_gMonToolsSessions" xml:space="preserve">
+    <value>&amp;Session Viewer...</value>
+  </data>
+  <data name="frmSessions_ColumnEnd" xml:space="preserve">
+    <value>End</value>
+  </data>
+  <data name="frmSessions_ColumnGameName" xml:space="preserve">
+    <value>Game</value>
+  </data>
+  <data name="frmSessions_ColumnStart" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="frmSessions_Name" xml:space="preserve">
+    <value>Session Viewer</value>
+  </data>
+  <data name="frmMain_ErrorNoSessions" xml:space="preserve">
+    <value>There is currently no session data to display.</value>
+  </data>
+  <data name="frmSessions_btnClose" xml:space="preserve">
+    <value>&amp;Close</value>
+  </data>
+  <data name="frmSessions_btnDelete" xml:space="preserve">
+    <value>&amp;Delete Session</value>
+  </data>
+  <data name="frmSessions_btnReset" xml:space="preserve">
+    <value>&amp;Reset Filters</value>
+  </data>
+  <data name="frmSessions_ColumnMonitorID" xml:space="preserve">
+    <value>MonitorID</value>
+  </data>
+  <data name="frmSessions_ConfirmDelete" xml:space="preserve">
+    <value>Are you sure you want to delete the selected session(s)?  This cannot be undone.</value>
+  </data>
+  <data name="frmSessions_lblDateRange" xml:space="preserve">
+    <value>Date Range:</value>
+  </data>
+  <data name="frmSessions_lblFilter" xml:space="preserve">
+    <value>Game Filter:</value>
+  </data>
+  <data name="frmMain_WarningSessionsDisabled" xml:space="preserve">
+    <value>Session tracking is currently disabled.[BR][BR]Enable session tracking in Settings if you'd like to track data for individual gaming sessions.</value>
+  </data>
+  <data name="frmSettings_chkSessionTracking" xml:space="preserve">
+    <value>Enable session tracking</value>
+  </data>
+  <data name="frmSettings_WarningAdminStart" xml:space="preserve">
+    <value>Please note that GBM will not "Start with Windows" as Administrator.[BR][BR]See the Online Manual in the Help menu for details.</value>
+  </data>
+  <data name="frmSessions_ColumnHours" xml:space="preserve">
+    <value>Hours</value>
+  </data>
+  <data name="frmSessions_lblTotalHours" xml:space="preserve">
+    <value>Total Hours: [PARAM]</value>
+  </data>
+  <data name="frmSessions_ChooseExportLocation" xml:space="preserve">
+    <value>Choose a location for the export file</value>
+  </data>
+  <data name="frmSessions_CSV" xml:space="preserve">
+    <value>CSV</value>
+  </data>
+  <data name="frmSessions_DefaultExportFileName" xml:space="preserve">
+    <value>Game Session Export</value>
+  </data>
+  <data name="frmSessions_XML" xml:space="preserve">
+    <value>XML</value>
+  </data>
+  <data name="mgrSessions_ErrorExportFailure" xml:space="preserve">
+    <value>An error occured exporting the session data.[BR][BR][PARAM]</value>
+  </data>
+  <data name="mgrSessions_ExportSuccess" xml:space="preserve">
+    <value>The data has been exported successfully.</value>
+  </data>
+  <data name="frmSessionExport_btnCancel" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="frmSessionExport_btnExport" xml:space="preserve">
+    <value>&amp;Export</value>
+  </data>
+  <data name="frmSessionExport_chkCSVHeaders" xml:space="preserve">
+    <value>Export Column Headers (CSV)</value>
+  </data>
+  <data name="frmSessionExport_FormName" xml:space="preserve">
+    <value>Session Export Options</value>
+  </data>
+  <data name="frmSessionExport_grpDateType" xml:space="preserve">
+    <value>Date Type</value>
+  </data>
+  <data name="frmSessionExport_grpExportType" xml:space="preserve">
+    <value>Export Type</value>
+  </data>
+  <data name="frmSessionExport_grpOptions" xml:space="preserve">
+    <value>Other Options</value>
+  </data>
+  <data name="frmSessionExport_optCSV" xml:space="preserve">
+    <value>CSV</value>
+  </data>
+  <data name="frmSessionExport_optCurrentLocale" xml:space="preserve">
+    <value>Current Locale</value>
+  </data>
+  <data name="frmSessionExport_optUnix" xml:space="preserve">
+    <value>Unix Timestamp</value>
+  </data>
+  <data name="frmSessionExport_optXML" xml:space="preserve">
+    <value>XML</value>
+  </data>
+  <data name="frmSessions_btnExport" xml:space="preserve">
+    <value>&amp;Export Grid</value>
+  </data>
 </root>

GBM/readme.txt

@@ -1,27 +1,25 @@
-Game Backup Monitor v1.02 Readme
+Game Backup Monitor v1.0.7 Readme
 http://mikemaximus.github.io/gbm-web/
 gamebackupmonitor@gmail.com
 
-July 1, 2017
+February 2, 2018
 
-New in 1.02
+New in 1.0.7
 
-- (Windows) Upgraded SQLite to 3.19.3.
-- (All) The SQLite version is displayed on the "About" screen.
-- (All) Added the ability to detect command parameters.
-	- Use parameter detection for better detection of games running in emulators or interpreters like DOSBox.
-	- This is an advanced optional feature and is not available in the "Add Game Wizard", please read the manual (http://mikemaximus.github.io/gbm-web/manual.html) for more details.	
-	- (Linux) Please note that Wine detection is still handled automatically by GBM and only requires a Windows process name.  But this feature does work with Wine if you need to detect parameters!
-- (All) Added the ability to resize and maximize the main program window.
-	- The log is now displayed by default and resizes with the window.
-	- The "Show/Hide Log" button has been removed due to technical issues with this change.
-	- The minimum window size will let you easily hide the log as in past versions.
-- (All) The last browse location in various dialogs is now saved, such as when using the Import/Export feature.
-- (All) Available disk space is checked before attempting a backup.  The log now displays available disk space and save folder size.
-- (Linux) Using the keyboard to navigate the game list in the Game Manager now works correctly.
-- (All) Tags can now be added to a new game configuration before saving on the Game Manager.
-- (All) Fixed various issues when adding new game configurations while using filters on the Game Manager.
-- (All) Added better handling of 7-Zip warnings and errors.
-- (Linux) GBM now requires the "readlink" utility to properly handle Wine games.  However bash, ls and grep are no longer required.
+All Platforms:
 
+- Added Hours and Total Hours to the Session Viewer
+	- An Hours column now shows the time spent each session.
+	- The Total Hours of the currently displayed sessions is now displayed under the grid.  
+
+- Added Export feature to the Sessions Viewer
+	- The session data currently displayed on the grid can be exported in CSV or XML format.
+	- Dates can be exported in Unix format or the current system format.
+	- The CSV format can exported with or without headers.
+
+Linux Only:
+
+- A low disk space warning will no longer be displayed on every backup.
+- Fixed the column sorting issues on the Session Viewer.
+	
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

deb-package/gbm/DEBIAN/control

@@ -0,0 +1,9 @@
+Package: gbm
+Architecture: all
+Maintainer: Sebastian Riedel <git@basxto.de>
+Priority: optional
+Version: 1.0.5
+Homepage: https://mikemaximus.github.io/gbm-web/
+Bugs: https://github.com/MikeMaximus/gbm/issues
+Depends: mono-vbnc, libsqlite3-0, p7zip-full
+Description: Automatically backup your saved games!

deb-package/gbm/DEBIAN/postinst

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+XDG_DESKTOP_MENU="`which xdg-desktop-menu 2> /dev/null`"
+XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null`"
+
+if [ -x "$XDG_DESKTOP_MENU" ]; then
+    xdg-desktop-menu forceupdate --mode system;
+fi
+
+if [ -x "$XDG_ICON_RESOURCE" ]; then
+    xdg-icon-resource forceupdate --mode system;
+fi

gbm.desktop

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Version=1.0
+Name=Game Backup Monitor
+Comment=Monitors games and backs up their savegames
+Comment[de]=Beobachtet Spiele und sichert ihre Spielstände
+
+TryExec=mono
+Exec=gbm
+Terminal=false
+
+Icon=gbm
+Categories=Utility;Archiving;Monitor

gbm.sh

@@ -0,0 +1,22 @@
+#!/bin/sh -e
+#check for all dependencies
+for prog in mono readlink df 7za;do
+    [ -n "`whereis -b ${prog} | cut -sd' ' -f2`" ] || (echo "Please install ${prog}" && exit 1);
+done
+for lib in libsqlite3;do
+    [ -n "`ldconfig -p | grep ${lib}`" ] || (echo "Please install ${lib}" && exit 1);
+done
+dir="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
+echo "Located in ${dir}";
+gbmpath='./';
+#locate GBM.exe
+if [ "${dir}" = '/usr/bin' ] && [ -s '/usr/share/gbm/GBM.exe' ]; then
+    gbmpath='/usr/share/gbm/';
+elif [ "${dir}" = '/usr/local/bin' ] && [ -s '/usr/local/share/gbm/GBM.exe' ]; then
+    gbmpath='/usr/local/share/gbm/';
+elif [ ! -s './GBM.exe' ]; then
+    echo 'GBM.exe not found';
+    exit 2;
+fi
+mono --desktop ${gbmpath}'GBM.exe' "$@";
+exit $?;

makefile

@@ -0,0 +1,49 @@
+ICONSIZES := 16 24 32 48 64 72 96 128 256
+IMGMAGICK := $(shell command -v convert 2> /dev/null)
+DESTDIR := 
+PREFIX := usr/local
+define \n
+
+
+endef
+
+install: GBM.exe $(foreach size,$(ICONSIZES),gbm_$(size)x$(size).png)
+#rename it in a way, it can easily started from terminal
+	install -d $(DESTDIR)/$(PREFIX)/bin;
+	install gbm.sh $(DESTDIR)/$(PREFIX)/bin/gbm;
+	install -d $(DESTDIR)/$(PREFIX)/share/gbm/;
+	install GBM.exe $(DESTDIR)/$(PREFIX)/share/gbm/;
+#install icon in different sizes
+	$(foreach size,$(ICONSIZES),install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/$(size)x$(size)/apps/;$(\n))
+	$(foreach size,$(ICONSIZES),install -m644 gbm_$(size)x$(size).png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/$(size)x$(size)/apps/gbm.png;$(\n))
+#install .desktop file, which is used for running gbm from desktop and menus
+	install -d $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 gbm.desktop $(DESTDIR)/$(PREFIX)/share/applications/gbm.desktop
+ifeq ($(DESTDIR),)
+		-xdg-icon-resource forceupdate --mode system;
+		-xdg-desktop-menu forceupdate --mode system;
+endif
+
+uninstall: $(DESTDIR)/$(PREFIX)/bin/gbm
+	-rm $(DESTDIR)/$(PREFIX)/bin/gbm;
+	-rm -r $(DESTDIR)/$(PREFIX)/share/gbm/;
+	$(foreach size,$(ICONSIZES),-rm $(DESTDIR)/$(PREFIX)/share/icons/hicolor/$(size)x$(size)/apps/gbm.png;$(\n))
+	-rm $(DESTDIR)/$(PREFIX)/share/applications/gbm.desktop
+ifeq ($(DESTDIR),)
+		-xdg-icon-resource forceupdate --mode system;
+		-xdg-desktop-menu forceupdate --mode system;
+endif
+
+#must be root
+deb: DESTDIR := deb-package/gbm
+deb: PREFIX := usr
+deb: install
+	cd deb-package;dpkg-deb --build gbm
+
+gbm_%.png: gbm.ico
+ifndef IMGMAGICK
+	$(error "convert is not available, please install imagemagick")
+endif
+#extracts the correct ico index appended to the filename from identify’s output
+	$(eval INDEX := $(shell identify gbm.ico | grep $* | cut -d" " -f1;))
+	convert '$(INDEX)' '$@';