Merge pull request #96 from MikeMaximus/v104

Merge v104 into master

.gitignore

@@ -186,3 +186,5 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+/.vs/slnx.sqlite
+/.vs/VSWorkspaceState.json

GBM/Classes/XML Serialize Classes/Game.vb

@@ -1,11 +1,13 @@
 Public Class Game
     Private sGameName As String
     Private sProcessName As String
+    Private sParameter As String
     Private sPath As String
     Private bAbsolutePath As Boolean
     Private bFolderSave As Boolean
     Private sFileType As String
     Private sExcludeList As String
+    Private bMonitorOnly As Boolean
     Private oTags As List(Of Tag)
 
     Property Name As String
@@ -26,6 +28,15 @@
         End Get
     End Property
 
+    Property Parameter As String
+        Set(value As String)
+            sParameter = value
+        End Set
+        Get
+            Return sParameter
+        End Get
+    End Property
+
     Property Path As String
         Set(value As String)
             sPath = value
@@ -71,6 +82,15 @@
         End Get
     End Property
 
+    Property MonitorOnly As Boolean
+        Set(value As Boolean)
+            bMonitorOnly = value
+        End Set
+        Get
+            Return bMonitorOnly
+        End Get
+    End Property
+
     Property Tags As List(Of Tag)
         Get
             Return oTags

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/clsBackup.vb

@@ -7,8 +7,6 @@
     Private sRelativeRestorePath As String = String.Empty
     Private dDateUpdated As DateTime = Date.Now
     Private sUpdatedBy As String = String.Empty
-    Private dLastDateUpdated As DateTime = Date.Now
-    Private sLastUpdatedBy As String = String.Empty
     Private sCheckSum As String = String.Empty
 
     Property ID As String
@@ -109,24 +107,6 @@
         End Set
     End Property
 
-    Property LastDateUpdated As DateTime
-        Get
-            Return dLastDateUpdated
-        End Get
-        Set(value As DateTime)
-            dLastDateUpdated = value
-        End Set
-    End Property
-
-    Property LastUpdatedBy As String
-        Get
-            Return sLastUpdatedBy
-        End Get
-        Set(value As String)
-            sLastUpdatedBy = value
-        End Set
-    End Property
-
     Property CheckSum As String
         Get
             Return sCheckSum

GBM/Classes/clsGame.vb

@@ -1,13 +1,16 @@
-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
+    Private sParameter As String = String.Empty
     Private sPath As String = String.Empty
     Private bAbsolutePath As Boolean = False
     Private bFolderSave As Boolean = False
     Private sFileType As String = String.Empty
     Private bAppendTimeStamp As Boolean = False
     Private iBackupLimit As Integer = 2
+    Private bCleanFolder As Boolean = False
     Private sExcludeList As String = String.Empty
     Private sProcessPath As String = String.Empty
     Private sIcon As String = String.Empty
@@ -73,6 +76,15 @@
         End Get
     End Property
 
+    Property Parameter As String
+        Set(value As String)
+            sParameter = value
+        End Set
+        Get
+            Return sParameter
+        End Get
+    End Property
+
     Property Path As String
         Set(value As String)
             sPath = mgrPath.ReverseSpecialPaths(value)
@@ -127,6 +139,15 @@
         End Set
     End Property
 
+    Property CleanFolder As Boolean
+        Get
+            Return bCleanFolder
+        End Get
+        Set(value As Boolean)
+            bCleanFolder = value
+        End Set
+    End Property
+
     Property ExcludeList As String
         Set(value As String)
             sExcludeList = value
@@ -238,6 +259,26 @@
         End Set
     End Property
 
+    ReadOnly Property IncludeArray As String()
+        Get
+            If FileType = String.Empty Then
+                Return New String() {}
+            Else
+                Return FileType.Split(":")
+            End If
+        End Get
+    End Property
+
+    ReadOnly Property ExcludeArray As String()
+        Get
+            If ExcludeList = String.Empty Then
+                Return New String() {}
+            Else
+                Return ExcludeList.Split(":")
+            End If
+        End Get
+    End Property
+
     Public Function SyncEquals(obj As Object, eSyncFields As eOptionalSyncFields) As Boolean
         Dim oGame As clsGame = TryCast(obj, clsGame)
         If oGame Is Nothing Then
@@ -253,6 +294,9 @@
             If ProcessName <> oGame.ProcessName Then
                 Return False
             End If
+            If Parameter <> oGame.Parameter Then
+                Return False
+            End If
             If Path <> oGame.Path Then
                 Return False
             End If
@@ -268,6 +312,9 @@
             If FolderSave <> oGame.FolderSave Then
                 Return False
             End If
+            If CleanFolder <> oGame.CleanFolder Then
+                Return False
+            End If
             If AppendTimeStamp <> oGame.AppendTimeStamp Then
                 Return False
             End If
@@ -359,4 +406,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,71 @@
+Public Class clsGameFilter
+
+    Private sID As String
+    Private oField As clsGameFilterField
+    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 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/clsSavedPath.vb

@@ -0,0 +1,22 @@
+Public Class clsSavedPath
+    Private sPathName As String = String.Empty
+    Private sPath As String = String.Empty
+
+    Property PathName As String
+        Get
+            Return sPathName
+        End Get
+        Set(value As String)
+            sPathName = value
+        End Set
+    End Property
+
+    Property Path As String
+        Get
+            Return sPath
+        End Get
+        Set(value As String)
+            sPath = value
+        End Set
+    End Property
+End Class

GBM/Forms/frmAddWizard.vb

@@ -425,8 +425,8 @@ Public Class frmAddWizard
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFileBrowser(frmAddWizard_ChooseProcess, "exe",
+        sNewPath = mgrCommon.OpenFileBrowser("Wizard_Process_Path", frmAddWizard_ChooseProcess, "exe",
-                                          frmAddWizard_Executable, sDefaultFolder, False)
+                                          frmAddWizard_Executable, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then txtProcessPath.Text = sNewPath
     End Sub
@@ -442,7 +442,7 @@ Public Class frmAddWizard
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmAddWizard_ChooseSavePath, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("Wizard_Save_Path", frmAddWizard_ChooseSavePath, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then txtSavePath.Text = sNewPath
     End Sub

GBM/Forms/frmAdvancedImport.vb

@@ -1,10 +1,11 @@
 Imports GBM.My.Resources
+Imports System.IO
 
 Public Class frmAdvancedImport
 
     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
@@ -44,7 +45,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 +80,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
@@ -142,8 +156,7 @@ Public Class frmAdvancedImport
     Private Sub frmAdvancedImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         bIsLoading = True
         SetForm()
-        LoadData()
+        LoadData(String.Empty, True)
-        SelectToggle()
         bIsLoading = False
     End Sub
 
@@ -184,6 +197,7 @@ Public Class frmAdvancedImport
         tmFilterTimer.Stop()
         tmFilterTimer.Enabled = False
     End Sub
+
 End Class
 
 ' Column Sorter

GBM/Forms/frmFilter.Designer.vb

@@ -22,8 +22,6 @@ 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.grpTagOptions = New System.Windows.Forms.GroupBox()
         Me.optAll = New System.Windows.Forms.RadioButton()
@@ -32,45 +30,42 @@ Partial Class frmFilter
         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.lstTagFilter = 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.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.txtStringFilter = New System.Windows.Forms.TextBox()
-        Me.lblCompany = New System.Windows.Forms.Label()
+        Me.grpSorting = New System.Windows.Forms.GroupBox()
-        Me.txtProcess = New System.Windows.Forms.TextBox()
+        Me.grpSortOptions = New System.Windows.Forms.GroupBox()
-        Me.lblProcess = New System.Windows.Forms.Label()
+        Me.optSortAsc = New System.Windows.Forms.RadioButton()
-        Me.lblName = New System.Windows.Forms.Label()
+        Me.optSortDesc = New System.Windows.Forms.RadioButton()
-        Me.txtName = New System.Windows.Forms.TextBox()
+        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.grpTagOptions)
@@ -78,11 +73,11 @@ Partial Class frmFilter
         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.lstTagFilter)
         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(385, 198)
         Me.grpTagFilter.TabIndex = 3
         Me.grpTagFilter.TabStop = False
         '
@@ -90,7 +85,7 @@ Partial Class frmFilter
         '
         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
@@ -138,7 +133,7 @@ Partial Class frmFilter
         '
         'btnRemove
         '
-        Me.btnRemove.Location = New System.Drawing.Point(162, 122)
+        Me.btnRemove.Location = New System.Drawing.Point(162, 88)
         Me.btnRemove.Name = "btnRemove"
         Me.btnRemove.Size = New System.Drawing.Size(61, 23)
         Me.btnRemove.TabIndex = 3
@@ -147,22 +142,22 @@ Partial Class frmFilter
         '
         'btnAdd
         '
-        Me.btnAdd.Location = New System.Drawing.Point(162, 93)
+        Me.btnAdd.Location = New System.Drawing.Point(162, 59)
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(61, 23)
         Me.btnAdd.TabIndex = 2
         Me.btnAdd.Text = ">"
         Me.btnAdd.UseVisualStyleBackColor = True
         '
-        'lstFilter
+        'lstTagFilter
         '
-        Me.lstFilter.FormattingEnabled = True
+        Me.lstTagFilter.FormattingEnabled = True
-        Me.lstFilter.Location = New System.Drawing.Point(229, 32)
+        Me.lstTagFilter.Location = New System.Drawing.Point(229, 32)
-        Me.lstFilter.Name = "lstFilter"
+        Me.lstTagFilter.Name = "lstTagFilter"
-        Me.lstFilter.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
+        Me.lstTagFilter.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
-        Me.lstFilter.Size = New System.Drawing.Size(150, 173)
+        Me.lstTagFilter.Size = New System.Drawing.Size(150, 108)
-        Me.lstFilter.Sorted = True
+        Me.lstTagFilter.Sorted = True
-        Me.lstFilter.TabIndex = 5
+        Me.lstTagFilter.TabIndex = 5
         '
         'lstTags
         '
@@ -170,124 +165,270 @@ Partial Class frmFilter
         Me.lstTags.Location = New System.Drawing.Point(6, 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(150, 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(322, 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.cboBoolFilter)
-        Me.grpGameFilter.Controls.Add(Me.txtCompany)
+        Me.grpGameFilter.Controls.Add(Me.numFilter)
-        Me.grpGameFilter.Controls.Add(Me.lblCompany)
+        Me.grpGameFilter.Controls.Add(Me.cboNumericOps)
-        Me.grpGameFilter.Controls.Add(Me.txtProcess)
+        Me.grpGameFilter.Controls.Add(Me.lblCurrentFilters)
-        Me.grpGameFilter.Controls.Add(Me.lblProcess)
+        Me.grpGameFilter.Controls.Add(Me.lblFilterData)
-        Me.grpGameFilter.Controls.Add(Me.lblName)
+        Me.grpGameFilter.Controls.Add(Me.lblFields)
-        Me.grpGameFilter.Controls.Add(Me.txtName)
+        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(385, 172)
         Me.grpGameFilter.TabIndex = 1
         Me.grpGameFilter.TabStop = False
         '
-        'grpGameInfoOptions
+        'cboBoolFilter
         '
-        Me.grpGameInfoOptions.Controls.Add(Me.optOr)
+        Me.cboBoolFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.grpGameInfoOptions.Controls.Add(Me.optAnd)
+        Me.cboBoolFilter.FormattingEnabled = True
-        Me.grpGameInfoOptions.Location = New System.Drawing.Point(14, 97)
+        Me.cboBoolFilter.Location = New System.Drawing.Point(162, 36)
-        Me.grpGameInfoOptions.Name = "grpGameInfoOptions"
+        Me.cboBoolFilter.Name = "cboBoolFilter"
-        Me.grpGameInfoOptions.Size = New System.Drawing.Size(106, 46)
+        Me.cboBoolFilter.Size = New System.Drawing.Size(136, 21)
-        Me.grpGameInfoOptions.TabIndex = 6
+        Me.cboBoolFilter.TabIndex = 3
-        Me.grpGameInfoOptions.TabStop = False
+        '
-        Me.grpGameInfoOptions.Text = "Options"
+        'numFilter
+        '
+        Me.numFilter.DecimalPlaces = 1
+        Me.numFilter.Location = New System.Drawing.Point(233, 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(162, 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(214, 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(304, 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.Size = New System.Drawing.Size(44, 17)
-        Me.optOr.TabIndex = 1
+        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(56, 19)
-        Me.optAnd.Location = New System.Drawing.Point(6, 19)
         Me.optAnd.Name = "optAnd"
         Me.optAnd.Size = New System.Drawing.Size(44, 17)
-        Me.optAnd.TabIndex = 0
+        Me.optAnd.TabIndex = 1
-        Me.optAnd.TabStop = True
+        Me.optAnd.Text = "All"
-        Me.optAnd.Text = "And"
         Me.optAnd.UseVisualStyleBackColor = True
         '
-        'txtCompany
+        'txtStringFilter
         '
-        Me.txtCompany.Location = New System.Drawing.Point(70, 71)
+        Me.txtStringFilter.Location = New System.Drawing.Point(162, 36)
-        Me.txtCompany.Name = "txtCompany"
+        Me.txtStringFilter.Name = "txtStringFilter"
-        Me.txtCompany.Size = New System.Drawing.Size(309, 20)
+        Me.txtStringFilter.Size = New System.Drawing.Size(136, 20)
-        Me.txtCompany.TabIndex = 5
+        Me.txtStringFilter.TabIndex = 3
         '
-        'lblCompany
+        'grpSorting
         '
-        Me.lblCompany.AutoSize = True
+        Me.grpSorting.Controls.Add(Me.grpSortOptions)
-        Me.lblCompany.Location = New System.Drawing.Point(11, 74)
+        Me.grpSorting.Controls.Add(Me.lblSortFields)
-        Me.lblCompany.Name = "lblCompany"
+        Me.grpSorting.Controls.Add(Me.cboSortField)
-        Me.lblCompany.Size = New System.Drawing.Size(54, 13)
+        Me.grpSorting.Location = New System.Drawing.Point(12, 440)
-        Me.lblCompany.TabIndex = 4
+        Me.grpSorting.Name = "grpSorting"
-        Me.lblCompany.Text = "Company:"
+        Me.grpSorting.Size = New System.Drawing.Size(385, 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.grpSortOptions.Controls.Add(Me.optSortAsc)
-        Me.txtProcess.Name = "txtProcess"
+        Me.grpSortOptions.Controls.Add(Me.optSortDesc)
-        Me.txtProcess.Size = New System.Drawing.Size(309, 20)
+        Me.grpSortOptions.Location = New System.Drawing.Point(162, 19)
-        Me.txtProcess.TabIndex = 3
+        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.optSortAsc.AutoSize = True
-        Me.lblProcess.Location = New System.Drawing.Point(11, 48)
+        Me.optSortAsc.Location = New System.Drawing.Point(6, 17)
-        Me.lblProcess.Name = "lblProcess"
+        Me.optSortAsc.Name = "optSortAsc"
-        Me.lblProcess.Size = New System.Drawing.Size(48, 13)
+        Me.optSortAsc.Size = New System.Drawing.Size(75, 17)
-        Me.lblProcess.TabIndex = 2
+        Me.optSortAsc.TabIndex = 0
-        Me.lblProcess.Text = "Process:"
+        Me.optSortAsc.TabStop = True
+        Me.optSortAsc.Text = "Ascending"
+        Me.optSortAsc.UseVisualStyleBackColor = True
         '
-        'lblName
+        'optSortDesc
         '
-        Me.lblName.AutoSize = True
+        Me.optSortDesc.AutoSize = True
-        Me.lblName.Location = New System.Drawing.Point(11, 22)
+        Me.optSortDesc.Location = New System.Drawing.Point(90, 17)
-        Me.lblName.Name = "lblName"
+        Me.optSortDesc.Name = "optSortDesc"
-        Me.lblName.Size = New System.Drawing.Size(38, 13)
+        Me.optSortDesc.Size = New System.Drawing.Size(82, 17)
-        Me.lblName.TabIndex = 0
+        Me.optSortDesc.TabIndex = 1
-        Me.lblName.Text = "Name:"
+        Me.optSortDesc.TabStop = True
+        Me.optSortDesc.Text = "Descending"
+        Me.optSortDesc.UseVisualStyleBackColor = True
         '
-        'txtName
+        'lblSortFields
         '
-        Me.txtName.Location = New System.Drawing.Point(70, 19)
+        Me.lblSortFields.AutoSize = True
-        Me.txtName.Name = "txtName"
+        Me.lblSortFields.Location = New System.Drawing.Point(41, 19)
-        Me.txtName.Size = New System.Drawing.Size(309, 20)
+        Me.lblSortFields.Name = "lblSortFields"
-        Me.txtName.TabIndex = 1
+        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(409, 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,13 +441,16 @@ 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
@@ -315,17 +459,31 @@ Partial Class frmFilter
     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 lstTagFilter 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 txtStringFilter As System.Windows.Forms.TextBox
-    Friend WithEvents lblProcess As System.Windows.Forms.Label
+    Friend WithEvents grpFilterType As System.Windows.Forms.GroupBox
-    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 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
 End Class

GBM/Forms/frmFilter.vb

@@ -3,36 +3,74 @@
 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 oGameFilters As New List(Of clsGameFilter)
-    Dim eCurrentFilterType As eFilterType = eFilterType.AnyTag
+    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 TagFilters As List(Of clsTag)
         Get
             Return oTagFilters
         End Get
+        Set(value As List(Of clsTag))
+            oTagFilters = value
+        End Set
     End Property
 
-    Public ReadOnly Property FilterType As eFilterType
+    Public Property FilterType As eFilterType
         Get
             Return eCurrentFilterType
         End Get
+        Set(value As eFilterType)
+            eCurrentFilterType = value
+        End Set
+    End Property
+
+    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()
@@ -41,7 +79,7 @@ Public Class frmFilter
 
         If lstTags.SelectedItems.Count = 1 Then
             oData = lstTags.SelectedItems(0)
-            lstFilter.Items.Add(oData)
+            lstTagFilter.Items.Add(oData)
             lstTags.Items.Remove(oData)
         ElseIf lstTags.SelectedItems.Count > 1 Then
             oTags = New List(Of KeyValuePair(Of String, String))
@@ -51,7 +89,7 @@ Public Class frmFilter
             Next
 
             For Each kp As KeyValuePair(Of String, String) In oTags
-                lstFilter.Items.Add(kp)
+                lstTagFilter.Items.Add(kp)
                 lstTags.Items.Remove(kp)
             Next
         End If
@@ -62,26 +100,173 @@ Public Class frmFilter
         Dim oData As KeyValuePair(Of String, String)
         Dim oTags As List(Of KeyValuePair(Of String, String))
 
-        If lstFilter.SelectedItems.Count = 1 Then
+        If lstTagFilter.SelectedItems.Count = 1 Then
-            oData = lstFilter.SelectedItems(0)
+            oData = lstTagFilter.SelectedItems(0)
-            lstFilter.Items.Remove(oData)
+            lstTagFilter.Items.Remove(oData)
             lstTags.Items.Add(oData)
-        ElseIf lstFilter.SelectedItems.Count > 1 Then
+        ElseIf lstTagFilter.SelectedItems.Count > 1 Then
             oTags = New List(Of KeyValuePair(Of String, String))
 
-            For Each oData In lstFilter.SelectedItems
+            For Each oData In lstTagFilter.SelectedItems
                 oTags.Add(oData)
             Next
 
             For Each kp As KeyValuePair(Of String, String) In oTags
-                lstFilter.Items.Remove(kp)
+                lstTagFilter.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)
+
+        '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 +275,13 @@ Public Class frmFilter
 
         'Handle Lists
         lstTags.Items.Clear()
-        lstFilter.Items.Clear()
+        lstTagFilter.Items.Clear()
 
         lstTags.ValueMember = "Key"
         lstTags.DisplayMember = "Value"
-        lstFilter.ValueMember = "Key"
+
-        lstFilter.DisplayMember = "Value"
+        lstTagFilter.ValueMember = "Key"
+        lstTagFilter.DisplayMember = "Value"
 
         For Each de As DictionaryEntry In hshTags
             oTag = DirectCast(de.Value, clsTag)
@@ -105,32 +291,140 @@ 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
+
+                lstFilter.Items.Add(New KeyValuePair(Of clsGameFilter, String)(oFilter, sFilter))
+            Next
+        End If
+
+        'Tag Filters
+        If oTagFilters.Count > 0 Then
+            chkTag.Checked = True
+            For Each oTag As clsTag In oTagFilters
+                oListTag = New KeyValuePair(Of String, String)(oTag.ID, oTag.Name)
+                lstTagFilter.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
+
+        '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
+
+        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
+        If chkGameInfo.Checked Then
-            'Set Filter Type
+            'Set Filter Type(s)
-            If optAnd.Checked Then
+            eCurrentFilterType = eFilterType.BaseFilter
-                eCurrentFilterType = eFilterType.FieldAnd
+            bAndOperator = optAnd.Checked
-            Else
-                eCurrentFilterType = eFilterType.FieldOr
         End If
 
-            'Set String Filter
+        If chkTag.Checked Then
-            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
             'Set Tags
-            For Each oData In lstFilter.Items
+            TagFilters.Clear()
+            For Each oData In lstTagFilter.Items
                 oTag = DirectCast(hshTags(oData.Value), clsTag)
                 TagFilters.Add(oTag)
             Next
@@ -145,6 +439,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,10 +514,7 @@ Public Class frmFilter
         'Set Form Text
         optOr.Text = frmFilter_optOr
         optAnd.Text = frmFilter_optAnd
-        lblCompany.Text = frmFilter_lblCompany
+        grpFilterType.Text = frmFilter_grpFilterType
-        lblProcess.Text = frmFilter_lblProcess
-        lblName.Text = frmFilter_lblName
-        grpGameInfoOptions.Text = frmFilter_grpGameInfoOptions
         optAll.Text = frmFilter_optAll
         optAny.Text = frmFilter_optAny
         lblGameTags.Text = frmFilter_lblGameTags
@@ -166,14 +523,36 @@ Public Class frmFilter
         btnAdd.Text = frmFilter_btnAdd
         btnOK.Text = frmFilter_btnOK
         grpTagOptions.Text = frmFilter_grpTagOptions
-        optTag.Text = frmFilter_optTag
+        chkTag.Text = frmFilter_chkTag
-        optGameInfo.Text = frmFilter_optGameInfo
+        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
+        LoadFilterFields()
-        LoadData()
+        LoadCombos()
+        LoadTagData()
+        LoadExistingFilters()
     End Sub
 
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
@@ -196,13 +575,37 @@ Public Class frmFilter
         End If
     End Sub
 
-    Private Sub optGameInfo_Click(sender As Object, e As EventArgs) Handles optGameInfo.Click, optTag.Click
+    Private Sub chkGameInfo_CheckedChanged(sender As Object, e As EventArgs) Handles chkGameInfo.CheckedChanged
-        If optGameInfo.Checked = True Then
+        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
+            oTagFilters.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

@@ -28,6 +28,9 @@ 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.txtParameter = New System.Windows.Forms.TextBox()
+        Me.lblParameter = New System.Windows.Forms.Label()
+        Me.chkCleanFolder = New System.Windows.Forms.CheckBox()
         Me.lblLimit = New System.Windows.Forms.Label()
         Me.nudLimit = New System.Windows.Forms.NumericUpDown()
         Me.btnExclude = New System.Windows.Forms.Button()
@@ -151,6 +154,9 @@ Partial Class frmGameManager
         '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.txtParameter)
+        Me.grpConfig.Controls.Add(Me.lblParameter)
+        Me.grpConfig.Controls.Add(Me.chkCleanFolder)
         Me.grpConfig.Controls.Add(Me.lblLimit)
         Me.grpConfig.Controls.Add(Me.nudLimit)
         Me.grpConfig.Controls.Add(Me.btnExclude)
@@ -176,13 +182,39 @@ Partial Class frmGameManager
         Me.grpConfig.TabStop = False
         Me.grpConfig.Text = "Configuration"
         '
+        'txtParameter
+        '
+        Me.txtParameter.Location = New System.Drawing.Point(333, 45)
+        Me.txtParameter.Name = "txtParameter"
+        Me.txtParameter.Size = New System.Drawing.Size(150, 20)
+        Me.txtParameter.TabIndex = 7
+        '
+        'lblParameter
+        '
+        Me.lblParameter.AutoSize = True
+        Me.lblParameter.Location = New System.Drawing.Point(269, 48)
+        Me.lblParameter.Name = "lblParameter"
+        Me.lblParameter.Size = New System.Drawing.Size(58, 13)
+        Me.lblParameter.TabIndex = 6
+        Me.lblParameter.Text = "Parameter:"
+        '
+        'chkCleanFolder
+        '
+        Me.chkCleanFolder.AutoSize = True
+        Me.chkCleanFolder.Location = New System.Drawing.Point(329, 101)
+        Me.chkCleanFolder.Name = "chkCleanFolder"
+        Me.chkCleanFolder.Size = New System.Drawing.Size(136, 17)
+        Me.chkCleanFolder.TabIndex = 13
+        Me.chkCleanFolder.Text = "Delete folder on restore"
+        Me.chkCleanFolder.UseVisualStyleBackColor = True
+        '
         'lblLimit
         '
         Me.lblLimit.AutoSize = True
         Me.lblLimit.Location = New System.Drawing.Point(375, 130)
         Me.lblLimit.Name = "lblLimit"
         Me.lblLimit.Size = New System.Drawing.Size(68, 13)
-        Me.lblLimit.TabIndex = 13
+        Me.lblLimit.TabIndex = 16
         Me.lblLimit.Text = "Backup Limit"
         Me.lblLimit.Visible = False
         '
@@ -192,7 +224,7 @@ Partial Class frmGameManager
         Me.nudLimit.Minimum = New Decimal(New Integer() {2, 0, 0, 0})
         Me.nudLimit.Name = "nudLimit"
         Me.nudLimit.Size = New System.Drawing.Size(40, 20)
-        Me.nudLimit.TabIndex = 12
+        Me.nudLimit.TabIndex = 15
         Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0})
         Me.nudLimit.Visible = False
         '
@@ -201,7 +233,7 @@ Partial Class frmGameManager
         Me.btnExclude.Location = New System.Drawing.Point(9, 125)
         Me.btnExclude.Name = "btnExclude"
         Me.btnExclude.Size = New System.Drawing.Size(175, 23)
-        Me.btnExclude.TabIndex = 9
+        Me.btnExclude.TabIndex = 11
         Me.btnExclude.Text = "E&xclude Items..."
         Me.btnExclude.UseVisualStyleBackColor = True
         '
@@ -210,7 +242,7 @@ Partial Class frmGameManager
         Me.btnInclude.Location = New System.Drawing.Point(9, 97)
         Me.btnInclude.Name = "btnInclude"
         Me.btnInclude.Size = New System.Drawing.Size(175, 23)
-        Me.btnInclude.TabIndex = 8
+        Me.btnInclude.TabIndex = 10
         Me.btnInclude.Text = "In&clude Items..."
         Me.btnInclude.UseVisualStyleBackColor = True
         '
@@ -229,13 +261,13 @@ Partial Class frmGameManager
         Me.btnSavePathBrowse.Location = New System.Drawing.Point(489, 71)
         Me.btnSavePathBrowse.Name = "btnSavePathBrowse"
         Me.btnSavePathBrowse.Size = New System.Drawing.Size(30, 20)
-        Me.btnSavePathBrowse.TabIndex = 7
+        Me.btnSavePathBrowse.TabIndex = 9
         Me.btnSavePathBrowse.Text = "..."
         Me.btnSavePathBrowse.UseVisualStyleBackColor = True
         '
         'btnProcessBrowse
         '
-        Me.btnProcessBrowse.Location = New System.Drawing.Point(489, 45)
+        Me.btnProcessBrowse.Location = New System.Drawing.Point(225, 44)
         Me.btnProcessBrowse.Name = "btnProcessBrowse"
         Me.btnProcessBrowse.Size = New System.Drawing.Size(30, 20)
         Me.btnProcessBrowse.TabIndex = 5
@@ -293,7 +325,7 @@ Partial Class frmGameManager
         Me.chkTimeStamp.Location = New System.Drawing.Point(190, 129)
         Me.chkTimeStamp.Name = "chkTimeStamp"
         Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
-        Me.chkTimeStamp.TabIndex = 11
+        Me.chkTimeStamp.TabIndex = 14
         Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
@@ -303,7 +335,7 @@ Partial Class frmGameManager
         Me.chkFolderSave.Location = New System.Drawing.Point(190, 101)
         Me.chkFolderSave.Name = "chkFolderSave"
         Me.chkFolderSave.Size = New System.Drawing.Size(109, 17)
-        Me.chkFolderSave.TabIndex = 10
+        Me.chkFolderSave.TabIndex = 12
         Me.chkFolderSave.Text = "Save entire folder"
         Me.chkFolderSave.UseVisualStyleBackColor = True
         '
@@ -312,13 +344,13 @@ Partial Class frmGameManager
         Me.txtSavePath.Location = New System.Drawing.Point(69, 71)
         Me.txtSavePath.Name = "txtSavePath"
         Me.txtSavePath.Size = New System.Drawing.Size(414, 20)
-        Me.txtSavePath.TabIndex = 6
+        Me.txtSavePath.TabIndex = 8
         '
         'txtProcess
         '
         Me.txtProcess.Location = New System.Drawing.Point(69, 45)
         Me.txtProcess.Name = "txtProcess"
-        Me.txtProcess.Size = New System.Drawing.Size(414, 20)
+        Me.txtProcess.Size = New System.Drawing.Size(150, 20)
         Me.txtProcess.TabIndex = 4
         '
         'txtName
@@ -718,10 +750,10 @@ Partial Class frmGameManager
         Me.optPendingRestores.AutoSize = True
         Me.optPendingRestores.Location = New System.Drawing.Point(6, 64)
         Me.optPendingRestores.Name = "optPendingRestores"
-        Me.optPendingRestores.Size = New System.Drawing.Size(122, 17)
+        Me.optPendingRestores.Size = New System.Drawing.Size(134, 17)
         Me.optPendingRestores.TabIndex = 2
         Me.optPendingRestores.TabStop = True
-        Me.optPendingRestores.Text = "New Saves Pending"
+        Me.optPendingRestores.Text = "New Backups Pending"
         Me.optPendingRestores.UseVisualStyleBackColor = True
         '
         'optAllGames
@@ -928,4 +960,7 @@ Partial Class frmGameManager
     Friend WithEvents cmsDeleteBackup As ContextMenuStrip
     Friend WithEvents cmsDeleteOne As ToolStripMenuItem
     Friend WithEvents cmsDeleteAll As ToolStripMenuItem
+    Friend WithEvents chkCleanFolder As CheckBox
+    Friend WithEvents txtParameter As TextBox
+    Friend WithEvents lblParameter As Label
 End Class

GBM/Forms/frmGameManager.vb

@@ -1,4 +1,5 @@
 Imports GBM.My.Resources
+Imports System.Collections.Specialized
 Imports System.IO
 
 Public Class frmGameManager
@@ -7,19 +8,23 @@ Public Class frmGameManager
     Private bPendingRestores As Boolean = False
     Private oCurrentBackupItem As clsBackup
     Private oCurrentGame As clsGame
+    Private oTagsToSave As New List(Of KeyValuePair(Of String, String))
     Private bDisableExternalFunctions As Boolean = False
     Private bTriggerBackup As Boolean = False
     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 oCurrentFilters As New List(Of clsGameFilter)
-    Private eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
+    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
@@ -69,12 +74,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)
+        Set(value As OrderedDictionary)
-            oAppData = value
+            oGameData = value
         End Set
     End Property
 
@@ -221,41 +226,55 @@ Public Class frmGameManager
         If optCustom.Checked Then
             If Not bRetainFilter Then
                 frm = New frmFilter
+
+                frm.TagFilters = oCurrentTagFilters
+                frm.GameFilters = oCurrentFilters
+                frm.FilterType = eCurrentFilter
+                frm.AndOperator = bCurrentAndOperator
+                frm.SortAsc = bCurrentSortAsc
+                frm.SortField = sCurrentSortField
+
                 frm.ShowDialog()
+
                 oCurrentTagFilters = frm.TagFilters
-                oCurrentStringFilters = frm.StringFilters
+                oCurrentFilters = frm.GameFilters
                 eCurrentFilter = frm.FilterType
+                bCurrentAndOperator = frm.AndOperator
+                bCurrentSortAsc = frm.SortAsc
+                sCurrentSortField = frm.SortField
             End If
         Else
             oCurrentTagFilters.Clear()
-            oCurrentStringFilters.Clear()
+            oCurrentFilters.Clear()
-            eCurrentFilter = frmFilter.eFilterType.NoFilter
+            eCurrentFilter = frmFilter.eFilterType.BaseFilter
+            bCurrentSortAsc = True
+            sCurrentSortField = "Name"
         End If
 
-        AppData = mgrMonitorList.ReadFilteredList(oCurrentTagFilters, oCurrentStringFilters, eCurrentFilter)
+        GameData = mgrMonitorList.ReadFilteredList(oCurrentTagFilters, 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
@@ -268,7 +287,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
 
@@ -287,8 +306,8 @@ Public Class frmGameManager
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseExe, "exe",
+        sNewPath = mgrCommon.OpenFileBrowser("GM_Process", frmGameManager_ChooseExe, "exe",
-                                          frmGameManager_Executable, sDefaultFolder, False)
+                                          frmGameManager_Executable, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then
             txtAppPath.Text = Path.GetDirectoryName(sNewPath)
@@ -308,7 +327,7 @@ Public Class frmGameManager
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmGameManager_ChooseExePath, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("GM_Process_Path", frmGameManager_ChooseExePath, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then txtAppPath.Text = sNewPath
     End Sub
@@ -324,7 +343,7 @@ Public Class frmGameManager
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmGameManager_ChooseSaveFolder, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("GM_Save_Path", frmGameManager_ChooseSaveFolder, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then
             txtSavePath.Text = sNewPath
@@ -345,11 +364,11 @@ Public Class frmGameManager
 
         'Unix Handler
         If Not mgrCommon.IsUnix Then
-            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "ico",
+            sNewPath = mgrCommon.OpenFileBrowser("GM_Icon", frmGameManager_ChooseCustomIcon, "ico",
-                                              frmGameManager_Icon, sDefaultFolder, False)
+                                              frmGameManager_Icon, sDefaultFolder, False, False)
         Else
-            sNewPath = mgrCommon.OpenFileBrowser(frmGameManager_ChooseCustomIcon, "png",
+            sNewPath = mgrCommon.OpenFileBrowser("GM_Icon", frmGameManager_ChooseCustomIcon, "png",
-                                              "PNG", sDefaultFolder, False)
+                                              "PNG", sDefaultFolder, False, False)
         End If
 
         If sNewPath <> String.Empty Then
@@ -386,7 +405,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
@@ -399,12 +418,20 @@ Public Class frmGameManager
             End If
         Next
 
-        oList.Sort(AddressOf mgrCommon.CompareByListBoxItemByValue)
-
         lstGames.BeginUpdate()
-        lstGames.DataSource = oList
         lstGames.ValueMember = "Key"
         lstGames.DisplayMember = "Value"
+
+        'Due to a control bug with Mono we need to fill the list box differently on Linux
+        If mgrCommon.IsUnix Then
+            lstGames.Items.Clear()
+            For Each kp As KeyValuePair(Of String, String) In oList
+                lstGames.Items.Add(kp)
+            Next
+        Else
+            lstGames.DataSource = oList
+        End If
+
         lstGames.EndUpdate()
         lstGames.ClearSelected()
         IsLoading = False
@@ -470,6 +497,7 @@ Public Class frmGameManager
         frm.ShowDialog()
 
         txtBox.Text = frm.BuilderString
+        VerifyCleanFolder()
     End Sub
 
     Private Function FindRestorePath() As Boolean
@@ -525,17 +553,30 @@ Public Class frmGameManager
         Dim oApp As clsGame
         Dim sMonitorIDs As New List(Of String)
 
+        If eCurrentMode = eModes.Add Then
+            'Use a dummy ID
+            sMonitorIDs.Add(Guid.NewGuid.ToString)
+            frm.GameName = txtName.Text
+            frm.NewMode = True
+            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
+            frm.NewMode = False
+        End If
 
         frm.IDList = sMonitorIDs
-        frm.GameName = CurrentGame.Name
         frm.ShowDialog()
 
+        If eCurrentMode = eModes.Add Then
+            oTagsToSave = frm.TagList
+            FillTagsbyList(frm.TagList)
+        Else
             'Only update visible tags if one item is selected
-        If lstGames.SelectedItems.Count = 1 Then FillTags(CurrentGame.ID)
+            If lstGames.SelectedItems.Count = 1 Then FillTagsbyID(CurrentGame.ID)
 
             'If a tag filter is enabled, reload list to reflect changes
             If optCustom.Checked Then
@@ -545,6 +586,8 @@ Public Class frmGameManager
             'If the selected game(s) no longer match the filter, disable the form
             If lstGames.SelectedIndex = -1 Then eCurrentMode = eModes.Disabled
             ModeChange()
+        End If
+
     End Sub
 
     Private Sub UpdateBackupInfo(ByVal sManifestID As String)
@@ -556,7 +599,7 @@ Public Class frmGameManager
             sFileName = BackupFolder & CurrentBackupItem.FileName
 
             If File.Exists(sFileName) Then
-                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.GetFileSize(sFileName) & ")"
+                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sFileName)) & ")"
             Else
                 lblBackupFileData.Text = frmGameManager_ErrorNoBackupExists
             End If
@@ -598,7 +641,7 @@ Public Class frmGameManager
             btnDeleteBackup.Enabled = True
 
             If File.Exists(sFileName) Then
-                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.GetFileSize(sFileName) & ")"
+                lblBackupFileData.Text = Path.GetFileName(CurrentBackupItem.FileName) & " (" & mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sFileName)) & ")"
             Else
                 lblBackupFileData.Text = frmGameManager_ErrorNoBackupExists
             End If
@@ -704,16 +747,18 @@ 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
         txtName.Text = oApp.Name
         txtProcess.Text = oApp.TrueProcess
+        txtParameter.Text = oApp.Parameter
         txtSavePath.Text = oApp.Path
         txtFileType.Text = oApp.FileType
         txtExclude.Text = oApp.ExcludeList
         chkFolderSave.Checked = oApp.FolderSave
+        chkCleanFolder.Checked = oApp.CleanFolder
         chkTimeStamp.Checked = oApp.AppendTimeStamp
         nudLimit.Value = oApp.BackupLimit
         chkEnabled.Checked = oApp.Enabled
@@ -729,7 +774,7 @@ Public Class frmGameManager
         txtVersion.Text = oApp.Version
         txtIcon.Text = oApp.Icon
 
-        FillTags(oData.Key)
+        FillTagsbyID(oData.Key)
 
         'Icon
         If IO.File.Exists(oApp.Icon) Then
@@ -754,7 +799,7 @@ Public Class frmGameManager
         IsLoading = False
     End Sub
 
-    Private Sub FillTags(ByVal sID As String)
+    Private Sub FillTagsbyID(ByVal sID As String)
         Dim hshTags As Hashtable
         Dim oTag As clsTag
         Dim sTags As String = String.Empty
@@ -770,6 +815,17 @@ Public Class frmGameManager
         lblTags.Text = sTags.TrimEnd(cTrim)
     End Sub
 
+    Private Sub FillTagsbyList(ByVal oList As List(Of KeyValuePair(Of String, String)))
+        Dim sTags As String = String.Empty
+        Dim cTrim() As Char = {",", " "}
+
+        For Each kp As KeyValuePair(Of String, String) In oList
+            sTags &= "#" & kp.Value & ", "
+        Next
+
+        lblTags.Text = sTags.TrimEnd(cTrim)
+    End Sub
+
     Private Sub DirtyCheck_ValueChanged(sender As Object, e As EventArgs)
         If Not IsLoading And Not eCurrentMode = eModes.MultiSelect Then
             IsDirty = True
@@ -815,6 +871,7 @@ Public Class frmGameManager
 
         Select Case eCurrentMode
             Case eModes.Add
+                oTagsToSave.Clear()
                 grpFilter.Enabled = False
                 lstGames.Enabled = False
                 lblQuickFilter.Enabled = False
@@ -826,6 +883,7 @@ Public Class frmGameManager
                 WipeControls(grpConfig.Controls)
                 WipeControls(grpExtra.Controls)
                 WipeControls(grpStats.Controls)
+                chkCleanFolder.Enabled = False
                 pbIcon.Image = Icon_Unknown
                 chkEnabled.Enabled = True
                 chkMonitorOnly.Enabled = True
@@ -841,8 +899,9 @@ Public Class frmGameManager
                 btnOpenRestorePath.Enabled = False
                 chkEnabled.Checked = True
                 chkMonitorOnly.Checked = False
-                btnTags.Enabled = False
+                btnTags.Enabled = True
-                lblTags.Visible = False
+                lblTags.Text = String.Empty
+                lblTags.Visible = True
                 btnInclude.Text = frmGameManager_btnInclude
                 btnExclude.Text = frmGameManager_btnExclude
                 btnImport.Enabled = False
@@ -982,6 +1041,28 @@ Public Class frmGameManager
         Else
             btnInclude.Enabled = True
         End If
+        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()
@@ -996,6 +1077,17 @@ Public Class frmGameManager
         End If
     End Sub
 
+    Private Sub VerifyCleanFolder()
+        If Not bIsLoading 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
+                chkCleanFolder.Enabled = False
+            End If
+        End If
+    End Sub
+
     Private Sub EditApp()
         eCurrentMode = eModes.Edit
         ModeChange()
@@ -1038,6 +1130,22 @@ Public Class frmGameManager
         End If
     End Sub
 
+    Private Sub SaveTags(ByVal sID As String)
+        Dim oGameTag As clsGameTag
+        Dim oGameTags As List(Of clsGameTag)
+
+        If oTagsToSave.Count > 0 Then
+            oGameTags = New List(Of clsGameTag)
+            For Each kp As KeyValuePair(Of String, String) In oTagsToSave
+                oGameTag = New clsGameTag
+                oGameTag.MonitorID = sID
+                oGameTag.TagID = kp.Key
+                oGameTags.Add(oGameTag)
+            Next
+            mgrGameTags.DoGameTagAddBatch(oGameTags)
+        End If
+    End Sub
+
     Private Sub SaveApp()
         Dim oData As KeyValuePair(Of String, String)
         Dim oApp As New clsGame
@@ -1056,12 +1164,14 @@ Public Class frmGameManager
         Else
             oApp.ProcessName = txtProcess.Text
         End If
+        oApp.Parameter = txtParameter.Text
         oApp.Path = txtSavePath.Text
         'Only do a simple root check here in case the user doesn't really understand creating a proper configuration
         oApp.AbsolutePath = Path.IsPathRooted(txtSavePath.Text)
         oApp.FileType = txtFileType.Text
         oApp.ExcludeList = txtExclude.Text
         oApp.FolderSave = chkFolderSave.Checked
+        oApp.CleanFolder = chkCleanFolder.Checked
         oApp.AppendTimeStamp = chkTimeStamp.Checked
         oApp.BackupLimit = nudLimit.Value
         oApp.Enabled = chkEnabled.Checked
@@ -1077,6 +1187,7 @@ Public Class frmGameManager
                 If CoreValidatation(oApp) Then
                     bSuccess = True
                     mgrMonitorList.DoListAdd(oApp)
+                    SaveTags(oApp.ID)
                     eCurrentMode = eModes.View
                 End If
             Case eModes.Edit
@@ -1102,8 +1213,16 @@ Public Class frmGameManager
         If bSuccess Then
             IsDirty = False
             LoadData()
+            If eCurrentMode = eModes.View Then
+                lstGames.SelectedItem = New KeyValuePair(Of String, String)(oApp.ID, oApp.Name)
+            Else
                 ModeChange()
-            If eCurrentMode = eModes.View Then lstGames.SelectedValue = oApp.ID
+            End If
+            'If the addition doesn't match the current filter we should go into disabled mode as it can't be selected to view
+            If lstGames.SelectedIndex = -1 Then
+                eCurrentMode = eModes.Disabled
+                ModeChange()
+            End If
         End If
     End Sub
 
@@ -1113,7 +1232,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)
@@ -1125,7 +1244,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
 
@@ -1144,6 +1263,7 @@ Public Class frmGameManager
                 eCurrentMode = eModes.View
                 FillData()
                 ModeChange()
+                VerifyCleanFolder()
             ElseIf lstGames.SelectedItems.Count > 1 Then
                 eCurrentMode = eModes.MultiSelect
                 ModeChange()
@@ -1164,7 +1284,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
@@ -1176,6 +1296,13 @@ Public Class frmGameManager
             Return False
         End If
 
+        If oApp.Parameter <> String.Empty Then
+            If mgrMonitorList.DoDuplicateParameterCheck(oApp.ProcessName, oApp.Parameter, , oApp.ID) Then
+                mgrCommon.ShowMessage(frmGameManager_ErrorProcessParameterDupe, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+        End If
+
         Return True
     End Function
 
@@ -1244,8 +1371,8 @@ Public Class frmGameManager
             BackupList.Clear()
 
             For Each oData In lstGames.SelectedItems
-                oGame = DirectCast(AppData(oData.Key), clsGame)
+                oGame = DirectCast(GameData(oData.Key), clsGame)
-                BackupList.Add(oGame)
+                If Not oGame.MonitorOnly Then BackupList.Add(oGame)
             Next
 
             If BackupList.Count = 1 Then
@@ -1282,17 +1409,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)
+                    oGame = DirectCast(GameData(oData.Key), clsGame)
                     oBackup = DirectCast(oRemoteBackupData(oData.Value), clsBackup)
-                        RestoreList.Add(oGame, oBackup)
+                    If Not oGame.MonitorOnly Then RestoreList.Add(oGame, oBackup)
                 End If
             Next
-            End If
 
             If RestoreList.Count = 1 Then
                 bDoRestore = True
@@ -1329,7 +1453,7 @@ Public Class frmGameManager
     Private Sub ImportGameListFile()
         Dim sLocation As String
 
-        sLocation = mgrCommon.OpenFileBrowser(frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
+        sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
 
         If sLocation <> String.Empty Then
             If mgrMonitorList.DoImport(sLocation) Then
@@ -1342,7 +1466,7 @@ Public Class frmGameManager
     Private Sub ExportGameList()
         Dim sLocation As String
 
-        sLocation = mgrCommon.SaveFileBrowser(frmGameManager_ChooseExportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmGameManager_DefaultExportFileName & " " & Date.Now.ToString("dd-MMM-yyyy"))
+        sLocation = mgrCommon.SaveFileBrowser("XML_Export", frmGameManager_ChooseExportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmGameManager_DefaultExportFileName & " " & Date.Now.ToString("dd-MMM-yyyy"))
 
         If sLocation <> String.Empty Then
             mgrMonitorList.ExportMonitorList(sLocation)
@@ -1408,9 +1532,11 @@ Public Class frmGameManager
         btnProcessBrowse.Text = frmGameManager_btnProcessBrowse
         lblSavePath.Text = frmGameManager_lblSavePath
         lblProcess.Text = frmGameManager_lblProcess
+        lblParameter.Text = frmGameManager_lblParameter
         lblName.Text = frmGameManager_lblName
         chkTimeStamp.Text = frmGameManager_chkTimeStamp
         chkFolderSave.Text = frmGameManager_chkFolderSave
+        chkCleanFolder.Text = frmGameManager_chkCleanFolder
         btnBackup.Text = frmGameManager_btnBackup
         btnClose.Text = frmGameManager_btnClose
         btnDelete.Text = frmGameManager_btnDelete
@@ -1607,6 +1733,10 @@ Public Class frmGameManager
         End If
     End Sub
 
+    Private Sub txtSavePath_TextChanged(sender As Object, e As EventArgs) Handles txtSavePath.TextChanged
+        VerifyCleanFolder()
+    End Sub
+
     Private Sub tmFilterTimer_Tick(sender As Object, ByVal e As EventArgs) Handles tmFilterTimer.Tick
         lstGames.DataSource = Nothing
         FormatAndFillList()
@@ -1618,4 +1748,7 @@ Public Class frmGameManager
         txtQuickFilter.Focus()
     End Sub
 
+    Private Sub chkMonitorOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkMonitorOnly.CheckedChanged
+        MonitorOnlyModeChange()
+    End Sub
 End Class

GBM/Forms/frmGameTags.vb

@@ -2,8 +2,10 @@
 
 Public Class frmGameTags
 
-    Dim sMonitorIDs As List(Of String)
+    Private sMonitorIDs As List(Of String)
-    Dim sGameName As String = String.Empty
+    Private sGameName As String = String.Empty
+    Private bNewMode As Boolean = False
+    Private oTagList As List(Of KeyValuePair(Of String, String))
 
     Public Property IDList As List(Of String)
         Get
@@ -23,6 +25,25 @@ Public Class frmGameTags
         End Set
     End Property
 
+    Public Property NewMode As Boolean
+        Get
+            Return bNewMode
+        End Get
+        Set(value As Boolean)
+            bNewMode = value
+        End Set
+    End Property
+
+    Public Property TagList As List(Of KeyValuePair(Of String, String))
+        Get
+            Return oTagList
+        End Get
+        Set(value As List(Of KeyValuePair(Of String, String)))
+            oTagList = value
+        End Set
+    End Property
+
+
     Private Sub AddTag()
         Dim oData As KeyValuePair(Of String, String)
         Dim oTags As List(Of KeyValuePair(Of String, String))
@@ -40,7 +61,7 @@ Public Class frmGameTags
                 oGameTags.Add(oGameTag)
             Next
 
-            mgrGameTags.DoGameTagAddBatch(oGameTags)
+            If Not bNewMode Then mgrGameTags.DoGameTagAddBatch(oGameTags)
 
             lstGameTags.Items.Add(oData)
             lstTags.Items.Remove(oData)
@@ -60,7 +81,7 @@ Public Class frmGameTags
                     oGameTags.Add(oGameTag)
                 Next
 
-                mgrGameTags.DoGameTagAddBatch(oGameTags)
+                If Not bNewMode Then mgrGameTags.DoGameTagAddBatch(oGameTags)
 
                 lstGameTags.Items.Add(kp)
                 lstTags.Items.Remove(kp)
@@ -86,7 +107,7 @@ Public Class frmGameTags
                 oGameTags.Add(oGameTag)
             Next
 
-            mgrGameTags.DoGameTagDelete(oGameTags)
+            If Not bNewMode Then mgrGameTags.DoGameTagDelete(oGameTags)
 
             lstGameTags.Items.Remove(oData)
                 lstTags.Items.Add(oData)
@@ -106,7 +127,7 @@ Public Class frmGameTags
                     oGameTags.Add(oGameTag)
                 Next
 
-                mgrGameTags.DoGameTagDelete(oGameTags)
+                If Not bNewMode Then mgrGameTags.DoGameTagDelete(oGameTags)
 
                 lstGameTags.Items.Remove(kp)
                 lstTags.Items.Add(kp)
@@ -121,16 +142,8 @@ Public Class frmGameTags
         Dim oTag As clsTag
         Dim oData As KeyValuePair(Of String, String)
 
-        'Handle Data
+        'Load Tags
         hshTags = mgrTags.ReadTags()
-        hshGameTags = mgrGameTags.GetTagsByGameMulti(IDList)
-
-        For Each de As DictionaryEntry In hshGameTags
-            oTag = DirectCast(de.Value, clsTag)
-            If hshTags.ContainsKey(oTag.Name) Then
-                hshTags.Remove(oTag.Name)
-            End If
-        Next
 
         'Handle Lists
         lstTags.Items.Clear()
@@ -141,11 +154,35 @@ Public Class frmGameTags
         lstGameTags.ValueMember = "Key"
         lstGameTags.DisplayMember = "Value"
 
+        If bNewMode Then
+            For Each kp As KeyValuePair(Of String, String) In oTagList
+                'We need to be sure the tags still exist if the "Setup Tags" form was used
+                If hshTags.ContainsKey(kp.Value) Then
+                    lstGameTags.Items.Add(kp)
+                End If
+            Next
+
+            For Each kp As KeyValuePair(Of String, String) In oTagList
+                If hshTags.ContainsKey(kp.Value) Then
+                    hshTags.Remove(kp.Value)
+                End If
+            Next
+        Else
+            hshGameTags = mgrGameTags.GetTagsByGameMulti(IDList)
+
+            For Each de As DictionaryEntry In hshGameTags
+                oTag = DirectCast(de.Value, clsTag)
+                If hshTags.ContainsKey(oTag.Name) Then
+                    hshTags.Remove(oTag.Name)
+                End If
+            Next
+
             For Each de As DictionaryEntry In hshGameTags
                 oTag = DirectCast(de.Value, clsTag)
                 oData = New KeyValuePair(Of String, String)(oTag.ID, oTag.Name)
                 lstGameTags.Items.Add(oData)
             Next
+        End If
 
         For Each de As DictionaryEntry In hshTags
             oTag = DirectCast(de.Value, clsTag)
@@ -155,6 +192,14 @@ Public Class frmGameTags
 
     End Sub
 
+    Private Sub BuildTagList()
+        Dim oData As KeyValuePair(Of String, String)
+        oTagList.Clear()
+        For Each oData In lstGameTags.Items
+            oTagList.Add(oData)
+        Next
+    End Sub
+
     Private Sub OpenTags()
         Dim frm As New frmTags
         frm.ShowDialog()
@@ -185,6 +230,7 @@ Public Class frmGameTags
     End Sub
 
     Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+        If bNewMode Then BuildTagList()
         Me.Close()
     End Sub
 
@@ -197,6 +243,7 @@ Public Class frmGameTags
     End Sub
 
     Private Sub btnOpenTags_Click(sender As Object, e As EventArgs) Handles btnOpenTags.Click
+        If bNewMode Then BuildTagList()
         OpenTags()
     End Sub
 End Class

GBM/Forms/frmIncludeExclude.vb

@@ -108,7 +108,7 @@ Public Class frmIncludeExclude
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmIncludeExclude_BrowseSaveFolder, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("IE_Save_Path", frmIncludeExclude_BrowseSaveFolder, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then txtRootFolder.Text = sNewPath
     End Sub

GBM/Forms/frmMain.Designer.vb

@@ -75,7 +75,6 @@ Partial Class frmMain
         Me.gMonHelpAbout = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonNotification = New System.Windows.Forms.ToolStripMenuItem()
         Me.pbIcon = New System.Windows.Forms.PictureBox()
-        Me.btnLogToggle = New System.Windows.Forms.Button()
         Me.lblGameTitle = New System.Windows.Forms.Label()
         Me.lblLastAction = New System.Windows.Forms.Label()
         Me.lblLastActionTitle = New System.Windows.Forms.Label()
@@ -222,6 +221,9 @@ Partial Class frmMain
         '
         'txtLog
         '
+        Me.txtLog.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.txtLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtLog.Location = New System.Drawing.Point(12, 184)
         Me.txtLog.MaxLength = 524288
@@ -430,17 +432,11 @@ Partial Class frmMain
         Me.pbIcon.TabIndex = 9
         Me.pbIcon.TabStop = False
         '
-        'btnLogToggle
-        '
-        Me.btnLogToggle.Location = New System.Drawing.Point(437, 155)
-        Me.btnLogToggle.Name = "btnLogToggle"
-        Me.btnLogToggle.Size = New System.Drawing.Size(75, 23)
-        Me.btnLogToggle.TabIndex = 7
-        Me.btnLogToggle.Text = "Show &Log"
-        Me.btnLogToggle.UseVisualStyleBackColor = True
-        '
         'lblGameTitle
         '
+        Me.lblGameTitle.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblGameTitle.AutoEllipsis = True
         Me.lblGameTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblGameTitle.Location = New System.Drawing.Point(66, 36)
         Me.lblGameTitle.Name = "lblGameTitle"
@@ -450,6 +446,8 @@ Partial Class frmMain
         '
         'lblLastAction
         '
+        Me.lblLastAction.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblLastAction.AutoEllipsis = True
         Me.lblLastAction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblLastAction.Location = New System.Drawing.Point(12, 165)
@@ -480,7 +478,8 @@ Partial Class frmMain
         '
         'btnCancelOperation
         '
-        Me.btnCancelOperation.Location = New System.Drawing.Point(437, 126)
+        Me.btnCancelOperation.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCancelOperation.Location = New System.Drawing.Point(437, 155)
         Me.btnCancelOperation.Name = "btnCancelOperation"
         Me.btnCancelOperation.Size = New System.Drawing.Size(75, 23)
         Me.btnCancelOperation.TabIndex = 6
@@ -489,6 +488,8 @@ Partial Class frmMain
         '
         'lblStatus1
         '
+        Me.lblStatus1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblStatus1.AutoEllipsis = True
         Me.lblStatus1.Location = New System.Drawing.Point(66, 58)
         Me.lblStatus1.Name = "lblStatus1"
@@ -497,6 +498,8 @@ Partial Class frmMain
         '
         'lblStatus2
         '
+        Me.lblStatus2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblStatus2.AutoEllipsis = True
         Me.lblStatus2.Location = New System.Drawing.Point(66, 74)
         Me.lblStatus2.Name = "lblStatus2"
@@ -505,6 +508,8 @@ Partial Class frmMain
         '
         'lblStatus3
         '
+        Me.lblStatus3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblStatus3.AutoEllipsis = True
         Me.lblStatus3.Location = New System.Drawing.Point(66, 90)
         Me.lblStatus3.Name = "lblStatus3"
@@ -533,16 +538,13 @@ Partial Class frmMain
         Me.Controls.Add(Me.lblLastActionTitle)
         Me.Controls.Add(Me.lblLastAction)
         Me.Controls.Add(Me.lblGameTitle)
-        Me.Controls.Add(Me.btnLogToggle)
         Me.Controls.Add(Me.pbIcon)
         Me.Controls.Add(Me.gMonStatusStrip)
         Me.Controls.Add(Me.gMonMainMenu)
         Me.Controls.Add(Me.txtLog)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.KeyPreview = True
         Me.MainMenuStrip = Me.gMonMainMenu
-        Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmMain"
         Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -585,7 +587,6 @@ Partial Class frmMain
     Friend WithEvents gMonTraySetupGameManager As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonTraySetupCustomVariables As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents pbIcon As System.Windows.Forms.PictureBox
-    Friend WithEvents btnLogToggle As System.Windows.Forms.Button
     Friend WithEvents lblGameTitle As System.Windows.Forms.Label
     Friend WithEvents lblLastAction As System.Windows.Forms.Label
     Friend WithEvents lblLastActionTitle As System.Windows.Forms.Label

GBM/Forms/frmMain.vb

@@ -1,4 +1,5 @@
 Imports GBM.My.Resources
+Imports System.IO
 
 'Name: frmMain
 'Description: Game Backup Monitor Main Screen
@@ -38,14 +39,18 @@ Public Class frmMain
     Private sPriorPath As String
     Private sPriorCompany As String
     Private sPriorVersion As String
-    Private iFormHeight As Integer
+    Private iRestoreTimeOut As Integer
-    Private iLogSpacer As Integer
+    Private wState As FormWindowState = FormWindowState.Normal
 
     'Developer Debug Flags
     Private bProcessDebugMode As Boolean = False
 
-    WithEvents oFileWatcher As New System.IO.FileSystemWatcher
+    WithEvents oFileWatcher As New FileSystemWatcher
+
+    'Timers - There may only be one System.Windows.Forms.Timer and it must be tmScanTimer.
     WithEvents tmScanTimer As New Timer
+    WithEvents tmRestoreCheck As New System.Timers.Timer
+    WithEvents tmFileWatcherQueue As New System.Timers.Timer
 
     Public WithEvents oProcess As New mgrProcesses
     Public WithEvents oBackup As New mgrBackup
@@ -53,6 +58,7 @@ Public Class frmMain
     Public hshScanList As Hashtable
     Public oSettings As New mgrSettings
 
+    Delegate Sub UpdateNotifierCallBack(ByVal iCount As Integer)
     Delegate Sub UpdateLogCallBack(ByVal sLogUpdate As String, ByVal bTrayUpdate As Boolean, ByVal objIcon As System.Windows.Forms.ToolTipIcon, ByVal bTimeStamp As Boolean)
     Delegate Sub WorkingGameInfoCallBack(ByVal sTitle As String, ByVal sStatus1 As String, ByVal sStatus2 As String, ByVal sStatus3 As String)
     Delegate Sub UpdateStatusCallBack(ByVal sStatus As String)
@@ -79,7 +85,7 @@ Public Class frmMain
         Dim sStatus3 As String
 
         'Build Info
-        sStatus1 = IO.Path.GetFileName(oRestoreInfo.FileName)
+        sStatus1 = Path.GetFileName(oRestoreInfo.FileName)
         sStatus2 = mgrCommon.FormatString(frmMain_UpdatedBy, New String() {oRestoreInfo.UpdatedBy, oRestoreInfo.DateUpdated})
         If oRestoreInfo.AbsolutePath Then
             sStatus3 = oRestoreInfo.RestorePath
@@ -101,7 +107,7 @@ Public Class frmMain
         If oGame.AbsolutePath Then
             sStatus2 = oGame.Path
         Else
-            sStatus2 = oGame.ProcessPath & System.IO.Path.DirectorySeparatorChar & oGame.Path
+            sStatus2 = oGame.ProcessPath & Path.DirectorySeparatorChar & oGame.Path
         End If
         sStatus3 = String.Empty
 
@@ -181,7 +187,7 @@ Public Class frmMain
             End If
 
             If bPathVerified Then
-                If oRestore.CheckRestorePrereq(oRestoreInfo) Then
+                If oRestore.CheckRestorePrereq(oRestoreInfo, oGame.CleanFolder) Then
                     oReadyList.Add(oRestoreInfo)
                 End If
             End If
@@ -328,15 +334,17 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub CheckRestore()
+    Private Sub UpdateNotifier(ByVal iCount As Integer)
-        Dim slRestoreData As SortedList = mgrRestore.CompareManifests()
+        'Thread Safe
-        Dim sNotification As String
+        If Me.InvokeRequired = True Then
-
+            Dim d As New UpdateNotifierCallBack(AddressOf UpdateNotifier)
-        If slRestoreData.Count > 0 Then
+            Me.Invoke(d, New Object() {iCount})
-            If slRestoreData.Count > 1 Then
-                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationMulti, slRestoreData.Count)
         Else
-                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationSingle, slRestoreData.Count)
+            Dim sNotification As String
+            If iCount > 1 Then
+                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationMulti, iCount)
+            Else
+                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationSingle, iCount)
             End If
             gMonNotification.Image = Icon_Inbox
             gMonTrayNotification.Image = Icon_Inbox
@@ -347,6 +355,149 @@ Public Class frmMain
         End If
     End Sub
 
+    Private Sub StartRestoreCheck()
+        iRestoreTimeOut = -1
+        tmRestoreCheck.Interval = 60000
+        tmRestoreCheck.AutoReset = True
+        tmRestoreCheck.Start()
+        AutoRestoreCheck()
+    End Sub
+
+    Private Sub AutoRestoreCheck()
+        Dim slRestoreData As SortedList = mgrRestore.CompareManifests()
+        Dim sNotReady As New List(Of String)
+        Dim sNotInstalled As New List(Of String)
+        Dim sNoCheckSum As New List(Of String)
+        Dim oBackup As clsBackup
+        Dim sFileName As String
+        Dim sExtractPath As String
+        Dim bFinished As Boolean = True
+        Dim hshRestore As Hashtable
+        Dim hshGames As Hashtable
+        Dim oGame As clsGame
+        Dim sGame As String
+
+        'Shut down the timer and bail out if there's nothing to do
+        If slRestoreData.Count = 0 Then
+            tmRestoreCheck.Stop()
+            Exit Sub
+        End If
+
+        If oSettings.AutoMark Or oSettings.AutoRestore Then
+            'Increment Timer
+            iRestoreTimeOut += 1
+
+            'Check backup files
+            For Each de As DictionaryEntry In slRestoreData
+                oBackup = DirectCast(de.Value, clsBackup)
+
+                'Check if backup file is ready to restore
+                If oBackup.CheckSum <> String.Empty Then
+                    sFileName = oSettings.BackupFolder & Path.DirectorySeparatorChar & oBackup.FileName
+                    If mgrHash.Generate_SHA256_Hash(sFileName) <> oBackup.CheckSum Then
+                        sNotReady.Add(de.Key)
+                        bFinished = False
+                    End If
+                Else
+                    sNoCheckSum.Add(de.Key)
+                End If
+
+                'Check if the restore location exists,  if not we assume the game is not installed and should be auto-marked.
+                hshGames = mgrMonitorList.DoListGetbyName(de.Key)
+                If hshGames.Count = 1 Then
+                    oGame = DirectCast(hshGames(0), clsGame)
+                    mgrRestore.DoPathOverride(oBackup, oGame)
+                    If oGame.ProcessPath <> String.Empty Then
+                        oBackup.RelativeRestorePath = oGame.ProcessPath & Path.DirectorySeparatorChar & oBackup.RestorePath
+                    End If
+                End If
+
+                If oBackup.AbsolutePath Then
+                    sExtractPath = oBackup.RestorePath
+                Else
+                    sExtractPath = oBackup.RelativeRestorePath
+                End If
+
+                If Not Directory.Exists(sExtractPath) Then
+                    If oSettings.AutoMark Then
+                        If mgrManifest.DoGlobalManifestCheck(de.Key, mgrSQLite.Database.Local) Then
+                            mgrManifest.DoManifestUpdateByName(de.Value, mgrSQLite.Database.Local)
+                        Else
+                            mgrManifest.DoManifestAdd(de.Value, mgrSQLite.Database.Local)
+                        End If
+                    End If
+                    sNotInstalled.Add(de.Key)
+                End If
+            Next
+
+            'Remove any backup files that are not ready
+            For Each s As String In sNotReady
+                slRestoreData.Remove(s)
+                UpdateLog(mgrCommon.FormatString(frmMain_RestoreNotReady, s), False, ToolTipIcon.Info, True)
+            Next
+
+            'Remove any backup files that should not be automatically restored
+            For Each s As String In sNotInstalled
+                slRestoreData.Remove(s)
+                If oSettings.AutoMark Then
+                    UpdateLog(mgrCommon.FormatString(frmMain_AutoMark, s), False, ToolTipIcon.Info, True)
+                Else
+                    UpdateLog(mgrCommon.FormatString(frmMain_NoAutoMark, s), False, ToolTipIcon.Info, True)
+                End If
+            Next
+            For Each s As String In sNoCheckSum
+                slRestoreData.Remove(s)
+                UpdateLog(mgrCommon.FormatString(frmMain_NoCheckSum, s), False, ToolTipIcon.Info, True)
+            Next
+
+            'Automatically restore backup files
+            If oSettings.AutoRestore Then
+                If slRestoreData.Count > 0 Then
+                    hshRestore = New Hashtable
+                    sGame = String.Empty
+                    For Each de As DictionaryEntry In slRestoreData
+                        hshGames = mgrMonitorList.DoListGetbyName(de.Key)
+                        If hshGames.Count = 1 Then
+                            oGame = DirectCast(hshGames(0), clsGame)
+                            sGame = oGame.CroppedName
+                            hshRestore.Add(oGame, de.Value)
+                        Else
+                            UpdateLog(mgrCommon.FormatString(frmMain_AutoRestoreFailure, de.Key), False, ToolTipIcon.Info, True)
+                        End If
+                    Next
+
+                    'Handle notifications
+                    If oSettings.RestoreOnLaunch Then
+                        If slRestoreData.Count > 1 Then
+                            UpdateLog(mgrCommon.FormatString(frmMain_RestoreNotificationMulti, slRestoreData.Count), True, ToolTipIcon.Info, True)
+                        Else
+                            UpdateLog(mgrCommon.FormatString(frmMain_RestoreNotificationSingle, sGame), True, ToolTipIcon.Info, True)
+                        End If
+                    End If
+
+                    RunRestore(hshRestore)
+                End If
+            End If
+
+            'Shutdown if we are finished
+            If bFinished Then
+                tmRestoreCheck.Stop()
+            End If
+
+            'Time out after 15 minutes
+            If iRestoreTimeOut = 15 Then
+                tmRestoreCheck.Stop()
+            End If
+        End If
+
+        'Update the menu notifier if we aren't using auto restore
+        If oSettings.RestoreOnLaunch And Not oSettings.AutoRestore Then
+            If slRestoreData.Count > 0 Then
+                UpdateNotifier(slRestoreData.Count)
+            End If
+        End If
+    End Sub
+
     'Functions handling the display of game information
     Private Sub SetIcon()
         Dim sIcon As String
@@ -364,7 +515,7 @@ Public Class frmMain
         End If
 
         Try
-            fbBrowser.InitialDirectory = IO.Path.GetDirectoryName(oProcess.FoundProcess.MainModule.FileName)
+            fbBrowser.InitialDirectory = Path.GetDirectoryName(oProcess.FoundProcess.MainModule.FileName)
         Catch ex As Exception
             fbBrowser.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
         End Try
@@ -372,7 +523,7 @@ Public Class frmMain
 
         If fbBrowser.ShowDialog() = Windows.Forms.DialogResult.OK Then
             sIcon = fbBrowser.FileName
-            If IO.File.Exists(sIcon) Then
+            If File.Exists(sIcon) Then
                 oProcess.GameInfo.Icon = sIcon
                 pbIcon.Image = Image.FromFile(sIcon)
                 mgrMonitorList.DoListUpdate(oProcess.GameInfo)
@@ -382,7 +533,7 @@ Public Class frmMain
 
     Private Sub ResetGameInfo(Optional ByVal bKeepInfo As Boolean = False)
         If bKeepInfo And Not oProcess.GameInfo Is Nothing Then
-            lblGameTitle.Text = mgrCommon.FormatString(frmMain_LastGame, oProcess.GameInfo.CroppedName)
+            lblGameTitle.Text = mgrCommon.FormatString(frmMain_LastGame, oProcess.GameInfo.Name)
             pbIcon.Image = oPriorImage
             lblStatus1.Text = sPriorPath
             lblStatus2.Text = sPriorCompany
@@ -447,7 +598,7 @@ Public Class frmMain
         Else
             bAllowIcon = True
             bAllowDetails = True
-            lblGameTitle.Text = oProcess.GameInfo.CroppedName
+            lblGameTitle.Text = oProcess.GameInfo.Name
 
             Try
                 Dim ic As Icon = System.Drawing.Icon.ExtractAssociatedIcon(oProcess.FoundProcess.MainModule.FileName)
@@ -463,7 +614,7 @@ Public Class frmMain
             End Try
 
             'Check for a custom icon & details            
-            If IO.File.Exists(oProcess.GameInfo.Icon) Then
+            If File.Exists(oProcess.GameInfo.Icon) Then
                 pbIcon.Image = Image.FromFile(oProcess.GameInfo.Icon)
             End If
             If sFileName = String.Empty Then
@@ -652,6 +803,7 @@ Public Class frmMain
                             bProcessDebugMode = bDebugEnable
                             mgrCommon.ShowMessage(frmMain_CommandSucess, MsgBoxStyle.Exclamation)
                     End Select
+
                 Case Else
                     mgrCommon.ShowMessage(frmMain_ErrorCommandInvalid, sMainCommand, MsgBoxStyle.Exclamation)
             End Select
@@ -664,9 +816,11 @@ Public Class frmMain
         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, sConstCopyright}, MsgBoxStyle.Information)
+        mgrCommon.ShowMessage(frmMain_About, New String() {sVersion, sProcessType, sRevision, sSqliteVersion, sConstCopyright}, MsgBoxStyle.Information)
     End Sub
 
     Private Sub OpenTags()
@@ -756,8 +910,8 @@ Public Class frmMain
     End Sub
 
     Private Sub CheckForNewBackups()
-        If oSettings.RestoreOnLaunch Then
+        If oSettings.RestoreOnLaunch Or oSettings.AutoRestore Or oSettings.AutoMark Then
-            CheckRestore()
+            StartRestoreCheck()
         End If
     End Sub
 
@@ -770,32 +924,37 @@ Public Class frmMain
     End Sub
 
     Private Sub StartSyncWatcher()
-        If oSettings.Sync Then
         oFileWatcher.EnableRaisingEvents = True
-        End If
     End Sub
 
     Private Sub StopSyncWatcher()
-        If oSettings.Sync Then
         oFileWatcher.EnableRaisingEvents = False
-        End If
     End Sub
 
     Private Sub SetupSyncWatcher()
-        If oSettings.Sync Then
         oFileWatcher.Path = oSettings.BackupFolder
         oFileWatcher.Filter = "gbm.s3db"
-            oFileWatcher.NotifyFilter = IO.NotifyFilters.LastWrite
+        oFileWatcher.NotifyFilter = NotifyFilters.LastWrite
-        End If
+
     End Sub
 
-    Private Sub HandleSyncWatcher() Handles oFileWatcher.Changed
+    Private Sub QueueSyncWatcher() Handles oFileWatcher.Changed
+        tmFileWatcherQueue.Stop()
+        tmFileWatcherQueue.AutoReset = False
+        tmFileWatcherQueue.Interval = 30000
+        tmFileWatcherQueue.Start()
+    End Sub
+
+    Private Sub HandleSyncWatcher() Handles tmFileWatcherQueue.Elapsed
+        tmFileWatcherQueue.Stop()
+        StopSyncWatcher()
         If oSettings.Sync Then
             UpdateLog(frmMain_MasterListChanged, False, ToolTipIcon.Info, True)
             SyncGameSettings()
             LoadGameSettings()
-            CheckForNewBackups()
         End If
+        CheckForNewBackups()
+        StartSyncWatcher()
     End Sub
 
     Private Sub SyncGameSettings()
@@ -869,33 +1028,24 @@ Public Class frmMain
     End Sub
 
     'Functions that handle buttons, menus and other GUI features on this form
-    Private Sub ToggleLog()
-        If bLogToggle = False Then
-            txtLog.Visible = True
-            Me.Size = New System.Drawing.Size(Me.Size.Width, iFormHeight)
-            bLogToggle = True
-            btnLogToggle.Text = frmMain_btnToggleLog_Hide
-            txtLog.Select(txtLog.TextLength, 0)
-            txtLog.ScrollToCaret()
-        Else
-            txtLog.Visible = False
-            Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer))
-            bLogToggle = False
-            btnLogToggle.Text = frmMain_btnToggleLog_Show
-        End If
-    End Sub
-
     Private Sub ToggleState()
         'Toggle State with Tray Clicks        
         If Not bShowToggle Then
             bShowToggle = True
             Me.Visible = True
+            Me.WindowState = wState
             Me.ShowInTaskbar = True
             Me.Focus()
         Else
+            If Me.CanFocus Then
                 bShowToggle = False
-            Me.Visible = 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
 
@@ -986,7 +1136,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)
@@ -998,6 +1148,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)
@@ -1010,6 +1165,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
@@ -1077,7 +1235,7 @@ Public Class frmMain
             txtLog.ScrollToCaret()
             gMonTray.BalloonTipText = sLogUpdate
             gMonTray.BalloonTipIcon = objIcon
-            If bTrayUpdate Then gMonTray.ShowBalloonTip(5000)
+            If bTrayUpdate Then gMonTray.ShowBalloonTip(10000)
         End If
         Application.DoEvents()
     End Sub
@@ -1091,7 +1249,7 @@ Public Class frmMain
     Private Sub SaveLog()
         Dim sLocation As String
 
-        sLocation = mgrCommon.SaveFileBrowser(frmMain_ChooseLogFile, "txt", frmMain_Text, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmMain_DefaultLogFileName & " " & Date.Now.ToString("dd-MMM-yyyy"))
+        sLocation = mgrCommon.SaveFileBrowser("Log_File", frmMain_ChooseLogFile, "txt", frmMain_Text, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), frmMain_DefaultLogFileName & " " & Date.Now.ToString("dd-MMM-yyyy"))
 
         If sLocation <> String.Empty Then
             mgrCommon.SaveText(txtLog.Text, sLocation)
@@ -1099,6 +1257,9 @@ Public Class frmMain
     End Sub
 
     Private Sub SetForm()
+        'Set Minimum Size
+        Me.MinimumSize = New Size(Me.Size.Width, Me.Size.Height - txtLog.Size.Height)
+
         'Set Form Name
         Me.Name = App_NameLong
 
@@ -1156,14 +1317,10 @@ Public Class frmMain
             gMonStripAdminButton.ToolTipText = frmMain_RunningAsNormal
         End If
         btnCancelOperation.Visible = False
-        txtLog.Visible = False
         lblLastActionTitle.Visible = False
         lblLastAction.Text = String.Empty
         pbTime.SizeMode = PictureBoxSizeMode.AutoSize
         pbTime.Image = Icon_Clock
-        iFormHeight = Me.Size.Height
-        iLogSpacer = gMonStatusStrip.Location.Y - (txtLog.Location.Y + txtLog.Height)
-        Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer))
         AddHandler mgrMonitorList.UpdateLog, AddressOf UpdateLog
         ResetGameInfo()
     End Sub
@@ -1193,7 +1350,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()
@@ -1203,7 +1360,7 @@ Public Class frmMain
             gMonTray.Icon = GBM_Tray_Detected
         End If
         ToggleMenuText()
-        ToggleMenuEnable()
+        ToggleMenuEnable(bGameDetected)
     End Sub
 
     Private Sub ResumeScan()
@@ -1258,9 +1415,9 @@ Public Class frmMain
         Dim sSettingsRoot As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) & "/gbm"
         Dim sDBLocation As String = sSettingsRoot & "/gbm.s3db"
 
-        If Not IO.Directory.Exists(sSettingsRoot) Then
+        If Not Directory.Exists(sSettingsRoot) Then
             Try
-                IO.Directory.CreateDirectory(sSettingsRoot)
+                Directory.CreateDirectory(sSettingsRoot)
             Catch ex As Exception
                 mgrCommon.ShowMessage(frmMain_ErrorSettingsFolder, ex.Message, MsgBoxStyle.Critical)
                 bShutdown = True
@@ -1268,7 +1425,7 @@ Public Class frmMain
             End Try
         End If
 
-        If Not IO.File.Exists(sDBLocation) Then bFirstRun = True
+        If Not File.Exists(sDBLocation) Then bFirstRun = True
     End Sub
 
     Private Sub VerifyDBVersion(ByVal iDB As mgrSQLite.Database)
@@ -1311,7 +1468,7 @@ Public Class frmMain
 
     Private Sub CheckForSavedDuplicate()
         For Each o As clsGame In oProcess.DuplicateList
-            If o.ProcessPath.ToLower = oProcess.GameInfo.ProcessPath.ToLower Then
+            If o.ProcessPath.ToLower = oProcess.GameInfo.ProcessPath.ToLower And o.Parameter = String.Empty Then
                 oProcess.GameInfo = o
                 oProcess.Duplicate = False
             End If
@@ -1470,10 +1627,6 @@ Public Class frmMain
         OpenGameManager(True)
     End Sub
 
-    Private Sub btnLogToggle_Click(sender As Object, e As EventArgs) Handles btnLogToggle.Click
-        ToggleLog()
-    End Sub
-
     Private Sub gMonStripSplitStatusButton_ButtonClick(sender As Object, e As EventArgs) Handles gMonStripStatusButton.Click
         ScanToggle()
     End Sub
@@ -1484,13 +1637,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
@@ -1510,15 +1656,28 @@ Public Class frmMain
             ShutdownApp()
         End If
 
-        'Intercept Exit
+        Select Case e.CloseReason
+            Case CloseReason.UserClosing
                 If bShutdown = False Then
                     e.Cancel = True
                     If Not mgrCommon.IsUnix Then
                         bShowToggle = False
-                Me.Visible = False
+                        wState = Me.WindowState
+                        Me.WindowState = FormWindowState.Minimized
                         Me.ShowInTaskbar = False
+                        Me.Visible = False
                     End If
                 End If
+            Case CloseReason.TaskManagerClosing, CloseReason.WindowsShutDown
+                'Do nothing and let the app close without warning
+        End Select
+
+    End Sub
+
+    Private Sub AutoRestoreEventProcessor(myObject As Object, ByVal myEventArgs As EventArgs) Handles tmRestoreCheck.Elapsed
+        If eCurrentStatus <> eStatus.Paused Then
+            AutoRestoreCheck()
+        End If
     End Sub
 
     Private Sub ScanTimerEventProcessor(myObject As Object, ByVal myEventArgs As EventArgs) Handles tmScanTimer.Tick
@@ -1528,7 +1687,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
@@ -1683,14 +1842,18 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub txtGameInfo_Enter(sender As Object, e As EventArgs)
-        btnLogToggle.Focus()
-    End Sub
-
     Private Sub frmMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
         If e.KeyCode = Keys.Oemtilde AndAlso e.Modifiers = Keys.Control Then
             OpenDevConsole()
         End If
     End Sub
 
+    'This event handler lets the user clear focus from the log by clicking anywhere on the form.
+    'Due to txtLog being the only focusable control in most cases, it's impossible for it to lose focus unless a change is forced.
+    Private Sub ClearLogFocus(sender As Object, e As EventArgs) Handles MyBase.Click, lblGameTitle.Click, lblStatus1.Click, lblStatus2.Click,
+        lblStatus3.Click, pbTime.Click, lblTimeSpent.Click, lblLastActionTitle.Click, lblLastAction.Click, gMonMainMenu.Click, gMonStatusStrip.Click
+        'Move focus to first label
+        lblGameTitle.Focus()
+    End Sub
+
 End Class

GBM/Forms/frmSettings.Designer.vb

@@ -23,7 +23,6 @@ Partial Class frmSettings
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox()
-        Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
         Me.grpStartup = New System.Windows.Forms.GroupBox()
         Me.chkStartWindows = New System.Windows.Forms.CheckBox()
         Me.chkStartToTray = New System.Windows.Forms.CheckBox()
@@ -39,12 +38,6 @@ Partial Class frmSettings
         Me.chkCreateFolder = New System.Windows.Forms.CheckBox()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.btnCancel = New System.Windows.Forms.Button()
-        Me.lblMinutes = New System.Windows.Forms.Label()
-        Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown()
-        Me.chkSupressBackup = New System.Windows.Forms.CheckBox()
-        Me.chkCheckSum = New System.Windows.Forms.CheckBox()
-        Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox()
-        Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
         Me.grp7zGeneral = New System.Windows.Forms.GroupBox()
         Me.cboCompression = New System.Windows.Forms.ComboBox()
         Me.lblCompression = New System.Windows.Forms.Label()
@@ -57,6 +50,15 @@ 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()
+        Me.chkAutoRestore = New System.Windows.Forms.CheckBox()
+        Me.chkRestoreNotify = New System.Windows.Forms.CheckBox()
+        Me.chkAutoMark = New System.Windows.Forms.CheckBox()
         Me.pnl7z = New System.Windows.Forms.Panel()
         Me.grp7zAdvanced = New System.Windows.Forms.GroupBox()
         Me.grp7zInformation = New System.Windows.Forms.GroupBox()
@@ -65,9 +67,10 @@ Partial Class frmSettings
         Me.lstSettings = New System.Windows.Forms.ListBox()
         Me.grpStartup.SuspendLayout()
         Me.grpFolderOptions.SuspendLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
         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()
@@ -85,16 +88,6 @@ Partial Class frmSettings
         Me.chkMonitorOnStartup.Text = "Start monitoring at launch"
         Me.chkMonitorOnStartup.UseVisualStyleBackColor = True
         '
-        'chkBackupConfirm
-        '
-        Me.chkBackupConfirm.AutoSize = True
-        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 88)
-        Me.chkBackupConfirm.Name = "chkBackupConfirm"
-        Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
-        Me.chkBackupConfirm.TabIndex = 1
-        Me.chkBackupConfirm.Text = "Disable backup confirmation"
-        Me.chkBackupConfirm.UseVisualStyleBackColor = True
-        '
         'grpStartup
         '
         Me.grpStartup.Controls.Add(Me.chkStartWindows)
@@ -133,7 +126,7 @@ Partial Class frmSettings
         Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204)
         Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
         Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
-        Me.chkAutoSaveLog.TabIndex = 7
+        Me.chkAutoSaveLog.TabIndex = 3
         Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
         Me.chkAutoSaveLog.UseVisualStyleBackColor = True
         '
@@ -142,7 +135,7 @@ Partial Class frmSettings
         Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38)
         Me.btnOptionalFields.Name = "btnOptionalFields"
         Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23)
-        Me.btnOptionalFields.TabIndex = 6
+        Me.btnOptionalFields.TabIndex = 2
         Me.btnOptionalFields.Text = "Choose &Optional Fields..."
         Me.btnOptionalFields.UseVisualStyleBackColor = True
         '
@@ -152,7 +145,7 @@ Partial Class frmSettings
         Me.chkTimeTracking.Location = New System.Drawing.Point(6, 19)
         Me.chkTimeTracking.Name = "chkTimeTracking"
         Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17)
-        Me.chkTimeTracking.TabIndex = 4
+        Me.chkTimeTracking.TabIndex = 0
         Me.chkTimeTracking.Text = "Enable time tracking"
         Me.chkTimeTracking.UseVisualStyleBackColor = True
         '
@@ -162,7 +155,7 @@ Partial Class frmSettings
         Me.chkSync.Location = New System.Drawing.Point(6, 42)
         Me.chkSync.Name = "chkSync"
         Me.chkSync.Size = New System.Drawing.Size(98, 17)
-        Me.chkSync.TabIndex = 5
+        Me.chkSync.TabIndex = 1
         Me.chkSync.Text = "Enable syncing"
         Me.chkSync.UseVisualStyleBackColor = True
         '
@@ -172,7 +165,7 @@ Partial Class frmSettings
         Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181)
         Me.chkShowDetectionTips.Name = "chkShowDetectionTips"
         Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17)
-        Me.chkShowDetectionTips.TabIndex = 3
+        Me.chkShowDetectionTips.TabIndex = 2
         Me.chkShowDetectionTips.Text = "Show detection notifications"
         Me.chkShowDetectionTips.UseVisualStyleBackColor = True
         '
@@ -185,7 +178,7 @@ Partial Class frmSettings
         Me.grpFolderOptions.Location = New System.Drawing.Point(6, 12)
         Me.grpFolderOptions.Name = "grpFolderOptions"
         Me.grpFolderOptions.Size = New System.Drawing.Size(354, 70)
-        Me.grpFolderOptions.TabIndex = 1
+        Me.grpFolderOptions.TabIndex = 0
         Me.grpFolderOptions.TabStop = False
         Me.grpFolderOptions.Text = "Folders"
         '
@@ -194,7 +187,7 @@ Partial Class frmSettings
         Me.btnBackupFolder.Location = New System.Drawing.Point(313, 17)
         Me.btnBackupFolder.Name = "btnBackupFolder"
         Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20)
-        Me.btnBackupFolder.TabIndex = 2
+        Me.btnBackupFolder.TabIndex = 1
         Me.btnBackupFolder.Text = "..."
         Me.btnBackupFolder.UseVisualStyleBackColor = True
         '
@@ -212,7 +205,7 @@ Partial Class frmSettings
         Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17)
         Me.txtBackupFolder.Name = "txtBackupFolder"
         Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20)
-        Me.txtBackupFolder.TabIndex = 1
+        Me.txtBackupFolder.TabIndex = 0
         '
         'chkCreateFolder
         '
@@ -220,7 +213,7 @@ Partial Class frmSettings
         Me.chkCreateFolder.Location = New System.Drawing.Point(9, 43)
         Me.chkCreateFolder.Name = "chkCreateFolder"
         Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17)
-        Me.chkCreateFolder.TabIndex = 3
+        Me.chkCreateFolder.TabIndex = 2
         Me.chkCreateFolder.Text = "Create a sub-folder for each game"
         Me.chkCreateFolder.UseVisualStyleBackColor = True
         '
@@ -244,63 +237,6 @@ Partial Class frmSettings
         Me.btnCancel.Text = "&Cancel"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
-        'lblMinutes
-        '
-        Me.lblMinutes.AutoSize = True
-        Me.lblMinutes.Location = New System.Drawing.Point(286, 181)
-        Me.lblMinutes.Name = "lblMinutes"
-        Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
-        Me.lblMinutes.TabIndex = 7
-        Me.lblMinutes.Text = "minutes"
-        '
-        'nudSupressBackupThreshold
-        '
-        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 179)
-        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 = 6
-        '
-        'chkSupressBackup
-        '
-        Me.chkSupressBackup.AutoSize = True
-        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 180)
-        Me.chkSupressBackup.Name = "chkSupressBackup"
-        Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17)
-        Me.chkSupressBackup.TabIndex = 5
-        Me.chkSupressBackup.Text = "Backup only when session time exceeds"
-        Me.chkSupressBackup.UseVisualStyleBackColor = True
-        '
-        'chkCheckSum
-        '
-        Me.chkCheckSum.AutoSize = True
-        Me.chkCheckSum.Location = New System.Drawing.Point(6, 134)
-        Me.chkCheckSum.Name = "chkCheckSum"
-        Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
-        Me.chkCheckSum.TabIndex = 3
-        Me.chkCheckSum.Text = "Verify backup files with a checksum"
-        Me.chkCheckSum.UseVisualStyleBackColor = True
-        '
-        'chkRestoreOnLaunch
-        '
-        Me.chkRestoreOnLaunch.AutoSize = True
-        Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 157)
-        Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch"
-        Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17)
-        Me.chkRestoreOnLaunch.TabIndex = 4
-        Me.chkRestoreOnLaunch.Text = "Notify when there are new backup files to restore"
-        Me.chkRestoreOnLaunch.UseVisualStyleBackColor = True
-        '
-        'chkOverwriteWarning
-        '
-        Me.chkOverwriteWarning.AutoSize = True
-        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 111)
-        Me.chkOverwriteWarning.Name = "chkOverwriteWarning"
-        Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17)
-        Me.chkOverwriteWarning.TabIndex = 2
-        Me.chkOverwriteWarning.Text = "Show overwrite warning"
-        Me.chkOverwriteWarning.UseVisualStyleBackColor = True
-        '
         'grp7zGeneral
         '
         Me.grp7zGeneral.Controls.Add(Me.cboCompression)
@@ -319,7 +255,7 @@ Partial Class frmSettings
         Me.cboCompression.Location = New System.Drawing.Point(110, 17)
         Me.cboCompression.Name = "cboCompression"
         Me.cboCompression.Size = New System.Drawing.Size(238, 21)
-        Me.cboCompression.TabIndex = 1
+        Me.cboCompression.TabIndex = 0
         '
         'lblCompression
         '
@@ -335,7 +271,7 @@ Partial Class frmSettings
         Me.btn7zLocation.Location = New System.Drawing.Point(313, 41)
         Me.btn7zLocation.Name = "btn7zLocation"
         Me.btn7zLocation.Size = New System.Drawing.Size(27, 20)
-        Me.btn7zLocation.TabIndex = 5
+        Me.btn7zLocation.TabIndex = 2
         Me.btn7zLocation.Text = "..."
         Me.btn7zLocation.UseVisualStyleBackColor = True
         '
@@ -344,7 +280,7 @@ Partial Class frmSettings
         Me.txt7zLocation.Location = New System.Drawing.Point(110, 41)
         Me.txt7zLocation.Name = "txt7zLocation"
         Me.txt7zLocation.Size = New System.Drawing.Size(197, 20)
-        Me.txt7zLocation.TabIndex = 4
+        Me.txt7zLocation.TabIndex = 1
         '
         'lblLocation
         '
@@ -360,7 +296,7 @@ Partial Class frmSettings
         Me.txt7zArguments.Location = New System.Drawing.Point(110, 15)
         Me.txt7zArguments.Name = "txt7zArguments"
         Me.txt7zArguments.Size = New System.Drawing.Size(238, 20)
-        Me.txt7zArguments.TabIndex = 3
+        Me.txt7zArguments.TabIndex = 0
         '
         'lblArguments
         '
@@ -402,17 +338,109 @@ Partial Class frmSettings
         '
         Me.pnlBackup.Controls.Add(Me.lblMinutes)
         Me.pnlBackup.Controls.Add(Me.nudSupressBackupThreshold)
-        Me.pnlBackup.Controls.Add(Me.grpFolderOptions)
         Me.pnlBackup.Controls.Add(Me.chkSupressBackup)
         Me.pnlBackup.Controls.Add(Me.chkBackupConfirm)
-        Me.pnlBackup.Controls.Add(Me.chkCheckSum)
         Me.pnlBackup.Controls.Add(Me.chkOverwriteWarning)
-        Me.pnlBackup.Controls.Add(Me.chkRestoreOnLaunch)
+        Me.pnlBackup.Controls.Add(Me.grpBackupHandling)
+        Me.pnlBackup.Controls.Add(Me.grpFolderOptions)
         Me.pnlBackup.Location = New System.Drawing.Point(180, 0)
         Me.pnlBackup.Name = "pnlBackup"
         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.Name = "chkBackupConfirm"
+        Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
+        Me.chkBackupConfirm.TabIndex = 2
+        Me.chkBackupConfirm.Text = "Disable backup confirmation"
+        Me.chkBackupConfirm.UseVisualStyleBackColor = True
+        '
+        'chkOverwriteWarning
+        '
+        Me.chkOverwriteWarning.AutoSize = True
+        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 204)
+        Me.chkOverwriteWarning.Name = "chkOverwriteWarning"
+        Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17)
+        Me.chkOverwriteWarning.TabIndex = 3
+        Me.chkOverwriteWarning.Text = "Show overwrite warning"
+        Me.chkOverwriteWarning.UseVisualStyleBackColor = True
+        '
+        'grpBackupHandling
+        '
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoRestore)
+        Me.grpBackupHandling.Controls.Add(Me.chkRestoreNotify)
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoMark)
+        Me.grpBackupHandling.Location = New System.Drawing.Point(6, 88)
+        Me.grpBackupHandling.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.grpBackupHandling.Name = "grpBackupHandling"
+        Me.grpBackupHandling.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.grpBackupHandling.Size = New System.Drawing.Size(354, 87)
+        Me.grpBackupHandling.TabIndex = 1
+        Me.grpBackupHandling.TabStop = False
+        Me.grpBackupHandling.Text = "Backup Handling"
+        '
+        'chkAutoRestore
+        '
+        Me.chkAutoRestore.AutoSize = True
+        Me.chkAutoRestore.Location = New System.Drawing.Point(8, 41)
+        Me.chkAutoRestore.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.chkAutoRestore.Name = "chkAutoRestore"
+        Me.chkAutoRestore.Size = New System.Drawing.Size(190, 17)
+        Me.chkAutoRestore.TabIndex = 1
+        Me.chkAutoRestore.Text = "Automatically restore new backups"
+        Me.chkAutoRestore.UseVisualStyleBackColor = True
+        '
+        'chkRestoreNotify
+        '
+        Me.chkRestoreNotify.AutoSize = True
+        Me.chkRestoreNotify.Location = New System.Drawing.Point(8, 19)
+        Me.chkRestoreNotify.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.chkRestoreNotify.Name = "chkRestoreNotify"
+        Me.chkRestoreNotify.Size = New System.Drawing.Size(216, 17)
+        Me.chkRestoreNotify.TabIndex = 0
+        Me.chkRestoreNotify.Text = "Display notifications about new backups"
+        Me.chkRestoreNotify.UseVisualStyleBackColor = True
+        '
+        'chkAutoMark
+        '
+        Me.chkAutoMark.AutoSize = True
+        Me.chkAutoMark.Location = New System.Drawing.Point(8, 63)
+        Me.chkAutoMark.Name = "chkAutoMark"
+        Me.chkAutoMark.Size = New System.Drawing.Size(321, 17)
+        Me.chkAutoMark.TabIndex = 2
+        Me.chkAutoMark.Text = "Automatically mark new backups as restored when appropriate"
+        Me.chkAutoMark.UseVisualStyleBackColor = True
+        '
         'pnl7z
         '
         Me.pnl7z.Controls.Add(Me.grp7zAdvanced)
@@ -433,7 +461,7 @@ Partial Class frmSettings
         Me.grp7zAdvanced.Location = New System.Drawing.Point(6, 68)
         Me.grp7zAdvanced.Name = "grp7zAdvanced"
         Me.grp7zAdvanced.Size = New System.Drawing.Size(354, 73)
-        Me.grp7zAdvanced.TabIndex = 2
+        Me.grp7zAdvanced.TabIndex = 1
         Me.grp7zAdvanced.TabStop = False
         Me.grp7zAdvanced.Text = "Advanced"
         '
@@ -444,7 +472,7 @@ Partial Class frmSettings
         Me.grp7zInformation.Location = New System.Drawing.Point(6, 146)
         Me.grp7zInformation.Name = "grp7zInformation"
         Me.grp7zInformation.Size = New System.Drawing.Size(354, 63)
-        Me.grp7zInformation.TabIndex = 1
+        Me.grp7zInformation.TabIndex = 2
         Me.grp7zInformation.TabStop = False
         Me.grp7zInformation.Text = "Utility Information"
         '
@@ -484,13 +512,13 @@ Partial Class frmSettings
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(554, 361)
+        Me.Controls.Add(Me.pnlGeneral)
+        Me.Controls.Add(Me.pnlBackup)
+        Me.Controls.Add(Me.pnl7z)
         Me.Controls.Add(Me.lstSettings)
         Me.Controls.Add(Me.btnDefaults)
         Me.Controls.Add(Me.btnCancel)
         Me.Controls.Add(Me.btnSave)
-        Me.Controls.Add(Me.pnlGeneral)
-        Me.Controls.Add(Me.pnl7z)
-        Me.Controls.Add(Me.pnlBackup)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.MaximizeBox = False
         Me.MinimizeBox = False
@@ -503,11 +531,13 @@ Partial Class frmSettings
         Me.grpStartup.PerformLayout()
         Me.grpFolderOptions.ResumeLayout(False)
         Me.grpFolderOptions.PerformLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grp7zGeneral.ResumeLayout(False)
         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)
         Me.grp7zAdvanced.ResumeLayout(False)
         Me.grp7zAdvanced.PerformLayout()
@@ -520,7 +550,6 @@ Partial Class frmSettings
 
     End Sub
     Friend WithEvents chkMonitorOnStartup As System.Windows.Forms.CheckBox
-    Friend WithEvents chkBackupConfirm As System.Windows.Forms.CheckBox
     Friend WithEvents grpStartup As System.Windows.Forms.GroupBox
     Friend WithEvents grpFolderOptions As System.Windows.Forms.GroupBox
     Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox
@@ -530,16 +559,10 @@ Partial Class frmSettings
     Friend WithEvents btnBackupFolder As System.Windows.Forms.Button
     Friend WithEvents chkShowDetectionTips As System.Windows.Forms.CheckBox
     Friend WithEvents chkStartToTray As System.Windows.Forms.CheckBox
-    Friend WithEvents chkOverwriteWarning As System.Windows.Forms.CheckBox
     Friend WithEvents chkCreateFolder As System.Windows.Forms.CheckBox
-    Friend WithEvents chkRestoreOnLaunch As System.Windows.Forms.CheckBox
     Friend WithEvents chkSync As System.Windows.Forms.CheckBox
-    Friend WithEvents chkCheckSum As System.Windows.Forms.CheckBox
     Friend WithEvents chkStartWindows As System.Windows.Forms.CheckBox
     Friend WithEvents chkTimeTracking As System.Windows.Forms.CheckBox
-    Friend WithEvents lblMinutes As Label
-    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
-    Friend WithEvents chkSupressBackup As CheckBox
     Friend WithEvents grp7zGeneral As GroupBox
     Friend WithEvents cboCompression As ComboBox
     Friend WithEvents lblCompression As Label
@@ -560,4 +583,13 @@ 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
 End Class

GBM/Forms/frmSettings.vb

@@ -4,7 +4,6 @@ Imports System.IO
 Public Class frmSettings
     Dim bShutdown As Boolean = False
     Dim bSyncSettingsChanged As Boolean = False
-    Dim bCheckSumDisabled As Boolean = False
     Dim eCurrentSyncFields As clsGame.eOptionalSyncFields
     Private oSettings As mgrSettings
 
@@ -48,7 +47,9 @@ Public Class frmSettings
         oSettings.DisableConfirmation = chkBackupConfirm.Checked
         oSettings.CreateSubFolder = chkCreateFolder.Checked
         oSettings.ShowOverwriteWarning = chkOverwriteWarning.Checked
-        oSettings.RestoreOnLaunch = chkRestoreOnLaunch.Checked
+        oSettings.RestoreOnLaunch = chkRestoreNotify.Checked
+        oSettings.AutoRestore = chkAutoRestore.Checked
+        oSettings.AutoMark = chkAutoMark.Checked
         oSettings.TimeTracking = chkTimeTracking.Checked
         oSettings.SupressBackup = chkSupressBackup.Checked
         oSettings.SupressBackupThreshold = nudSupressBackupThreshold.Value
@@ -61,12 +62,6 @@ Public Class frmSettings
         oSettings.Custom7zArguments = txt7zArguments.Text.Trim
         oSettings.Custom7zLocation = txt7zLocation.Text.Trim
 
-        'We need to clear all checksums its turned off
-        If chkCheckSum.Checked = False And oSettings.CheckSum = True Then
-            bCheckSumDisabled = True
-        End If
-        oSettings.CheckSum = chkCheckSum.Checked
-
         'Turning syncing from off to on is the same as changing the backup folder
         If chkSync.Checked = True And oSettings.Sync = False Then
             bSyncSettingsChanged = True
@@ -106,7 +101,6 @@ Public Class frmSettings
         If ValidateSettings() Then
             oSettings.SaveSettings()
             If bSyncSettingsChanged Then mgrMonitorList.HandleBackupLocationChange(Settings)
-            If bCheckSumDisabled Then mgrManifest.DoManifestHashWipe()
             Return True
         Else
             Return False
@@ -177,10 +171,11 @@ Public Class frmSettings
         chkBackupConfirm.Checked = oSettings.DisableConfirmation
         chkCreateFolder.Checked = oSettings.CreateSubFolder
         chkOverwriteWarning.Checked = oSettings.ShowOverwriteWarning
-        chkRestoreOnLaunch.Checked = oSettings.RestoreOnLaunch
+        chkRestoreNotify.Checked = oSettings.RestoreOnLaunch
+        chkAutoRestore.Checked = oSettings.AutoRestore
+        chkAutoMark.Checked = oSettings.AutoMark
         txtBackupFolder.Text = oSettings.BackupFolder
         chkSync.Checked = oSettings.Sync
-        chkCheckSum.Checked = oSettings.CheckSum
         chkTimeTracking.Checked = oSettings.TimeTracking
         chkSupressBackup.Checked = oSettings.SupressBackup
         nudSupressBackupThreshold.Value = oSettings.SupressBackupThreshold
@@ -279,8 +274,10 @@ Public Class frmSettings
         'Set Form Text
         lblMinutes.Text = frmSettings_lblMinutes
         chkSupressBackup.Text = frmSettings_chkSupressBackup
-        chkCheckSum.Text = frmSettings_chkCheckSum
+        grpBackupHandling.Text = frmSettings_grpBackupHandling
-        chkRestoreOnLaunch.Text = frmSettings_chkRestoreOnLaunch
+        chkRestoreNotify.Text = frmSettings_chkRestoreNotify
+        chkAutoRestore.Text = frmSettings_chkAutoRestore
+        chkAutoMark.Text = frmSettings_chkAutoMark
         chkOverwriteWarning.Text = frmSettings_chkOverwriteWarning
         chkCreateFolder.Text = frmSettings_chkCreateFolder
         chkBackupConfirm.Text = frmSettings_chkBackupConfirm
@@ -339,13 +336,13 @@ Public Class frmSettings
 
     Private Sub btnBackupFolder_Click(sender As System.Object, e As System.EventArgs) Handles btnBackupFolder.Click
         Dim sNewFolder As String
-        sNewFolder = mgrCommon.OpenFolderBrowser(frmSettings_BrowseFolder, oSettings.BackupFolder, True)
+        sNewFolder = mgrCommon.OpenFolderBrowser("Settings_Backup_Path", frmSettings_BrowseFolder, oSettings.BackupFolder, True, False)
         If sNewFolder <> String.Empty Then txtBackupFolder.Text = sNewFolder
     End Sub
 
     Private Sub btn7zLocation_Click(sender As Object, e As EventArgs) Handles btn7zLocation.Click
         Dim sNewLocation As String
-        sNewLocation = mgrCommon.OpenFileBrowser(frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
+        sNewLocation = mgrCommon.OpenFileBrowser("7z_Browse", frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
         If sNewLocation <> String.Empty Then
             txt7zLocation.Text = sNewLocation
             GetUtilityInfo(txt7zLocation.Text)
@@ -375,4 +372,5 @@ Public Class frmSettings
     Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged
         ChangePanel()
     End Sub
+
 End Class

GBM/Forms/frmStartUpWizard.vb

@@ -215,7 +215,7 @@ Public Class frmStartUpWizard
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmStartUpWizard_BrowseFolder, sDefaultFolder, True)
+        sNewPath = mgrCommon.OpenFolderBrowser("Wizard_Backup_Path", frmStartUpWizard_BrowseFolder, sDefaultFolder, True, False)
 
         If sNewPath <> String.Empty Then txtBackupPath.Text = sNewPath
     End Sub

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/Forms/frmVariableManager.vb

@@ -54,7 +54,7 @@ Public Class frmVariableManager
             End If
         End If
 
-        sNewPath = mgrCommon.OpenFolderBrowser(frmVariableManager_PathBrowse, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("VM_Path", frmVariableManager_PathBrowse, sDefaultFolder, False, False)
 
         If sNewPath <> String.Empty Then txtPath.Text = sNewPath
     End Sub

GBM/Game Backup Monitor.vbproj

@@ -106,6 +106,7 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -121,6 +122,9 @@
     <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\XML Serialize Classes\Tag.vb" />
     <Compile Include="Classes\XML Serialize Classes\Game.vb" />
     <Compile Include="Classes\clsGameTag.vb" />
@@ -220,6 +224,7 @@
     <Compile Include="Managers\mgrMonitorList.vb" />
     <Compile Include="Managers\mgrPath.vb" />
     <Compile Include="Managers\mgrRestore.vb" />
+    <Compile Include="Managers\mgrSavedPath.vb" />
     <Compile Include="Managers\mgrSettings.vb" />
     <Compile Include="Managers\mgrBackup.vb" />
     <Compile Include="Managers\mgrSQLite.vb" />
@@ -344,6 +349,7 @@
     <Content Include="Utilities\x86\7za.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="x64\sqlite3.dll" />
     <Content Include="x86\sqlite3.dll" />
     <None Include="Resources\gbm.ico" />
     <Content Include="Resources\Admin.png" />
@@ -356,7 +362,6 @@
     <Content Include="Resources\Inbox.png" />
     <Content Include="Resources\type.ico" />
     <Content Include="Resources\User.png" />
-    <Content Include="x64\sqlite3.dll" />
     <None Include="Resources\Stopped.png" />
     <None Include="Resources\Detected.png" />
     <None Include="Resources\Ready.png" />

GBM/Managers/mgrBackup.vb

@@ -87,9 +87,25 @@ Public Class mgrBackup
 
     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)
+
         If oSettings.CreateSubFolder Then sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name
         sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z"
 
+        'Show Available Space
+        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrCommon_AvailableDiskSpace, mgrCommon.FormatDiskSpace(lAvailableSpace)), False, ToolTipIcon.Info, True)
+
+        'Show Save Folder Size
+        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrCommon_SavedGameFolderSize, New String() {oGame.Name, mgrCommon.FormatDiskSpace(lFolderSize)}), False, ToolTipIcon.Info, True)
+
+        If lFolderSize >= lAvailableSpace Then
+            If mgrCommon.ShowMessage(mgrBackup_ConfirmDiskSpace, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
+                RaiseEvent UpdateLog(mgrBackup_ErrorDiskSpace, False, ToolTipIcon.Error, True)
+                Return False
+            End If
+        End If
+
         If mgrRestore.CheckManifest(oGame.Name) Then
             If mgrCommon.ShowMessage(mgrBackup_ConfirmManifestConflict, oGame.Name, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
                 RaiseEvent UpdateLog(mgrBackup_ErrorManifestConflict, False, ToolTipIcon.Error, True)
@@ -222,13 +238,20 @@ Public Class mgrBackup
                             End While
                             prs7z.WaitForExit()
                             If Not CancelOperation Then
-                                If prs7z.ExitCode = 0 Then
+                                Select Case prs7z.ExitCode
-                                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, New String() {oGame.Name, mgrCommon.GetFileSize(sBackupFile)}), False, ToolTipIcon.Info, True)
+                                    Case 0
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, New String() {oGame.Name, mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sBackupFile))}), False, ToolTipIcon.Info, True)
                                         bBackupCompleted = True
-                                Else
+                                    Case 1
-                                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupWarnings, oGame.Name), True, ToolTipIcon.Warning, True)
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zWarnings, oGame.Name), True, ToolTipIcon.Warning, True)
+                                        bBackupCompleted = True
+                                    Case 2
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zFatalError, oGame.Name), True, ToolTipIcon.Error, True)
                                         bBackupCompleted = False
-                                End If
+                                    Case 7
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zCommandFailure, oGame.Name), True, ToolTipIcon.Error, True)
+                                        bBackupCompleted = False
+                                End Select
                             End If
                             prs7z.Dispose()
                         Else
@@ -242,10 +265,10 @@ Public Class mgrBackup
 
                     'Write Main Manifest
                     If bBackupCompleted Then
-                        If oSettings.CheckSum Then
+
+                        'Generate checksum for new backup
                         RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_GenerateHash, oGame.Name), False, ToolTipIcon.Info, True)
                         sHash = mgrHash.Generate_SHA256_Hash(sBackupFile)
-                        End If
 
                         If Not DoManifestUpdate(oGame, sBackupFile, dTimeStamp, sHash) Then
                             RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorManifestFailure, oGame.Name), True, ToolTipIcon.Error, True)

GBM/Managers/mgrCommon.vb

@@ -2,6 +2,9 @@
 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
 
@@ -34,6 +37,28 @@ Public Class mgrCommon
         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)
@@ -61,30 +86,66 @@ Public Class mgrCommon
         End If
     End Function
 
-    Public Shared Function SaveFileBrowser(ByVal sTitle As String, ByVal sExtension As String, ByVal sFileType As String, ByVal sDefaultFolder As String, ByVal sDefaultFile As String) As String
+    Public Shared Function SaveFileBrowser(ByVal sName As String, ByVal sTitle As String, ByVal sExtension As String, ByVal sFileType As String, ByVal sDefaultFolder As String,
+                                           ByVal sDefaultFile As String, Optional ByVal bSavedPath As Boolean = True) As String
         Dim fbBrowser As New SaveFileDialog
+        Dim oSavedPath As New clsSavedPath
+
         fbBrowser.Title = sTitle
         fbBrowser.DefaultExt = sExtension
         fbBrowser.Filter = FormatString(mgrCommon_FilesFilter, New String() {sFileType, sExtension, sExtension})
-        fbBrowser.InitialDirectory = sDefaultFolder
         fbBrowser.FileName = sDefaultFile
+        fbBrowser.InitialDirectory = sDefaultFolder
+
+        If bSavedPath Then
+            oSavedPath = mgrSavedPath.GetPathByName(sName)
+            If oSavedPath.Path <> String.Empty Then
+                If Directory.Exists(oSavedPath.Path) Then
+                    fbBrowser.InitialDirectory = oSavedPath.Path
+                End If
+            End If
+        End If
 
         If fbBrowser.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            If bSavedPath Then
+                oSavedPath.PathName = sName
+                oSavedPath.Path = Path.GetDirectoryName(fbBrowser.FileName)
+                mgrSavedPath.AddUpdatePath(oSavedPath)
+            End If
+
             Return fbBrowser.FileName
             End If
 
             Return String.Empty
     End Function
 
-    Public Shared Function OpenFileBrowser(ByVal sTitle As String, ByVal sExtension As String, ByVal sFileType As String, ByVal sDefaultFolder As String, ByVal bMulti As Boolean) As String
+    Public Shared Function OpenFileBrowser(ByVal sName As String, ByVal sTitle As String, ByVal sExtension As String, ByVal sFileType As String, ByVal sDefaultFolder As String,
+                                           ByVal bMulti As Boolean, Optional ByVal bSavedPath As Boolean = True) As String
         Dim fbBrowser As New OpenFileDialog
+        Dim oSavedPath As New clsSavedPath
+
         fbBrowser.Title = sTitle
         fbBrowser.DefaultExt = sExtension
         fbBrowser.Filter = FormatString(mgrCommon_FilesFilter, New String() {sFileType, sExtension, sExtension})
-        fbBrowser.InitialDirectory = sDefaultFolder
         fbBrowser.Multiselect = bMulti
+        fbBrowser.InitialDirectory = sDefaultFolder
+
+        If bSavedPath Then
+            oSavedPath = mgrSavedPath.GetPathByName(sName)
+            If oSavedPath.Path <> String.Empty Then
+                If Directory.Exists(oSavedPath.Path) Then
+                    fbBrowser.InitialDirectory = oSavedPath.Path
+                End If
+            End If
+        End If
 
         If fbBrowser.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            If bSavedPath Then
+                oSavedPath.PathName = sName
+                oSavedPath.Path = Path.GetDirectoryName(fbBrowser.FileName)
+                mgrSavedPath.AddUpdatePath(oSavedPath)
+            End If
+
             If bMulti Then
                 Dim sFileNames As String = String.Empty
                 For Each sFileName As String In fbBrowser.FileNames
@@ -100,12 +161,31 @@ Public Class mgrCommon
         Return String.Empty
     End Function
 
-    Public Shared Function OpenFolderBrowser(ByVal sTitle As String, ByVal sDefaultFolder As String, ByVal bEnableNewFolder As Boolean) As String
+    Public Shared Function OpenFolderBrowser(ByVal sName As String, ByVal sTitle As String, ByVal sDefaultFolder As String, ByVal bEnableNewFolder As Boolean,
+                                             Optional ByVal bSavedPath As Boolean = True) As String
         Dim fbBrowser As New FolderBrowserDialog
+        Dim oSavedPath As New clsSavedPath
+
         fbBrowser.Description = sTitle
         fbBrowser.SelectedPath = sDefaultFolder
         fbBrowser.ShowNewFolderButton = bEnableNewFolder
+
+        If bSavedPath Then
+            oSavedPath = mgrSavedPath.GetPathByName(sName)
+            If oSavedPath.Path <> String.Empty Then
+                If Directory.Exists(oSavedPath.Path) Then
+                    fbBrowser.SelectedPath = oSavedPath.Path
+                End If
+            End If
+        End If
+
         If fbBrowser.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            If bSavedPath Then
+                oSavedPath.PathName = sName
+                oSavedPath.Path = fbBrowser.SelectedPath
+                mgrSavedPath.AddUpdatePath(oSavedPath)
+            End If
+
             Return fbBrowser.SelectedPath
         End If
 
@@ -157,12 +237,152 @@ Public Class mgrCommon
         oProcess.Start()
     End Sub
 
-    Public Shared Function SetSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
+    'Get a file size
-        Return eSyncFields Or eSyncField
+    Public Shared Function GetFileSize(ByVal sFile As String) As Long
+        Dim oFileInfo As FileInfo
+        Dim dFileSize As Long = 0
+
+        Try
+            oFileInfo = New FileInfo(sFile)
+            dFileSize = oFileInfo.Length
+        Catch ex As Exception
+            'Do Nothing
+        End Try
+
+        Return dFileSize
     End Function
 
-    Public Shared Function RemoveSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
+    Public Shared Function WildcardToRegex(ByVal sPattern As String) As String
-        Return eSyncFields And (Not eSyncField)
+        Dim sRegEx As String
+        sRegEx = sPattern.Replace("*", ".*")
+        sRegEx = sRegEx.Replace("?", ".")
+        Return sRegEx
+    End Function
+
+    Public Shared Function CompareValueToArrayRegEx(ByVal sValue As String, ByVal sValues As String()) As Boolean
+        For Each se As String In sValues
+            If Regex.IsMatch(sValue, WildcardToRegex(se)) Then
+                Return True
+            End If
+        Next
+        Return False
+    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()) 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)
+                Else
+                    bInclude = True
+                End If
+
+                If sExclude.Length > 0 Then
+                    bExclude = CompareValueToArrayRegEx(fi.Name, sExclude) Or CompareValueToArrayRegEx(Path.GetDirectoryName(sPath), sExclude)
+                Else
+                    bExclude = False
+                End If
+
+                If bInclude And Not bExclude Then
+                    lSize += fi.Length
+                End If
+            Next
+
+            'Sub Folders
+            For Each di As DirectoryInfo In oFolder.EnumerateDirectories()
+                If Not ((di.Attributes And FileAttributes.ReparsePoint) = FileAttributes.ReparsePoint) Then
+                    If sExclude.Length > 0 Then
+                        bExclude = CompareValueToArrayRegEx(di.Name, sExclude)
+                    Else
+                        bExclude = False
+                    End If
+                    If Not bExclude Then
+                        lSize += GetFolderSize(di.FullName, sInclude, sExclude)
+                    End If
+                End If
+            Next
+        Catch
+            'Do Nothing
+        End Try
+
+        Return lSize
+    End Function
+
+    'Format Disk Space Amounts
+    Public Shared Function FormatDiskSpace(ByVal lSize As Long)
+
+        Select Case lSize
+            Case >= 1125899906842624
+                Return FormatString(mgrCommon_PB, Math.Round(lSize / 1125899906842624, 2))
+            Case >= 1099511627776
+                Return FormatString(mgrCommon_TB, Math.Round(lSize / 1099511627776, 2))
+            Case >= 1073741824
+                Return FormatString(mgrCommon_GB, Math.Round(lSize / 1073741824, 2))
+            Case >= 1048576
+                Return FormatString(mgrCommon_MB, Math.Round(lSize / 1048576, 2))
+            Case >= 1024
+                Return FormatString(mgrCommon_KB, Math.Round(lSize / 1024, 2))
+            Case >= 0
+                Return FormatString(mgrCommon_B, lSize)
+        End Select
+
+        Return lSize
+    End Function
+
+    '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
+            oDrive = New DriveInfo(Path.GetPathRoot(sPath))
+            lAvailableSpace = oDrive.AvailableFreeSpace
+        Catch
+            'Do Nothing
+        End Try
+        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
@@ -224,24 +444,6 @@ Public Class mgrCommon
         End Try
     End Sub
 
-    'Get a file size
-    Public Shared Function GetFileSize(ByVal sFile As String) As String
-        Dim oFileInfo As FileInfo
-        Dim dFileSize As Double
-
-        Try
-            oFileInfo = New FileInfo(sFile)
-            dFileSize = oFileInfo.Length
-            If dFileSize > 1048576 Then
-                Return FormatString(App_MB, Math.Round(dFileSize / 1048576, 2).ToString)
-            Else
-                Return FormatString(App_KB, Math.Round(dFileSize / 1024, 2).ToString)
-            End If
-        Catch ex As Exception
-            Return String.Empty
-        End Try
-    End Function
-
     'Handles no extra parameters
     Public Shared Function ShowMessage(ByVal sMsg As String, ByVal oType As MsgBoxStyle) As MsgBoxResult
         Dim oResult As MsgBoxResult

GBM/Managers/mgrMonitorList.vb

@@ -1,4 +1,5 @@
 Imports GBM.My.Resources
+Imports System.Collections.Specialized
 Imports System.IO
 
 Public Class mgrMonitorList
@@ -30,6 +31,8 @@ Public Class mgrMonitorList
         oGame.Enabled = CBool(dr("Enabled"))
         oGame.MonitorOnly = CBool(dr("MonitorOnly"))
         oGame.BackupLimit = CInt(dr("BackupLimit"))
+        oGame.CleanFolder = CBool(dr("CleanFolder"))
+        If Not IsDBNull(dr("Parameter")) Then oGame.Parameter = CStr(dr("Parameter"))
 
         Return oGame
     End Function
@@ -54,6 +57,8 @@ Public Class mgrMonitorList
         hshParams.Add("Enabled", oGame.Enabled)
         hshParams.Add("MonitorOnly", oGame.MonitorOnly)
         hshParams.Add("BackupLimit", oGame.BackupLimit)
+        hshParams.Add("CleanFolder", oGame.CleanFolder)
+        hshParams.Add("Parameter", oGame.Parameter)
 
         Return hshParams
     End Function
@@ -94,7 +99,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)"
+        sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit, @CleanFolder, @Parameter)"
 
         'Parameters
         hshParams = SetCoreParameters(oGame)
@@ -110,7 +115,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 WHERE MonitorID=@ID"
+        sSQL &= "Hours=@Hours, Version=@Version, Company=@Company, Enabled=@Enabled, MonitorOnly=@MonitorOnly, BackupLimit=@BackupLimit, CleanFolder=@CleanFolder, Parameter=@Parameter WHERE MonitorID=@ID"
 
         'Parameters
         hshParams = SetCoreParameters(oGame)
@@ -264,6 +269,31 @@ Public Class mgrMonitorList
         End If
     End Function
 
+    Public Shared Function DoDuplicateParameterCheck(ByVal sProcess As String, ByVal sParameter As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local, Optional ByVal sExcludeID As String = "") As Boolean
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim oData As DataSet
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT * FROM monitorlist WHERE Process = @Process AND Parameter = @Parameter"
+
+        hshParams.Add("Process", sProcess)
+        hshParams.Add("Parameter", sParameter)
+
+        If sExcludeID <> String.Empty Then
+            sSQL &= " AND MonitorID <> @MonitorID"
+            hshParams.Add("MonitorID", sExcludeID)
+        End If
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        If oData.Tables(0).Rows.Count > 0 Then
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
     'Sync Functions
     Public Shared Sub DoListAddUpdateSync(ByVal hshGames As Hashtable, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local,
                                           Optional ByVal eSyncFields As clsGame.eOptionalSyncFields = clsGame.eOptionalSyncFields.None)
@@ -315,11 +345,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) "
+        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 &= "VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, "
         sSQL &= sTimeStamp & ", @ExcludeList, " & sGamePath & ", "
         sSQL &= sIcon & ", @Hours, " & sVersion & ", "
-        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, " & sBackupLimit & ");"
+        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, " & sBackupLimit & ", @CleanFolder, @Parameter);"
 
         For Each oGame As clsGame In hshGames.Values
             hshParams = New Hashtable
@@ -335,6 +365,8 @@ Public Class mgrMonitorList
             hshParams.Add("ExcludeList", oGame.ExcludeList)
             hshParams.Add("Hours", oGame.Hours)
             hshParams.Add("MonitorOnly", oGame.MonitorOnly)
+            hshParams.Add("CleanFolder", oGame.CleanFolder)
+            hshParams.Add("Parameter", oGame.Parameter)
 
             'Optional Parameters
             If (eSyncFields And clsGame.eOptionalSyncFields.Company) = clsGame.eOptionalSyncFields.Company Then
@@ -465,38 +497,25 @@ 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 oTagFilters 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 FROM monitorlist"
+        Dim sSort As String = " ORDER BY " & sSortField
 
-        Select Case eFilterType
+        If bSortAsc Then
-            Case frmFilter.eFilterType.NoFilter
+            sSort &= " ASC"
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist ORDER BY Name Asc"
+        Else
-            Case frmFilter.eFilterType.FieldAnd, frmFilter.eFilterType.FieldOr
+            sSort &= " DESC"
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit 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
+        Select Case eFilterType
-                    sSQL &= ")"
+            Case frmFilter.eFilterType.BaseFilter
-                End If
+                sSQL = "SELECT " & sBaseSelect
-                sSQL &= " ORDER BY Name Asc"
             Case frmFilter.eFilterType.AnyTag
-                sSQL = "SELECT DISTINCT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist "
+                sSQL = "SELECT DISTINCT " & sBaseSelect
-                sSQL &= "NATURAL JOIN gametags WHERE gametags.TagID IN ("
+                sSQL &= " NATURAL JOIN gametags WHERE gametags.TagID IN ("
 
                 For Each oTag As clsTag In oTagFilters
                     sSQL &= "@TagID" & iCounter & ","
@@ -505,9 +524,9 @@ Public Class mgrMonitorList
                 Next
 
                 sSQL = sSQL.TrimEnd(",")
-                sSQL &= ") ORDER BY Name Asc"
+                sSQL &= ")"
             Case frmFilter.eFilterType.AllTags
-                sSQL = "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit FROM monitorlist WHERE MonitorID IN "
+                sSQL = "SELECT " & sBaseSelect & " WHERE MonitorID IN "
 
                 For Each oTag As clsTag In oTagFilters
                     sSQL &= "(SELECT MonitorID FROM gametags WHERE monitorlist.MonitorID = gametags.MonitorID And TagID = @TagID" & iCounter & ")"
@@ -517,41 +536,78 @@ Public Class mgrMonitorList
                     hshParams.Add("TagID" & iCounter, oTag.ID)
                     iCounter += 1
                 Next
-
-                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 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
+                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 oTagFilters 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(oTagFilters, 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 oTagFilters 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
@@ -560,7 +616,7 @@ Public Class mgrMonitorList
         Dim oGame As Game
         Dim hshParams As New Hashtable
 
-        sSQL = BuildFilterQuery(oTagFilters, hshStringFilters, eFilterType, hshParams)
+        sSQL = BuildFilterQuery(oTagFilters, oFilters, eFilterType, bAndOperator, bSortAsc, sSortField, hshParams)
 
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
@@ -574,6 +630,8 @@ 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"))
             oGame.Tags = mgrGameTags.GetTagsByGameForExport(sID)
             oList.Add(oGame)
         Next
@@ -652,18 +710,24 @@ Public Class mgrMonitorList
         Dim oList As List(Of Game)
         Dim bSuccess As Boolean = False
         Dim oTagFilters As New List(Of clsTag)
-        Dim oStringFilters As New Hashtable
+        Dim oFilters As New List(Of clsGameFilter)
-        Dim eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.NoFilter
+        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
+            oFilters = frm.GameFilters
             eCurrentFilter = frm.FilterType
+            bAndOperator = frm.AndOperator
+            bSortAsc = frm.SortAsc
+            sSortField = frm.SortField
         End If
 
-        oList = ReadListForExport(oTagFilters, oStringFilters, eCurrentFilter)
+        oList = ReadListForExport(oTagFilters, oFilters, eCurrentFilter, bAndOperator, bSortAsc, sSortField)
 
         bSuccess = mgrXML.SerializeAndExport(oList, sLocation)
 

GBM/Managers/mgrPath.vb

@@ -335,7 +335,7 @@ Public Class mgrPath
         Dim sDefaultFolder As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
         Dim sNewPath As String
 
-        sNewPath = mgrCommon.OpenFolderBrowser(mgrPath_ChoosePath, sDefaultFolder, False)
+        sNewPath = mgrCommon.OpenFolderBrowser("Manual_Game_Location", mgrPath_ChoosePath, sDefaultFolder, False)
 
         Return sNewPath
     End Function

GBM/Managers/mgrProcesses.vb

@@ -1,6 +1,5 @@
-Imports System.Diagnostics
+Imports System.IO
-Imports System.IO
+Imports System.Management
-Imports System.Threading
 
 Public Class mgrProcesses
 
@@ -11,6 +10,7 @@ Public Class mgrProcesses
     Private oDuplicateGames As New ArrayList
     Private bDuplicates As Boolean
     Private bVerified As Boolean = False
+    Private sFullCommand As String = String.Empty
 
     Property FoundProcess As Process
         Get
@@ -72,17 +72,63 @@ Public Class mgrProcesses
         End Set
     End Property
 
-    Private Sub VerifyDuplicate(oGame As clsGame, hshScanList As Hashtable)
+    Property FullCommand As String
+        Get
+            Return sFullCommand
+        End Get
+        Set(value As String)
+            sFullCommand = value
+        End Set
+    End Property
+
+    Private Function HandleDuplicates(hshScanList As Hashtable) As Boolean
         Dim sProcess As String
         bDuplicates = True
         oDuplicateGames.Clear()
+
         For Each o As clsGame In hshScanList.Values
             sProcess = o.ProcessName.Split(":")(0)
 
             If o.Duplicate = True And sProcess = oGame.TrueProcess Then
+                If o.Parameter <> String.Empty And FullCommand.Contains(o.Parameter) Then
+                    oGame = o.ShallowCopy
+                    Return True
+                ElseIf o.Parameter = String.Empty Then
                     oDuplicateGames.Add(o.ShallowCopy)
                 End If
+            End If
         Next
+
+        If oDuplicateGames.Count = 1 Then
+            oGame = DirectCast(oDuplicateGames(0), clsGame).ShallowCopy
+            Return True
+        End If
+
+        Return False
+    End Function
+
+    'This function will only work correctly on Windows
+    Private Sub GetWindowsCommand(ByVal prs As Process)
+        FullCommand = String.Empty
+        Try
+            Using searcher As New ManagementObjectSearcher("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + prs.Id.ToString)
+                For Each o As ManagementObject In searcher.Get()
+                    FullCommand &= o("CommandLine") & " "
+                Next
+            End Using
+        Catch ex As Exception
+            'Do Nothing
+        End Try
+    End Sub
+
+    'This function will only work correctly on Unix
+    Private Sub GetUnixCommand(ByVal prs As Process)
+        FullCommand = String.Empty
+        Try
+            FullCommand = File.ReadAllText("/proc/" & prs.Id.ToString() & "/cmdline").Replace(vbNullChar, " ")
+        Catch ex As Exception
+            'Do Nothing
+        End Try
     End Sub
 
     'This function will only work correctly on Unix
@@ -99,19 +145,18 @@ Public Class mgrProcesses
     'This function will only work correctly on Unix
     Private Function GetUnixSymLinkDirectory(ByVal prs As Process) As String
         Dim prsls As Process
-        Dim slsinfo As String()
+        Dim slsinfo As String
 
-        'This is the best way I can think of to determine the end point of a symlink without doing even more crazy shit
         Try
             prsls = New Process
-            prsls.StartInfo.FileName = "/bin/bash"
+            prsls.StartInfo.FileName = "/bin/readlink"
-            prsls.StartInfo.Arguments = "-c ""ls -l /proc/" & prs.Id.ToString & " | grep cwd"""
+            prsls.StartInfo.Arguments = "-f /proc/" & prs.Id.ToString & "/cwd"
             prsls.StartInfo.UseShellExecute = False
             prsls.StartInfo.RedirectStandardOutput = True
             prsls.StartInfo.CreateNoWindow = True
             prsls.Start()
-            slsinfo = prsls.StandardOutput.ReadToEnd().Split(">")
+            slsinfo = prsls.StandardOutput.ReadToEnd()
-            Return slsinfo(slsinfo.Length - 1).Trim
+            Return slsinfo.Trim()
         Catch ex As Exception
             Return String.Empty
         End Try
@@ -153,13 +198,26 @@ Public Class mgrProcesses
                 prsFoundProcess = prsCurrent
                 oGame = DirectCast(hshScanList.Item(sProcessCheck), clsGame).ShallowCopy
 
+                If mgrCommon.IsUnix Then
+                    GetUnixCommand(prsCurrent)
+                Else
+                    GetWindowsCommand(prsCurrent)
+                End If
+
                 If oGame.Duplicate = True Then
-                    VerifyDuplicate(oGame, hshScanList)
+                    If HandleDuplicates(hshScanList) Then
+                        bDuplicates = False
+                        oDuplicateGames.Clear()
+                    End If
                 Else
                     bDuplicates = False
                     oDuplicateGames.Clear()
                 End If
 
+                If Duplicate And DuplicateList.Count = 0 Then Return False
+
+                If oGame.Parameter <> String.Empty And Not Duplicate And Not FullCommand.Contains(oGame.Parameter) Then Return False
+
                 If Not oGame.AbsolutePath Or oGame.Duplicate Then
                     Try
                         If Not bWineProcess Then

GBM/Managers/mgrRestore.vb

@@ -96,8 +96,6 @@ Public Class mgrRestore
         If bLocal And bRemote Then
             'Compare
             If oRemoteItem.DateUpdated > oLocalItem.DateUpdated Then
-                oRemoteItem.LastDateUpdated = oLocalItem.DateUpdated
-                oRemoteItem.LastUpdatedBy = oLocalItem.UpdatedBy
                 Return True
             End If
         End If
@@ -125,18 +123,10 @@ Public Class mgrRestore
                 oLocalItem = DirectCast(slLocalManifest(oItem.Name), clsBackup)
 
                 If oItem.DateUpdated > oLocalItem.DateUpdated Then
-                    oLocalItem.FileName = oItem.FileName
+                    slRestoreItems.Add(oItem.Name, oItem)
-                    oLocalItem.LastDateUpdated = oItem.DateUpdated
-                    oLocalItem.LastUpdatedBy = oItem.UpdatedBy
-                    slRestoreItems.Add(oLocalItem.Name, oLocalItem)
                 End If
             Else
-                oLocalItem = oItem
+                slRestoreItems.Add(oItem.Name, oItem)
-                oLocalItem.LastDateUpdated = oItem.DateUpdated
-                oLocalItem.LastUpdatedBy = oItem.UpdatedBy
-                oLocalItem.DateUpdated = Nothing
-                oLocalItem.UpdatedBy = Nothing
-                slRestoreItems.Add(oLocalItem.Name, oLocalItem)
             End If
         Next
 
@@ -161,7 +151,7 @@ Public Class mgrRestore
         Return slRemovedItems
     End Function
 
-    Public Function CheckRestorePrereq(ByVal oBackupInfo As clsBackup) As Boolean
+    Public Function CheckRestorePrereq(ByVal oBackupInfo As clsBackup, ByVal bCleanFolder As Boolean) As Boolean
         Dim sHash As String
         Dim sExtractPath As String
         Dim sBackupFile As String = oSettings.BackupFolder & Path.DirectorySeparatorChar & oBackupInfo.FileName
@@ -185,10 +175,14 @@ Public Class mgrRestore
                 RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorNoPath, sExtractPath), False, ToolTipIcon.Error, True)
                 Return False
             End If
+        Else
+            If bCleanFolder Then
+                mgrCommon.DeleteDirectory(sExtractPath, True)
+                Directory.CreateDirectory(sExtractPath)
+            End If
         End If
 
         'Check file integrity
-        If oSettings.CheckSum Then
         If oBackupInfo.CheckSum <> String.Empty Then
             sHash = mgrHash.Generate_SHA256_Hash(sBackupFile)
             If sHash <> oBackupInfo.CheckSum Then
@@ -203,7 +197,7 @@ Public Class mgrRestore
         Else
             RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_NoVerify, oBackupInfo.Name), False, ToolTipIcon.Info, True)
         End If
-        End If
+
 
         Return True
     End Function

GBM/Managers/mgrSQLite.vb

@@ -72,15 +72,18 @@ Public Class mgrSQLite
             'Add Tables (Settings)
             sSql = "CREATE TABLE settings (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " &
                    "DisableConfirmation BOOLEAN NOT NULL, CreateSubFolder BOOLEAN NOT NULL, ShowOverwriteWarning BOOLEAN NOT NULL, RestoreOnLaunch BOOLEAN NOT NULL, " &
-                   "BackupFolder TEXT NOT NULL, Sync BOOLEAN NOT NULL, CheckSum BOOLEAN NOT NULL, StartWithWindows BOOLEAN NOT NULL, TimeTracking 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);"
+                   "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL);"
+
+            'Add Tables (SavedPath)
+            sSql &= "CREATE TABLE savedpath (PathName TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);"
 
             'Add Tables (Monitor List)
             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, PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, PRIMARY KEY(Name, Process));"
 
             'Add Tables (Tags)
             sSql &= "CREATE TABLE tags (TagID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY); "
@@ -117,7 +120,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, PRIMARY KEY(Name, Process));"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter 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, " &
@@ -167,6 +170,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)
@@ -186,7 +198,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
@@ -212,7 +224,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
@@ -600,6 +612,74 @@ Public Class mgrSQLite
             End If
         End If
 
+        '1.01 Upgrade
+        If GetDatabaseVersion() < 101 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v98")
+
+                'Remove checksum field                
+                sSQL = "CREATE TABLE settings_new (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " &
+                        "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);"
+                sSQL &= "INSERT INTO settings_new (SettingsID, MonitorOnStartup, StartToTray, ShowDetectionToolTips, DisableConfirmation, CreateSubFolder, " &
+                        "ShowOverwriteWarning, RestoreOnLaunch, BackupFolder, Sync, StartWithWindows, TimeTracking,  SupressBackup, SupressBackupThreshold, " &
+                        "CompressionLevel, Custom7zArguments, Custom7zLocation, SyncFields, AutoSaveLog) " &
+                        "SELECT SettingsID, MonitorOnStartup, StartToTray, ShowDetectionToolTips, DisableConfirmation, CreateSubFolder, " &
+                        "ShowOverwriteWarning, RestoreOnLaunch, BackupFolder, Sync, StartWithWindows, TimeTracking,  SupressBackup, SupressBackupThreshold, " &
+                        "CompressionLevel, Custom7zArguments, Custom7zLocation, SyncFields, AutoSaveLog FROM settings;" &
+                        "DROP TABLE settings; ALTER TABLE settings_new RENAME TO settings;"
+                'Add new field(s)
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN CleanFolder BOOLEAN NOT NULL DEFAULT 0;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN AutoRestore BOOLEAN NOT NULL DEFAULT 0;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN AutoMark BOOLEAN NOT NULL DEFAULT 0;"
+                sSQL &= "PRAGMA user_version=101"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v98")
+
+                'Add new field(s)
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN CleanFolder BOOLEAN NOT NULL DEFAULT 0;"
+                sSQL &= "PRAGMA user_version=101"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
+
+        '1.02 Upgrade
+        If GetDatabaseVersion() < 102 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v101")
+
+                'Add Table (SavedPath)
+                sSQL = "CREATE TABLE savedpath (PathName TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);"
+
+                'Add new field(s)
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN Parameter TEXT;"
+
+                sSQL &= "PRAGMA user_version=102"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v101")
+
+                'Add new field(s)
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN Parameter TEXT;"
+
+                sSQL &= "PRAGMA user_version=102"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
+
     End Sub
 
     Public Function GetDBSize() As Long
@@ -607,6 +687,10 @@ Public Class mgrSQLite
         Return Math.Round(oFileInfo.Length / 1024, 2)
     End Function
 
+    Public Function ReportVersion() As String
+        Return SqliteConnection.SQLiteVersion
+    End Function
+
     Public Sub CompactDatabase()
         Dim sSQL As String
         Dim command As SQLiteCommand

GBM/Managers/mgrSavedPath.vb

@@ -0,0 +1,54 @@
+Public Class mgrSavedPath
+
+
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsSavedPath
+        Dim oSavedPath As New clsSavedPath
+
+        oSavedPath.PathName = CStr(dr("PathName"))
+        oSavedPath.Path = CStr(dr("Path"))
+
+        Return oSavedPath
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oSavedPath As clsSavedPath) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("PathName", oSavedPath.PathName)
+        hshParams.Add("Path", oSavedPath.Path)
+
+        Return hshParams
+    End Function
+
+    Public Shared Function GetPathByName(ByVal sPathName As String) As clsSavedPath
+        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim oSavedPath As New clsSavedPath
+
+        sSQL = "SELECT PathName, Path from savedpath WHERE PathName=@PathName;"
+
+        hshParams.Add("PathName", sPathName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oSavedPath = MapToObject(dr)
+        Next
+
+        Return oSavedPath
+    End Function
+
+    Public Shared Sub AddUpdatePath(ByVal oSavedPath As clsSavedPath)
+        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
+        Dim sSQL As String
+        Dim hshParams As Hashtable
+
+        sSQL = "INSERT OR REPLACE INTO savedpath (PathName, Path) VALUES (@PathName, @Path);"
+
+        hshParams = SetCoreParameters(oSavedPath)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+    End Sub
+
+End Class

GBM/Managers/mgrSettings.vb

@@ -9,8 +9,9 @@ Public Class mgrSettings
     Private bCreateSubFolder As Boolean = False
     Private bShowOverwriteWarning As Boolean = True
     Private bRestoreOnLaunch As Boolean = False
+    Private bAutoRestore As Boolean = False
+    Private bAutoMark As Boolean = False
     Private bSync As Boolean = True
-    Private bCheckSum As Boolean = True
     Private bTimeTracking As Boolean = True
     Private bSupressBackup As Boolean = False
     Private iSupressBackupThreshold As Integer = 10
@@ -93,6 +94,24 @@ Public Class mgrSettings
         End Set
     End Property
 
+    Property AutoRestore As Boolean
+        Get
+            Return bAutoRestore
+        End Get
+        Set(value As Boolean)
+            bAutoRestore = value
+        End Set
+    End Property
+
+    Property AutoMark As Boolean
+        Get
+            Return bAutoMark
+        End Get
+        Set(value As Boolean)
+            bAutoMark = value
+        End Set
+    End Property
+
     Property Sync As Boolean
         Get
             Return bSync
@@ -102,15 +121,6 @@ Public Class mgrSettings
         End Set
     End Property
 
-    Property CheckSum As Boolean
-        Get
-            Return bCheckSum
-        End Get
-        Set(value As Boolean)
-            bCheckSum = value
-        End Set
-    End Property
-
     Property TimeTracking As Boolean
         Get
             Return bTimeTracking
@@ -249,9 +259,9 @@ Public Class mgrSettings
         oDatabase.RunParamQuery(sSQL, New Hashtable)
 
         sSQL = "INSERT INTO settings VALUES (1, @MonitorOnStartup, @StartToTray, @ShowDetectionToolTips, @DisableConfirmation, "
-        sSQL &= "@CreateSubFolder, @ShowOverwriteWarning, @RestoreOnLaunch, @BackupFolder, @Sync, @CheckSum, @StartWithWindows, "
+        sSQL &= "@CreateSubFolder, @ShowOverwriteWarning, @RestoreOnLaunch, @BackupFolder, @Sync, @StartWithWindows, "
         sSQL &= "@TimeTracking, @SupressBackup, @SupressBackupThreshold, @CompressionLevel, @Custom7zArguments, @Custom7zLocation, "
-        sSQL &= "@SyncFields,@AutoSaveLog)"
+        sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark)"
 
         hshParams.Add("MonitorOnStartup", MonitorOnStartup)
         hshParams.Add("StartToTray", StartToTray)
@@ -262,7 +272,6 @@ Public Class mgrSettings
         hshParams.Add("RestoreOnLaunch", RestoreOnLaunch)
         hshParams.Add("BackupFolder", BackupFolder)
         hshParams.Add("Sync", Sync)
-        hshParams.Add("CheckSum", CheckSum)
         hshParams.Add("StartWithWindows", StartWithWindows)
         hshParams.Add("TimeTracking", TimeTracking)
         hshParams.Add("SupressBackup", SupressBackup)
@@ -272,6 +281,8 @@ Public Class mgrSettings
         hshParams.Add("Custom7zLocation", Custom7zLocation)
         hshParams.Add("SyncFields", SyncFields)
         hshParams.Add("AutoSaveLog", AutoSaveLog)
+        hshParams.Add("AutoRestore", AutoRestore)
+        hshParams.Add("AutoMark", AutoMark)
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
@@ -295,7 +306,6 @@ Public Class mgrSettings
             RestoreOnLaunch = CBool(dr("RestoreOnLaunch"))
             BackupFolder = CStr(dr("BackupFolder"))
             Sync = CBool(dr("Sync"))
-            CheckSum = CBool(dr("CheckSum"))
             StartWithWindows = CBool(dr("StartWithWindows"))
             TimeTracking = CBool(dr("TimeTracking"))
             SupressBackup = CBool(dr("SupressBackup"))
@@ -305,6 +315,8 @@ Public Class mgrSettings
             If Not IsDBNull(dr("Custom7zLocation")) Then Custom7zLocation = CStr(dr("Custom7zLocation"))
             SyncFields = CInt(dr("SyncFields"))
             AutoSaveLog = CBool(dr("AutoSaveLog"))
+            AutoRestore = CBool(dr("AutoRestore"))
+            AutoMark = CBool(dr("AutoMark"))
         Next
 
         oDatabase.Disconnect()

GBM/Managers/mgrXML.vb

@@ -28,6 +28,8 @@ Public Class mgrXML
             oGame.FolderSave = g.FolderSave
             oGame.FileType = g.FileType
             oGame.ExcludeList = g.ExcludeList
+            oGame.MonitorOnly = g.MonitorOnly
+            oGame.Parameter = g.Parameter
             For Each t As Tag In g.Tags
                 oGame.ImportTags.Add(t)
             Next

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 © 2016 Michael J. Seiferling")>
+<Assembly: AssemblyCopyright("Copyright © 2017 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.0.*")>
+<Assembly: AssemblyVersion("1.0.4.*")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.4.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 

GBM/My Project/Resources.Designer.vb

@@ -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>
@@ -96,24 +105,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Looks up a localized string similar to [PARAM] KB.
-        '''</summary>
-        Friend ReadOnly Property App_KB() As String
-            Get
-                Return ResourceManager.GetString("App_KB", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to [PARAM] MB.
-        '''</summary>
-        Friend ReadOnly Property App_MB() As String
-            Get
-                Return ResourceManager.GetString("App_MB", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Looks up a localized string similar to Game Backup Monitor.
         '''</summary>
@@ -933,6 +924,15 @@ 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 &amp;OK.
         '''</summary>
@@ -951,6 +951,204 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Remove.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_btnRemoveFilter() As String
+            Get
+                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 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
+        
         '''<summary>
         '''  Looks up a localized string similar to Custom Filter.
         '''</summary>
@@ -961,11 +1159,29 @@ 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 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
         
@@ -979,11 +1195,29 @@ 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 Available Fields.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblFields() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblFields", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Filter.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_lblFilterData() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_lblFilterData", resourceCulture)
             End Get
         End Property
         
@@ -997,20 +1231,11 @@ Namespace My.Resources
         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_lblSortsFields() As String
             Get
-                Return ResourceManager.GetString("frmFilter_lblName", resourceCulture)
+                Return ResourceManager.GetString("frmFilter_lblSortsFields", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Process:.
-        '''</summary>
-        Friend ReadOnly Property frmFilter_lblProcess() As String
-            Get
-                Return ResourceManager.GetString("frmFilter_lblProcess", resourceCulture)
             End Get
         End Property
         
@@ -1023,6 +1248,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>
@@ -1033,7 +1276,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
@@ -1051,16 +1294,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Game Information.
+        '''  Looks up a localized string similar to Any.
-        '''</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.
         '''</summary>
         Friend ReadOnly Property frmFilter_optOr() As String
             Get
@@ -1069,11 +1303,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
         
@@ -1293,6 +1536,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Delete folder on restore.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_chkCleanFolder() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_chkCleanFolder", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Monitor this game.
         '''</summary>
@@ -1644,6 +1896,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to A game with this exact process and parameter already exists..
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_ErrorProcessParameterDupe() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_ErrorProcessParameterDupe", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to You must enter a valid game name..
         '''</summary>
@@ -1851,6 +2112,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Parameter:.
+        '''</summary>
+        Friend ReadOnly Property frmGameManager_lblParameter() As String
+            Get
+                Return ResourceManager.GetString("frmGameManager_lblParameter", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Process:.
         '''</summary>
@@ -1942,7 +2212,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to New Saves Pending.
+        '''  Looks up a localized string similar to New Backups Pending.
         '''</summary>
         Friend ReadOnly Property frmGameManager_optPendingRestores() As String
             Get
@@ -2275,7 +2545,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details..
+        '''  Looks up a localized string similar to Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR]SQLite: [PARAM][BR][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details..
         '''</summary>
         Friend ReadOnly Property frmMain_About() As String
             Get
@@ -2292,6 +2562,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to The saved game folder for [PARAM] does not exist or could not be determined, the backup has been automatically marked as restored..
+        '''</summary>
+        Friend ReadOnly Property frmMain_AutoMark() As String
+            Get
+                Return ResourceManager.GetString("frmMain_AutoMark", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] has multiple configurations and cannot be automatically restored..
+        '''</summary>
+        Friend ReadOnly Property frmMain_AutoRestoreFailure() As String
+            Get
+                Return ResourceManager.GetString("frmMain_AutoRestoreFailure", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Backup in Progress....
         '''</summary>
@@ -3058,7 +3346,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to [PARAM] New Saves Pending.
+        '''  Looks up a localized string similar to [PARAM] New Backups Pending.
         '''</summary>
         Friend ReadOnly Property frmMain_NewSaveNotificationMulti() As String
             Get
@@ -3067,7 +3355,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to [PARAM] New Save Pending.
+        '''  Looks up a localized string similar to [PARAM] New Backup Pending.
         '''</summary>
         Friend ReadOnly Property frmMain_NewSaveNotificationSingle() As String
             Get
@@ -3075,6 +3363,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to The saved game folder for [PARAM] does not exist or could not be determined, this backup has been skipped..
+        '''</summary>
+        Friend ReadOnly Property frmMain_NoAutoMark() As String
+            Get
+                Return ResourceManager.GetString("frmMain_NoAutoMark", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The backup file for [PARAM] has no checksum,  it cannot be automatically restored..
+        '''</summary>
+        Friend ReadOnly Property frmMain_NoCheckSum() As String
+            Get
+                Return ResourceManager.GetString("frmMain_NoCheckSum", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Game details are unavailable..
         '''</summary>
@@ -3147,6 +3453,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] new saved game backups are being automatically restored..
+        '''</summary>
+        Friend ReadOnly Property frmMain_RestoreNotificationMulti() As String
+            Get
+                Return ResourceManager.GetString("frmMain_RestoreNotificationMulti", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to A new saved game backup for [PARAM] is being automatically restored..
+        '''</summary>
+        Friend ReadOnly Property frmMain_RestoreNotificationSingle() As String
+            Get
+                Return ResourceManager.GetString("frmMain_RestoreNotificationSingle", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to The backup file for [PARAM] is not ready to restore..
+        '''</summary>
+        Friend ReadOnly Property frmMain_RestoreNotReady() As String
+            Get
+                Return ResourceManager.GetString("frmMain_RestoreNotReady", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to GBM is running with Administrator privileges..
         '''</summary>
@@ -3345,6 +3678,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Automatically mark new backups as restored when appropriate.
+        '''</summary>
+        Friend ReadOnly Property frmSettings_chkAutoMark() As String
+            Get
+                Return ResourceManager.GetString("frmSettings_chkAutoMark", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Automatically restore new backups.
+        '''</summary>
+        Friend ReadOnly Property frmSettings_chkAutoRestore() As String
+            Get
+                Return ResourceManager.GetString("frmSettings_chkAutoRestore", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Autosave log when max length is exceeded.
         '''</summary>
@@ -3363,15 +3714,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Looks up a localized string similar to Verify backup files with a checksum.
-        '''</summary>
-        Friend ReadOnly Property frmSettings_chkCheckSum() As String
-            Get
-                Return ResourceManager.GetString("frmSettings_chkCheckSum", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Looks up a localized string similar to Create a sub-folder for each game.
         '''</summary>
@@ -3400,11 +3742,11 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Notify when there are new backup files to restore.
+        '''  Looks up a localized string similar to Display notifications about new backups.
         '''</summary>
-        Friend ReadOnly Property frmSettings_chkRestoreOnLaunch() As String
+        Friend ReadOnly Property frmSettings_chkRestoreNotify() As String
             Get
-                Return ResourceManager.GetString("frmSettings_chkRestoreOnLaunch", resourceCulture)
+                Return ResourceManager.GetString("frmSettings_chkRestoreNotify", resourceCulture)
             End Get
         End Property
         
@@ -3525,6 +3867,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Backup Handling.
+        '''</summary>
+        Friend ReadOnly Property frmSettings_grpBackupHandling() As String
+            Get
+                Return ResourceManager.GetString("frmSettings_grpBackupHandling", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Folders.
         '''</summary>
@@ -4366,6 +4717,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] backup failed due to a malformed command..
+        '''</summary>
+        Friend ReadOnly Property mgrBackup_7zCommandFailure() As String
+            Get
+                Return ResourceManager.GetString("mgrBackup_7zCommandFailure", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] backup failed due to an error..
+        '''</summary>
+        Friend ReadOnly Property mgrBackup_7zFatalError() As String
+            Get
+                Return ResourceManager.GetString("mgrBackup_7zFatalError", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] backup completed with warnings..
+        '''</summary>
+        Friend ReadOnly Property mgrBackup_7zWarnings() As String
+            Get
+                Return ResourceManager.GetString("mgrBackup_7zWarnings", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to [PARAM] backup completed..
         '''</summary>
@@ -4412,11 +4790,11 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to [PARAM] backup finished with warnings or errors..
+        '''  Looks up a localized string similar to You may not have enough disk space available to perform a backup.[BR][BR]Do you want to continue anyway?.
         '''</summary>
-        Friend ReadOnly Property mgrBackup_BackupWarnings() As String
+        Friend ReadOnly Property mgrBackup_ConfirmDiskSpace() As String
             Get
-                Return ResourceManager.GetString("mgrBackup_BackupWarnings", resourceCulture)
+                Return ResourceManager.GetString("mgrBackup_ConfirmDiskSpace", resourceCulture)
             End Get
         End Property
         
@@ -4438,6 +4816,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Backup aborted due to lack of disk space..
+        '''</summary>
+        Friend ReadOnly Property mgrBackup_ErrorDiskSpace() As String
+            Get
+                Return ResourceManager.GetString("mgrBackup_ErrorDiskSpace", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to An error occured creating a file list: [PARAM].
         '''</summary>
@@ -4519,6 +4906,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Available Disk Space: [PARAM].
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_AvailableDiskSpace() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_AvailableDiskSpace", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] B.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_B() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_B", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to An error has occured writing the text file.[BR][BR][PARAM].
         '''</summary>
@@ -4537,6 +4942,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] GB.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_GB() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_GB", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] KB.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_KB() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_KB", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] MB.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_MB() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_MB", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to No.
         '''</summary>
@@ -4546,6 +4978,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] PB.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_PB() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_PB", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] Save Folder Size: [PARAM].
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_SavedGameFolderSize() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_SavedGameFolderSize", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to [PARAM] TB.
+        '''</summary>
+        Friend ReadOnly Property mgrCommon_TB() As String
+            Get
+                Return ResourceManager.GetString("mgrCommon_TB", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Yes.
         '''</summary>

GBM/My Project/Resources.resx

@@ -122,7 +122,7 @@
     <value>..\Resources\Admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="frmMain_About" xml:space="preserve">
-    <value>Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details.</value>
+    <value>Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR]SQLite: [PARAM][BR][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details.</value>
   </data>
   <data name="frmMain_ManifestAreadyClean" xml:space="preserve">
     <value>The local manifest is clean.</value>
@@ -287,10 +287,10 @@
     <value>Multiple Games Detected</value>
   </data>
   <data name="frmMain_NewSaveNotificationMulti" xml:space="preserve">
-    <value>[PARAM] New Saves Pending</value>
+    <value>[PARAM] New Backups Pending</value>
   </data>
   <data name="frmMain_NewSaveNotificationSingle" xml:space="preserve">
-    <value>[PARAM] New Save Pending</value>
+    <value>[PARAM] New Backup Pending</value>
   </data>
   <data name="frmMain_NoDetails" xml:space="preserve">
     <value>Game details are unavailable.</value>
@@ -424,12 +424,6 @@
   <data name="App_ConfirmDirty" xml:space="preserve">
     <value>There are unsaved changes on this form.  Do you want to save?</value>
   </data>
-  <data name="App_KB" xml:space="preserve">
-    <value>[PARAM] KB</value>
-  </data>
-  <data name="App_MB" xml:space="preserve">
-    <value>[PARAM] MB</value>
-  </data>
   <data name="frmGameManager_BackupTimeAndName" xml:space="preserve">
     <value>[PARAM] ([PARAM])</value>
   </data>
@@ -659,7 +653,7 @@
     <value>Custom</value>
   </data>
   <data name="frmGameManager_optPendingRestores" xml:space="preserve">
-    <value>New Saves Pending</value>
+    <value>New Backups Pending</value>
   </data>
   <data name="frmGameManager_OutofSync" xml:space="preserve">
     <value>Out of Sync</value>
@@ -901,18 +895,9 @@
   <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>
   <data name="frmFilter_lblTags" xml:space="preserve">
     <value>Available Tags</value>
   </data>
@@ -920,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">
@@ -1021,8 +1006,8 @@
   <data name="frmIncludeExclude_ToolTipTitle" xml:space="preserve">
     <value>Saved Game Explorer</value>
   </data>
-  <data name="frmFilter_grpGameInfoOptions" xml:space="preserve">
+  <data name="frmFilter_grpFilterType" xml:space="preserve">
-    <value>Options</value>
+    <value>Filter Type</value>
   </data>
   <data name="frmFilter_grpTagOptions" xml:space="preserve">
     <value>Options</value>
@@ -1075,9 +1060,6 @@
   <data name="frmSettings_chkBackupConfirm" xml:space="preserve">
     <value>Disable backup confirmation</value>
   </data>
-  <data name="frmSettings_chkCheckSum" xml:space="preserve">
-    <value>Verify backup files with a checksum</value>
-  </data>
   <data name="frmSettings_chkCreateFolder" xml:space="preserve">
     <value>Create a sub-folder for each game</value>
   </data>
@@ -1087,8 +1069,8 @@
   <data name="frmSettings_chkOverwriteWarning" xml:space="preserve">
     <value>Show overwrite warning</value>
   </data>
-  <data name="frmSettings_chkRestoreOnLaunch" xml:space="preserve">
+  <data name="frmSettings_chkRestoreNotify" xml:space="preserve">
-    <value>Notify when there are new backup files to restore</value>
+    <value>Display notifications about new backups</value>
   </data>
   <data name="frmSettings_chkShowDetectionTips" xml:space="preserve">
     <value>Show detection notifications</value>
@@ -1306,8 +1288,8 @@
   <data name="mgrBackup_BackupInProgress" xml:space="preserve">
     <value>Backup of [PARAM] in progress...</value>
   </data>
-  <data name="mgrBackup_BackupWarnings" xml:space="preserve">
+  <data name="mgrBackup_7zWarnings" xml:space="preserve">
-    <value>[PARAM] backup finished with warnings or errors.</value>
+    <value>[PARAM] backup completed with warnings.</value>
   </data>
   <data name="mgrBackup_ConfirmManifestConflict" xml:space="preserve">
     <value>The manifest shows the backup folder contains a backup for [PARAM] that has not been restored on this computer.[BR][BR]Do you want to overwrite this file anyway?</value>
@@ -1732,4 +1714,175 @@
   <data name="frmGameManager_Unknown" xml:space="preserve">
     <value>Unknown</value>
   </data>
+  <data name="frmGameManager_chkCleanFolder" xml:space="preserve">
+    <value>Delete folder on restore</value>
+  </data>
+  <data name="frmMain_AutoMark" xml:space="preserve">
+    <value>The saved game folder for [PARAM] does not exist or could not be determined, the backup has been automatically marked as restored.</value>
+  </data>
+  <data name="frmMain_RestoreNotReady" xml:space="preserve">
+    <value>The backup file for [PARAM] is not ready to restore.</value>
+  </data>
+  <data name="frmSettings_chkAutoMark" xml:space="preserve">
+    <value>Automatically mark new backups as restored when appropriate</value>
+  </data>
+  <data name="frmSettings_grpBackupHandling" xml:space="preserve">
+    <value>Backup Handling</value>
+  </data>
+  <data name="frmSettings_chkAutoRestore" xml:space="preserve">
+    <value>Automatically restore new backups</value>
+  </data>
+  <data name="frmMain_AutoRestoreFailure" xml:space="preserve">
+    <value>[PARAM] has multiple configurations and cannot be automatically restored.</value>
+  </data>
+  <data name="frmMain_RestoreNotificationMulti" xml:space="preserve">
+    <value>[PARAM] new saved game backups are being automatically restored.</value>
+  </data>
+  <data name="frmMain_RestoreNotificationSingle" xml:space="preserve">
+    <value>A new saved game backup for [PARAM] is being automatically restored.</value>
+  </data>
+  <data name="frmMain_NoAutoMark" xml:space="preserve">
+    <value>The saved game folder for [PARAM] does not exist or could not be determined, this backup has been skipped.</value>
+  </data>
+  <data name="frmMain_NoCheckSum" xml:space="preserve">
+    <value>The backup file for [PARAM] has no checksum,  it cannot be automatically restored.</value>
+  </data>
+  <data name="mgrBackup_ConfirmDiskSpace" xml:space="preserve">
+    <value>You may not have enough disk space available to perform a backup.[BR][BR]Do you want to continue anyway?</value>
+  </data>
+  <data name="mgrBackup_ErrorDiskSpace" xml:space="preserve">
+    <value>Backup aborted due to lack of disk space.</value>
+  </data>
+  <data name="mgrCommon_AvailableDiskSpace" xml:space="preserve">
+    <value>Available Disk Space: [PARAM]</value>
+  </data>
+  <data name="mgrCommon_GB" xml:space="preserve">
+    <value>[PARAM] GB</value>
+  </data>
+  <data name="mgrCommon_KB" xml:space="preserve">
+    <value>[PARAM] KB</value>
+  </data>
+  <data name="mgrCommon_MB" xml:space="preserve">
+    <value>[PARAM] MB</value>
+  </data>
+  <data name="mgrCommon_PB" xml:space="preserve">
+    <value>[PARAM] PB</value>
+  </data>
+  <data name="mgrCommon_SavedGameFolderSize" xml:space="preserve">
+    <value>[PARAM] Save Folder Size: [PARAM]</value>
+  </data>
+  <data name="mgrCommon_TB" xml:space="preserve">
+    <value>[PARAM] TB</value>
+  </data>
+  <data name="frmGameManager_lblParameter" xml:space="preserve">
+    <value>Parameter:</value>
+  </data>
+  <data name="frmGameManager_ErrorProcessParameterDupe" xml:space="preserve">
+    <value>A game with this exact process and parameter already exists.</value>
+  </data>
+  <data name="mgrCommon_B" xml:space="preserve">
+    <value>[PARAM] B</value>
+  </data>
+  <data name="mgrBackup_7zCommandFailure" xml:space="preserve">
+    <value>[PARAM] backup failed due to a malformed command.</value>
+  </data>
+  <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>
 </root>

GBM/readme.txt

@@ -1,14 +1,20 @@
-Game Backup Monitor v1.0 Readme
+Game Backup Monitor v1.04 Readme
 http://mikemaximus.github.io/gbm-web/
 gamebackupmonitor@gmail.com
 
-December 15, 2016
+September 26, 2017
 
-Game Backup Monitor has reached 1.0!
+New in 1.04
 
-New in 1.0
+- (All) The import feature now detects most saved games currently on your PC and automatically selects configurations for you.
-
+- (All) The Game Manager's "Custom Filter" feature has received a major overhaul:
-- (Windows) Resolved issues related to DPI display scaling. GBM looks best with scaling disabled via the Compatability tab.
+	- More fields are now available for use.
-- (All) Very minor bug fixes and tweaks.
+	- Added the ability to combine different filters.
+	- Added the ability to set a sort field and order.
+	- The current filter is now saved when the Custom Filter window is closed and re-opened.
+- (All) The "Monitor Only" feature has been updated.  This feature allows tracking play time for games that do not require a backup, such as MMOs or CCGs.
+	- The Game Manager now disables and ignores validation on fields that aren't needed for a Monitor Only configuration.
+	- Monitor Only is now included in the XML Import / Export.
+	- Monitor Only configurations may now be included in the official game lists.
 	
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html

README.md

@@ -1,15 +1,15 @@
-# [Game Backup Monitor] (http://mikemaximus.github.io/gbm-web/)
+# [Game Backup Monitor](http://mikemaximus.github.io/gbm-web/)
 
-![Screenshot] (http://mikemaximus.github.io/gbm-web/images/manual/manual_01.jpg)
+![Screenshot](http://mikemaximus.github.io/gbm-web/images/manual/manual_01.jpg)
 
 Game Backup Monitor is a simple, but flexible application that detects games as you play them.  Once you finish playing a game, a backup of the saved games will be made automatically using 7-Zip compression.  GBM can be used on a single computer, or on multiple computers to effectively add cloud support to any game or application.
 
 **License**: GNU General Public License version 3.0 (GPLv3)<br />
-**Language**: English ([Translation FAQ] (http://mikemaximus.github.io/gbm-web/translations.html))<br />
+**Language**: English ([Translation FAQ](http://mikemaximus.github.io/gbm-web/translations.html))<br />
 **Platform**: Windows (.NET 4) & Linux (Mono)
 
-[About Game Backup Monitor] (http://mikemaximus.github.io/gbm-web/about.html) <br />
+[About Game Backup Monitor](http://mikemaximus.github.io/gbm-web/about.html) <br />
-[Game Backup Monitor FAQ] (http://mikemaximus.github.io/gbm-web/faq.html) <br />
+[Game Backup Monitor FAQ](http://mikemaximus.github.io/gbm-web/faq.html) <br />
-[Game Backup Monitor Manual] (http://mikemaximus.github.io/gbm-web/manual.html) <br />
+[Game Backup Monitor Manual](http://mikemaximus.github.io/gbm-web/manual.html) <br />
-[List of Preconfigured Games] (http://mikemaximus.github.io/gbm-web/GBM_Official.xml) <br /> <br />
+[List of Preconfigured Games](http://mikemaximus.github.io/gbm-web/GBM_Official.xml) <br /> <br />
-Updates regarding this project are available via the [Game Backup Monitor web site] (http://mikemaximus.github.io/gbm-web/).
+Updates regarding this project are available via the [Game Backup Monitor web site](http://mikemaximus.github.io/gbm-web/).