Merge pull request #169 from MikeMaximus/v116

V116

GBM/Classes/XML Serialize Classes/Game.vb

@@ -13,6 +13,7 @@
     Private bMonitorOnly As Boolean
     Private sComments As String
     Private bIsRegEx As Boolean
+    Private bRecurseSubFolders As Boolean
     Private oTags As List(Of Tag)
 
     Property ID As String
@@ -141,6 +142,15 @@
         End Get
     End Property
 
+    Property RecurseSubFolders As Boolean
+        Set(value As Boolean)
+            bRecurseSubFolders = value
+        End Set
+        Get
+            Return bRecurseSubFolders
+        End Get
+    End Property
+
     Property Tags As List(Of Tag)
         Get
             Return oTags

GBM/Classes/clsGame.vb

@@ -21,6 +21,7 @@ Public Class clsGame
     Private bMonitorOnly As Boolean = False
     Private sComments As String = String.Empty
     Private bIsRegEx As Boolean = False
+    Private bRecurseSubFolders As Boolean = True
     Private oImportTags As New List(Of Tag)
     Private bImportUpdate As Boolean = False
 
@@ -241,6 +242,15 @@ Public Class clsGame
         End Set
     End Property
 
+    Property RecurseSubFolders As Boolean
+        Get
+            Return bRecurseSubFolders
+        End Get
+        Set(value As Boolean)
+            bRecurseSubFolders = value
+        End Set
+    End Property
+
     Property TruePath As String
         Set(value As String)
             sPath = value
@@ -342,6 +352,9 @@ Public Class clsGame
             If IsRegEx <> oGame.IsRegEx Then
                 Return False
             End If
+            If RecurseSubFolders <> oGame.RecurseSubFolders Then
+                Return False
+            End If
 
             'Optional Sync Fields
             If (eSyncFields And eOptionalSyncFields.Company) = eOptionalSyncFields.Company Then
@@ -418,6 +431,9 @@ Public Class clsGame
             If IsRegEx <> oGame.IsRegEx Then
                 Return False
             End If
+            If RecurseSubFolders <> oGame.RecurseSubFolders Then
+                Return False
+            End If
             Return True
         End If
     End Function

GBM/Forms/frmFilter.vb

@@ -202,6 +202,14 @@ Public Class frmFilter
         oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
         oValidFields.Add(oField)
 
+        'Include Sub Folders
+        oField = New clsGameFilterField
+        oField.FieldName = "RecurseSubFolders"
+        oField.FriendlyFieldName = frmFilter_FieldRecurseSubFolders
+        oField.Type = clsGameFilterField.eDataType.fBool
+        oField.Status = clsGameFilterField.eFieldStatus.ValidFilter
+        oValidFields.Add(oField)
+
         'Delete Folder on Restore
         oField = New clsGameFilterField
         oField.FieldName = "CleanFolder"

GBM/Forms/frmGameManager.Designer.vb

@@ -107,6 +107,7 @@ Partial Class frmGameManager
         Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnProcesses = New System.Windows.Forms.Button()
         Me.ttFullPath = New System.Windows.Forms.ToolTip(Me.components)
+        Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox()
         Me.grpConfig.SuspendLayout()
         CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpExtra.SuspendLayout()
@@ -163,6 +164,7 @@ 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.chkRecurseSubFolders)
         Me.grpConfig.Controls.Add(Me.btnGameID)
         Me.grpConfig.Controls.Add(Me.chkRegEx)
         Me.grpConfig.Controls.Add(Me.lblComments)
@@ -860,13 +862,13 @@ Partial Class frmGameManager
         'cmsOfficialWindows
         '
         Me.cmsOfficialWindows.Name = "cmsOfficialWindows"
-        Me.cmsOfficialWindows.Size = New System.Drawing.Size(180, 22)
+        Me.cmsOfficialWindows.Size = New System.Drawing.Size(132, 22)
         Me.cmsOfficialWindows.Text = "&Windows..."
         '
         'cmsOfficialLinux
         '
         Me.cmsOfficialLinux.Name = "cmsOfficialLinux"
-        Me.cmsOfficialLinux.Size = New System.Drawing.Size(180, 22)
+        Me.cmsOfficialLinux.Size = New System.Drawing.Size(132, 22)
         Me.cmsOfficialLinux.Text = "&Linux..."
         '
         'cmsFile
@@ -925,6 +927,17 @@ Partial Class frmGameManager
         Me.ttFullPath.InitialDelay = 300
         Me.ttFullPath.ReshowDelay = 60
         '
+        'chkRecurseSubFolders
+        '
+        Me.chkRecurseSubFolders.AutoSize = True
+        Me.chkRecurseSubFolders.Location = New System.Drawing.Point(489, 206)
+        Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders"
+        Me.chkRecurseSubFolders.Size = New System.Drawing.Size(15, 14)
+        Me.chkRecurseSubFolders.TabIndex = 0
+        Me.chkRecurseSubFolders.TabStop = False
+        Me.chkRecurseSubFolders.UseVisualStyleBackColor = True
+        Me.chkRecurseSubFolders.Visible = False
+        '
         'frmGameManager
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1059,4 +1072,5 @@ Partial Class frmGameManager
     Friend WithEvents btnImportBackup As Button
     Friend WithEvents cmsOfficialWindows As ToolStripMenuItem
     Friend WithEvents cmsOfficialLinux As ToolStripMenuItem
+    Friend WithEvents chkRecurseSubFolders As CheckBox
 End Class

GBM/Forms/frmGameManager.vb

@@ -8,6 +8,7 @@ Public Class frmGameManager
     Private sBackupFolder As String
     Private bPendingRestores As Boolean = False
     Private oCurrentBackupItem As clsBackup
+    Private oLastPlayedGame As clsGame
     Private oCurrentGame As clsGame
     Private oTagsToSave As New List(Of KeyValuePair(Of String, String))
     Private oProcessesToSave As New List(Of KeyValuePair(Of String, String))
@@ -69,6 +70,15 @@ Public Class frmGameManager
         End Set
     End Property
 
+    Property LastPlayedGame As clsGame
+        Get
+            Return oLastPlayedGame
+        End Get
+        Set(value As clsGame)
+            oLastPlayedGame = value
+        End Set
+    End Property
+
     Property CurrentGame As clsGame
         Get
             Return oCurrentGame
@@ -585,10 +595,11 @@ Public Class frmGameManager
         frm.FormName = sFormText
         frm.BuilderString = txtBox.Text
         frm.RootFolder = GetBuilderRoot()
-
+        frm.RecurseSubFolders = chkRecurseSubFolders.Checked
         frm.ShowDialog()
 
         txtBox.Text = frm.BuilderString
+        chkRecurseSubFolders.Checked = frm.RecurseSubFolders
         VerifyCleanFolder()
     End Sub
 
@@ -923,6 +934,7 @@ Public Class frmGameManager
         txtFileType.Text = oApp.FileType
         txtExclude.Text = oApp.ExcludeList
         chkFolderSave.Checked = oApp.FolderSave
+        chkRecurseSubFolders.Checked = oApp.RecurseSubFolders
         chkCleanFolder.Checked = oApp.CleanFolder
         chkTimeStamp.Checked = oApp.AppendTimeStamp
         nudLimit.Value = oApp.BackupLimit
@@ -1062,6 +1074,7 @@ Public Class frmGameManager
                 btnOpenRestorePath.Enabled = False
                 chkEnabled.Checked = True
                 chkMonitorOnly.Checked = False
+                chkRecurseSubFolders.Checked = True
                 btnTags.Enabled = True
                 btnProcesses.Enabled = True
                 lblTags.Text = String.Empty
@@ -1185,6 +1198,7 @@ Public Class frmGameManager
     Private Sub FolderSaveModeChange()
         If chkFolderSave.Checked Then
             btnInclude.Enabled = False
+            chkRecurseSubFolders.Checked = False
             If txtFileType.Text <> String.Empty Then
                 txtFileType.Text = String.Empty
                 UpdateBuilderButtonLabel(txtFileType.Text, frmGameManager_IncludeShortcut, btnInclude, False)
@@ -1218,7 +1232,6 @@ Public Class frmGameManager
             btnInclude.Enabled = True
             btnExclude.Enabled = True
             FolderSaveModeChange()
-            VerifyCleanFolder()
         End If
     End Sub
 
@@ -1234,6 +1247,16 @@ Public Class frmGameManager
         End If
     End Sub
 
+    Private Sub VerifyImportBackup()
+        If Not bIsLoading Then
+            If chkMonitorOnly.Checked Then
+                btnImportBackup.Enabled = False
+            Else
+                btnImportBackup.Enabled = True
+            End If
+        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
@@ -1348,6 +1371,7 @@ Public Class frmGameManager
         oApp.FileType = txtFileType.Text
         oApp.ExcludeList = txtExclude.Text
         oApp.FolderSave = chkFolderSave.Checked
+        oApp.RecurseSubFolders = chkRecurseSubFolders.Checked
         oApp.CleanFolder = chkCleanFolder.Checked
         oApp.AppendTimeStamp = chkTimeStamp.Checked
         oApp.BackupLimit = nudLimit.Value
@@ -1448,6 +1472,7 @@ Public Class frmGameManager
                 FillData()
                 ModeChange()
                 VerifyCleanFolder()
+                VerifyImportBackup()
             ElseIf lstGames.SelectedItems.Count > 1 Then
                 eCurrentMode = eModes.MultiSelect
                 ModeChange()
@@ -1805,6 +1830,7 @@ Public Class frmGameManager
         tmFilterTimer = New Timer()
         tmFilterTimer.Interval = 1000
         tmFilterTimer.Enabled = False
+
     End Sub
 
     Private Sub frmGameManager_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -1821,7 +1847,7 @@ Public Class frmGameManager
 
         LoadBackupData()
 
-        'Event will take care of initial load
+        'Event will take care of initial load (on Windows)
         If PendingRestores Then
             optPendingRestores.Checked = True
         Else
@@ -1833,8 +1859,11 @@ Public Class frmGameManager
         AssignDirtyHandlers(grpStats.Controls)
         AssignDirtyHandlersMisc()
 
+        'Mono doesn't fire events in the same way as .NET, so we'll to do this to get an initial load on Linux and prevent multiple loads in Windows.
+        If mgrCommon.IsUnix Then
             LoadData(False)
             ModeChange()
+        End If
     End Sub
 
     Private Sub lstGames_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lstGames.SelectedIndexChanged
@@ -2038,6 +2067,11 @@ Public Class frmGameManager
     End Sub
 
     Private Sub frmGameManager_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        'Load Last Played Game
+        If Not LastPlayedGame Is Nothing Then
+            lstGames.SelectedItem = New KeyValuePair(Of String, String)(LastPlayedGame.ID, LastPlayedGame.Name)
+        End If
+
         txtQuickFilter.Focus()
     End Sub
 

GBM/Forms/frmIncludeExclude.Designer.vb

@@ -37,15 +37,16 @@ Partial Class frmIncludeExclude
         Me.cmsAdd = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnRemove = New System.Windows.Forms.Button()
         Me.btnAdd = New System.Windows.Forms.Button()
-        Me.grpFileOptions = New System.Windows.Forms.GroupBox()
+        Me.grpOptions = New System.Windows.Forms.GroupBox()
         Me.optFileTypes = New System.Windows.Forms.RadioButton()
         Me.optIndividualFiles = New System.Windows.Forms.RadioButton()
         Me.lblItems = New System.Windows.Forms.Label()
         Me.btnRawEdit = New System.Windows.Forms.Button()
         Me.lblSaveFolder = New System.Windows.Forms.Label()
         Me.ttWarning = New System.Windows.Forms.ToolTip(Me.components)
+        Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox()
         Me.cmsItems.SuspendLayout()
-        Me.grpFileOptions.SuspendLayout()
+        Me.grpOptions.SuspendLayout()
         Me.SuspendLayout()
         '
         'treFiles
@@ -157,16 +158,17 @@ Partial Class frmIncludeExclude
         Me.btnAdd.Text = ">"
         Me.btnAdd.UseVisualStyleBackColor = True
         '
-        'grpFileOptions
+        'grpOptions
         '
-        Me.grpFileOptions.Controls.Add(Me.optFileTypes)
+        Me.grpOptions.Controls.Add(Me.chkRecurseSubFolders)
-        Me.grpFileOptions.Controls.Add(Me.optIndividualFiles)
+        Me.grpOptions.Controls.Add(Me.optFileTypes)
-        Me.grpFileOptions.Location = New System.Drawing.Point(12, 403)
+        Me.grpOptions.Controls.Add(Me.optIndividualFiles)
-        Me.grpFileOptions.Name = "grpFileOptions"
+        Me.grpOptions.Location = New System.Drawing.Point(12, 403)
-        Me.grpFileOptions.Size = New System.Drawing.Size(194, 46)
+        Me.grpOptions.Name = "grpOptions"
-        Me.grpFileOptions.TabIndex = 2
+        Me.grpOptions.Size = New System.Drawing.Size(317, 46)
-        Me.grpFileOptions.TabStop = False
+        Me.grpOptions.TabIndex = 2
-        Me.grpFileOptions.Text = "File Options"
+        Me.grpOptions.TabStop = False
+        Me.grpOptions.Text = "Options"
         '
         'optFileTypes
         '
@@ -222,6 +224,16 @@ Partial Class frmIncludeExclude
         Me.ttWarning.ReshowDelay = 50
         Me.ttWarning.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Warning
         '
+        'chkRecurseSubFolders
+        '
+        Me.chkRecurseSubFolders.AutoSize = True
+        Me.chkRecurseSubFolders.Location = New System.Drawing.Point(185, 20)
+        Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders"
+        Me.chkRecurseSubFolders.Size = New System.Drawing.Size(120, 17)
+        Me.chkRecurseSubFolders.TabIndex = 2
+        Me.chkRecurseSubFolders.Text = "Recurse sub-folders"
+        Me.chkRecurseSubFolders.UseVisualStyleBackColor = True
+        '
         'frmIncludeExclude
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -230,7 +242,7 @@ Partial Class frmIncludeExclude
         Me.Controls.Add(Me.lblSaveFolder)
         Me.Controls.Add(Me.btnRawEdit)
         Me.Controls.Add(Me.lblItems)
-        Me.Controls.Add(Me.grpFileOptions)
+        Me.Controls.Add(Me.grpOptions)
         Me.Controls.Add(Me.btnRemove)
         Me.Controls.Add(Me.btnAdd)
         Me.Controls.Add(Me.lstBuilder)
@@ -247,7 +259,8 @@ Partial Class frmIncludeExclude
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Include / Exclude Builder"
         Me.cmsItems.ResumeLayout(False)
-        Me.grpFileOptions.ResumeLayout(False)
+        Me.grpOptions.ResumeLayout(False)
+        Me.grpOptions.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -261,7 +274,7 @@ Partial Class frmIncludeExclude
     Friend WithEvents lstBuilder As System.Windows.Forms.ListView
     Friend WithEvents btnRemove As System.Windows.Forms.Button
     Friend WithEvents btnAdd As System.Windows.Forms.Button
-    Friend WithEvents grpFileOptions As System.Windows.Forms.GroupBox
+    Friend WithEvents grpOptions As System.Windows.Forms.GroupBox
     Friend WithEvents optFileTypes As System.Windows.Forms.RadioButton
     Friend WithEvents optIndividualFiles As System.Windows.Forms.RadioButton
     Friend WithEvents lblItems As System.Windows.Forms.Label
@@ -272,4 +285,5 @@ Partial Class frmIncludeExclude
     Friend WithEvents btnRawEdit As Button
     Friend WithEvents lblSaveFolder As Label
     Friend WithEvents ttWarning As ToolTip
+    Friend WithEvents chkRecurseSubFolders As CheckBox
 End Class

GBM/Forms/frmIncludeExclude.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB6
-        CQAAAk1TRnQBSQFMAgEBAwEAAbgBAAG4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAwEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

GBM/Forms/frmIncludeExclude.vb

@@ -6,6 +6,7 @@ Public Class frmIncludeExclude
     Dim sFormName As String = String.Empty
     Dim sRootFolder As String = String.Empty
     Dim sBuilderString As String
+    Dim bRecurseSubFolders As Boolean
 
     Public Property BuilderString As String
         Get
@@ -34,6 +35,15 @@ Public Class frmIncludeExclude
         End Set
     End Property
 
+    Public Property RecurseSubFolders As Boolean
+        Get
+            Return bRecurseSubFolders
+        End Get
+        Set(value As Boolean)
+            bRecurseSubFolders = value
+        End Set
+    End Property
+
     Private Sub BuildBranch(ByVal sDirectory As String, ByVal oNode As TreeNode)
         Dim sFolders As String()
         Dim sFiles As String()
@@ -239,9 +249,10 @@ Public Class frmIncludeExclude
         lblSaveFolder.Text = frmIncludeExclude_lblSaveFolder
         btnRawEdit.Text = frmIncludeExclude_btnRawEdit
         lblItems.Text = mgrCommon.FormatString(frmIncludeExclude_lblItems, FormName)
-        grpFileOptions.Text = mgrCommon.FormatString(frmIncludeExclude_grpFileOptions, FormName)
+        grpOptions.Text = mgrCommon.FormatString(frmIncludeExclude_grpOptions, FormName)
         optFileTypes.Text = frmIncludeExclude_optFileTypes
         optIndividualFiles.Text = frmIncludeExclude_optIndividualFiles
+        chkRecurseSubFolders.Text = frmIncludeExclude_chkRecurseSubFolders
         btnRemove.Text = frmIncludeExclude_btnRemove
         btnAdd.Text = frmIncludeExclude_btnAdd
         btnBrowse.Text = frmIncludeExclude_btnBrowse
@@ -254,6 +265,7 @@ Public Class frmIncludeExclude
         'Set Defaults
         txtRootFolder.Text = RootFolder
         optFileTypes.Checked = True
+        chkRecurseSubFolders.Checked = bRecurseSubFolders
         If BuilderString <> String.Empty Then ParseBuilderString(BuilderString)
         If txtRootFolder.Text <> String.Empty Then BuildTrunk()
     End Sub
@@ -285,6 +297,7 @@ Public Class frmIncludeExclude
 
     Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
         BuilderString = CreateNewBuilderString()
+        RecurseSubFolders = chkRecurseSubFolders.Checked
         Me.Close()
     End Sub
 

GBM/Forms/frmMain.vb

@@ -882,6 +882,7 @@ Public Class frmMain
         PauseScan()
         frm.Settings = oSettings
         frm.PendingRestores = bPendingRestores
+        frm.LastPlayedGame = oProcess.GameInfo
         frm.ShowDialog()
         LoadGameSettings()
         ResumeScan()
@@ -1938,9 +1939,15 @@ Public Class frmMain
                             oProcess.GameInfo.TruePath = sWineSavePath
                             oProcess.GameInfo.AbsolutePath = True
                             UpdateLog(mgrCommon.FormatString(frmMain_WineSavePath, New String() {oProcess.GameInfo.Name, sWineSavePath}), False)
+                        Else
+                            bContinue = False
+                        End If
+                    Else
+                        bContinue = False
                     End If
                 End If
-                End If
+                'This does required mods to include/exclude data and relative paths (if required)
+                mgrPath.ModWinePathData(oProcess.GameInfo)
             End If
 
             If bContinue = True Then

GBM/Managers/mgrBackup.vb

@@ -66,7 +66,7 @@ Public Class mgrBackup
         Return True
     End Function
 
-    Private Sub BuildFileList(ByVal sBackupPath As String, ByVal sList As String, ByVal sPath As String)
+    Private Sub BuildFileList(ByVal sList As String, ByVal sPath As String)
         Dim oStream As StreamWriter
 
         Try
@@ -75,7 +75,7 @@ Public Class mgrBackup
             Using oStream
                 If sList <> String.Empty Then
                     For Each sTypeItem As String In sList.Split(":")
-                        oStream.WriteLine("""" & sBackupPath & Path.DirectorySeparatorChar & sTypeItem & """")
+                        oStream.WriteLine("""" & sTypeItem & """")
                     Next
                 End If
                 oStream.Flush()
@@ -118,7 +118,8 @@ Public Class mgrBackup
         Dim sSavePath As String
         Dim sOverwriteMessage As String
         Dim lAvailableSpace As Long
-        Dim lFolderSize As Long
+        Dim lFolderSize As Long = 0
+        Dim sDeepFolder As String
 
         If oSettings.CreateSubFolder Then sBackupFile = sBackupFile & Path.DirectorySeparatorChar & GetFileName(oGame)
         sBackupFile = sBackupFile & Path.DirectorySeparatorChar & GetFileName(oGame) & ".7z"
@@ -128,7 +129,18 @@ Public Class mgrBackup
 
         'Calculate space
         lAvailableSpace = mgrCommon.GetAvailableDiskSpace(oSettings.BackupFolder)
-        lFolderSize = mgrCommon.GetFolderSize(sSavePath, oGame.IncludeArray, oGame.ExcludeArray)
+        'If any includes are using a deep path and we aren't using recursion,  we need to go directly to folders to do file size calculations or they will be missed.
+        If Not oGame.RecurseSubFolders Then
+            For Each s As String In oGame.IncludeArray
+                If s.Contains(Path.DirectorySeparatorChar) Then
+                    sDeepFolder = Path.GetDirectoryName(sSavePath & Path.DirectorySeparatorChar & s)
+                    If Directory.Exists(sDeepFolder) Then
+                        lFolderSize += mgrCommon.GetFolderSize(sDeepFolder, oGame.IncludeArray, oGame.ExcludeArray, oGame.RecurseSubFolders)
+                    End If
+                End If
+            Next
+        End If
+        lFolderSize += mgrCommon.GetFolderSize(sSavePath, oGame.IncludeArray, oGame.ExcludeArray, oGame.RecurseSubFolders)
 
         'Show Available Space
         RaiseEvent UpdateLog(mgrCommon.FormatString(mgrCommon_AvailableDiskSpace, mgrCommon.FormatDiskSpace(lAvailableSpace)), False, ToolTipIcon.Info, True)
@@ -283,6 +295,7 @@ Public Class mgrBackup
         Dim dTimeStamp As DateTime
         Dim sTimeStamp As String
         Dim sHash As String
+        Dim sArguments As String
 
         For Each oGame In oBackupList
             'Init
@@ -314,12 +327,16 @@ Public Class mgrBackup
                 sSavePath = VerifySavePath(oGame)
 
                 If oGame.FolderSave = True Then
-                    BuildFileList(sSavePath, "*", mgrPath.IncludeFileLocation)
+                    BuildFileList("*", mgrPath.IncludeFileLocation)
                 Else
-                    BuildFileList(sSavePath, oGame.FileType, mgrPath.IncludeFileLocation)
+                    BuildFileList(oGame.FileType, mgrPath.IncludeFileLocation)
                 End If
 
-                BuildFileList(sSavePath, oGame.ExcludeList, mgrPath.ExcludeFileLocation)
+                BuildFileList(oGame.ExcludeList, mgrPath.ExcludeFileLocation)
+
+                sArguments = "a" & oSettings.Prepared7zArguments & "-t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """"
+
+                If oGame.RecurseSubFolders Then sArguments &= " -r"
 
                 Try
                     If Directory.Exists(sSavePath) Then
@@ -330,8 +347,9 @@ Public Class mgrBackup
                                 File.Delete(sBackupFile)
                             End If
 
-                            prs7z.StartInfo.Arguments = "a" & oSettings.Prepared7zArguments & "-t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
+                            prs7z.StartInfo.Arguments = sArguments
                             prs7z.StartInfo.FileName = oSettings.Utility7zLocation
+                            prs7z.StartInfo.WorkingDirectory = sSavePath
                             prs7z.StartInfo.UseShellExecute = False
                             prs7z.StartInfo.RedirectStandardOutput = True
                             prs7z.StartInfo.CreateNoWindow = True

GBM/Managers/mgrCommon.vb

@@ -293,8 +293,9 @@ Public Class mgrCommon
 
     Public Shared Function WildcardToRegex(ByVal sPattern As String) As String
         Dim sRegEx As String
-        sRegEx = sPattern.Replace("*", ".*")
+        sPattern = Regex.Escape(sPattern)
-        sRegEx = sRegEx.Replace("?", ".")
+        sRegEx = sPattern.Replace("\*", ".*")
+        sRegEx = sRegEx.Replace("\?", ".")
         Return sRegEx
     End Function
 
@@ -318,7 +319,7 @@ Public Class mgrCommon
     End Function
 
     'Calculate the current size of a folder
-    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String()) As Long
+    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String(), Optional ByVal b7zStyleRecurse As Boolean = True) As Long
         Dim oFolder As DirectoryInfo
         Dim bInclude As Boolean
         Dim bExclude As Boolean
@@ -331,14 +332,15 @@ Public Class mgrCommon
 
             'Files
             For Each fi As FileInfo In oFolder.EnumerateFiles()
+
                 If sInclude.Length > 0 Then
-                    bInclude = CompareValueToArrayRegEx(fi.Name, sInclude) Or CompareValueToArrayRegEx(fi.DirectoryName, sInclude)
+                    bInclude = CompareValueToArrayRegEx(fi.FullName, sInclude)
                 Else
                     bInclude = True
                 End If
 
                 If sExclude.Length > 0 Then
-                    bExclude = CompareValueToArrayRegEx(fi.Name, sExclude) Or CompareValueToArrayRegEx(fi.DirectoryName, sExclude)
+                    bExclude = CompareValueToArrayRegEx(fi.FullName, sExclude)
                 Else
                     bExclude = False
                 End If
@@ -351,16 +353,36 @@ Public Class mgrCommon
             'Sub Folders
             For Each di As DirectoryInfo In oFolder.EnumerateDirectories()
                 If Not ((di.Attributes And FileAttributes.ReparsePoint) = FileAttributes.ReparsePoint) Then
+                    If b7zStyleRecurse Then
                         If sExclude.Length > 0 Then
-                        bExclude = CompareValueToArrayRegEx(di.Name, sExclude)
+                            bExclude = CompareValueToArrayRegEx(di.FullName, sExclude)
                         Else
                             bExclude = False
                         End If
+
                         If Not bExclude Then
                             lSize += GetFolderSize(di.FullName, sInclude, sExclude)
                         End If
+                    Else
+                        If sInclude.Length > 0 Then
+                            bInclude = CompareValueToArrayRegEx(di.FullName, sInclude)
+                        Else
+                            bInclude = True
+                        End If
+
+                        If sExclude.Length > 0 Then
+                            bExclude = CompareValueToArrayRegEx(di.FullName, sExclude)
+                        Else
+                            bExclude = False
+                        End If
+
+                        If bInclude And Not bExclude Then
+                            lSize += GetFolderSize(di.FullName, sInclude, sExclude)
+                        End If
+                    End If
                 End If
             Next
+
         Catch
             'Do Nothing
         End Try

GBM/Managers/mgrMonitorList.vb

@@ -36,6 +36,7 @@ Public Class mgrMonitorList
         If Not IsDBNull(dr("Parameter")) Then oGame.Parameter = CStr(dr("Parameter"))
         If Not IsDBNull(dr("Comments")) Then oGame.Comments = CStr(dr("Comments"))
         oGame.IsRegEx = CBool(dr("IsRegEx"))
+        oGame.RecurseSubFolders = CBool(dr("RecurseSubFolders"))
 
         Return oGame
     End Function
@@ -64,6 +65,7 @@ Public Class mgrMonitorList
         hshParams.Add("Parameter", oGame.Parameter)
         hshParams.Add("Comments", oGame.Comments)
         hshParams.Add("IsRegEx", oGame.IsRegEx)
+        hshParams.Add("RecurseSubFolders", oGame.RecurseSubFolders)
 
         Return hshParams
     End Function
@@ -99,7 +101,7 @@ Public Class mgrMonitorList
 
         sSQL = "INSERT INTO monitorlist VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, @TimeStamp, "
         sSQL &= "@ExcludeList, @ProcessPath, @Icon, @Hours, @Version, @Company, @Enabled, @MonitorOnly, @BackupLimit, @CleanFolder, "
-        sSQL &= "@Parameter, @Comments, @IsRegEx)"
+        sSQL &= "@Parameter, @Comments, @IsRegEx, @RecurseSubFolders)"
 
         'Parameters
         hshParams = SetCoreParameters(oGame)
@@ -116,7 +118,7 @@ Public Class mgrMonitorList
         sSQL = "UPDATE monitorlist SET MonitorID=@ID, 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, "
-        sSQL &= "CleanFolder=@CleanFolder, Parameter=@Parameter, Comments=@Comments, IsRegEx=@IsRegEx WHERE MonitorID=@QueryID;"
+        sSQL &= "CleanFolder=@CleanFolder, Parameter=@Parameter, Comments=@Comments, IsRegEx=@IsRegEx, RecurseSubFolders=@RecurseSubFolders WHERE MonitorID=@QueryID;"
         sSQL &= "UPDATE gametags SET MonitorID=@ID WHERE MonitorID=@QueryID;"
 
         If iSelectDB = mgrSQLite.Database.Local Then
@@ -367,11 +369,11 @@ Public Class mgrMonitorList
             sVersion = "(SELECT Version FROM monitorlist WHERE MonitorID=@ID)"
         End If
 
-        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx) "
+        sSQL = "INSERT OR REPLACE INTO monitorlist (MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx, RecurseSubFolders) "
         sSQL &= "VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, "
         sSQL &= "@TimeStamp, @ExcludeList, " & sGamePath & ", "
         sSQL &= sIcon & ", @Hours, " & sVersion & ", "
-        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, @BackupLimit, @CleanFolder, @Parameter, @Comments, @IsRegEx);"
+        sSQL &= sCompany & ", " & sMonitorGame & ", @MonitorOnly, @BackupLimit, @CleanFolder, @Parameter, @Comments, @IsRegEx, @RecurseSubFolders);"
 
         For Each oGame As clsGame In hshGames.Values
             hshParams = New Hashtable
@@ -393,6 +395,7 @@ Public Class mgrMonitorList
             hshParams.Add("Parameter", oGame.Parameter)
             hshParams.Add("Comments", oGame.Comments)
             hshParams.Add("IsRegEx", oGame.IsRegEx)
+            hshParams.Add("RecurseSubFolders", oGame.RecurseSubFolders)
 
             'Optional Parameters
             If (eSyncFields And clsGame.eOptionalSyncFields.Company) = clsGame.eOptionalSyncFields.Company Then
@@ -548,7 +551,7 @@ Public Class mgrMonitorList
                                              ByRef hshParams As Hashtable) As String
         Dim sSQL As String = String.Empty
         Dim iCounter As Integer = 0
-        Dim sBaseSelect As String = "MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx FROM monitorlist"
+        Dim sBaseSelect As String = "MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx, RecurseSubFolders FROM monitorlist"
         Dim sSort As String = " ORDER BY " & sSortField
 
         If bSortAsc Then
@@ -745,6 +748,7 @@ Public Class mgrMonitorList
             If Not IsDBNull(dr("Parameter")) Then oGame.Parameter = CStr(dr("Parameter"))
             If Not IsDBNull(dr("Comments")) Then oGame.Comments = CStr(dr("Comments"))
             oGame.IsRegEx = CBool(dr("IsRegEx"))
+            oGame.RecurseSubFolders = CBool(dr("RecurseSubFolders"))
             oGame.Tags = mgrGameTags.GetTagsByGameForExport(oGame.ID)
             oList.Add(oGame)
         Next

GBM/Managers/mgrPath.vb

@@ -203,6 +203,12 @@ Public Class mgrPath
         Return sResult
     End Function
 
+    Public Shared Sub ModWinePathData(ByRef oGame As clsGame)
+        If Not oGame.AbsolutePath Then oGame.Path = oGame.Path.Replace("\", Path.DirectorySeparatorChar)
+        oGame.FileType = oGame.FileType.Replace("\", Path.DirectorySeparatorChar)
+        oGame.ExcludeList = oGame.ExcludeList.Replace("\", Path.DirectorySeparatorChar)
+    End Sub
+
     Private Shared Function BuildWinePath(ByVal sPath As String, ByVal sWinePrefix As String) As String
         Dim sRealPath As String
         Dim cDriveLetter As Char
@@ -217,7 +223,7 @@ Public Class mgrPath
             sRealPath = sRealPath.TrimEnd("""")
 
             'Flip Seperators
-            sRealPath = sRealPath.Replace("\\", "/")
+            sRealPath = sRealPath.Replace("\\", Path.DirectorySeparatorChar)
 
             'Change Wine Drive
             cDriveLetter = sRealPath.Chars(sRealPath.IndexOf(":") - 1)
@@ -259,6 +265,10 @@ Public Class mgrPath
                 sReplace = "%COMMONDOCUMENTS%"
                 sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "system.reg")
                 oParse = New Regex("""Common Documents""="".+?(?=\n)")
+            ElseIf sPath.Contains("%PROGRAMDATA%") Then
+                sReplace = "%PROGRAMDATA%"
+                sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "system.reg")
+                oParse = New Regex("""Common AppData""="".+?(?=\n)")
             ElseIf sPath.Contains("%USERPROFILE%") Then
                 sReplace = "%USERPROFILE%"
                 sRegistry = File.ReadAllText(sPrefix & Path.DirectorySeparatorChar & "user.reg")
@@ -300,7 +310,8 @@ Public Class mgrPath
                 oMatch = oParse.Match(sPsinfo)
                 Return oMatch.Value.Trim("/").Split("=")(1)
             Else
-                Return String.Empty
+                'When WINEPREFIX is not part of the command,  we will assume the default prefix.
+                Return Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "/.wine"
             End If
         Catch ex As Exception
             mgrCommon.ShowMessage(mgrPath_ErrorWinePrefix, ex.Message, MsgBoxStyle.Exclamation)
@@ -315,6 +326,8 @@ Public Class mgrPath
         hshEnvs.Add("Documents", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
         hshEnvs.Add("AppDataRoaming", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData))
         hshEnvs.Add("AppDataLocal", Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData))
+        hshEnvs.Add("ProgramData", Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData))
+
         If Not mgrCommon.IsUnix Then
             hshEnvs.Add("UserData", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
             hshEnvs.Add("PublicDocuments", Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
@@ -416,6 +429,8 @@ Public Class mgrPath
         Dim sCurrentUser As String = "%USERPROFILE%"
         Dim sHomeDir As String = "~"
         Dim sEnvCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
+        Dim sProgramData As String = "%PROGRAMDATA%"
+        Dim sEnvProgramData As String = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)
         Dim oCustomVariable As clsPathVariable
 
         For Each oCustomVariable In hshCustomVariables.Values
@@ -433,6 +448,10 @@ Public Class mgrPath
                 Return sValue.Replace(sEnvAppDataLocal, sAppDataLocal)
             End If
 
+            If sValue.Contains(sEnvProgramData) Then
+                Return sValue.Replace(sEnvProgramData, sProgramData)
+            End If
+
             'This needs to be tested last for Unix compatability
             If sValue.Contains(sEnvMyDocs) Then
                 Return sValue.Replace(sEnvMyDocs, sMyDocs)

GBM/Managers/mgrProcessDetection.vb

@@ -267,8 +267,8 @@ Public Class mgrProcessDetection
                     Dim sParameter As String
                     Dim sWinePath As String()
                     'The wine-preloader parameters can refer to a path on the host system, windows based path within in the prefix, or mixed notation.
-                    sParameter = sArgs(0).Replace("\", "/")
+                    sParameter = sArgs(0).Replace("\", Path.DirectorySeparatorChar)
-                    sWinePath = sParameter.Split("/")
+                    sWinePath = sParameter.Split(Path.DirectorySeparatorChar)
                     sProcessCheck = Path.GetFileNameWithoutExtension(sWinePath(sWinePath.Length - 1))
                     bWineProcess = True
                 Else

GBM/Managers/mgrSQLite.vb

@@ -84,7 +84,7 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, IsRegEx BOOLEAN NOT NULL);"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, IsRegEx BOOLEAN NOT NULL, RecurseSubFolders NOT NULL);"
 
             'Add Tables (Tags)
             sSql &= "CREATE TABLE tags (TagID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY); "
@@ -130,7 +130,7 @@ Public Class mgrSQLite
             sSql = "CREATE TABLE monitorlist (MonitorID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
                    "ProcessPath TEXT, Icon TEXT, Hours REAL, Version TEXT, Company TEXT, Enabled BOOLEAN NOT NULL, MonitorOnly BOOLEAN NOT NULL, " &
-                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, IsRegEx BOOLEAN NOT NULL);"
+                   "BackupLimit INTEGER NOT NULL, CleanFolder BOOLEAN NOT NULL, Parameter TEXT, Comments TEXT, IsRegEx BOOLEAN NOT NULL, RecurseSubFolders NOT NULL);"
 
             'Add Tables (Remote Manifest)
             sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, MonitorID TEXT NOT NULL, FileName TEXT NOT NULL, " &
@@ -892,6 +892,30 @@ Public Class mgrSQLite
                 RunParamQuery(sSQL, New Hashtable)
             End If
         End If
+
+        '1.16 Upgrade
+        If GetDatabaseVersion() < 116 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v115")
+
+                'Add new field(s)
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN RecurseSubFolders BOOLEAN NOT NULL DEFAULT 1;"
+                sSQL &= "PRAGMA user_version=116"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v115")
+
+                'Add new field(s)
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN RecurseSubFolders BOOLEAN NOT NULL DEFAULT 1;"
+                sSQL &= "PRAGMA user_version=116"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
     End Sub
 
     Public Function GetDBSize() As Long

GBM/Managers/mgrVariables.vb

@@ -163,6 +163,7 @@
         oList.Add("USERDOCUMENTS")
         oList.Add("COMMONDOCUMENTS")
         oList.Add("USERPROFILE")
+        oList.Add("PROGRAMDATA")
 
         Return oList
     End Function

GBM/Managers/mgrXML.vb

@@ -41,6 +41,7 @@ Public Class mgrXML
             oGame.Parameter = g.Parameter
             oGame.Comments = g.Comments
             oGame.IsRegEx = g.IsRegEx
+            oGame.RecurseSubFolders = g.RecurseSubFolders
             For Each t As Tag In g.Tags
                 oGame.ImportTags.Add(t)
             Next

GBM/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.1.5.*")>
+<Assembly: AssemblyVersion("1.1.6.*")>
-<Assembly: AssemblyFileVersion("1.1.5.0")>
+<Assembly: AssemblyFileVersion("1.1.6.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 

GBM/My Project/Resources.Designer.vb

@@ -1203,6 +1203,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Recurse Sub-Folders.
+        '''</summary>
+        Friend ReadOnly Property frmFilter_FieldRecurseSubFolders() As String
+            Get
+                Return ResourceManager.GetString("frmFilter_FieldRecurseSubFolders", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Save Multiple Backups.
         '''</summary>
@@ -2715,6 +2724,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Recurse sub-folders.
+        '''</summary>
+        Friend ReadOnly Property frmIncludeExclude_chkRecurseSubFolders() As String
+            Get
+                Return ResourceManager.GetString("frmIncludeExclude_chkRecurseSubFolders", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Add Custom Item.
         '''</summary>
@@ -2772,9 +2790,9 @@ Namespace My.Resources
         '''<summary>
         '''  Looks up a localized string similar to [PARAM] Options.
         '''</summary>
-        Friend ReadOnly Property frmIncludeExclude_grpFileOptions() As String
+        Friend ReadOnly Property frmIncludeExclude_grpOptions() As String
             Get
-                Return ResourceManager.GetString("frmIncludeExclude_grpFileOptions", resourceCulture)
+                Return ResourceManager.GetString("frmIncludeExclude_grpOptions", resourceCulture)
             End Get
         End Property
         

GBM/My Project/Resources.resx

@@ -967,7 +967,7 @@
   <data name="frmIncludeExclude_FormName" xml:space="preserve">
     <value>[PARAM] Builder</value>
   </data>
-  <data name="frmIncludeExclude_grpFileOptions" xml:space="preserve">
+  <data name="frmIncludeExclude_grpOptions" xml:space="preserve">
     <value>[PARAM] Options</value>
   </data>
   <data name="frmIncludeExclude_lblItems" xml:space="preserve">
@@ -2269,4 +2269,10 @@
   <data name="frmGameManager_ConfirmBackupImportOverwriteSingle" xml:space="preserve">
     <value>Importing this backup file will overwrite the current backup file for [PARAM].[BR][BR]Do you want to continue?  This will close the form.</value>
   </data>
+  <data name="frmFilter_FieldRecurseSubFolders" xml:space="preserve">
+    <value>Recurse Sub-Folders</value>
+  </data>
+  <data name="frmIncludeExclude_chkRecurseSubFolders" xml:space="preserve">
+    <value>Recurse sub-folders</value>
+  </data>
 </root>