Changes for #160 - Pass 1

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

@@ -585,10 +585,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 +924,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 +1064,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 +1188,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)
@@ -1348,6 +1352,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

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.grpFileOptions.Controls.Add(Me.optIndividualFiles)
-        Me.grpFileOptions.Location = New System.Drawing.Point(12, 403)
-        Me.grpFileOptions.Name = "grpFileOptions"
-        Me.grpFileOptions.Size = New System.Drawing.Size(194, 46)
-        Me.grpFileOptions.TabIndex = 2
-        Me.grpFileOptions.TabStop = False
-        Me.grpFileOptions.Text = "File Options"
+        Me.grpOptions.Controls.Add(Me.chkRecurseSubFolders)
+        Me.grpOptions.Controls.Add(Me.optFileTypes)
+        Me.grpOptions.Controls.Add(Me.optIndividualFiles)
+        Me.grpOptions.Location = New System.Drawing.Point(12, 403)
+        Me.grpOptions.Name = "grpOptions"
+        Me.grpOptions.Size = New System.Drawing.Size(317, 46)
+        Me.grpOptions.TabIndex = 2
+        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