Merge pull request #95 from MikeMaximus/v103

Merge v103 into master

.gitignore

@@ -185,4 +185,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+/.vs/slnx.sqlite
+/.vs/VSWorkspaceState.json

GBM/Classes/XML Serialize Classes/Game.vb

@@ -1,6 +1,7 @@
 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
@@ -26,6 +27,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

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
@@ -41,7 +39,11 @@
 
     Property FileName As String
         Get
-            Return sFileName
+            If mgrCommon.IsUnix Then
+                Return sFileName.Replace("\", "/")
+            Else
+                Return sFileName.Replace("/", "\")
+            End If
         End Get
         Set(value As String)
             sFileName = value
@@ -105,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

@@ -2,11 +2,14 @@
     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
@@ -19,6 +22,16 @@
     Private bTempGame As Boolean = False
     Private oImportTags As New List(Of Tag)
 
+    <Flags()> Public Enum eOptionalSyncFields
+        None = 0
+        GamePath = 1
+        Company = 2
+        Version = 4
+        Icon = 16
+        TimeStamp = 32
+        MonitorGame = 64
+    End Enum
+
     Property ID As String
         Set(value As String)
             sGameID = value
@@ -44,7 +57,6 @@
         End Get
     End Property
 
-
     Property Name As String
         Set(value As String)
             sGameName = value
@@ -63,6 +75,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)
@@ -108,6 +129,24 @@
         End Set
     End Property
 
+    Property BackupLimit As Integer
+        Get
+            Return iBackupLimit
+        End Get
+        Set(value As Integer)
+            iBackupLimit = value
+        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
@@ -219,21 +258,44 @@
         End Set
     End Property
 
-    Public Function SyncEquals(obj As Object) As Boolean
+    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
             Return False
         Else
+            'Core Sync Fields
             If ID <> oGame.ID Then
                 Return False
             End If
-
             If Name <> oGame.Name Then
                 Return False
             End If
             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
@@ -249,12 +311,53 @@
             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
             If Hours <> oGame.Hours Then
                 Return False
             End If
+            If MonitorOnly <> oGame.MonitorOnly Then
+                Return False
+            End If
+
+            'Optional Sync Fields
+            If (eSyncFields And eOptionalSyncFields.Company) = eOptionalSyncFields.Company Then
+                If Company <> oGame.Company Then
+                    Return False
+                End If
+            End If
+            If (eSyncFields And eOptionalSyncFields.GamePath) = eOptionalSyncFields.GamePath Then
+                If ProcessPath <> oGame.ProcessPath Then
+                    Return False
+                End If
+            End If
+            If (eSyncFields And eOptionalSyncFields.Icon) = eOptionalSyncFields.Icon Then
+                If Icon <> oGame.Icon Then
+                    Return False
+                End If
+            End If
+            If (eSyncFields And eOptionalSyncFields.MonitorGame) = eOptionalSyncFields.MonitorGame Then
+                If Enabled <> oGame.Enabled Then
+                    Return False
+                End If
+            End If
+            If (eSyncFields And eOptionalSyncFields.TimeStamp) = eOptionalSyncFields.TimeStamp Then
+                If AppendTimeStamp <> oGame.AppendTimeStamp Then
+                    Return False
+                End If
+                If BackupLimit <> oGame.BackupLimit Then
+                    Return False
+                End If
+            End If
+            If (eSyncFields And eOptionalSyncFields.Version) = eOptionalSyncFields.Version Then
+                If Version <> oGame.Version Then
+                    Return False
+                End If
+            End If
             Return True
         End If
     End Function

GBM/Classes/clsSavedPath.vb

@@ -1,13 +1,13 @@
-Public Class clsRestoreCache
+Public Class clsSavedPath
-    Private sName As String
+    Private sPathName As String = String.Empty
-    Private sPath As String
+    Private sPath As String = String.Empty
 
-    Property Name As String
+    Property PathName As String
         Get
-            Return sName
+            Return sPathName
         End Get
         Set(value As String)
-            sName = value
+            sPathName = value
         End Set
     End Property
 
@@ -19,5 +19,4 @@
             sPath = value
         End Set
     End Property
-
 End Class

GBM/Forms/frmAddWizard.Designer.vb

@@ -22,21 +22,22 @@ Partial Class frmAddWizard
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAddWizard))
         Me.tabWizard = New System.Windows.Forms.TabControl()
         Me.tbPage1 = New System.Windows.Forms.TabPage()
         Me.lblStep1Title = New System.Windows.Forms.Label()
-        Me.lblDrag1 = New System.Windows.Forms.Label()
         Me.lblStep1Instructions = New System.Windows.Forms.Label()
         Me.txtName = New System.Windows.Forms.TextBox()
         Me.lblStep1Intro = New System.Windows.Forms.Label()
         Me.tbPage2 = New System.Windows.Forms.TabPage()
         Me.lblStep2Title = New System.Windows.Forms.Label()
         Me.lblStep2Instructions = New System.Windows.Forms.Label()
-        Me.lblDrag2 = New System.Windows.Forms.Label()
         Me.btnProcessBrowse = New System.Windows.Forms.Button()
         Me.txtProcessPath = New System.Windows.Forms.TextBox()
         Me.lblStep2Intro = New System.Windows.Forms.Label()
         Me.tbPage3 = New System.Windows.Forms.TabPage()
+        Me.lblLimit = New System.Windows.Forms.Label()
+        Me.nudLimit = New System.Windows.Forms.NumericUpDown()
         Me.lblStep3Title = New System.Windows.Forms.Label()
         Me.lblStep3Instructions = New System.Windows.Forms.Label()
         Me.chkTimeStamp = New System.Windows.Forms.CheckBox()
@@ -71,6 +72,7 @@ Partial Class frmAddWizard
         Me.tbPage1.SuspendLayout()
         Me.tbPage2.SuspendLayout()
         Me.tbPage3.SuspendLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbPage3a.SuspendLayout()
         Me.tbPage4.SuspendLayout()
         Me.tbPage5.SuspendLayout()
@@ -95,7 +97,6 @@ Partial Class frmAddWizard
         '
         Me.tbPage1.BackColor = System.Drawing.SystemColors.Control
         Me.tbPage1.Controls.Add(Me.lblStep1Title)
-        Me.tbPage1.Controls.Add(Me.lblDrag1)
         Me.tbPage1.Controls.Add(Me.lblStep1Instructions)
         Me.tbPage1.Controls.Add(Me.txtName)
         Me.tbPage1.Controls.Add(Me.lblStep1Intro)
@@ -116,23 +117,16 @@ Partial Class frmAddWizard
         Me.lblStep1Title.TabIndex = 8
         Me.lblStep1Title.Text = "Game Name"
         '
-        'lblDrag1
-        '
-        Me.lblDrag1.AllowDrop = True
-        Me.lblDrag1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblDrag1.Location = New System.Drawing.Point(14, 135)
-        Me.lblDrag1.Name = "lblDrag1"
-        Me.lblDrag1.Size = New System.Drawing.Size(303, 49)
-        Me.lblDrag1.TabIndex = 7
-        Me.lblDrag1.Text = "Drag a shortcut here to complete this step."
-        '
         'lblStep1Instructions
         '
+        Me.lblStep1Instructions.AllowDrop = True
         Me.lblStep1Instructions.Location = New System.Drawing.Point(14, 93)
         Me.lblStep1Instructions.Name = "lblStep1Instructions"
-        Me.lblStep1Instructions.Size = New System.Drawing.Size(303, 30)
+        Me.lblStep1Instructions.Size = New System.Drawing.Size(303, 85)
         Me.lblStep1Instructions.TabIndex = 6
-        Me.lblStep1Instructions.Text = "The name will be automatically filtered for length and invalid characters. "
+        Me.lblStep1Instructions.Text = "The name will be automatically filtered for length and invalid characters.  You m" &
+    "ay drag and drop a shortcut here to complete this step, only Windows shortcuts a" &
+    "re currently supported."
         '
         'txtName
         '
@@ -156,7 +150,6 @@ Partial Class frmAddWizard
         Me.tbPage2.BackColor = System.Drawing.SystemColors.Control
         Me.tbPage2.Controls.Add(Me.lblStep2Title)
         Me.tbPage2.Controls.Add(Me.lblStep2Instructions)
-        Me.tbPage2.Controls.Add(Me.lblDrag2)
         Me.tbPage2.Controls.Add(Me.btnProcessBrowse)
         Me.tbPage2.Controls.Add(Me.txtProcessPath)
         Me.tbPage2.Controls.Add(Me.lblStep2Intro)
@@ -179,22 +172,12 @@ Partial Class frmAddWizard
         '
         'lblStep2Instructions
         '
+        Me.lblStep2Instructions.AllowDrop = True
         Me.lblStep2Instructions.Location = New System.Drawing.Point(14, 93)
         Me.lblStep2Instructions.Name = "lblStep2Instructions"
-        Me.lblStep2Instructions.Size = New System.Drawing.Size(303, 29)
+        Me.lblStep2Instructions.Size = New System.Drawing.Size(303, 85)
         Me.lblStep2Instructions.TabIndex = 10
-        Me.lblStep2Instructions.Text = "Some games use launchers.  Do not monitor launchers,  be sure to choose the game'" & _
+        Me.lblStep2Instructions.Text = resources.GetString("lblStep2Instructions.Text")
-    "s actual exe file."
-        '
-        'lblDrag2
-        '
-        Me.lblDrag2.AllowDrop = True
-        Me.lblDrag2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblDrag2.Location = New System.Drawing.Point(14, 135)
-        Me.lblDrag2.Name = "lblDrag2"
-        Me.lblDrag2.Size = New System.Drawing.Size(336, 44)
-        Me.lblDrag2.TabIndex = 9
-        Me.lblDrag2.Text = "Drag a shortcut here to complete this step."
         '
         'btnProcessBrowse
         '
@@ -225,6 +208,8 @@ Partial Class frmAddWizard
         'tbPage3
         '
         Me.tbPage3.BackColor = System.Drawing.SystemColors.Control
+        Me.tbPage3.Controls.Add(Me.lblLimit)
+        Me.tbPage3.Controls.Add(Me.nudLimit)
         Me.tbPage3.Controls.Add(Me.lblStep3Title)
         Me.tbPage3.Controls.Add(Me.lblStep3Instructions)
         Me.tbPage3.Controls.Add(Me.chkTimeStamp)
@@ -238,6 +223,26 @@ Partial Class frmAddWizard
         Me.tbPage3.TabIndex = 2
         Me.tbPage3.Text = "TabPage3"
         '
+        'lblLimit
+        '
+        Me.lblLimit.AutoSize = True
+        Me.lblLimit.Location = New System.Drawing.Point(203, 109)
+        Me.lblLimit.Name = "lblLimit"
+        Me.lblLimit.Size = New System.Drawing.Size(68, 13)
+        Me.lblLimit.TabIndex = 15
+        Me.lblLimit.Text = "Backup Limit"
+        Me.lblLimit.Visible = False
+        '
+        'nudLimit
+        '
+        Me.nudLimit.Location = New System.Drawing.Point(157, 107)
+        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 = 14
+        Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Visible = False
+        '
         'lblStep3Title
         '
         Me.lblStep3Title.AutoSize = True
@@ -250,32 +255,32 @@ Partial Class frmAddWizard
         '
         'lblStep3Instructions
         '
-        Me.lblStep3Instructions.Location = New System.Drawing.Point(14, 116)
+        Me.lblStep3Instructions.Location = New System.Drawing.Point(14, 139)
         Me.lblStep3Instructions.Name = "lblStep3Instructions"
         Me.lblStep3Instructions.Size = New System.Drawing.Size(303, 42)
         Me.lblStep3Instructions.TabIndex = 9
-        Me.lblStep3Instructions.Text = "If you're unsure of exactly which files to backup,  make sure Save Entire Folder " & _
+        Me.lblStep3Instructions.Text = "If you're unsure of exactly which files to backup,  make sure Save entire folder " &
-    "is checked.  You can also time stamp your backup files to make incremental backu" & _
+    "is checked.  You can also choose to save multiple backups and set a limit on how" &
-    "ps."
+    " many to keep."
         '
         'chkTimeStamp
         '
         Me.chkTimeStamp.AutoSize = True
-        Me.chkTimeStamp.Location = New System.Drawing.Point(139, 87)
+        Me.chkTimeStamp.Location = New System.Drawing.Point(18, 108)
         Me.chkTimeStamp.Name = "chkTimeStamp"
-        Me.chkTimeStamp.Size = New System.Drawing.Size(122, 17)
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
         Me.chkTimeStamp.TabIndex = 8
-        Me.chkTimeStamp.Text = "Time Stamp Backup"
+        Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
         'chkFolderSave
         '
         Me.chkFolderSave.AutoSize = True
-        Me.chkFolderSave.Location = New System.Drawing.Point(17, 87)
+        Me.chkFolderSave.Location = New System.Drawing.Point(18, 87)
         Me.chkFolderSave.Name = "chkFolderSave"
-        Me.chkFolderSave.Size = New System.Drawing.Size(113, 17)
+        Me.chkFolderSave.Size = New System.Drawing.Size(109, 17)
         Me.chkFolderSave.TabIndex = 7
-        Me.chkFolderSave.Text = "Save Entire Folder"
+        Me.chkFolderSave.Text = "Save entire folder"
         Me.chkFolderSave.UseVisualStyleBackColor = True
         '
         'btnSaveBrowse
@@ -372,7 +377,7 @@ Partial Class frmAddWizard
         Me.lblStep3aInstructions.Name = "lblStep3aInstructions"
         Me.lblStep3aInstructions.Size = New System.Drawing.Size(303, 56)
         Me.lblStep3aInstructions.TabIndex = 5
-        Me.lblStep3aInstructions.Text = "Choose any file types, specific files  or folders you wish to include in the back" & _
+        Me.lblStep3aInstructions.Text = "Choose any file types, specific files  or folders you wish to include in the back" &
     "up.  If you're unsure, go back a step and choose to save the entire folder. "
         '
         'txtFileTypes
@@ -454,7 +459,7 @@ Partial Class frmAddWizard
         Me.lblStep4Instructions.Name = "lblStep4Instructions"
         Me.lblStep4Instructions.Size = New System.Drawing.Size(303, 59)
         Me.lblStep4Instructions.TabIndex = 5
-        Me.lblStep4Instructions.Text = "Choose any file types, specific files  or folders you wish to exclude from the ba" & _
+        Me.lblStep4Instructions.Text = "Choose any file types, specific files  or folders you wish to exclude from the ba" &
     "ckup.  You may choose multiple items to exclude.  This step can be skipped."
         '
         'txtExcludeList
@@ -559,6 +564,7 @@ Partial Class frmAddWizard
         Me.tbPage2.PerformLayout()
         Me.tbPage3.ResumeLayout(False)
         Me.tbPage3.PerformLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).EndInit()
         Me.tbPage3a.ResumeLayout(False)
         Me.tbPage3a.PerformLayout()
         Me.tbPage4.ResumeLayout(False)
@@ -578,12 +584,10 @@ Partial Class frmAddWizard
     Friend WithEvents tbPage3a As System.Windows.Forms.TabPage
     Friend WithEvents tbPage4 As System.Windows.Forms.TabPage
     Friend WithEvents tbPage5 As System.Windows.Forms.TabPage
-    Friend WithEvents lblDrag1 As System.Windows.Forms.Label
     Friend WithEvents lblStep1Instructions As System.Windows.Forms.Label
     Friend WithEvents txtName As System.Windows.Forms.TextBox
     Friend WithEvents lblStep1Intro As System.Windows.Forms.Label
     Friend WithEvents lblStep2Instructions As System.Windows.Forms.Label
-    Friend WithEvents lblDrag2 As System.Windows.Forms.Label
     Friend WithEvents btnProcessBrowse As System.Windows.Forms.Button
     Friend WithEvents txtProcessPath As System.Windows.Forms.TextBox
     Friend WithEvents lblStep2Intro As System.Windows.Forms.Label
@@ -613,4 +617,6 @@ Partial Class frmAddWizard
     Friend WithEvents lblExcludePath As Label
     Friend WithEvents lblIncludePathTitle As Label
     Friend WithEvents lblExcludePathTitle As Label
+    Friend WithEvents lblLimit As Label
+    Friend WithEvents nudLimit As NumericUpDown
 End Class

GBM/Forms/frmAddWizard.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="lblStep2Instructions.Text" xml:space="preserve">
+    <value>Some games use launchers.  Do not monitor launchers,  be sure to choose the game's actual exe file.  You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.</value>
+  </data>
 </root>

GBM/Forms/frmAddWizard.vb

@@ -36,18 +36,17 @@ Public Class frmAddWizard
         btnNext.Text = frmAddWizard_btnNext
         btnBack.Text = frmAddWizard_btnBack
         lblStep1Title.Text = frmAddWizard_lblStep1Title
-        lblDrag1.Text = frmAddWizard_lblDrag1
         lblStep1Instructions.Text = frmAddWizard_lblStep1Instructions
         lblStep1Intro.Text = frmAddWizard_lblStep1Intro
         lblStep2Title.Text = frmAddWizard_lblStep2Title
         lblStep2Instructions.Text = frmAddWizard_lblStep2Instructions
-        lblDrag2.Text = frmAddWizard_lblDrag2
         btnProcessBrowse.Text = frmAddWizard_btnProcessBrowse
         lblStep2Intro.Text = frmAddWizard_lblStep2Intro
         lblStep3Title.Text = frmAddWizard_lblStep3Title
         lblStep3Instructions.Text = frmAddWizard_lblStep3Instructions
         chkTimeStamp.Text = frmAddWizard_chkTimeStamp
         chkFolderSave.Text = frmAddWizard_chkFolderSave
+        lblLimit.Text = frmAddWizard_lblLimit
         btnSaveBrowse.Text = frmAddWizard_btnSaveBrowse
         lblStep3Intro.Text = frmAddWizard_lblStep3Intro
         lblIncludePathTitle.Text = frmAddWizard_lblIncludePathTitle
@@ -70,6 +69,28 @@ Public Class frmAddWizard
         StepHandler()
     End Sub
 
+    Private Sub ShowHideLimit()
+        If chkTimeStamp.Checked Then
+            nudLimit.Visible = True
+            lblLimit.Visible = True
+            nudLimit.Value = 5
+        Else
+            nudLimit.Visible = False
+            nudLimit.Value = nudLimit.Minimum
+            lblLimit.Visible = False
+        End If
+    End Sub
+
+    Private Function ShowSummaryLimit(ByVal bTimeStamp As Boolean, ByVal iLimit As Integer) As String
+        Dim sLimit As String = String.Empty
+
+        If bTimeStamp Then
+            Return mgrCommon.BooleanYesNo(bTimeStamp) & " (" & iLimit & ")"
+        Else
+            Return mgrCommon.BooleanYesNo(bTimeStamp)
+        End If
+    End Function
+
     Private Function StringEmptyText(ByVal sString As String) As String
         If sString = String.Empty Then
             Return frmAddWizard_None
@@ -83,19 +104,31 @@ Public Class frmAddWizard
         Dim sName As String = txtName.Text
         Dim sProcessFullPath As String = txtProcessPath.Text
         Dim sProcessPath As String = Path.GetDirectoryName(sProcessFullPath)
-        Dim sProcess As String = Path.GetFileNameWithoutExtension(sProcessFullPath)
         Dim sProcessSummaryText As String = Path.GetFileName(sProcessFullPath) & " (" & sProcessPath & ")"
         Dim sSavePath As String = txtSavePath.Text
         Dim bIsAbsolute As Boolean = mgrPath.IsAbsolute(sSavePath)
         Dim bFolderBackup As Boolean = chkFolderSave.Checked
         Dim bTimeStamp As Boolean = chkTimeStamp.Checked
+        Dim iLimit As Integer = nudLimit.Value
         Dim sFileType As String = txtFileTypes.Text
         Dim sExcludeList As String = txtExcludeList.Text
+        Dim sProcess As String
         Dim sItem As String()
         Dim sItems As String()
         Dim sValues As String()
         Dim lstItem As ListViewItem
 
+        'Handle Process
+        If Path.HasExtension(sProcessFullPath) Then
+            If sProcessFullPath.ToLower.EndsWith(".exe") Then
+                sProcess = Path.GetFileNameWithoutExtension(sProcessFullPath)
+            Else
+                sProcess = Path.GetFileName(sProcessFullPath)
+            End If
+        Else
+            sProcess = Path.GetFileName(sProcessFullPath)
+        End If
+
         If Not bIsAbsolute Then
             sSavePath = mgrPath.DetermineRelativePath(sProcessPath, sSavePath)
         End If
@@ -108,7 +141,7 @@ Public Class frmAddWizard
         lstSummary.Columns(1).Width = 210
 
         sItems = {frmAddWizard_Summary_Name, frmAddWizard_Summary_Process, frmAddWizard_Summary_AbsolutePath, frmAddWizard_Summary_SavePath, frmAddWizard_Summary_FolderSave, frmAddWizard_Summary_Timestamp, frmAddWizard_Summary_Include, frmAddWizard_Summary_Exclude}
-        sValues = {sName, sProcessSummaryText, mgrCommon.BooleanYesNo(bIsAbsolute), sSavePath, mgrCommon.BooleanYesNo(bFolderBackup), mgrCommon.BooleanYesNo(bTimeStamp), StringEmptyText(sFileType), StringEmptyText(sExcludeList)}
+        sValues = {sName, sProcessSummaryText, mgrCommon.BooleanYesNo(bIsAbsolute), sSavePath, mgrCommon.BooleanYesNo(bFolderBackup), ShowSummaryLimit(bTimeStamp, iLimit), StringEmptyText(sFileType), StringEmptyText(sExcludeList)}
 
         For i = 0 To sItems.Length - 1
             sItem = {sItems(i), sValues(i)}
@@ -124,7 +157,9 @@ Public Class frmAddWizard
         oGame.FolderSave = bFolderBackup
         oGame.FileType = sFileType
         oGame.AppendTimeStamp = bTimeStamp
+        oGame.BackupLimit = iLimit
         oGame.ExcludeList = sExcludeList
+        oGame.ProcessPath = sProcessPath
 
         Return oGame
     End Function
@@ -178,7 +213,7 @@ Public Class frmAddWizard
             Return False
         End If
 
-        If Path.GetExtension(strPath.ToLower) <> ".exe" Then
+        If Path.GetExtension(strPath.ToLower) <> ".exe" And Not mgrCommon.IsUnix Then
             sErrorMessage = frmAddWizard_ErrorNotAProcess
             txtProcessPath.Focus()
             Return False
@@ -390,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
@@ -407,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
@@ -459,13 +494,13 @@ Public Class frmAddWizard
         SetForm()
     End Sub
 
-    Private Sub DropTarget_DragEnter(sender As Object, e As DragEventArgs) Handles lblDrag1.DragEnter, lblDrag2.DragEnter, txtName.DragEnter, txtProcessPath.DragEnter
+    Private Sub DropTarget_DragEnter(sender As Object, e As DragEventArgs) Handles txtName.DragEnter, txtProcessPath.DragEnter, lblStep1Instructions.DragEnter, lblStep2Instructions.DragEnter
         If e.Data.GetDataPresent(DataFormats.FileDrop) Then
             e.Effect = DragDropEffects.Copy
         End If
     End Sub
 
-    Private Sub DropTarget_DragDrop(sender As Object, e As DragEventArgs) Handles lblDrag1.DragDrop, lblDrag2.DragDrop, txtName.DragDrop, txtProcessPath.DragDrop
+    Private Sub DropTarget_DragDrop(sender As Object, e As DragEventArgs) Handles txtName.DragDrop, txtProcessPath.DragDrop, lblStep1Instructions.DragDrop, lblStep2Instructions.DragDrop
         Dim oFiles() As String = e.Data.GetData(DataFormats.FileDrop)
         For Each sPath In oFiles
             ReadShortcut(sPath)
@@ -492,6 +527,10 @@ Public Class frmAddWizard
         txtFileTypes.Clear()
     End Sub
 
+    Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged
+        ShowHideLimit()
+    End Sub
+
     Private Sub btnInclude_Click(sender As Object, e As EventArgs) Handles btnInclude.Click
         OpenBuilder(frmAddWizard_Include, txtFileTypes)
         UpdateBuilderLabel(txtFileTypes.Text, lblFileTypes)
@@ -501,4 +540,6 @@ Public Class frmAddWizard
         OpenBuilder(frmAddWizard_Exclude, txtExcludeList)
         UpdateBuilderLabel(txtExcludeList.Text, lblExclude)
     End Sub
+
+
 End Class

GBM/Forms/frmAdvancedImport.Designer.vb

@@ -22,47 +22,40 @@ Partial Class frmAdvancedImport
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.lstGames = New System.Windows.Forms.CheckedListBox()
         Me.btnImport = New System.Windows.Forms.Button()
         Me.chkSelectAll = New System.Windows.Forms.CheckBox()
         Me.lblGames = New System.Windows.Forms.Label()
         Me.lblSelected = New System.Windows.Forms.Label()
         Me.btnCancel = New System.Windows.Forms.Button()
+        Me.lstGames = New System.Windows.Forms.ListView()
+        Me.txtFilter = New System.Windows.Forms.TextBox()
+        Me.lblFilter = New System.Windows.Forms.Label()
         Me.SuspendLayout()
         '
-        'lstGames
-        '
-        Me.lstGames.CheckOnClick = True
-        Me.lstGames.FormattingEnabled = True
-        Me.lstGames.Location = New System.Drawing.Point(12, 30)
-        Me.lstGames.Name = "lstGames"
-        Me.lstGames.Size = New System.Drawing.Size(335, 334)
-        Me.lstGames.Sorted = True
-        Me.lstGames.TabIndex = 1
-        '
         'btnImport
         '
-        Me.btnImport.Location = New System.Drawing.Point(191, 370)
+        Me.btnImport.Location = New System.Drawing.Point(416, 375)
         Me.btnImport.Name = "btnImport"
         Me.btnImport.Size = New System.Drawing.Size(75, 23)
-        Me.btnImport.TabIndex = 2
+        Me.btnImport.TabIndex = 3
         Me.btnImport.Text = "&Import"
         Me.btnImport.UseVisualStyleBackColor = True
         '
         'chkSelectAll
         '
         Me.chkSelectAll.AutoSize = True
-        Me.chkSelectAll.Location = New System.Drawing.Point(15, 12)
+        Me.chkSelectAll.Location = New System.Drawing.Point(12, 12)
         Me.chkSelectAll.Name = "chkSelectAll"
-        Me.chkSelectAll.Size = New System.Drawing.Size(15, 14)
+        Me.chkSelectAll.Size = New System.Drawing.Size(70, 17)
         Me.chkSelectAll.TabIndex = 0
+        Me.chkSelectAll.Text = "Select All"
         Me.chkSelectAll.UseVisualStyleBackColor = True
         '
         'lblGames
         '
-        Me.lblGames.Location = New System.Drawing.Point(12, 12)
+        Me.lblGames.Location = New System.Drawing.Point(12, 380)
         Me.lblGames.Name = "lblGames"
-        Me.lblGames.Size = New System.Drawing.Size(335, 14)
+        Me.lblGames.Size = New System.Drawing.Size(560, 14)
         Me.lblGames.TabIndex = 0
         Me.lblGames.Text = "Games"
         Me.lblGames.TextAlign = System.Drawing.ContentAlignment.TopCenter
@@ -70,7 +63,7 @@ Partial Class frmAdvancedImport
         'lblSelected
         '
         Me.lblSelected.AutoSize = True
-        Me.lblSelected.Location = New System.Drawing.Point(9, 375)
+        Me.lblSelected.Location = New System.Drawing.Point(9, 380)
         Me.lblSelected.Name = "lblSelected"
         Me.lblSelected.Size = New System.Drawing.Size(77, 13)
         Me.lblSelected.TabIndex = 0
@@ -78,23 +71,52 @@ Partial Class frmAdvancedImport
         '
         'btnCancel
         '
-        Me.btnCancel.Location = New System.Drawing.Point(272, 370)
+        Me.btnCancel.Location = New System.Drawing.Point(497, 375)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 3
+        Me.btnCancel.TabIndex = 4
         Me.btnCancel.Text = "&Cancel"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
+        'lstGames
+        '
+        Me.lstGames.CheckBoxes = True
+        Me.lstGames.FullRowSelect = True
+        Me.lstGames.Location = New System.Drawing.Point(12, 35)
+        Me.lstGames.Name = "lstGames"
+        Me.lstGames.Size = New System.Drawing.Size(560, 329)
+        Me.lstGames.TabIndex = 2
+        Me.lstGames.UseCompatibleStateImageBehavior = False
+        Me.lstGames.View = System.Windows.Forms.View.Details
+        '
+        'txtFilter
+        '
+        Me.txtFilter.Location = New System.Drawing.Point(416, 9)
+        Me.txtFilter.Name = "txtFilter"
+        Me.txtFilter.Size = New System.Drawing.Size(156, 20)
+        Me.txtFilter.TabIndex = 1
+        '
+        'lblFilter
+        '
+        Me.lblFilter.Location = New System.Drawing.Point(307, 12)
+        Me.lblFilter.Name = "lblFilter"
+        Me.lblFilter.Size = New System.Drawing.Size(103, 14)
+        Me.lblFilter.TabIndex = 0
+        Me.lblFilter.Text = "Filter:"
+        Me.lblFilter.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
         'frmAdvancedImport
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(359, 402)
+        Me.ClientSize = New System.Drawing.Size(584, 411)
+        Me.Controls.Add(Me.lblFilter)
+        Me.Controls.Add(Me.txtFilter)
+        Me.Controls.Add(Me.lstGames)
         Me.Controls.Add(Me.btnCancel)
         Me.Controls.Add(Me.lblSelected)
         Me.Controls.Add(Me.chkSelectAll)
         Me.Controls.Add(Me.btnImport)
-        Me.Controls.Add(Me.lstGames)
         Me.Controls.Add(Me.lblGames)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.MaximizeBox = False
@@ -107,10 +129,12 @@ Partial Class frmAdvancedImport
         Me.PerformLayout()
 
     End Sub
-    Friend WithEvents lstGames As System.Windows.Forms.CheckedListBox
     Friend WithEvents btnImport As System.Windows.Forms.Button
     Friend WithEvents chkSelectAll As System.Windows.Forms.CheckBox
     Friend WithEvents lblGames As System.Windows.Forms.Label
     Friend WithEvents lblSelected As System.Windows.Forms.Label
     Friend WithEvents btnCancel As System.Windows.Forms.Button
+    Friend WithEvents lstGames As System.Windows.Forms.ListView
+    Friend WithEvents txtFilter As System.Windows.Forms.TextBox
+    Friend WithEvents lblFilter As System.Windows.Forms.Label
 End Class

GBM/Forms/frmAdvancedImport.vb

@@ -3,8 +3,11 @@
 Public Class frmAdvancedImport
 
     Private hshImportData As Hashtable
+    Private hshFinalData As New Hashtable
     Private bSelectAll As Boolean = False
     Private bIsLoading As Boolean = False
+    Private iCurrentSort As Integer = 0
+    Private WithEvents tmFilterTimer As Timer
 
     Public Property ImportData As Hashtable
         Set(value As Hashtable)
@@ -15,26 +18,103 @@ Public Class frmAdvancedImport
         End Get
     End Property
 
+    Public ReadOnly Property FinalData As Hashtable
+        Get
+            Return hshFinalData
+        End Get
+    End Property
+
     Private Sub SelectToggle()
+        Cursor.Current = Cursors.WaitCursor
+        lstGames.BeginUpdate()
         bSelectAll = Not bSelectAll
         For i As Integer = 0 To lstGames.Items.Count - 1
-            lstGames.SetItemChecked(i, bSelectAll)
+            lstGames.Items(i).Checked = bSelectAll            
         Next
+        lstGames.EndUpdate()
+        Cursor.Current = Cursors.Default
         UpdateSelected()
     End Sub
 
-    Private Sub LoadData()
+    Private Sub SaveChecked(ByVal oItem As ListViewItem)
-        Dim oApp As clsGame
+        If oItem.Checked Then
-        Dim oData As KeyValuePair(Of String, String)
+            FinalData.Add(oItem.Tag, ImportData(oItem.Tag))
+        Else
+            FinalData.Remove(oItem.Tag)
+        End If
+    End Sub
 
-        lstGames.ValueMember = "Key"
+    Private Sub LoadData(Optional ByVal sFilter As String = "")
-        lstGames.DisplayMember = "Value"
+        Dim oApp As clsGame
+        Dim oListViewItem As ListViewItem
+        Dim sTags As String
+        Dim bAddItem As Boolean
+        Dim bResetSelectAll As Boolean = False
+
+        Cursor.Current = Cursors.WaitCursor
+        lstGames.BeginUpdate()
+
+        lstGames.Clear()
+
+        lstGames.Columns.Add(frmAdvancedImport_ColumnName, 215)
+        lstGames.Columns.Add(frmAdvancedImport_ColumnProcess, 130)
+        lstGames.Columns.Add(frmAdvancedImport_ColumnTags, 190)
 
         For Each de As DictionaryEntry In ImportData
+            bAddItem = False
             oApp = DirectCast(de.Value, clsGame)
-            oData = New KeyValuePair(Of String, String)(oApp.CompoundKey, oApp.Name & " (" & oApp.TrueProcess & ")")
+            sTags = String.Empty
-            lstGames.Items.Add(oData)
+            oApp.ImportTags.Sort(AddressOf mgrCommon.CompareImportTagsByName)
+            For Each oTag As Tag In oApp.ImportTags
+                sTags &= oTag.Name & ", "
+            Next
+            sTags = sTags.TrimEnd(New Char() {",", " "})
+
+            oListViewItem = New ListViewItem(New String() {oApp.Name, oApp.TrueProcess, sTags})
+            oListViewItem.Tag = oApp.CompoundKey
+
+            If FinalData.ContainsKey(oApp.CompoundKey) Then
+                oListViewItem.Checked = True
+            Else
+                oListViewItem.Checked = False
+            End If
+
+            If sFilter = String.Empty Then
+                bAddItem = True
+            Else
+                If oApp.Name.ToLower.Contains(sFilter.ToLower) Or oApp.TrueProcess.ToLower.Contains(sFilter.ToLower) Or sTags.ToLower.Contains(sFilter.ToLower) Then
+                    bAddItem = True
+                End If
+            End If
+
+            If bAddItem Then
+                If oListViewItem.Checked Then bResetSelectAll = True
+                lstGames.Items.Add(oListViewItem)
+            End If
         Next
+
+        'Change the status of the "Select All" checkbox depending on the status of the items filter results.  Set loading flag so we don't trigger any events
+        bIsLoading = True
+        If Not bResetSelectAll And bSelectAll Then
+            bSelectAll = False
+            chkSelectAll.Checked = False
+        ElseIf bResetSelectAll And Not bSelectAll Then
+            bSelectAll = True
+            chkSelectAll.Checked = True
+        End If
+        bIsLoading = False
+
+        lstGames.ListViewItemSorter = New ListViewItemComparer(iCurrentSort)
+        lstGames.EndUpdate()
+        UpdateSelected()
+
+        If txtFilter.Text = String.Empty Then
+            lblGames.Text = mgrCommon.FormatString(frmAdvancedImport_Configs, lstGames.Items.Count)
+        Else
+            lblGames.Text = mgrCommon.FormatString(frmAdvancedImport_Configs, lstGames.Items.Count) & " " & frmAdvancedImport_Filtered
+        End If
+
+        Cursor.Current = Cursors.Default
     End Sub
 
     Private Sub SetForm()
@@ -42,26 +122,21 @@ Public Class frmAdvancedImport
         Me.Text = frmAdvancedImport_FormName
 
         'Set Form Text
+        lblFilter.Text = frmAdvancedImport_lblFilter
         btnCancel.Text = frmAdvancedImport_btnCancel
         btnImport.Text = frmAdvancedImport_btnImport
+        chkSelectAll.Text = frmAdvancedImport_chkSelectAll
 
         chkSelectAll.Checked = True
-        lblGames.Text = mgrCommon.FormatString(frmAdvancedImport_NewConfigs, ImportData.Count)
-    End Sub
 
-    Private Sub BuildList()
+        'Init Filter Timer
-        Dim oData As KeyValuePair(Of String, String)
+        tmFilterTimer = New Timer()
-
+        tmFilterTimer.Interval = 1000
-        For i As Integer = 0 To lstGames.Items.Count - 1
+        tmFilterTimer.Enabled = False
-            If Not lstGames.GetItemChecked(i) Then
-                oData = lstGames.Items(i)
-                ImportData.Remove(oData.Key)
-            End If
-        Next
     End Sub
 
     Private Sub UpdateSelected()
-        lblSelected.Text = mgrCommon.FormatString(frmAdvancedImport_Selected, lstGames.CheckedItems.Count)
+        lblSelected.Text = mgrCommon.FormatString(frmAdvancedImport_Selected, FinalData.Count)
     End Sub
 
     Private Sub frmAdvancedImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -76,8 +151,11 @@ Public Class frmAdvancedImport
         If Not bIsLoading Then SelectToggle()
     End Sub
 
-    Private Sub lstGames_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstGames.SelectedValueChanged
+    Private Sub lstGames_ItemChecked(sender As Object, e As ItemCheckedEventArgs) Handles lstGames.ItemChecked
-        If Not bIsLoading Then UpdateSelected()
+        SaveChecked(e.Item)
+        If Not bIsLoading Then
+            UpdateSelected()
+        End If
     End Sub
 
     Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
@@ -85,8 +163,44 @@ Public Class frmAdvancedImport
     End Sub
 
     Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
-        BuildList()
+        If FinalData.Count > 0 Then Me.DialogResult = Windows.Forms.DialogResult.OK
-        If ImportData.Count > 0 Then Me.DialogResult = Windows.Forms.DialogResult.OK
         Me.Close()
     End Sub
+
+    Private Sub lstGames_ColumnClick(sender As Object, e As ColumnClickEventArgs) Handles lstGames.ColumnClick
+        iCurrentSort = e.Column
+        lstGames.ListViewItemSorter = New ListViewItemComparer(e.Column)
+    End Sub
+
+    Private Sub txtFilter_TextChanged(sender As Object, e As EventArgs) Handles txtFilter.TextChanged
+        If Not tmFilterTimer.Enabled Then
+            tmFilterTimer.Enabled = True
+            tmFilterTimer.Start()
+        End If
+    End Sub
+
+    Private Sub tmFilterTimer_Tick(sender As Object, ByVal e As EventArgs) Handles tmFilterTimer.Tick
+        LoadData(txtFilter.Text)
+        tmFilterTimer.Stop()
+        tmFilterTimer.Enabled = False
+    End Sub
+End Class
+
+' Column Sorter
+Class ListViewItemComparer
+    Implements IComparer
+
+    Private col As Integer
+
+    Public Sub New()
+        col = 0
+    End Sub
+
+    Public Sub New(ByVal column As Integer)
+        col = column
+    End Sub
+
+    Public Function Compare(ByVal x As Object, ByVal y As Object) As Integer Implements IComparer.Compare
+        Return String.Compare(CType(x, ListViewItem).SubItems(col).Text, CType(y, ListViewItem).SubItems(col).Text)
+    End Function
 End Class

GBM/Forms/frmChooseGame.vb

@@ -65,11 +65,6 @@ Public Class frmChooseGame
         SetForm()
         FillComboBox()
         Me.Focus()
-
-        Dim sResource As String = String.Empty
-        Dim sCode As String = String.Empty
-        mgrCommon.GetAllStrings(Me, sResource, sCode, "frmChooseGame")
-        Clipboard.SetText(sResource & vbCrLf & vbCrLf & sCode)
     End Sub
 
     Private Sub btnChoose_Click(sender As System.Object, e As System.EventArgs) Handles btnChoose.Click

GBM/Forms/frmFileFolderSearch.Designer.vb

@@ -22,35 +22,30 @@ Partial Class frmFileFolderSearch
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.pgbProgress = New System.Windows.Forms.ProgressBar()
         Me.txtCurrentLocation = New System.Windows.Forms.TextBox()
         Me.btnCancel = New System.Windows.Forms.Button()
         Me.bwSearch = New System.ComponentModel.BackgroundWorker()
+        Me.lstResults = New System.Windows.Forms.ListBox()
+        Me.btnOk = New System.Windows.Forms.Button()
+        Me.lblResults = New System.Windows.Forms.Label()
+        Me.cboDrive = New System.Windows.Forms.ComboBox()
         Me.SuspendLayout()
         '
-        'pgbProgress
-        '
-        Me.pgbProgress.Location = New System.Drawing.Point(12, 12)
-        Me.pgbProgress.MarqueeAnimationSpeed = 0
-        Me.pgbProgress.Name = "pgbProgress"
-        Me.pgbProgress.Size = New System.Drawing.Size(460, 23)
-        Me.pgbProgress.TabIndex = 0
-        '
         'txtCurrentLocation
         '
-        Me.txtCurrentLocation.Location = New System.Drawing.Point(12, 43)
+        Me.txtCurrentLocation.Location = New System.Drawing.Point(102, 13)
         Me.txtCurrentLocation.Name = "txtCurrentLocation"
         Me.txtCurrentLocation.ReadOnly = True
-        Me.txtCurrentLocation.Size = New System.Drawing.Size(379, 20)
+        Me.txtCurrentLocation.Size = New System.Drawing.Size(370, 20)
         Me.txtCurrentLocation.TabIndex = 0
         Me.txtCurrentLocation.TabStop = False
         '
         'btnCancel
         '
-        Me.btnCancel.Location = New System.Drawing.Point(397, 41)
+        Me.btnCancel.Location = New System.Drawing.Point(397, 146)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 0
+        Me.btnCancel.TabIndex = 4
         Me.btnCancel.Text = "&Cancel"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
@@ -58,14 +53,52 @@ Partial Class frmFileFolderSearch
         '
         Me.bwSearch.WorkerSupportsCancellation = True
         '
+        'lstResults
+        '
+        Me.lstResults.FormattingEnabled = True
+        Me.lstResults.Location = New System.Drawing.Point(12, 58)
+        Me.lstResults.Name = "lstResults"
+        Me.lstResults.Size = New System.Drawing.Size(460, 82)
+        Me.lstResults.TabIndex = 2
+        '
+        'btnOk
+        '
+        Me.btnOk.Location = New System.Drawing.Point(316, 146)
+        Me.btnOk.Name = "btnOk"
+        Me.btnOk.Size = New System.Drawing.Size(75, 23)
+        Me.btnOk.TabIndex = 3
+        Me.btnOk.Text = "&OK"
+        Me.btnOk.UseVisualStyleBackColor = True
+        '
+        'lblResults
+        '
+        Me.lblResults.Location = New System.Drawing.Point(9, 42)
+        Me.lblResults.Name = "lblResults"
+        Me.lblResults.Size = New System.Drawing.Size(463, 13)
+        Me.lblResults.TabIndex = 1
+        Me.lblResults.Text = "Search Results"
+        Me.lblResults.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'cboDrive
+        '
+        Me.cboDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboDrive.FormattingEnabled = True
+        Me.cboDrive.Location = New System.Drawing.Point(12, 13)
+        Me.cboDrive.Name = "cboDrive"
+        Me.cboDrive.Size = New System.Drawing.Size(85, 21)
+        Me.cboDrive.TabIndex = 5
+        '
         'frmFileFolderSearch
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(484, 77)
+        Me.ClientSize = New System.Drawing.Size(484, 181)
+        Me.Controls.Add(Me.cboDrive)
+        Me.Controls.Add(Me.lblResults)
+        Me.Controls.Add(Me.btnOk)
+        Me.Controls.Add(Me.lstResults)
         Me.Controls.Add(Me.btnCancel)
         Me.Controls.Add(Me.txtCurrentLocation)
-        Me.Controls.Add(Me.pgbProgress)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.MaximizeBox = False
         Me.MinimizeBox = False
@@ -77,8 +110,11 @@ Partial Class frmFileFolderSearch
         Me.PerformLayout()
 
     End Sub
-    Friend WithEvents pgbProgress As System.Windows.Forms.ProgressBar
     Friend WithEvents txtCurrentLocation As System.Windows.Forms.TextBox
     Friend WithEvents btnCancel As System.Windows.Forms.Button
     Friend WithEvents bwSearch As System.ComponentModel.BackgroundWorker
+    Friend WithEvents lstResults As System.Windows.Forms.ListBox
+    Friend WithEvents btnOk As System.Windows.Forms.Button
+    Friend WithEvents lblResults As System.Windows.Forms.Label
+    Friend WithEvents cboDrive As System.Windows.Forms.ComboBox
 End Class

GBM/Forms/frmFileFolderSearch.vb

@@ -3,14 +3,34 @@ Imports System.IO
 
 Public Class frmFileFolderSearch
     Private sSearchItem As String
+    Private sGameName As String = String.Empty
+    Private bIsLoading As Boolean
     Private bIsFolder As Boolean
     Private sFoundItem As String
     Private oDrives As List(Of DriveInfo)
-    Private iCurrentDrive As Integer
     Private oSearchDrive As DirectoryInfo
     Dim bShutdown As Boolean = False
 
+    Private Enum eStopStatus As Integer
+        Cancel = 1
+        ChangeDrive = 2
+        FoundResult = 3
+        FinishedDrive = 4
+    End Enum
+
+    Private iStopStatus As eStopStatus
+
     Delegate Sub UpdateInfoCallBack(ByVal sCurrentFolder As String)
+    Delegate Sub UpdateResultsCallBack(ByVal sItem As String)
+
+    Public Property GameName As String
+        Get
+            Return sGameName
+        End Get
+        Set(value As String)
+            sGameName = value
+        End Set
+    End Property
 
     Public Property SearchItem As String
         Get
@@ -48,19 +68,38 @@ Public Class frmFileFolderSearch
         End If
     End Sub
 
+    Private Sub UpdateResults(ByVal sItem As String)
+        If lstResults.InvokeRequired = True Then
+            Dim d As New UpdateInfoCallBack(AddressOf UpdateResults)
+            Me.Invoke(d, New Object() {sItem})
+        Else
+            'It's possible the same location will be searched twice when using Linux.  Filter out duplicate results
+            If Not lstResults.Items.Contains(sItem) Then
+                lstResults.Items.Add(sItem)
+            End If
+        End If
+    End Sub
+
     Private Function SearchDirectory(ByVal dir As DirectoryInfo, ByVal sDirectoryName As String) As String
         Dim sSubSearch As String = String.Empty
+        Dim sFoundItem As String = String.Empty
 
         If bwSearch.CancellationPending Then
             Return "Cancel"
         End If
 
+        'Ignore Symlinks
+        If (dir.Attributes And FileAttributes.ReparsePoint) = FileAttributes.ReparsePoint Then
+            Return String.Empty
+        End If
+
         UpdateInfo(dir.FullName)
 
         Try
             'Search Current Directory
             If dir.GetDirectories(sDirectoryName).Length > 0 Then
-                Return dir.FullName & "\" & sDirectoryName
+                sFoundItem = dir.FullName & Path.DirectorySeparatorChar & sDirectoryName
+                UpdateResults(sFoundItem)                
             End If
 
             'Search Sub Directory
@@ -69,7 +108,7 @@ Public Class frmFileFolderSearch
                 sSubSearch = SearchDirectory(newDir, sDirectoryName)
                 If sSubSearch <> String.Empty Then
                     Return sSubSearch
-                End If                
+                End If
             Next
         Catch e As System.UnauthorizedAccessException
             'Do Nothing
@@ -82,26 +121,34 @@ Public Class frmFileFolderSearch
 
     Private Function SearchFile(ByVal dir As DirectoryInfo, ByVal sFileName As String) As String
         Dim sSubSearch As String = String.Empty
+        Dim sFoundItem As String = String.Empty
 
         If bwSearch.CancellationPending Then
             Return "Cancel"
         End If
 
+        'Ignore Symlinks
+        If (dir.Attributes And FileAttributes.ReparsePoint) = FileAttributes.ReparsePoint Then
+            Return String.Empty
+        End If
+
         UpdateInfo(dir.FullName)
 
         Try
             'Search Current Directory
             If dir.GetFiles(sFileName).Length > 0 Then
-                Return dir.FullName & "\" & sFileName
+                sFoundItem = Path.GetDirectoryName(dir.FullName & Path.DirectorySeparatorChar & sFileName)
+                UpdateResults(sFoundItem)
             End If
 
             'Search Sub Directory
             Dim subdirs() As DirectoryInfo = dir.GetDirectories("*")
             For Each newDir As DirectoryInfo In subdirs
-                    sSubSearch = SearchFile(newDir, sFileName)
+                sSubSearch = SearchFile(newDir, sFileName)
-                    If sSubSearch <> String.Empty Then
+
-                        Return sSubSearch
+                If sSubSearch <> String.Empty Then
-                    End If
+                    Return sSubSearch
+                End If
             Next
         Catch e As System.UnauthorizedAccessException
             'Do Nothing
@@ -113,39 +160,60 @@ Public Class frmFileFolderSearch
     End Function
 
     Private Sub GetDrives()
+        Dim oComboItems As New List(Of KeyValuePair(Of Integer, String))
+        Dim iCount As Integer = 0
+
+        'cboDrive
+        cboDrive.ValueMember = "Key"
+        cboDrive.DisplayMember = "Value"
+
         oDrives = New List(Of DriveInfo)
         For Each oDrive As DriveInfo In My.Computer.FileSystem.Drives
             If oDrive.DriveType = IO.DriveType.Fixed Then
                 oDrives.Add(oDrive)
+                oComboItems.Add(New KeyValuePair(Of Integer, String)(iCount, oDrive.RootDirectory.ToString))
+                iCount += 1
             End If
         Next
+        cboDrive.DataSource = oComboItems
     End Sub
 
     Private Sub Search(ByVal oDrive As DriveInfo)
-        pgbProgress.Style = ProgressBarStyle.Marquee
+        iStopStatus = eStopStatus.FinishedDrive
-        pgbProgress.MarqueeAnimationSpeed = 5
         oSearchDrive = oDrive.RootDirectory
         bwSearch.RunWorkerAsync()
-        iCurrentDrive += 1
     End Sub
 
     Private Sub EndSearch()
-        Dim oResult As MsgBoxResult
-        pgbProgress.MarqueeAnimationSpeed = 0
-
         If FoundItem = "Cancel" Then FoundItem = String.Empty
 
-        If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
+        Select Case iStopStatus
-            oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oSearchDrive.Root.ToString, oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
+            Case eStopStatus.Cancel
-            If oResult = MsgBoxResult.Yes Then
+                SearchComplete(frmFileFolderSearch_SearchCancel)
-                Search(oDrives(iCurrentDrive))
+            Case eStopStatus.ChangeDrive
-            Else
+                Search(oDrives(cboDrive.SelectedValue))
+            Case eStopStatus.FinishedDrive
+                'Attempt to move onto the next drive it one exists and there's been no results
+                If oDrives.Count > 1 And lstResults.Items.Count = 0 Then
+                    If cboDrive.SelectedIndex = (cboDrive.Items.Count - 1) Then
+                        cboDrive.SelectedIndex = 0
+                    Else
+                        cboDrive.SelectedIndex = cboDrive.SelectedIndex + 1
+                    End If
+                Else
+                    SearchComplete(frmFileFolderSearch_SearchComplete)
+                End If
+            Case eStopStatus.FoundResult
+                FoundItem = lstResults.SelectedItem.ToString
                 bShutdown = True
                 Me.Close()
-            End If
+        End Select
-        Else
+    End Sub
-            bShutdown = True
+
-            Me.Close()
+    Private Sub SearchComplete(ByVal sStopMessage As String)
+        txtCurrentLocation.Text = sStopMessage
+        If lstResults.Items.Count > 0 Then
+            lstResults.SelectedIndex = 0
         End If
     End Sub
 
@@ -154,13 +222,17 @@ Public Class frmFileFolderSearch
         Me.Text = frmFileFolderSearch_FormName
 
         'Set Form Text
+        lblResults.Text = frmFileFolderSearch_lblResults
+        btnOk.Text = frmFileFolderSearch_btnOk
         btnCancel.Text = frmFileFolderSearch_btnCancel
     End Sub
 
     Private Sub frmFileFolderSearch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        bIsLoading = True
         SetForm()
         GetDrives()
-        Search(oDrives(iCurrentDrive))
+        bIsLoading = False
+        Search(oDrives(0))
     End Sub
 
     Private Sub bwSearch_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles bwSearch.DoWork
@@ -176,11 +248,54 @@ Public Class frmFileFolderSearch
     End Sub
 
     Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
-        bwSearch.CancelAsync()
+        If bwSearch.IsBusy Then
+            iStopStatus = eStopStatus.Cancel
+            bwSearch.CancelAsync()
+        Else
+            bShutdown = True
+            Me.Close()
+        End If
     End Sub
 
     Private Sub frmFileFolderSearch_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
-        bwSearch.CancelAsync()
         If Not bShutdown Then e.Cancel = True
     End Sub
+
+    Private Sub btnOk_Click(sender As Object, e As EventArgs) Handles btnOk.Click
+        Dim sItem As String
+
+        If lstResults.SelectedItems.Count = 1 Then
+            sItem = lstResults.SelectedItem.ToString
+            If mgrCommon.ShowMessage(mgrPath_ConfirmPathCorrect, New String() {GameName, sItem}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                If bwSearch.IsBusy Then
+                    iStopStatus = eStopStatus.FoundResult
+                    bwSearch.CancelAsync()
+                Else
+                    FoundItem = sItem
+                    bShutdown = True
+                    Me.Close()
+                End If
+            End If
+        End If
+    End Sub
+
+    Private Sub cboDrive_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboDrive.SelectedIndexChanged
+        If Not bIsLoading Then
+            Dim oResult As MsgBoxResult
+
+            oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oDrives(cboDrive.SelectedValue).RootDirectory.ToString}, MsgBoxStyle.YesNo)
+
+            If oResult = MsgBoxResult.Yes Then
+                If bwSearch.IsBusy Then
+                    iStopStatus = eStopStatus.ChangeDrive
+                    bwSearch.CancelAsync()
+                Else
+                    Search(oDrives(cboDrive.SelectedValue))
+                End If
+            Else
+                iStopStatus = eStopStatus.FinishedDrive
+                SearchComplete(frmFileFolderSearch_SearchCancel)
+            End If
+        End If
+    End Sub
 End Class

GBM/Forms/frmFilter.Designer.vb

@@ -99,7 +99,6 @@ Partial Class frmFilter
         '
         'optAll
         '
-        Me.optAll.AutoSize = True
         Me.optAll.Location = New System.Drawing.Point(77, 19)
         Me.optAll.Name = "optAll"
         Me.optAll.Size = New System.Drawing.Size(63, 17)
@@ -110,7 +109,6 @@ Partial Class frmFilter
         '
         'optAny
         '
-        Me.optAny.AutoSize = True
         Me.optAny.Checked = True
         Me.optAny.Location = New System.Drawing.Point(6, 19)
         Me.optAny.Name = "optAny"
@@ -213,7 +211,6 @@ Partial Class frmFilter
         '
         'optOr
         '
-        Me.optOr.AutoSize = True
         Me.optOr.Location = New System.Drawing.Point(56, 19)
         Me.optOr.Name = "optOr"
         Me.optOr.Size = New System.Drawing.Size(36, 17)
@@ -224,7 +221,6 @@ Partial Class frmFilter
         '
         'optAnd
         '
-        Me.optAnd.AutoSize = True
         Me.optAnd.Checked = True
         Me.optAnd.Location = New System.Drawing.Point(6, 19)
         Me.optAnd.Name = "optAnd"
@@ -302,11 +298,9 @@ Partial Class frmFilter
         Me.grpTagFilter.ResumeLayout(False)
         Me.grpTagFilter.PerformLayout()
         Me.grpTagOptions.ResumeLayout(False)
-        Me.grpTagOptions.PerformLayout()
         Me.grpGameFilter.ResumeLayout(False)
         Me.grpGameFilter.PerformLayout()
         Me.grpGameInfoOptions.ResumeLayout(False)
-        Me.grpGameInfoOptions.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

GBM/Forms/frmGameManager.Designer.vb

@@ -28,6 +28,11 @@ 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()
         Me.btnInclude = New System.Windows.Forms.Button()
         Me.txtID = New System.Windows.Forms.TextBox()
@@ -61,18 +66,17 @@ Partial Class frmGameManager
         Me.lblHours = New System.Windows.Forms.Label()
         Me.btnTags = New System.Windows.Forms.Button()
         Me.grpStats = New System.Windows.Forms.GroupBox()
+        Me.cboRemoteBackup = New System.Windows.Forms.ComboBox()
+        Me.lblRestorePathData = New System.Windows.Forms.Label()
+        Me.lblBackupFileData = New System.Windows.Forms.Label()
+        Me.lblLocalBackupData = New System.Windows.Forms.Label()
         Me.lblRestorePath = New System.Windows.Forms.Label()
-        Me.txtRestorePath = New System.Windows.Forms.TextBox()
         Me.btnOpenRestorePath = New System.Windows.Forms.Button()
         Me.btnOpenBackupFile = New System.Windows.Forms.Button()
-        Me.txtFileSize = New System.Windows.Forms.TextBox()
         Me.btnDeleteBackup = New System.Windows.Forms.Button()
-        Me.lblFileSize = New System.Windows.Forms.Label()
+        Me.lblBackupFile = New System.Windows.Forms.Label()
-        Me.lblSync = New System.Windows.Forms.Label()
+        Me.lblRemote = New System.Windows.Forms.Label()
-        Me.txtCurrentBackup = New System.Windows.Forms.TextBox()
+        Me.lblLocalData = New System.Windows.Forms.Label()
-        Me.lblCurrentBackup = New System.Windows.Forms.Label()
-        Me.txtLocalBackup = New System.Windows.Forms.TextBox()
-        Me.lblLastBackup = New System.Windows.Forms.Label()
         Me.btnMarkAsRestored = New System.Windows.Forms.Button()
         Me.btnRestore = New System.Windows.Forms.Button()
         Me.btnSave = New System.Windows.Forms.Button()
@@ -89,13 +93,20 @@ Partial Class frmGameManager
         Me.cmsImport = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.cmsOfficial = New System.Windows.Forms.ToolStripMenuItem()
         Me.cmsFile = New System.Windows.Forms.ToolStripMenuItem()
+        Me.txtQuickFilter = New System.Windows.Forms.TextBox()
+        Me.lblQuickFilter = New System.Windows.Forms.Label()
+        Me.cmsDeleteBackup = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cmsDeleteOne = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem()
         Me.grpConfig.SuspendLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpExtra.SuspendLayout()
         CType(Me.pbIcon, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.nudHours, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.grpStats.SuspendLayout()
         Me.grpFilter.SuspendLayout()
         Me.cmsImport.SuspendLayout()
+        Me.cmsDeleteBackup.SuspendLayout()
         Me.SuspendLayout()
         '
         'btnAdd
@@ -105,7 +116,7 @@ Partial Class frmGameManager
         Me.btnAdd.Location = New System.Drawing.Point(12, 526)
         Me.btnAdd.Name = "btnAdd"
         Me.btnAdd.Size = New System.Drawing.Size(30, 23)
-        Me.btnAdd.TabIndex = 2
+        Me.btnAdd.TabIndex = 4
         Me.btnAdd.Text = "+"
         Me.btnAdd.UseVisualStyleBackColor = True
         '
@@ -116,33 +127,38 @@ Partial Class frmGameManager
         Me.btnDelete.Location = New System.Drawing.Point(48, 526)
         Me.btnDelete.Name = "btnDelete"
         Me.btnDelete.Size = New System.Drawing.Size(30, 23)
-        Me.btnDelete.TabIndex = 3
+        Me.btnDelete.TabIndex = 5
         Me.btnDelete.Text = "-"
         Me.btnDelete.UseVisualStyleBackColor = True
         '
         'btnBackup
         '
         Me.btnBackup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnBackup.Location = New System.Drawing.Point(616, 525)
+        Me.btnBackup.Location = New System.Drawing.Point(616, 526)
         Me.btnBackup.Name = "btnBackup"
         Me.btnBackup.Size = New System.Drawing.Size(75, 23)
-        Me.btnBackup.TabIndex = 16
+        Me.btnBackup.TabIndex = 19
         Me.btnBackup.Text = "&Backup"
         Me.btnBackup.UseVisualStyleBackColor = True
         '
         'btnClose
         '
         Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnClose.Location = New System.Drawing.Point(697, 525)
+        Me.btnClose.Location = New System.Drawing.Point(697, 526)
         Me.btnClose.Name = "btnClose"
         Me.btnClose.Size = New System.Drawing.Size(75, 23)
-        Me.btnClose.TabIndex = 17
+        Me.btnClose.TabIndex = 20
         Me.btnClose.Text = "C&lose"
         Me.btnClose.UseVisualStyleBackColor = True
         '
         'grpConfig
         '
         Me.grpConfig.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.grpConfig.Controls.Add(Me.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)
         Me.grpConfig.Controls.Add(Me.btnInclude)
         Me.grpConfig.Controls.Add(Me.txtID)
@@ -162,16 +178,62 @@ Partial Class frmGameManager
         Me.grpConfig.Location = New System.Drawing.Point(247, 12)
         Me.grpConfig.Name = "grpConfig"
         Me.grpConfig.Size = New System.Drawing.Size(525, 157)
-        Me.grpConfig.TabIndex = 6
+        Me.grpConfig.TabIndex = 8
         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 = 16
+        Me.lblLimit.Text = "Backup Limit"
+        Me.lblLimit.Visible = False
+        '
+        'nudLimit
+        '
+        Me.nudLimit.Location = New System.Drawing.Point(329, 128)
+        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 = 15
+        Me.nudLimit.Value = New Decimal(New Integer() {2, 0, 0, 0})
+        Me.nudLimit.Visible = False
+        '
         'btnExclude
         '
         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 = 13
+        Me.btnExclude.TabIndex = 11
         Me.btnExclude.Text = "E&xclude Items..."
         Me.btnExclude.UseVisualStyleBackColor = True
         '
@@ -190,7 +252,7 @@ Partial Class frmGameManager
         Me.txtID.Location = New System.Drawing.Point(489, 19)
         Me.txtID.Name = "txtID"
         Me.txtID.Size = New System.Drawing.Size(30, 20)
-        Me.txtID.TabIndex = 16
+        Me.txtID.TabIndex = 0
         Me.txtID.TabStop = False
         Me.txtID.Visible = False
         '
@@ -205,10 +267,10 @@ Partial Class frmGameManager
         '
         '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 = 7
+        Me.btnProcessBrowse.TabIndex = 5
         Me.btnProcessBrowse.Text = "..."
         Me.btnProcessBrowse.UseVisualStyleBackColor = True
         '
@@ -241,18 +303,18 @@ Partial Class frmGameManager
         '
         'txtExclude
         '
-        Me.txtExclude.Location = New System.Drawing.Point(363, 128)
+        Me.txtExclude.Location = New System.Drawing.Point(489, 122)
         Me.txtExclude.Name = "txtExclude"
-        Me.txtExclude.Size = New System.Drawing.Size(156, 20)
+        Me.txtExclude.Size = New System.Drawing.Size(30, 20)
         Me.txtExclude.TabIndex = 0
         Me.txtExclude.TabStop = False
         Me.txtExclude.Visible = False
         '
         'txtFileType
         '
-        Me.txtFileType.Location = New System.Drawing.Point(363, 99)
+        Me.txtFileType.Location = New System.Drawing.Point(489, 99)
         Me.txtFileType.Name = "txtFileType"
-        Me.txtFileType.Size = New System.Drawing.Size(156, 20)
+        Me.txtFileType.Size = New System.Drawing.Size(30, 20)
         Me.txtFileType.TabIndex = 0
         Me.txtFileType.TabStop = False
         Me.txtFileType.Visible = False
@@ -262,9 +324,9 @@ Partial Class frmGameManager
         Me.chkTimeStamp.AutoSize = True
         Me.chkTimeStamp.Location = New System.Drawing.Point(190, 129)
         Me.chkTimeStamp.Name = "chkTimeStamp"
-        Me.chkTimeStamp.Size = New System.Drawing.Size(146, 17)
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
         Me.chkTimeStamp.TabIndex = 14
-        Me.chkTimeStamp.Text = "Time stamp each backup"
+        Me.chkTimeStamp.Text = "Save multiple backups"
         Me.chkTimeStamp.UseVisualStyleBackColor = True
         '
         'chkFolderSave
@@ -273,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 = 11
+        Me.chkFolderSave.TabIndex = 12
         Me.chkFolderSave.Text = "Save entire folder"
         Me.chkFolderSave.UseVisualStyleBackColor = True
         '
@@ -288,24 +350,24 @@ Partial Class frmGameManager
         '
         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 = 6
+        Me.txtProcess.TabIndex = 4
         '
         'txtName
         '
         Me.txtName.Location = New System.Drawing.Point(69, 19)
         Me.txtName.Name = "txtName"
         Me.txtName.Size = New System.Drawing.Size(414, 20)
-        Me.txtName.TabIndex = 5
+        Me.txtName.TabIndex = 3
         '
         'chkMonitorOnly
         '
         Me.chkMonitorOnly.AutoSize = True
         Me.chkMonitorOnly.Location = New System.Drawing.Point(362, 340)
         Me.chkMonitorOnly.Name = "chkMonitorOnly"
-        Me.chkMonitorOnly.Size = New System.Drawing.Size(145, 17)
+        Me.chkMonitorOnly.Size = New System.Drawing.Size(83, 17)
-        Me.chkMonitorOnly.TabIndex = 9
+        Me.chkMonitorOnly.TabIndex = 11
-        Me.chkMonitorOnly.Text = "Monitor only (No backup)"
+        Me.chkMonitorOnly.Text = "Monitor only"
         Me.chkMonitorOnly.UseVisualStyleBackColor = True
         '
         'grpExtra
@@ -328,7 +390,7 @@ Partial Class frmGameManager
         Me.grpExtra.Location = New System.Drawing.Point(247, 175)
         Me.grpExtra.Name = "grpExtra"
         Me.grpExtra.Size = New System.Drawing.Size(525, 155)
-        Me.grpExtra.TabIndex = 7
+        Me.grpExtra.TabIndex = 9
         Me.grpExtra.TabStop = False
         Me.grpExtra.Text = "Game Information"
         '
@@ -459,32 +521,73 @@ Partial Class frmGameManager
         Me.btnTags.Location = New System.Drawing.Point(535, 336)
         Me.btnTags.Name = "btnTags"
         Me.btnTags.Size = New System.Drawing.Size(75, 23)
-        Me.btnTags.TabIndex = 10
+        Me.btnTags.TabIndex = 12
         Me.btnTags.Text = "Tags..."
         Me.btnTags.UseVisualStyleBackColor = True
         '
         'grpStats
         '
         Me.grpStats.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.grpStats.Controls.Add(Me.cboRemoteBackup)
+        Me.grpStats.Controls.Add(Me.lblRestorePathData)
+        Me.grpStats.Controls.Add(Me.lblBackupFileData)
+        Me.grpStats.Controls.Add(Me.lblLocalBackupData)
         Me.grpStats.Controls.Add(Me.lblRestorePath)
-        Me.grpStats.Controls.Add(Me.txtRestorePath)
         Me.grpStats.Controls.Add(Me.btnOpenRestorePath)
         Me.grpStats.Controls.Add(Me.btnOpenBackupFile)
-        Me.grpStats.Controls.Add(Me.txtFileSize)
         Me.grpStats.Controls.Add(Me.btnDeleteBackup)
-        Me.grpStats.Controls.Add(Me.lblFileSize)
+        Me.grpStats.Controls.Add(Me.lblBackupFile)
-        Me.grpStats.Controls.Add(Me.lblSync)
+        Me.grpStats.Controls.Add(Me.lblRemote)
-        Me.grpStats.Controls.Add(Me.txtCurrentBackup)
+        Me.grpStats.Controls.Add(Me.lblLocalData)
-        Me.grpStats.Controls.Add(Me.lblCurrentBackup)
-        Me.grpStats.Controls.Add(Me.txtLocalBackup)
-        Me.grpStats.Controls.Add(Me.lblLastBackup)
         Me.grpStats.Location = New System.Drawing.Point(247, 365)
         Me.grpStats.Name = "grpStats"
         Me.grpStats.Size = New System.Drawing.Size(525, 154)
-        Me.grpStats.TabIndex = 13
+        Me.grpStats.TabIndex = 15
         Me.grpStats.TabStop = False
         Me.grpStats.Text = "Backup Information"
         '
+        'cboRemoteBackup
+        '
+        Me.cboRemoteBackup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboRemoteBackup.FormattingEnabled = True
+        Me.cboRemoteBackup.Location = New System.Drawing.Point(96, 24)
+        Me.cboRemoteBackup.Name = "cboRemoteBackup"
+        Me.cboRemoteBackup.Size = New System.Drawing.Size(387, 21)
+        Me.cboRemoteBackup.TabIndex = 12
+        '
+        'lblRestorePathData
+        '
+        Me.lblRestorePathData.AutoEllipsis = True
+        Me.lblRestorePathData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblRestorePathData.Location = New System.Drawing.Point(96, 98)
+        Me.lblRestorePathData.Name = "lblRestorePathData"
+        Me.lblRestorePathData.Size = New System.Drawing.Size(387, 20)
+        Me.lblRestorePathData.TabIndex = 7
+        Me.lblRestorePathData.Tag = "wipe"
+        Me.lblRestorePathData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lblBackupFileData
+        '
+        Me.lblBackupFileData.AutoEllipsis = True
+        Me.lblBackupFileData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblBackupFileData.Location = New System.Drawing.Point(96, 73)
+        Me.lblBackupFileData.Name = "lblBackupFileData"
+        Me.lblBackupFileData.Size = New System.Drawing.Size(387, 20)
+        Me.lblBackupFileData.TabIndex = 6
+        Me.lblBackupFileData.Tag = "wipe"
+        Me.lblBackupFileData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lblLocalBackupData
+        '
+        Me.lblLocalBackupData.AutoEllipsis = True
+        Me.lblLocalBackupData.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblLocalBackupData.Location = New System.Drawing.Point(96, 49)
+        Me.lblLocalBackupData.Name = "lblLocalBackupData"
+        Me.lblLocalBackupData.Size = New System.Drawing.Size(387, 20)
+        Me.lblLocalBackupData.TabIndex = 5
+        Me.lblLocalBackupData.Tag = "wipe"
+        Me.lblLocalBackupData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
         'lblRestorePath
         '
         Me.lblRestorePath.AutoSize = True
@@ -494,122 +597,77 @@ Partial Class frmGameManager
         Me.lblRestorePath.TabIndex = 3
         Me.lblRestorePath.Text = "Restore Path:"
         '
-        'txtRestorePath
-        '
-        Me.txtRestorePath.Location = New System.Drawing.Point(96, 99)
-        Me.txtRestorePath.Name = "txtRestorePath"
-        Me.txtRestorePath.ReadOnly = True
-        Me.txtRestorePath.Size = New System.Drawing.Size(387, 20)
-        Me.txtRestorePath.TabIndex = 8
-        '
         'btnOpenRestorePath
         '
-        Me.btnOpenRestorePath.Location = New System.Drawing.Point(339, 125)
+        Me.btnOpenRestorePath.Location = New System.Drawing.Point(369, 125)
         Me.btnOpenRestorePath.Name = "btnOpenRestorePath"
         Me.btnOpenRestorePath.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenRestorePath.TabIndex = 12
+        Me.btnOpenRestorePath.TabIndex = 11
         Me.btnOpenRestorePath.Text = "O&pen Restore Path"
         Me.btnOpenRestorePath.UseVisualStyleBackColor = True
         '
         'btnOpenBackupFile
         '
-        Me.btnOpenBackupFile.Location = New System.Drawing.Point(216, 125)
+        Me.btnOpenBackupFile.Location = New System.Drawing.Point(249, 125)
         Me.btnOpenBackupFile.Name = "btnOpenBackupFile"
         Me.btnOpenBackupFile.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenBackupFile.TabIndex = 11
+        Me.btnOpenBackupFile.TabIndex = 10
         Me.btnOpenBackupFile.Text = "&Open Backup File"
         Me.btnOpenBackupFile.UseVisualStyleBackColor = True
         '
-        'txtFileSize
-        '
-        Me.txtFileSize.Location = New System.Drawing.Point(96, 74)
-        Me.txtFileSize.Name = "txtFileSize"
-        Me.txtFileSize.ReadOnly = True
-        Me.txtFileSize.Size = New System.Drawing.Size(387, 20)
-        Me.txtFileSize.TabIndex = 7
-        Me.txtFileSize.TabStop = False
-        '
         'btnDeleteBackup
         '
-        Me.btnDeleteBackup.Location = New System.Drawing.Point(96, 125)
+        Me.btnDeleteBackup.Location = New System.Drawing.Point(129, 125)
         Me.btnDeleteBackup.Name = "btnDeleteBackup"
         Me.btnDeleteBackup.Size = New System.Drawing.Size(114, 23)
-        Me.btnDeleteBackup.TabIndex = 10
+        Me.btnDeleteBackup.TabIndex = 8
         Me.btnDeleteBackup.Text = "&Delete Backup"
         Me.btnDeleteBackup.UseVisualStyleBackColor = True
         '
-        'lblFileSize
+        'lblBackupFile
         '
-        Me.lblFileSize.AutoSize = True
+        Me.lblBackupFile.AutoSize = True
-        Me.lblFileSize.Location = New System.Drawing.Point(6, 77)
+        Me.lblBackupFile.Location = New System.Drawing.Point(6, 77)
-        Me.lblFileSize.Name = "lblFileSize"
+        Me.lblBackupFile.Name = "lblBackupFile"
-        Me.lblFileSize.Size = New System.Drawing.Size(70, 13)
+        Me.lblBackupFile.Size = New System.Drawing.Size(66, 13)
-        Me.lblFileSize.TabIndex = 2
+        Me.lblBackupFile.TabIndex = 2
-        Me.lblFileSize.Text = "Backup Size:"
+        Me.lblBackupFile.Text = "Backup File:"
         '
-        'lblSync
+        'lblRemote
         '
-        Me.lblSync.AutoSize = True
+        Me.lblRemote.AutoSize = True
-        Me.lblSync.Location = New System.Drawing.Point(6, 130)
+        Me.lblRemote.Location = New System.Drawing.Point(6, 27)
-        Me.lblSync.Name = "lblSync"
+        Me.lblRemote.Name = "lblRemote"
-        Me.lblSync.Size = New System.Drawing.Size(62, 13)
+        Me.lblRemote.Size = New System.Drawing.Size(73, 13)
-        Me.lblSync.TabIndex = 4
+        Me.lblRemote.TabIndex = 0
-        Me.lblSync.Text = "Up to Date!"
+        Me.lblRemote.Text = "Backup Data:"
-        Me.lblSync.Visible = False
         '
-        'txtCurrentBackup
+        'lblLocalData
         '
-        Me.txtCurrentBackup.Location = New System.Drawing.Point(96, 24)
+        Me.lblLocalData.AutoSize = True
-        Me.txtCurrentBackup.Name = "txtCurrentBackup"
+        Me.lblLocalData.Location = New System.Drawing.Point(6, 53)
-        Me.txtCurrentBackup.ReadOnly = True
+        Me.lblLocalData.Name = "lblLocalData"
-        Me.txtCurrentBackup.Size = New System.Drawing.Size(387, 20)
+        Me.lblLocalData.Size = New System.Drawing.Size(62, 13)
-        Me.txtCurrentBackup.TabIndex = 5
+        Me.lblLocalData.TabIndex = 1
-        Me.txtCurrentBackup.TabStop = False
+        Me.lblLocalData.Text = "Local Data:"
-        '
-        'lblCurrentBackup
-        '
-        Me.lblCurrentBackup.AutoSize = True
-        Me.lblCurrentBackup.Location = New System.Drawing.Point(6, 27)
-        Me.lblCurrentBackup.Name = "lblCurrentBackup"
-        Me.lblCurrentBackup.Size = New System.Drawing.Size(84, 13)
-        Me.lblCurrentBackup.TabIndex = 0
-        Me.lblCurrentBackup.Text = "Current Backup:"
-        '
-        'txtLocalBackup
-        '
-        Me.txtLocalBackup.Location = New System.Drawing.Point(96, 50)
-        Me.txtLocalBackup.Name = "txtLocalBackup"
-        Me.txtLocalBackup.ReadOnly = True
-        Me.txtLocalBackup.Size = New System.Drawing.Size(387, 20)
-        Me.txtLocalBackup.TabIndex = 6
-        Me.txtLocalBackup.TabStop = False
-        '
-        'lblLastBackup
-        '
-        Me.lblLastBackup.AutoSize = True
-        Me.lblLastBackup.Location = New System.Drawing.Point(6, 53)
-        Me.lblLastBackup.Name = "lblLastBackup"
-        Me.lblLastBackup.Size = New System.Drawing.Size(76, 13)
-        Me.lblLastBackup.TabIndex = 1
-        Me.lblLastBackup.Text = "Local Backup:"
         '
         'btnMarkAsRestored
         '
         Me.btnMarkAsRestored.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 525)
+        Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 526)
         Me.btnMarkAsRestored.Name = "btnMarkAsRestored"
         Me.btnMarkAsRestored.Size = New System.Drawing.Size(100, 23)
-        Me.btnMarkAsRestored.TabIndex = 14
+        Me.btnMarkAsRestored.TabIndex = 17
         Me.btnMarkAsRestored.Text = "&Mark as Restored"
         Me.btnMarkAsRestored.UseVisualStyleBackColor = True
         '
         'btnRestore
         '
         Me.btnRestore.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnRestore.Location = New System.Drawing.Point(535, 525)
+        Me.btnRestore.Location = New System.Drawing.Point(535, 526)
         Me.btnRestore.Name = "btnRestore"
         Me.btnRestore.Size = New System.Drawing.Size(75, 23)
-        Me.btnRestore.TabIndex = 15
+        Me.btnRestore.TabIndex = 18
         Me.btnRestore.Text = "&Restore"
         Me.btnRestore.UseVisualStyleBackColor = True
         '
@@ -619,19 +677,18 @@ Partial Class frmGameManager
         Me.btnSave.Location = New System.Drawing.Point(616, 336)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(75, 23)
-        Me.btnSave.TabIndex = 11
+        Me.btnSave.TabIndex = 13
         Me.btnSave.Text = "&Save"
         Me.btnSave.UseVisualStyleBackColor = True
         '
         'lstGames
         '
         Me.lstGames.FormattingEnabled = True
-        Me.lstGames.Location = New System.Drawing.Point(12, 138)
+        Me.lstGames.Location = New System.Drawing.Point(12, 160)
         Me.lstGames.Name = "lstGames"
         Me.lstGames.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
-        Me.lstGames.Size = New System.Drawing.Size(228, 381)
+        Me.lstGames.Size = New System.Drawing.Size(228, 355)
-        Me.lstGames.Sorted = True
+        Me.lstGames.TabIndex = 3
-        Me.lstGames.TabIndex = 1
         '
         'btnCancel
         '
@@ -639,7 +696,7 @@ Partial Class frmGameManager
         Me.btnCancel.Location = New System.Drawing.Point(697, 336)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 12
+        Me.btnCancel.TabIndex = 14
         Me.btnCancel.Text = "&Cancel"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
@@ -649,7 +706,7 @@ Partial Class frmGameManager
         Me.chkEnabled.Location = New System.Drawing.Point(247, 340)
         Me.chkEnabled.Name = "chkEnabled"
         Me.chkEnabled.Size = New System.Drawing.Size(109, 17)
-        Me.chkEnabled.TabIndex = 8
+        Me.chkEnabled.TabIndex = 10
         Me.chkEnabled.Text = "Monitor this game"
         Me.chkEnabled.UseVisualStyleBackColor = True
         '
@@ -693,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
@@ -715,7 +772,7 @@ Partial Class frmGameManager
         Me.btnImport.Location = New System.Drawing.Point(84, 526)
         Me.btnImport.Name = "btnImport"
         Me.btnImport.Size = New System.Drawing.Size(75, 23)
-        Me.btnImport.TabIndex = 4
+        Me.btnImport.TabIndex = 6
         Me.btnImport.Text = "&Import"
         Me.btnImport.UseVisualStyleBackColor = True
         '
@@ -724,7 +781,7 @@ Partial Class frmGameManager
         Me.btnExport.Location = New System.Drawing.Point(165, 526)
         Me.btnExport.Name = "btnExport"
         Me.btnExport.Size = New System.Drawing.Size(75, 23)
-        Me.btnExport.TabIndex = 5
+        Me.btnExport.TabIndex = 7
         Me.btnExport.Text = "&Export"
         Me.btnExport.UseVisualStyleBackColor = True
         '
@@ -747,11 +804,48 @@ Partial Class frmGameManager
         Me.cmsFile.Size = New System.Drawing.Size(117, 22)
         Me.cmsFile.Text = "&File..."
         '
+        'txtQuickFilter
+        '
+        Me.txtQuickFilter.Location = New System.Drawing.Point(80, 134)
+        Me.txtQuickFilter.Name = "txtQuickFilter"
+        Me.txtQuickFilter.Size = New System.Drawing.Size(160, 20)
+        Me.txtQuickFilter.TabIndex = 2
+        '
+        'lblQuickFilter
+        '
+        Me.lblQuickFilter.AutoSize = True
+        Me.lblQuickFilter.Location = New System.Drawing.Point(12, 137)
+        Me.lblQuickFilter.Name = "lblQuickFilter"
+        Me.lblQuickFilter.Size = New System.Drawing.Size(63, 13)
+        Me.lblQuickFilter.TabIndex = 1
+        Me.lblQuickFilter.Text = "Quick Filter:"
+        '
+        'cmsDeleteBackup
+        '
+        Me.cmsDeleteBackup.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmsDeleteOne, Me.cmsDeleteAll})
+        Me.cmsDeleteBackup.Name = "cmsDeleteBackup"
+        Me.cmsDeleteBackup.ShowImageMargin = False
+        Me.cmsDeleteBackup.Size = New System.Drawing.Size(115, 48)
+        '
+        'cmsDeleteOne
+        '
+        Me.cmsDeleteOne.Name = "cmsDeleteOne"
+        Me.cmsDeleteOne.Size = New System.Drawing.Size(114, 22)
+        Me.cmsDeleteOne.Text = "&Selected File"
+        '
+        'cmsDeleteAll
+        '
+        Me.cmsDeleteAll.Name = "cmsDeleteAll"
+        Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22)
+        Me.cmsDeleteAll.Text = "&All Files"
+        '
         'frmGameManager
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(784, 561)
+        Me.Controls.Add(Me.lblQuickFilter)
+        Me.Controls.Add(Me.txtQuickFilter)
         Me.Controls.Add(Me.btnExport)
         Me.Controls.Add(Me.btnImport)
         Me.Controls.Add(Me.grpFilter)
@@ -779,6 +873,7 @@ Partial Class frmGameManager
         Me.Text = "Game Manager"
         Me.grpConfig.ResumeLayout(False)
         Me.grpConfig.PerformLayout()
+        CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).EndInit()
         Me.grpExtra.ResumeLayout(False)
         Me.grpExtra.PerformLayout()
         CType(Me.pbIcon, System.ComponentModel.ISupportInitialize).EndInit()
@@ -788,6 +883,7 @@ Partial Class frmGameManager
         Me.grpFilter.ResumeLayout(False)
         Me.grpFilter.PerformLayout()
         Me.cmsImport.ResumeLayout(False)
+        Me.cmsDeleteBackup.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -829,14 +925,10 @@ Partial Class frmGameManager
     Friend WithEvents btnIconBrowse As System.Windows.Forms.Button
     Friend WithEvents txtIcon As System.Windows.Forms.TextBox
     Friend WithEvents txtID As System.Windows.Forms.TextBox
-    Friend WithEvents txtCurrentBackup As System.Windows.Forms.TextBox
+    Friend WithEvents lblRemote As System.Windows.Forms.Label
-    Friend WithEvents lblCurrentBackup As System.Windows.Forms.Label
+    Friend WithEvents lblLocalData As System.Windows.Forms.Label
-    Friend WithEvents txtLocalBackup As System.Windows.Forms.TextBox
-    Friend WithEvents lblLastBackup As System.Windows.Forms.Label
-    Friend WithEvents lblSync As System.Windows.Forms.Label
     Friend WithEvents chkEnabled As System.Windows.Forms.CheckBox
-    Friend WithEvents txtFileSize As System.Windows.Forms.TextBox
+    Friend WithEvents lblBackupFile As System.Windows.Forms.Label
-    Friend WithEvents lblFileSize As System.Windows.Forms.Label
     Friend WithEvents btnMarkAsRestored As System.Windows.Forms.Button
     Friend WithEvents btnRestore As System.Windows.Forms.Button
     Friend WithEvents btnDeleteBackup As System.Windows.Forms.Button
@@ -852,10 +944,23 @@ Partial Class frmGameManager
     Friend WithEvents btnInclude As System.Windows.Forms.Button
     Friend WithEvents btnExclude As System.Windows.Forms.Button
     Friend WithEvents lblRestorePath As Label
-    Friend WithEvents txtRestorePath As TextBox
     Friend WithEvents btnImport As System.Windows.Forms.Button
     Friend WithEvents btnExport As System.Windows.Forms.Button
     Friend WithEvents cmsImport As System.Windows.Forms.ContextMenuStrip
     Friend WithEvents cmsOfficial As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents cmsFile As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents txtQuickFilter As TextBox
+    Friend WithEvents lblQuickFilter As Label
+    Friend WithEvents lblLocalBackupData As Label
+    Friend WithEvents lblRestorePathData As Label
+    Friend WithEvents lblBackupFileData As Label
+    Friend WithEvents lblLimit As Label
+    Friend WithEvents nudLimit As NumericUpDown
+    Friend WithEvents cboRemoteBackup As ComboBox
+    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.resx

@@ -120,4 +120,7 @@
   <metadata name="cmsImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="cmsDeleteBackup.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
 </root>

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,12 +107,12 @@ 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)
+                lstTags.Items.Add(oData)
-        ElseIf lstGameTags.SelectedItems.Count > 1 Then
+            ElseIf lstGameTags.SelectedItems.Count > 1 Then
-            oTags = New List(Of KeyValuePair(Of String, String))
+                oTags = New List(Of KeyValuePair(Of String, String))
 
             For Each oData In lstGameTags.SelectedItems
                 oTags.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"
 
-        For Each de As DictionaryEntry In hshGameTags
+        If bNewMode Then
-            oTag = DirectCast(de.Value, clsTag)
+            For Each kp As KeyValuePair(Of String, String) In oTagList
-            oData = New KeyValuePair(Of String, String)(oTag.ID, oTag.Name)
+                'We need to be sure the tags still exist if the "Setup Tags" form was used
-            lstGameTags.Items.Add(oData)
+                If hshTags.ContainsKey(kp.Value) Then
-        Next
+                    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.Designer.vb

@@ -170,7 +170,6 @@ Partial Class frmIncludeExclude
         '
         'optFileTypes
         '
-        Me.optFileTypes.AutoSize = True
         Me.optFileTypes.Location = New System.Drawing.Point(6, 19)
         Me.optFileTypes.Name = "optFileTypes"
         Me.optFileTypes.Size = New System.Drawing.Size(73, 17)
@@ -181,7 +180,6 @@ Partial Class frmIncludeExclude
         '
         'optIndividualFiles
         '
-        Me.optIndividualFiles.AutoSize = True
         Me.optIndividualFiles.Location = New System.Drawing.Point(85, 19)
         Me.optIndividualFiles.Name = "optIndividualFiles"
         Me.optIndividualFiles.Size = New System.Drawing.Size(94, 17)
@@ -250,7 +248,6 @@ Partial Class frmIncludeExclude
         Me.Text = "Include / Exclude Builder"
         Me.cmsItems.ResumeLayout(False)
         Me.grpFileOptions.ResumeLayout(False)
-        Me.grpFileOptions.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

GBM/Forms/frmIncludeExclude.resx

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

GBM/Forms/frmIncludeExclude.vb

@@ -30,7 +30,7 @@ Public Class frmIncludeExclude
             Return sRootFolder
         End Get
         Set(value As String)
-            sRootFolder = value.TrimEnd("\")
+            sRootFolder = value.TrimEnd(Path.DirectorySeparatorChar)
         End Set
     End Property
 
@@ -52,7 +52,7 @@ Public Class frmIncludeExclude
 
                 If sFolders.Length <> 0 Then
                     For Each sFolder As String In sFolders
-                        oChild = New TreeNode(sFolder.Replace(sDirectory, String.Empty).TrimStart("\"), 0, 0)
+                        oChild = New TreeNode(sFolder.Replace(sDirectory, String.Empty).TrimStart(Path.DirectorySeparatorChar), 0, 0)
                         oChild.Name = sFolder
                         oChild.Tag = 0
                         oNode.Nodes.Add(oChild)
@@ -64,7 +64,7 @@ Public Class frmIncludeExclude
 
                 If sFiles.Length <> 0 Then
                     For Each sFile As String In sFiles
-                        oChild = New TreeNode(sFile.Replace(sDirectory, String.Empty).TrimStart("\"), 1, 1)
+                        oChild = New TreeNode(sFile.Replace(sDirectory, String.Empty).TrimStart(Path.DirectorySeparatorChar), 1, 1)
                         oChild.Tag = 1
                         oNode.Nodes.Add(oChild)
                     Next
@@ -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
@@ -195,7 +195,7 @@ Public Class frmIncludeExclude
                 If Path.GetFileName(txtRootFolder.Text) = sNewLabel Then
                     sFolderCheck = txtRootFolder.Text
                 Else
-                    sFolderCheck = txtRootFolder.Text & "\" & sNewLabel
+                    sFolderCheck = txtRootFolder.Text & Path.DirectorySeparatorChar & sNewLabel
                 End If
                 If Directory.Exists(sFolderCheck) Then
                     iType = 0
@@ -205,7 +205,7 @@ Public Class frmIncludeExclude
             End If
         End If
 
-        oListItem.ImageIndex = iType        
+        oListItem.ImageIndex = iType
     End Sub
 
     Private Function CreateNewBuilderString() As String
@@ -226,6 +226,8 @@ Public Class frmIncludeExclude
         sNewString = InputBox(frmIncludeExclude_RawEditInfo, mgrCommon.FormatString(frmIncludeExclude_RawEditTitle, FormName), sCurrentString)
         If sNewString <> String.Empty Then
             ParseBuilderString(sNewString)
+        Else
+            lstBuilder.Clear()
         End If
     End Sub
 
@@ -329,16 +331,21 @@ Public Class frmIncludeExclude
     Private Sub cmsAdd_Click(sender As Object, e As EventArgs) Handles cmsAdd.Click
         Dim oNewItem As New ListViewItem(frmIncludeExclude_CustomItem, 1)
         oNewItem.Selected = True
-        lstBuilder.Items.Add(oNewItem)        
+        lstBuilder.Items.Add(oNewItem)
         lstBuilder.SelectedItems(0).BeginEdit()
     End Sub
 
     Private Sub lstBuilder_AfterLabelEdit(sender As Object, e As LabelEditEventArgs) Handles lstBuilder.AfterLabelEdit
         If Not e.Label Is Nothing Then
+            If e.Label = String.Empty Then
+                e.CancelEdit = True
+            End If
+
             If lstBuilder.Items.ContainsKey(e.Label) Then
                 e.CancelEdit = True
             Else
-                IdentifyEntry(lstBuilder.Items(e.Item), e.Label)
+                'Unix Handler - Mono is unable to modify list items during an edit event without crashing
+                If Not mgrCommon.IsUnix Then IdentifyEntry(lstBuilder.Items(e.Item), e.Label)
             End If
         End If
     End Sub

GBM/Forms/frmMain.Designer.vb

@@ -39,14 +39,17 @@ Partial Class frmMain
         Me.gMonTrayTools = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonTrayToolsCleanMan = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonTrayToolsCompact = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayToolsLog = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayLogClear = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayLogSave = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonTraySep1 = New System.Windows.Forms.ToolStripSeparator()
         Me.gMonTrayExit = New System.Windows.Forms.ToolStripMenuItem()
         Me.bwMonitor = New System.ComponentModel.BackgroundWorker()
         Me.txtLog = New System.Windows.Forms.TextBox()
         Me.gMonStatusStrip = New System.Windows.Forms.StatusStrip()
-        Me.gMonStripAdminButton = New System.Windows.Forms.ToolStripSplitButton()
+        Me.gMonStripAdminButton = New System.Windows.Forms.ToolStripStatusLabel()
         Me.gMonStripTxtStatus = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.gMonStripStatusButton = New System.Windows.Forms.ToolStripSplitButton()
+        Me.gMonStripStatusButton = New System.Windows.Forms.ToolStripStatusLabel()
         Me.gMonMainMenu = New System.Windows.Forms.MenuStrip()
         Me.gMonFile = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonFileMonitor = New System.Windows.Forms.ToolStripMenuItem()
@@ -62,6 +65,9 @@ Partial Class frmMain
         Me.gMonTools = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonToolsCleanMan = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonToolsCompact = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonToolsLog = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonLogClear = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonLogSave = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelp = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelpWebSite = New System.Windows.Forms.ToolStripMenuItem()
         Me.gMonHelpManual = New System.Windows.Forms.ToolStripMenuItem()
@@ -69,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()
@@ -93,7 +98,6 @@ Partial Class frmMain
         Me.gMonTray.ContextMenuStrip = Me.gMonTrayMenu
         Me.gMonTray.Icon = CType(resources.GetObject("gMonTray.Icon"), System.Drawing.Icon)
         Me.gMonTray.Text = "GBM"
-        Me.gMonTray.Visible = True
         '
         'gMonTrayMenu
         '
@@ -164,7 +168,7 @@ Partial Class frmMain
         '
         'gMonTrayTools
         '
-        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCleanMan, Me.gMonTrayToolsCompact})
+        Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCleanMan, Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog})
         Me.gMonTrayTools.Name = "gMonTrayTools"
         Me.gMonTrayTools.Size = New System.Drawing.Size(161, 22)
         Me.gMonTrayTools.Text = "&Tools"
@@ -181,6 +185,25 @@ Partial Class frmMain
         Me.gMonTrayToolsCompact.Size = New System.Drawing.Size(184, 22)
         Me.gMonTrayToolsCompact.Text = "&Compact Databases"
         '
+        'gMonTrayToolsLog
+        '
+        Me.gMonTrayToolsLog.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayLogClear, Me.gMonTrayLogSave})
+        Me.gMonTrayToolsLog.Name = "gMonTrayToolsLog"
+        Me.gMonTrayToolsLog.Size = New System.Drawing.Size(184, 22)
+        Me.gMonTrayToolsLog.Text = "&Log"
+        '
+        'gMonTrayLogClear
+        '
+        Me.gMonTrayLogClear.Name = "gMonTrayLogClear"
+        Me.gMonTrayLogClear.Size = New System.Drawing.Size(101, 22)
+        Me.gMonTrayLogClear.Text = "&Clear"
+        '
+        'gMonTrayLogSave
+        '
+        Me.gMonTrayLogSave.Name = "gMonTrayLogSave"
+        Me.gMonTrayLogSave.Size = New System.Drawing.Size(101, 22)
+        Me.gMonTrayLogSave.Text = "&Save"
+        '
         'gMonTraySep1
         '
         Me.gMonTraySep1.Name = "gMonTraySep1"
@@ -198,14 +221,17 @@ 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 = 16777216
+        Me.txtLog.MaxLength = 524288
         Me.txtLog.Multiline = True
         Me.txtLog.Name = "txtLog"
         Me.txtLog.ReadOnly = True
         Me.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.txtLog.Size = New System.Drawing.Size(500, 177)
+        Me.txtLog.Size = New System.Drawing.Size(500, 186)
         Me.txtLog.TabIndex = 10
         Me.txtLog.TabStop = False
         '
@@ -213,7 +239,7 @@ Partial Class frmMain
         '
         Me.gMonStatusStrip.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.gMonStatusStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonStripAdminButton, Me.gMonStripTxtStatus, Me.gMonStripStatusButton})
-        Me.gMonStatusStrip.Location = New System.Drawing.Point(0, 364)
+        Me.gMonStatusStrip.Location = New System.Drawing.Point(0, 379)
         Me.gMonStatusStrip.Name = "gMonStatusStrip"
         Me.gMonStatusStrip.ShowItemToolTips = True
         Me.gMonStatusStrip.Size = New System.Drawing.Size(524, 22)
@@ -223,33 +249,26 @@ Partial Class frmMain
         'gMonStripAdminButton
         '
         Me.gMonStripAdminButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.gMonStripAdminButton.DropDownButtonWidth = 0
         Me.gMonStripAdminButton.Image = Global.GBM.My.Resources.Resources.Icon_User
-        Me.gMonStripAdminButton.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.gMonStripAdminButton.Name = "gMonStripAdminButton"
-        Me.gMonStripAdminButton.Size = New System.Drawing.Size(21, 20)
+        Me.gMonStripAdminButton.Size = New System.Drawing.Size(16, 17)
-        Me.gMonStripAdminButton.Text = "Elevation"
+        Me.gMonStripAdminButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
-        Me.gMonStripAdminButton.ToolTipText = "Elevation"
         '
         'gMonStripTxtStatus
         '
+        Me.gMonStripTxtStatus.Margin = New System.Windows.Forms.Padding(5, 0, 0, 0)
         Me.gMonStripTxtStatus.Name = "gMonStripTxtStatus"
-        Me.gMonStripTxtStatus.Size = New System.Drawing.Size(395, 17)
+        Me.gMonStripTxtStatus.Size = New System.Drawing.Size(400, 22)
         Me.gMonStripTxtStatus.Spring = True
         Me.gMonStripTxtStatus.Text = "Monitor Status"
         Me.gMonStripTxtStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'gMonStripStatusButton
         '
-        Me.gMonStripStatusButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.gMonStripStatusButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.gMonStripStatusButton.DropDownButtonWidth = 0
-        Me.gMonStripStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.gMonStripStatusButton.Name = "gMonStripStatusButton"
-        Me.gMonStripStatusButton.Size = New System.Drawing.Size(93, 20)
+        Me.gMonStripStatusButton.Size = New System.Drawing.Size(88, 17)
         Me.gMonStripStatusButton.Text = "Monitor Status:"
         Me.gMonStripStatusButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
-        Me.gMonStripStatusButton.ToolTipText = "Click to toggle monitoring on or off."
         '
         'gMonMainMenu
         '
@@ -329,7 +348,7 @@ Partial Class frmMain
         '
         'gMonTools
         '
-        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCleanMan, Me.gMonToolsCompact})
+        Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCleanMan, Me.gMonToolsCompact, Me.gMonToolsLog})
         Me.gMonTools.Name = "gMonTools"
         Me.gMonTools.Size = New System.Drawing.Size(47, 20)
         Me.gMonTools.Text = "&Tools"
@@ -346,6 +365,25 @@ Partial Class frmMain
         Me.gMonToolsCompact.Size = New System.Drawing.Size(184, 22)
         Me.gMonToolsCompact.Text = "&Compact Databases"
         '
+        'gMonToolsLog
+        '
+        Me.gMonToolsLog.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonLogClear, Me.gMonLogSave})
+        Me.gMonToolsLog.Name = "gMonToolsLog"
+        Me.gMonToolsLog.Size = New System.Drawing.Size(184, 22)
+        Me.gMonToolsLog.Text = "&Log"
+        '
+        'gMonLogClear
+        '
+        Me.gMonLogClear.Name = "gMonLogClear"
+        Me.gMonLogClear.Size = New System.Drawing.Size(101, 22)
+        Me.gMonLogClear.Text = "&Clear"
+        '
+        'gMonLogSave
+        '
+        Me.gMonLogSave.Name = "gMonLogSave"
+        Me.gMonLogSave.Size = New System.Drawing.Size(101, 22)
+        Me.gMonLogSave.Text = "&Save"
+        '
         'gMonHelp
         '
         Me.gMonHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonHelpWebSite, Me.gMonHelpManual, Me.gMonHelpCheckforUpdates, Me.gMonHelpAbout})
@@ -394,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"
@@ -414,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)
@@ -444,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
@@ -453,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"
@@ -461,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"
@@ -469,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"
@@ -487,7 +528,7 @@ Partial Class frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(524, 386)
+        Me.ClientSize = New System.Drawing.Size(524, 401)
         Me.Controls.Add(Me.pbTime)
         Me.Controls.Add(Me.lblStatus3)
         Me.Controls.Add(Me.lblStatus2)
@@ -497,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.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        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
@@ -548,9 +586,7 @@ Partial Class frmMain
     Friend WithEvents gMonHelpAbout As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonTraySetupGameManager As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonTraySetupCustomVariables As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents gMonStripStatusButton As System.Windows.Forms.ToolStripSplitButton
     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
@@ -566,7 +602,6 @@ Partial Class frmMain
     Friend WithEvents gMonHelpManual As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonHelpCheckforUpdates As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents btnCancelOperation As System.Windows.Forms.Button
-    Friend WithEvents gMonStripAdminButton As ToolStripSplitButton
     Friend WithEvents gMonTraySetupTags As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonSetupTags As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents lblStatus1 As Label
@@ -578,4 +613,12 @@ Partial Class frmMain
     Friend WithEvents pbTime As System.Windows.Forms.PictureBox
     Friend WithEvents gMonTrayToolsCleanMan As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents gMonToolsCleanMan As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents gMonToolsLog As ToolStripMenuItem
+    Friend WithEvents gMonLogClear As ToolStripMenuItem
+    Friend WithEvents gMonLogSave As ToolStripMenuItem
+    Friend WithEvents gMonTrayToolsLog As ToolStripMenuItem
+    Friend WithEvents gMonTrayLogClear As ToolStripMenuItem
+    Friend WithEvents gMonTrayLogSave As ToolStripMenuItem
+    Friend WithEvents gMonStripAdminButton As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents gMonStripStatusButton As System.Windows.Forms.ToolStripStatusLabel
 End Class

GBM/Forms/frmManifestViewer.Designer.vb

@@ -1,105 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmManifestViewer
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.dgView = New System.Windows.Forms.DataGridView()
-        Me.btnCancel = New System.Windows.Forms.Button()
-        Me.lblError = New System.Windows.Forms.Label()
-        Me.fbBrowser = New System.Windows.Forms.FolderBrowserDialog()
-        Me.cboManifest = New System.Windows.Forms.ComboBox()
-        CType(Me.dgView, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'dgView
-        '
-        Me.dgView.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.dgView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.dgView.BackgroundColor = System.Drawing.SystemColors.Window
-        Me.dgView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgView.Location = New System.Drawing.Point(12, 12)
-        Me.dgView.Name = "dgView"
-        Me.dgView.RowHeadersVisible = False
-        Me.dgView.Size = New System.Drawing.Size(960, 338)
-        Me.dgView.TabIndex = 0
-        '
-        'btnCancel
-        '
-        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnCancel.Location = New System.Drawing.Point(897, 356)
-        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 2
-        Me.btnCancel.Text = "C&lose"
-        Me.btnCancel.UseVisualStyleBackColor = True
-        '
-        'lblError
-        '
-        Me.lblError.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.lblError.AutoSize = True
-        Me.lblError.Location = New System.Drawing.Point(139, 362)
-        Me.lblError.Name = "lblError"
-        Me.lblError.Size = New System.Drawing.Size(54, 13)
-        Me.lblError.TabIndex = 5
-        Me.lblError.Text = "Info Label"
-        '
-        'fbBrowser
-        '
-        Me.fbBrowser.ShowNewFolderButton = False
-        '
-        'cboManifest
-        '
-        Me.cboManifest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.cboManifest.FormattingEnabled = True
-        Me.cboManifest.Location = New System.Drawing.Point(12, 359)
-        Me.cboManifest.Name = "cboManifest"
-        Me.cboManifest.Size = New System.Drawing.Size(121, 21)
-        Me.cboManifest.TabIndex = 6
-        '
-        'frmManifestViewer
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(984, 392)
-        Me.Controls.Add(Me.cboManifest)
-        Me.Controls.Add(Me.lblError)
-        Me.Controls.Add(Me.btnCancel)
-        Me.Controls.Add(Me.dgView)
-        Me.MinimizeBox = False
-        Me.Name = "frmManifestViewer"
-        Me.ShowIcon = False
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Manifest Viewer"
-        CType(Me.dgView, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents dgView As System.Windows.Forms.DataGridView
-    Friend WithEvents btnCancel As System.Windows.Forms.Button
-    Friend WithEvents lblError As System.Windows.Forms.Label
-    Friend WithEvents fbBrowser As System.Windows.Forms.FolderBrowserDialog
-    Friend WithEvents cboManifest As System.Windows.Forms.ComboBox
-End Class

GBM/Forms/frmManifestViewer.vb

@@ -1,149 +0,0 @@
-Public Class frmManifestViewer
-
-    Private bShutdown As Boolean = False
-    Private oLocalManifest As SortedList
-    Private oRemoteManfiest As SortedList
-    Private oRestoreInfo As clsBackup
-    Private oDataTable As DataTable
-
-    Property RestoreInfo As clsBackup
-        Get
-            Return oRestoreInfo
-        End Get
-        Set(value As clsBackup)
-            oRestoreInfo = value
-        End Set
-    End Property
-
-    Property LocalManifestData As SortedList
-        Get
-            Return oLocalManifest
-        End Get
-        Set(value As SortedList)
-            oLocalManifest = value
-        End Set
-    End Property
-
-    Property RemoteManifestData As SortedList
-        Get
-            Return oRemoteManfiest
-        End Get
-        Set(value As SortedList)
-            oRemoteManfiest = value
-        End Set
-    End Property
-
-    Private Sub FormatManifest(ByVal iManifest As Integer)
-        Dim oRow As Object()
-        Dim oLoadData As SortedList
-
-        If iManifest = 1 Then
-            oLoadData = LocalManifestData
-        Else
-            oLoadData = RemoteManifestData
-        End If
-
-        oDataTable = New DataTable
-
-        'Setup Columns
-        oDataTable.Columns.Add("Name")
-        oDataTable.Columns.Add("Backup Path")
-        oDataTable.Columns.Add("Restore Path")
-        oDataTable.Columns.Add("Absolute Path")
-        oDataTable.Columns.Add("Date Updated")
-        oDataTable.Columns.Add("Updated By")
-
-
-        'Setup Data Types
-        oDataTable.Columns(0).DataType = GetType(String)
-        oDataTable.Columns(1).DataType = GetType(String)
-        oDataTable.Columns(2).DataType = GetType(String)
-        oDataTable.Columns(3).DataType = GetType(Boolean)
-        oDataTable.Columns(4).DataType = GetType(DateTime)
-        oDataTable.Columns(5).DataType = GetType(String)
-
-
-
-        For Each o As clsBackup In oLoadData.Values
-            oRow = New Object() {o.Name, o.FileName, o.RestorePath, o.AbsolutePath, o.DateUpdated, o.UpdatedBy}
-            oDataTable.Rows.Add(oRow)
-        Next
-
-        'Sort
-        oDataTable.DefaultView.Sort = "Name asc"
-        dgView.DataSource = oDataTable
-
-        'Setup Column Widths        
-        dgView.Columns(0).MinimumWidth = 100
-        dgView.Columns(1).MinimumWidth = 175
-        dgView.Columns(2).MinimumWidth = 175
-        dgView.Columns(3).MinimumWidth = 60
-        dgView.Columns(4).MinimumWidth = 125
-        dgView.Columns(5).MinimumWidth = 100
-
-        dgView.Columns(0).FillWeight = 100
-        dgView.Columns(1).FillWeight = 100
-        dgView.Columns(2).FillWeight = 100
-        dgView.Columns(3).FillWeight = 25
-        dgView.Columns(4).FillWeight = 50
-        dgView.Columns(5).FillWeight = 50
-
-    End Sub
-
-    Private Sub LoadCombo()
-        Dim oCombo As New List(Of KeyValuePair(Of Integer, String))
-        oCombo.Add(New KeyValuePair(Of Integer, String)(1, "Local Manifest"))
-        oCombo.Add(New KeyValuePair(Of Integer, String)(2, "Remote Manifest"))
-        cboManifest.DataSource = oCombo
-        cboManifest.ValueMember = "key"
-        cboManifest.DisplayMember = "value"
-    End Sub
-
-    Private Sub frmManifestInfo_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
-        dgView.ReadOnly = True
-        dgView.AllowUserToAddRows = False
-        lblError.Text = String.Empty
-        LoadCombo()
-        FormatManifest(CInt(cboManifest.SelectedValue))
-    End Sub
-
-    Private Sub dgView_CellStateChanged(sender As Object, e As DataGridViewCellStateChangedEventArgs) Handles dgView.CellStateChanged
-        lblError.ForeColor = Color.Black
-
-        Select Case dgView.Columns(e.Cell.ColumnIndex).Index
-            Case 0
-                lblError.Text = "The name of the application."
-            Case 1
-                lblError.Text = "The location of the backup file to restore."
-            Case 2
-                lblError.Text = "When the backup file was updated from this computer."
-            Case 3
-                lblError.Text = "The name of this computer."
-            Case 4
-                lblError.Text = "When the local backup file was last updated."
-            Case 5
-                lblError.Text = "The name of the computer that performed the last backup."
-        End Select
-    End Sub
-
-    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
-        Me.Close()
-    End Sub
-
-    Private Sub frmGameInfo_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
-
-        If Not bShutdown Then
-            If MsgBox("Are you sure you want to close?", MsgBoxStyle.YesNo, "ABM") = MsgBoxResult.Yes Then
-                bShutdown = True
-            End If
-        End If
-
-        If Not bShutdown Then
-            e.Cancel = True
-        End If
-    End Sub
-
-    Private Sub cboManifest_SelectionChangeCommitted(sender As Object, e As EventArgs) Handles cboManifest.SelectionChangeCommitted
-        FormatManifest(CInt(cboManifest.SelectedValue))
-    End Sub
-End Class

GBM/Forms/frmSettings.Designer.vb

@@ -23,31 +23,59 @@ 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.grpGeneral = New System.Windows.Forms.GroupBox()
-        Me.chkTimeTracking = New System.Windows.Forms.CheckBox()
         Me.chkStartWindows = New System.Windows.Forms.CheckBox()
+        Me.chkStartToTray = New System.Windows.Forms.CheckBox()
+        Me.chkAutoSaveLog = New System.Windows.Forms.CheckBox()
+        Me.btnOptionalFields = New System.Windows.Forms.Button()
+        Me.chkTimeTracking = New System.Windows.Forms.CheckBox()
         Me.chkSync = New System.Windows.Forms.CheckBox()
         Me.chkShowDetectionTips = New System.Windows.Forms.CheckBox()
-        Me.chkStartToTray = New System.Windows.Forms.CheckBox()
+        Me.grpFolderOptions = New System.Windows.Forms.GroupBox()
-        Me.grpPaths = New System.Windows.Forms.GroupBox()
         Me.btnBackupFolder = New System.Windows.Forms.Button()
         Me.lblBackupFolder = New System.Windows.Forms.Label()
         Me.txtBackupFolder = New System.Windows.Forms.TextBox()
+        Me.chkCreateFolder = New System.Windows.Forms.CheckBox()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.btnCancel = New System.Windows.Forms.Button()
-        Me.grpBackup = New System.Windows.Forms.GroupBox()
+        Me.grp7zGeneral = New System.Windows.Forms.GroupBox()
+        Me.cboCompression = New System.Windows.Forms.ComboBox()
+        Me.lblCompression = New System.Windows.Forms.Label()
+        Me.btn7zLocation = New System.Windows.Forms.Button()
+        Me.txt7zLocation = New System.Windows.Forms.TextBox()
+        Me.lblLocation = New System.Windows.Forms.Label()
+        Me.txt7zArguments = New System.Windows.Forms.TextBox()
+        Me.lblArguments = New System.Windows.Forms.Label()
+        Me.lbl7zCopyright = New System.Windows.Forms.Label()
+        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.chkCheckSum = New System.Windows.Forms.CheckBox()
+        Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
-        Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox()
         Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
-        Me.chkCreateFolder = New System.Windows.Forms.CheckBox()
+        Me.grpBackupHandling = New System.Windows.Forms.GroupBox()
-        Me.grpGeneral.SuspendLayout()
+        Me.chkAutoRestore = New System.Windows.Forms.CheckBox()
-        Me.grpPaths.SuspendLayout()
+        Me.chkRestoreNotify = New System.Windows.Forms.CheckBox()
-        Me.grpBackup.SuspendLayout()
+        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()
+        Me.pnlGeneral = New System.Windows.Forms.Panel()
+        Me.grpGameData = New System.Windows.Forms.GroupBox()
+        Me.lstSettings = New System.Windows.Forms.ListBox()
+        Me.grpStartup.SuspendLayout()
+        Me.grpFolderOptions.SuspendLayout()
+        Me.grp7zGeneral.SuspendLayout()
+        Me.pnlBackup.SuspendLayout()
         CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.grpBackupHandling.SuspendLayout()
+        Me.pnl7z.SuspendLayout()
+        Me.grp7zAdvanced.SuspendLayout()
+        Me.grp7zInformation.SuspendLayout()
+        Me.pnlGeneral.SuspendLayout()
+        Me.grpGameData.SuspendLayout()
         Me.SuspendLayout()
         '
         'chkMonitorOnStartup
@@ -60,40 +88,17 @@ Partial Class frmSettings
         Me.chkMonitorOnStartup.Text = "Start monitoring at launch"
         Me.chkMonitorOnStartup.UseVisualStyleBackColor = True
         '
-        'chkBackupConfirm
+        'grpStartup
         '
-        Me.chkBackupConfirm.AutoSize = True
+        Me.grpStartup.Controls.Add(Me.chkStartWindows)
-        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 42)
+        Me.grpStartup.Controls.Add(Me.chkStartToTray)
-        Me.chkBackupConfirm.Name = "chkBackupConfirm"
+        Me.grpStartup.Controls.Add(Me.chkMonitorOnStartup)
-        Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
+        Me.grpStartup.Location = New System.Drawing.Point(6, 12)
-        Me.chkBackupConfirm.TabIndex = 1
+        Me.grpStartup.Name = "grpStartup"
-        Me.chkBackupConfirm.Text = "Disable backup confirmation"
+        Me.grpStartup.Size = New System.Drawing.Size(354, 90)
-        Me.chkBackupConfirm.UseVisualStyleBackColor = True
+        Me.grpStartup.TabIndex = 0
-        '
+        Me.grpStartup.TabStop = False
-        'grpGeneral
+        Me.grpStartup.Text = "Startup"
-        '
-        Me.grpGeneral.Controls.Add(Me.chkTimeTracking)
-        Me.grpGeneral.Controls.Add(Me.chkStartWindows)
-        Me.grpGeneral.Controls.Add(Me.chkSync)
-        Me.grpGeneral.Controls.Add(Me.chkShowDetectionTips)
-        Me.grpGeneral.Controls.Add(Me.chkStartToTray)
-        Me.grpGeneral.Controls.Add(Me.chkMonitorOnStartup)
-        Me.grpGeneral.Location = New System.Drawing.Point(12, 12)
-        Me.grpGeneral.Name = "grpGeneral"
-        Me.grpGeneral.Size = New System.Drawing.Size(360, 165)
-        Me.grpGeneral.TabIndex = 0
-        Me.grpGeneral.TabStop = False
-        Me.grpGeneral.Text = "General"
-        '
-        'chkTimeTracking
-        '
-        Me.chkTimeTracking.AutoSize = True
-        Me.chkTimeTracking.Location = New System.Drawing.Point(6, 111)
-        Me.chkTimeTracking.Name = "chkTimeTracking"
-        Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17)
-        Me.chkTimeTracking.TabIndex = 4
-        Me.chkTimeTracking.Text = "Enable time tracking"
-        Me.chkTimeTracking.UseVisualStyleBackColor = True
         '
         'chkStartWindows
         '
@@ -105,26 +110,6 @@ Partial Class frmSettings
         Me.chkStartWindows.Text = "Start with Windows"
         Me.chkStartWindows.UseVisualStyleBackColor = True
         '
-        'chkSync
-        '
-        Me.chkSync.AutoSize = True
-        Me.chkSync.Location = New System.Drawing.Point(6, 134)
-        Me.chkSync.Name = "chkSync"
-        Me.chkSync.Size = New System.Drawing.Size(208, 17)
-        Me.chkSync.TabIndex = 5
-        Me.chkSync.Text = "Sync game list data with backup folder"
-        Me.chkSync.UseVisualStyleBackColor = True
-        '
-        'chkShowDetectionTips
-        '
-        Me.chkShowDetectionTips.AutoSize = True
-        Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 88)
-        Me.chkShowDetectionTips.Name = "chkShowDetectionTips"
-        Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17)
-        Me.chkShowDetectionTips.TabIndex = 3
-        Me.chkShowDetectionTips.Text = "Show detection notifications"
-        Me.chkShowDetectionTips.UseVisualStyleBackColor = True
-        '
         'chkStartToTray
         '
         Me.chkStartToTray.AutoSize = True
@@ -135,179 +120,438 @@ Partial Class frmSettings
         Me.chkStartToTray.Text = "Start to system tray"
         Me.chkStartToTray.UseVisualStyleBackColor = True
         '
-        'grpPaths
+        'chkAutoSaveLog
         '
-        Me.grpPaths.Controls.Add(Me.btnBackupFolder)
+        Me.chkAutoSaveLog.AutoSize = True
-        Me.grpPaths.Controls.Add(Me.lblBackupFolder)
+        Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204)
-        Me.grpPaths.Controls.Add(Me.txtBackupFolder)
+        Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
-        Me.grpPaths.Location = New System.Drawing.Point(12, 360)
+        Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
-        Me.grpPaths.Name = "grpPaths"
+        Me.chkAutoSaveLog.TabIndex = 3
-        Me.grpPaths.Size = New System.Drawing.Size(360, 60)
+        Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
-        Me.grpPaths.TabIndex = 2
+        Me.chkAutoSaveLog.UseVisualStyleBackColor = True
-        Me.grpPaths.TabStop = False
+        '
-        Me.grpPaths.Text = "Paths"
+        'btnOptionalFields
+        '
+        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 = 2
+        Me.btnOptionalFields.Text = "Choose &Optional Fields..."
+        Me.btnOptionalFields.UseVisualStyleBackColor = True
+        '
+        'chkTimeTracking
+        '
+        Me.chkTimeTracking.AutoSize = True
+        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 = 0
+        Me.chkTimeTracking.Text = "Enable time tracking"
+        Me.chkTimeTracking.UseVisualStyleBackColor = True
+        '
+        'chkSync
+        '
+        Me.chkSync.AutoSize = True
+        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 = 1
+        Me.chkSync.Text = "Enable syncing"
+        Me.chkSync.UseVisualStyleBackColor = True
+        '
+        'chkShowDetectionTips
+        '
+        Me.chkShowDetectionTips.AutoSize = True
+        Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181)
+        Me.chkShowDetectionTips.Name = "chkShowDetectionTips"
+        Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17)
+        Me.chkShowDetectionTips.TabIndex = 2
+        Me.chkShowDetectionTips.Text = "Show detection notifications"
+        Me.chkShowDetectionTips.UseVisualStyleBackColor = True
+        '
+        'grpFolderOptions
+        '
+        Me.grpFolderOptions.Controls.Add(Me.btnBackupFolder)
+        Me.grpFolderOptions.Controls.Add(Me.lblBackupFolder)
+        Me.grpFolderOptions.Controls.Add(Me.txtBackupFolder)
+        Me.grpFolderOptions.Controls.Add(Me.chkCreateFolder)
+        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 = 0
+        Me.grpFolderOptions.TabStop = False
+        Me.grpFolderOptions.Text = "Folders"
         '
         'btnBackupFolder
         '
-        Me.btnBackupFolder.Location = New System.Drawing.Point(318, 23)
+        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
         '
         'lblBackupFolder
         '
         Me.lblBackupFolder.AutoSize = True
-        Me.lblBackupFolder.Location = New System.Drawing.Point(6, 27)
+        Me.lblBackupFolder.Location = New System.Drawing.Point(6, 20)
         Me.lblBackupFolder.Name = "lblBackupFolder"
-        Me.lblBackupFolder.Size = New System.Drawing.Size(76, 13)
+        Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13)
         Me.lblBackupFolder.TabIndex = 0
-        Me.lblBackupFolder.Text = "Backup Folder"
+        Me.lblBackupFolder.Text = "Backup Folder:"
         '
         'txtBackupFolder
         '
-        Me.txtBackupFolder.Location = New System.Drawing.Point(88, 24)
+        Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17)
         Me.txtBackupFolder.Name = "txtBackupFolder"
-        Me.txtBackupFolder.Size = New System.Drawing.Size(224, 20)
+        Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20)
-        Me.txtBackupFolder.TabIndex = 1
+        Me.txtBackupFolder.TabIndex = 0
+        '
+        'chkCreateFolder
+        '
+        Me.chkCreateFolder.AutoSize = True
+        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 = 2
+        Me.chkCreateFolder.Text = "Create a sub-folder for each game"
+        Me.chkCreateFolder.UseVisualStyleBackColor = True
         '
         'btnSave
         '
         Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.btnSave.Location = New System.Drawing.Point(216, 426)
+        Me.btnSave.Location = New System.Drawing.Point(384, 321)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(75, 23)
-        Me.btnSave.TabIndex = 3
+        Me.btnSave.TabIndex = 5
         Me.btnSave.Text = "&Save"
         Me.btnSave.UseVisualStyleBackColor = True
         '
         'btnCancel
         '
         Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.Location = New System.Drawing.Point(297, 426)
+        Me.btnCancel.Location = New System.Drawing.Point(465, 321)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 4
+        Me.btnCancel.TabIndex = 6
         Me.btnCancel.Text = "&Cancel"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
-        'grpBackup
+        'grp7zGeneral
         '
-        Me.grpBackup.Controls.Add(Me.lblMinutes)
+        Me.grp7zGeneral.Controls.Add(Me.cboCompression)
-        Me.grpBackup.Controls.Add(Me.nudSupressBackupThreshold)
+        Me.grp7zGeneral.Controls.Add(Me.lblCompression)
-        Me.grpBackup.Controls.Add(Me.chkSupressBackup)
+        Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12)
-        Me.grpBackup.Controls.Add(Me.chkCheckSum)
+        Me.grp7zGeneral.Name = "grp7zGeneral"
-        Me.grpBackup.Controls.Add(Me.chkRestoreOnLaunch)
+        Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50)
-        Me.grpBackup.Controls.Add(Me.chkOverwriteWarning)
+        Me.grp7zGeneral.TabIndex = 0
-        Me.grpBackup.Controls.Add(Me.chkCreateFolder)
+        Me.grp7zGeneral.TabStop = False
-        Me.grpBackup.Controls.Add(Me.chkBackupConfirm)
+        Me.grp7zGeneral.Text = "General"
-        Me.grpBackup.Location = New System.Drawing.Point(12, 183)
+        '
-        Me.grpBackup.Name = "grpBackup"
+        'cboCompression
-        Me.grpBackup.Size = New System.Drawing.Size(360, 171)
+        '
-        Me.grpBackup.TabIndex = 1
+        Me.cboCompression.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.grpBackup.TabStop = False
+        Me.cboCompression.FormattingEnabled = True
-        Me.grpBackup.Text = "Backup and Restore"
+        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 = 0
+        '
+        'lblCompression
+        '
+        Me.lblCompression.AutoSize = True
+        Me.lblCompression.Location = New System.Drawing.Point(6, 20)
+        Me.lblCompression.Name = "lblCompression"
+        Me.lblCompression.Size = New System.Drawing.Size(70, 13)
+        Me.lblCompression.TabIndex = 0
+        Me.lblCompression.Text = "Compression:"
+        '
+        'btn7zLocation
+        '
+        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 = 2
+        Me.btn7zLocation.Text = "..."
+        Me.btn7zLocation.UseVisualStyleBackColor = True
+        '
+        'txt7zLocation
+        '
+        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 = 1
+        '
+        'lblLocation
+        '
+        Me.lblLocation.AutoSize = True
+        Me.lblLocation.Location = New System.Drawing.Point(6, 44)
+        Me.lblLocation.Name = "lblLocation"
+        Me.lblLocation.Size = New System.Drawing.Size(89, 13)
+        Me.lblLocation.TabIndex = 4
+        Me.lblLocation.Text = "Custom Location:"
+        '
+        'txt7zArguments
+        '
+        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 = 0
+        '
+        'lblArguments
+        '
+        Me.lblArguments.AutoSize = True
+        Me.lblArguments.Location = New System.Drawing.Point(6, 20)
+        Me.lblArguments.Name = "lblArguments"
+        Me.lblArguments.Size = New System.Drawing.Size(98, 13)
+        Me.lblArguments.TabIndex = 2
+        Me.lblArguments.Text = "Custom Arguments:"
+        '
+        'lbl7zCopyright
+        '
+        Me.lbl7zCopyright.AutoEllipsis = True
+        Me.lbl7zCopyright.Location = New System.Drawing.Point(9, 34)
+        Me.lbl7zCopyright.Name = "lbl7zCopyright"
+        Me.lbl7zCopyright.Size = New System.Drawing.Size(339, 17)
+        Me.lbl7zCopyright.TabIndex = 8
+        Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'lbl7zProduct
+        '
+        Me.lbl7zProduct.AutoEllipsis = True
+        Me.lbl7zProduct.Location = New System.Drawing.Point(9, 17)
+        Me.lbl7zProduct.Name = "lbl7zProduct"
+        Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17)
+        Me.lbl7zProduct.TabIndex = 7
+        Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'btnDefaults
+        '
+        Me.btnDefaults.Location = New System.Drawing.Point(12, 321)
+        Me.btnDefaults.Name = "btnDefaults"
+        Me.btnDefaults.Size = New System.Drawing.Size(110, 23)
+        Me.btnDefaults.TabIndex = 4
+        Me.btnDefaults.Text = "Set &Defaults"
+        Me.btnDefaults.UseVisualStyleBackColor = True
+        '
+        'pnlBackup
+        '
+        Me.pnlBackup.Controls.Add(Me.lblMinutes)
+        Me.pnlBackup.Controls.Add(Me.nudSupressBackupThreshold)
+        Me.pnlBackup.Controls.Add(Me.chkSupressBackup)
+        Me.pnlBackup.Controls.Add(Me.chkBackupConfirm)
+        Me.pnlBackup.Controls.Add(Me.chkOverwriteWarning)
+        Me.pnlBackup.Controls.Add(Me.grpBackupHandling)
+        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, 135)
+        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 = 7
+        Me.lblMinutes.TabIndex = 14
         Me.lblMinutes.Text = "minutes"
         '
         'nudSupressBackupThreshold
         '
-        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 133)
+        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 = 6
+        Me.nudSupressBackupThreshold.TabIndex = 5
         '
         'chkSupressBackup
         '
         Me.chkSupressBackup.AutoSize = True
-        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 134)
+        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 = 5
+        Me.chkSupressBackup.TabIndex = 4
         Me.chkSupressBackup.Text = "Backup only when session time exceeds"
         Me.chkSupressBackup.UseVisualStyleBackColor = True
         '
-        'chkCheckSum
+        'chkBackupConfirm
         '
-        Me.chkCheckSum.AutoSize = True
+        Me.chkBackupConfirm.AutoSize = True
-        Me.chkCheckSum.Location = New System.Drawing.Point(6, 88)
+        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 180)
-        Me.chkCheckSum.Name = "chkCheckSum"
+        Me.chkBackupConfirm.Name = "chkBackupConfirm"
-        Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
+        Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
-        Me.chkCheckSum.TabIndex = 3
+        Me.chkBackupConfirm.TabIndex = 2
-        Me.chkCheckSum.Text = "Verify backup files with a checksum"
+        Me.chkBackupConfirm.Text = "Disable backup confirmation"
-        Me.chkCheckSum.UseVisualStyleBackColor = True
+        Me.chkBackupConfirm.UseVisualStyleBackColor = True
-        '
-        'chkRestoreOnLaunch
-        '
-        Me.chkRestoreOnLaunch.AutoSize = True
-        Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 111)
-        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, 65)
+        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 = 2
+        Me.chkOverwriteWarning.TabIndex = 3
         Me.chkOverwriteWarning.Text = "Show overwrite warning"
         Me.chkOverwriteWarning.UseVisualStyleBackColor = True
         '
-        'chkCreateFolder
+        'grpBackupHandling
         '
-        Me.chkCreateFolder.AutoSize = True
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoRestore)
-        Me.chkCreateFolder.Location = New System.Drawing.Point(6, 19)
+        Me.grpBackupHandling.Controls.Add(Me.chkRestoreNotify)
-        Me.chkCreateFolder.Name = "chkCreateFolder"
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoMark)
-        Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17)
+        Me.grpBackupHandling.Location = New System.Drawing.Point(6, 88)
-        Me.chkCreateFolder.TabIndex = 0
+        Me.grpBackupHandling.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
-        Me.chkCreateFolder.Text = "Create a sub-folder for each game"
+        Me.grpBackupHandling.Name = "grpBackupHandling"
-        Me.chkCreateFolder.UseVisualStyleBackColor = True
+        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)
+        Me.pnl7z.Controls.Add(Me.grp7zInformation)
+        Me.pnl7z.Controls.Add(Me.grp7zGeneral)
+        Me.pnl7z.Location = New System.Drawing.Point(180, 0)
+        Me.pnl7z.Name = "pnl7z"
+        Me.pnl7z.Size = New System.Drawing.Size(367, 314)
+        Me.pnl7z.TabIndex = 2
+        '
+        'grp7zAdvanced
+        '
+        Me.grp7zAdvanced.Controls.Add(Me.btn7zLocation)
+        Me.grp7zAdvanced.Controls.Add(Me.lblArguments)
+        Me.grp7zAdvanced.Controls.Add(Me.txt7zLocation)
+        Me.grp7zAdvanced.Controls.Add(Me.txt7zArguments)
+        Me.grp7zAdvanced.Controls.Add(Me.lblLocation)
+        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 = 1
+        Me.grp7zAdvanced.TabStop = False
+        Me.grp7zAdvanced.Text = "Advanced"
+        '
+        'grp7zInformation
+        '
+        Me.grp7zInformation.Controls.Add(Me.lbl7zProduct)
+        Me.grp7zInformation.Controls.Add(Me.lbl7zCopyright)
+        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 = 2
+        Me.grp7zInformation.TabStop = False
+        Me.grp7zInformation.Text = "Utility Information"
+        '
+        'pnlGeneral
+        '
+        Me.pnlGeneral.Controls.Add(Me.chkAutoSaveLog)
+        Me.pnlGeneral.Controls.Add(Me.grpGameData)
+        Me.pnlGeneral.Controls.Add(Me.chkShowDetectionTips)
+        Me.pnlGeneral.Controls.Add(Me.grpStartup)
+        Me.pnlGeneral.Location = New System.Drawing.Point(180, 0)
+        Me.pnlGeneral.Name = "pnlGeneral"
+        Me.pnlGeneral.Size = New System.Drawing.Size(367, 314)
+        Me.pnlGeneral.TabIndex = 1
+        '
+        'grpGameData
+        '
+        Me.grpGameData.Controls.Add(Me.chkTimeTracking)
+        Me.grpGameData.Controls.Add(Me.chkSync)
+        Me.grpGameData.Controls.Add(Me.btnOptionalFields)
+        Me.grpGameData.Location = New System.Drawing.Point(6, 106)
+        Me.grpGameData.Name = "grpGameData"
+        Me.grpGameData.Size = New System.Drawing.Size(354, 69)
+        Me.grpGameData.TabIndex = 1
+        Me.grpGameData.TabStop = False
+        Me.grpGameData.Text = "Game Data"
+        '
+        'lstSettings
+        '
+        Me.lstSettings.FormattingEnabled = True
+        Me.lstSettings.Location = New System.Drawing.Point(12, 12)
+        Me.lstSettings.Name = "lstSettings"
+        Me.lstSettings.Size = New System.Drawing.Size(162, 303)
+        Me.lstSettings.TabIndex = 0
         '
         'frmSettings
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(384, 461)
+        Me.ClientSize = New System.Drawing.Size(554, 361)
-        Me.Controls.Add(Me.grpBackup)
+        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.grpPaths)
-        Me.Controls.Add(Me.grpGeneral)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmSettings"
         Me.ShowIcon = False
         Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Settings"
-        Me.grpGeneral.ResumeLayout(False)
+        Me.grpStartup.ResumeLayout(False)
-        Me.grpGeneral.PerformLayout()
+        Me.grpStartup.PerformLayout()
-        Me.grpPaths.ResumeLayout(False)
+        Me.grpFolderOptions.ResumeLayout(False)
-        Me.grpPaths.PerformLayout()
+        Me.grpFolderOptions.PerformLayout()
-        Me.grpBackup.ResumeLayout(False)
+        Me.grp7zGeneral.ResumeLayout(False)
-        Me.grpBackup.PerformLayout()
+        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()
+        Me.grp7zInformation.ResumeLayout(False)
+        Me.pnlGeneral.ResumeLayout(False)
+        Me.pnlGeneral.PerformLayout()
+        Me.grpGameData.ResumeLayout(False)
+        Me.grpGameData.PerformLayout()
         Me.ResumeLayout(False)
 
     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 grpGeneral As System.Windows.Forms.GroupBox
+    Friend WithEvents grpFolderOptions As System.Windows.Forms.GroupBox
-    Friend WithEvents grpPaths As System.Windows.Forms.GroupBox
     Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox
     Friend WithEvents btnSave As System.Windows.Forms.Button
     Friend WithEvents btnCancel As System.Windows.Forms.Button
@@ -315,15 +559,37 @@ 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 grpBackup As System.Windows.Forms.GroupBox
-    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 grp7zGeneral As GroupBox
+    Friend WithEvents cboCompression As ComboBox
+    Friend WithEvents lblCompression As Label
+    Friend WithEvents lbl7zProduct As Label
+    Friend WithEvents lbl7zCopyright As Label
+    Friend WithEvents btn7zLocation As Button
+    Friend WithEvents txt7zLocation As TextBox
+    Friend WithEvents lblLocation As Label
+    Friend WithEvents txt7zArguments As TextBox
+    Friend WithEvents lblArguments As Label
+    Friend WithEvents btnDefaults As Button
+    Friend WithEvents btnOptionalFields As Button
+    Friend WithEvents chkAutoSaveLog As CheckBox
+    Friend WithEvents pnlBackup As Panel
+    Friend WithEvents pnl7z As Panel
+    Friend WithEvents pnlGeneral As Panel
+    Friend WithEvents grpGameData As GroupBox
+    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

@@ -1,9 +1,10 @@
 Imports GBM.My.Resources
+Imports System.IO
 
 Public Class frmSettings
     Dim bShutdown As Boolean = False
-    Dim bBackupLocationChanged As Boolean = False
+    Dim bSyncSettingsChanged As Boolean = False
-    Dim bCheckSumDisabled As Boolean = False
+    Dim eCurrentSyncFields As clsGame.eOptionalSyncFields
     Private oSettings As mgrSettings
 
     Property Settings As mgrSettings
@@ -15,15 +16,6 @@ Public Class frmSettings
         End Set
     End Property
 
-    Private Property BackupLocationChanged As Boolean
-        Get
-            Return bBackupLocationChanged
-        End Get
-        Set(value As Boolean)
-            bBackupLocationChanged = value
-        End Set
-    End Property
-
     Private Sub HandleRegistryUpdate(ByVal bToggle As Boolean)
         Dim oKey As Microsoft.Win32.RegistryKey
         Dim sAppName As String = Application.ProductName
@@ -51,29 +43,34 @@ Public Class frmSettings
         oSettings.MonitorOnStartup = chkMonitorOnStartup.Checked
         oSettings.StartToTray = chkStartToTray.Checked
         oSettings.ShowDetectionToolTips = chkShowDetectionTips.Checked
+        oSettings.AutoSaveLog = chkAutoSaveLog.Checked
         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
+        oSettings.CompressionLevel = cboCompression.SelectedValue
 
-        'We need to clear all checksums its turned off
+        If oSettings.Custom7zArguments <> txt7zArguments.Text.Trim And txt7zArguments.Text.Trim <> String.Empty Then
-        If chkCheckSum.Checked = False And oSettings.CheckSum = True Then
+            mgrCommon.ShowMessage(frmSettings_WarningArguments, MsgBoxStyle.Exclamation)
-            bCheckSumDisabled = True
         End If
-        oSettings.CheckSum = chkCheckSum.Checked
+
+        oSettings.Custom7zArguments = txt7zArguments.Text.Trim
+        oSettings.Custom7zLocation = txt7zLocation.Text.Trim
 
         'Turning syncing from off to on is the same as changing the backup folder
         If chkSync.Checked = True And oSettings.Sync = False Then
-            bBackupLocationChanged = True
+            bSyncSettingsChanged = True
         End If
         oSettings.Sync = chkSync.Checked
 
-        If IO.Directory.Exists(txtBackupFolder.Text) Then
+        If Directory.Exists(txtBackupFolder.Text) Then
             If oSettings.BackupFolder <> txtBackupFolder.Text Then
-                If chkSync.Checked Then bBackupLocationChanged = True
+                If chkSync.Checked Then bSyncSettingsChanged = True
             End If
             oSettings.BackupFolder = txtBackupFolder.Text
         Else
@@ -81,36 +78,242 @@ Public Class frmSettings
             Return False
         End If
 
+        If oSettings.Custom7zLocation <> String.Empty Then
+            If File.Exists(oSettings.Custom7zLocation) Then
+                If Path.GetFileNameWithoutExtension(oSettings.Custom7zLocation) <> "7za" Then
+                    mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Critical)
+                End If
+            Else
+                mgrCommon.ShowMessage(frmSettings_ErrorLocation, oSettings.Custom7zLocation, MsgBoxStyle.Critical)
+                Return False
+            End If
+        End If
+
+        'We must trigger a sync if optional fields have changed
+        If Settings.Sync And (eCurrentSyncFields <> Settings.SyncFields) Then
+            bSyncSettingsChanged = True
+        End If
+
         Return True
     End Function
 
     Private Function SaveSettings() As Boolean
         If ValidateSettings() Then
             oSettings.SaveSettings()
-            If BackupLocationChanged Then mgrMonitorList.HandleBackupLocationChange()
+            If bSyncSettingsChanged Then mgrMonitorList.HandleBackupLocationChange(Settings)
-            If bCheckSumDisabled Then mgrManifest.DoManifestHashWipe()
             Return True
         Else
             Return False
         End If
     End Function
 
+    Private Sub GetUtilityInfo(ByVal sLocation As String)
+        Dim bDefault As Boolean = False
+        Dim sFileDescription As String
+        Dim sVersion As String
+        Dim sCopyright As String
+
+        'Ignore this function when on Unix and hide the information data
+        If mgrCommon.IsUnix Then
+            grp7zInformation.Visible = False
+        Else
+            Try
+                grp7zInformation.Visible = True
+
+                'Use default when no custom location is set
+                If sLocation = String.Empty Then
+                    sLocation = mgrPath.Default7zLocation
+                    bDefault = True
+                End If
+
+                'Get info
+                Dim oFileInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(sLocation)
+
+                If oFileInfo.FileDescription = String.Empty Then
+                    sFileDescription = App_NotAvailable
+                Else
+                    sFileDescription = oFileInfo.FileDescription
+                End If
+
+                If oFileInfo.ProductVersion = String.Empty Then
+                    sVersion = App_NotAvailable
+                Else
+                    sVersion = oFileInfo.ProductVersion
+                End If
+
+                If oFileInfo.LegalCopyright = String.Empty Then
+                    sCopyright = App_NotAvailable
+                Else
+                    sCopyright = oFileInfo.LegalCopyright
+                End If
+
+                lbl7zProduct.Text = sFileDescription & " - " & sVersion
+                lbl7zCopyright.Text = sCopyright
+            Catch ex As Exception
+                grp7zInformation.Visible = False
+            End Try
+        End If
+    End Sub
+
+    Private Sub SetDefaults()
+        If mgrCommon.ShowMessage(frmSettings_ConfirmDefaults, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            oSettings = New mgrSettings
+            LoadSettings()
+        End If
+    End Sub
+
     Private Sub LoadSettings()
         chkStartWindows.Checked = oSettings.StartWithWindows
         chkMonitorOnStartup.Checked = oSettings.MonitorOnStartup
         chkStartToTray.Checked = oSettings.StartToTray
         chkShowDetectionTips.Checked = oSettings.ShowDetectionToolTips
+        chkAutoSaveLog.Checked = oSettings.AutoSaveLog
         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
         nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
+        cboCompression.SelectedValue = oSettings.CompressionLevel
+        txt7zArguments.Text = oSettings.Custom7zArguments
+        txt7zLocation.Text = oSettings.Custom7zLocation
+        eCurrentSyncFields = oSettings.SyncFields
+
+        'Unix Handler
+        If mgrCommon.IsUnix Then
+            chkStartToTray.Checked = False
+            chkStartWindows.Checked = False
+        End If
+
+        'Retrieve 7z Info
+        GetUtilityInfo(oSettings.Custom7zLocation)
+
+        'Toggle Sync Button
+        ToggleSyncButton()
+    End Sub
+
+    Private Sub LoadCombos()
+        Dim oComboItems As New List(Of KeyValuePair(Of Integer, String))
+        Dim oSettingsItems As New List(Of KeyValuePair(Of Integer, String))
+
+        'cboCompression
+        cboCompression.ValueMember = "Key"
+        cboCompression.DisplayMember = "Value"
+
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(0, frmSettings_cboCompression_None))
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(1, frmSettings_cboCompression_Fastest))
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(3, frmSettings_cboCompression_Fast))
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(5, frmSettings_cboCompression_Normal))
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(7, frmSettings_cboCompression_Maximum))
+        oComboItems.Add(New KeyValuePair(Of Integer, String)(9, frmSettings_cboCompression_Ultra))
+
+        cboCompression.DataSource = oComboItems
+
+        'lstSettings
+        lstSettings.ValueMember = "Key"
+        lstSettings.DisplayMember = "Value"
+
+        oSettingsItems.Add(New KeyValuePair(Of Integer, String)(0, frmSettings_lstSettings_General))
+        oSettingsItems.Add(New KeyValuePair(Of Integer, String)(1, frmSettings_lstSettings_BackupRestore))
+        oSettingsItems.Add(New KeyValuePair(Of Integer, String)(2, frmSettings_lstSettings_7z))
+
+        lstSettings.DataSource = oSettingsItems
+
+        'Select Default
+        lstSettings.SelectedIndex = 0
+    End Sub
+
+    Private Sub ToggleSyncButton()
+        If chkSync.Checked Then
+            btnOptionalFields.Enabled = True
+        Else
+            btnOptionalFields.Enabled = False
+        End If
+    End Sub
+
+    Private Sub OpenOptionalFields()
+        Dim frm As New frmSyncFields
+        frm.SyncFields = Settings.SyncFields
+        frm.ShowDialog()
+        If frm.DialogResult = DialogResult.OK Then
+            Settings.SyncFields = frm.SyncFields
+        End If
+    End Sub
+
+    Private Sub ChangePanel()
+        If lstSettings.SelectedItems.Count > 0 Then
+            Dim oSettingsItem As KeyValuePair(Of Integer, String) = lstSettings.SelectedItems(0)
+
+            Select Case oSettingsItem.Key
+                Case 0
+                    pnlGeneral.Visible = True
+                    pnlBackup.Visible = False
+                    pnl7z.Visible = False
+                Case 1
+                    pnlGeneral.Visible = False
+                    pnlBackup.Visible = True
+                    pnl7z.Visible = False
+                Case 2
+                    pnlGeneral.Visible = False
+                    pnlBackup.Visible = False
+                    pnl7z.Visible = True
+            End Select
+        End If
+    End Sub
+
+    Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmSettings_FormName
+
+        'Set Form Text
+        lblMinutes.Text = frmSettings_lblMinutes
+        chkSupressBackup.Text = frmSettings_chkSupressBackup
+        grpBackupHandling.Text = frmSettings_grpBackupHandling
+        chkRestoreNotify.Text = frmSettings_chkRestoreNotify
+        chkAutoRestore.Text = frmSettings_chkAutoRestore
+        chkAutoMark.Text = frmSettings_chkAutoMark
+        chkOverwriteWarning.Text = frmSettings_chkOverwriteWarning
+        chkCreateFolder.Text = frmSettings_chkCreateFolder
+        chkBackupConfirm.Text = frmSettings_chkBackupConfirm
+        btnCancel.Text = frmSettings_btnCancel
+        btnSave.Text = frmSettings_btnSave
+        grpFolderOptions.Text = frmSettings_grpFolderOptions
+        btnBackupFolder.Text = frmSettings_btnBackupFolder
+        lblBackupFolder.Text = frmSettings_lblBackupFolder
+        grpStartup.Text = frmSettings_grpStartup
+        grpGameData.Text = frmSettings_grpGameData
+        chkTimeTracking.Text = frmSettings_chkTimeTracking
+        chkStartWindows.Text = frmSettings_chkStartWindows
+        chkSync.Text = frmSettings_chkSync
+        chkShowDetectionTips.Text = frmSettings_chkShowDetectionTips
+        chkAutoSaveLog.Text = frmSettings_chkAutoSaveLog
+        chkStartToTray.Text = frmSettings_chkStartToTray
+        chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup
+        grp7zGeneral.Text = frmSettings_grp7zGeneral
+        grp7zAdvanced.Text = frmSettings_grp7zAdvanced
+        grp7zInformation.Text = frmSettings_grp7zInformation
+        lblCompression.Text = frmSettings_lblCompression
+        btnDefaults.Text = frmSettings_btnDefaults
+        lblArguments.Text = frmSettings_lblArguments
+        lblLocation.Text = frmSettings_lblLocation
+        btnOptionalFields.Text = frmSettings_btnOptionalFields
+
+        'Unix Handler
+        If mgrCommon.IsUnix Then
+            chkStartToTray.Enabled = False
+            chkStartWindows.Enabled = False
+        End If
+
+        'Handle Panels
+        pnlGeneral.Visible = False
+        pnlBackup.Visible = False
+        pnl7z.Visible = False
     End Sub
 
     Private Sub btnSave_Click(sender As System.Object, e As System.EventArgs) Handles btnSave.Click
@@ -125,51 +328,49 @@ Public Class frmSettings
         Me.Close()
     End Sub
 
-    Private Sub frmSettings_FormClosing(sender As System.Object, e As System.Windows.Forms.FormClosingEventArgs) Handles MyBase.FormClosing
-        If bShutdown = False Then
-            e.Cancel = True
-        End If
-    End Sub
-
-    Private Sub SetForm()
-        'Set Form Name
-        Me.Text = frmSettings_FormName
-
-        'Set Form Text
-        grpBackup.Text = frmSettings_grpBackup
-        lblMinutes.Text = frmSettings_lblMinutes
-        chkSupressBackup.Text = frmSettings_chkSupressBackup
-        chkCheckSum.Text = frmSettings_chkCheckSum
-        chkRestoreOnLaunch.Text = frmSettings_chkRestoreOnLaunch
-        chkOverwriteWarning.Text = frmSettings_chkOverwriteWarning
-        chkCreateFolder.Text = frmSettings_chkCreateFolder
-        chkBackupConfirm.Text = frmSettings_chkBackupConfirm
-        btnCancel.Text = frmSettings_btnCancel
-        btnSave.Text = frmSettings_btnSave
-        grpPaths.Text = frmSettings_grpPaths
-        btnBackupFolder.Text = frmSettings_btnBackupFolder
-        lblBackupFolder.Text = frmSettings_lblBackupFolder
-        grpGeneral.Text = frmSettings_grpGeneral
-        chkTimeTracking.Text = frmSettings_chkTimeTracking
-        chkStartWindows.Text = frmSettings_chkStartWindows
-        chkSync.Text = frmSettings_chkSync
-        chkShowDetectionTips.Text = frmSettings_chkShowDetectionTips
-        chkStartToTray.Text = frmSettings_chkStartToTray
-        chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup
-    End Sub
-
     Private Sub frmSettings_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
         SetForm()
+        LoadCombos()
         LoadSettings()
     End Sub
 
     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("7z_Browse", frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
+        If sNewLocation <> String.Empty Then
+            txt7zLocation.Text = sNewLocation
+            GetUtilityInfo(txt7zLocation.Text)
+        End If
+    End Sub
+
     Private Sub chkSupressBackup_CheckedChanged(sender As Object, e As EventArgs) Handles chkSupressBackup.CheckedChanged
         nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
     End Sub
+
+    Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave
+        GetUtilityInfo(txt7zLocation.Text.Trim)
+    End Sub
+
+    Private Sub btnDefaults_Click(sender As Object, e As EventArgs) Handles btnDefaults.Click
+        SetDefaults()
+    End Sub
+
+    Private Sub btnOptionalFields_Click(sender As Object, e As EventArgs) Handles btnOptionalFields.Click
+        OpenOptionalFields()
+    End Sub
+
+    Private Sub chkSync_CheckedChanged(sender As Object, e As EventArgs) Handles chkSync.CheckedChanged
+        ToggleSyncButton()
+    End Sub
+
+    Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged
+        ChangePanel()
+    End Sub
+
 End Class

GBM/Forms/frmStartUpWizard.Designer.vb

@@ -96,11 +96,10 @@ Partial Class frmStartUpWizard
         '
         'llbManual
         '
-        Me.llbManual.AutoSize = True
         Me.llbManual.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
         Me.llbManual.Location = New System.Drawing.Point(14, 158)
         Me.llbManual.Name = "llbManual"
-        Me.llbManual.Size = New System.Drawing.Size(151, 13)
+        Me.llbManual.Size = New System.Drawing.Size(303, 13)
         Me.llbManual.TabIndex = 3
         Me.llbManual.TabStop = True
         Me.llbManual.Text = "Game Backup Monitor Manual"

GBM/Forms/frmStartUpWizard.vb

@@ -66,7 +66,7 @@ Public Class frmStartUpWizard
         If oDatabase.CheckDB() Then
             'Make sure database is the latest version
             oDatabase.DatabaseUpgrade()
-            mgrMonitorList.SyncMonitorLists(False)
+            mgrMonitorList.SyncMonitorLists(oSettings.SyncFields, False)
             mgrCommon.ShowMessage(frmStartUpWizard_ExistingData, MsgBoxStyle.Information)
         End If
     End Sub
@@ -98,10 +98,18 @@ Public Class frmStartUpWizard
     End Sub
 
     Private Sub DownloadSettings()
+        Dim sImportURL As String
+
+        If mgrCommon.IsUnix Then
+            sImportURL = App_URLImportLinux
+        Else
+            sImportURL = App_URLImport
+        End If
+
         If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-            If mgrMonitorList.DoImport(App_URLImport) Then
+            If mgrMonitorList.DoImport(sImportURL) Then
                 oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList)
-                If oSettings.Sync Then mgrMonitorList.SyncMonitorLists()
+                If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
             End If
         End If
     End Sub
@@ -116,7 +124,7 @@ Public Class frmStartUpWizard
         frm.GameData = oGameData
         frm.ShowDialog()
         LoadGameSettings()
-        If oSettings.Sync Then mgrMonitorList.SyncMonitorLists()
+        If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
     End Sub
 
     Private Sub OpenMonitorList()
@@ -125,7 +133,7 @@ Public Class frmStartUpWizard
         frm.DisableExternalFunctions = True
         frm.ShowDialog()
         LoadGameSettings()
-        If oSettings.Sync Then mgrMonitorList.SyncMonitorLists()
+        If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
     End Sub
 
     Private Function ValidateBackupPath(ByVal strPath As String, ByRef sErrorMessage As String) As Boolean
@@ -207,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.Designer.vb

@@ -0,0 +1,163 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmSyncFields
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.grpFields = New System.Windows.Forms.GroupBox()
+        Me.chkMonitorGame = New System.Windows.Forms.CheckBox()
+        Me.chkIcon = New System.Windows.Forms.CheckBox()
+        Me.chkVersion = New System.Windows.Forms.CheckBox()
+        Me.chkCompany = New System.Windows.Forms.CheckBox()
+        Me.chkGamePath = New System.Windows.Forms.CheckBox()
+        Me.chkTimeStamp = New System.Windows.Forms.CheckBox()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.grpFields.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'grpFields
+        '
+        Me.grpFields.Controls.Add(Me.chkMonitorGame)
+        Me.grpFields.Controls.Add(Me.chkIcon)
+        Me.grpFields.Controls.Add(Me.chkVersion)
+        Me.grpFields.Controls.Add(Me.chkCompany)
+        Me.grpFields.Controls.Add(Me.chkGamePath)
+        Me.grpFields.Controls.Add(Me.chkTimeStamp)
+        Me.grpFields.Location = New System.Drawing.Point(12, 12)
+        Me.grpFields.Name = "grpFields"
+        Me.grpFields.Size = New System.Drawing.Size(195, 162)
+        Me.grpFields.TabIndex = 0
+        Me.grpFields.TabStop = False
+        Me.grpFields.Text = "Available Fields"
+        '
+        'chkMonitorGame
+        '
+        Me.chkMonitorGame.AutoSize = True
+        Me.chkMonitorGame.Location = New System.Drawing.Point(6, 134)
+        Me.chkMonitorGame.Name = "chkMonitorGame"
+        Me.chkMonitorGame.Size = New System.Drawing.Size(109, 17)
+        Me.chkMonitorGame.TabIndex = 5
+        Me.chkMonitorGame.Text = "Monitor this game"
+        Me.chkMonitorGame.UseVisualStyleBackColor = True
+        '
+        'chkIcon
+        '
+        Me.chkIcon.AutoSize = True
+        Me.chkIcon.Location = New System.Drawing.Point(6, 111)
+        Me.chkIcon.Name = "chkIcon"
+        Me.chkIcon.Size = New System.Drawing.Size(148, 17)
+        Me.chkIcon.TabIndex = 4
+        Me.chkIcon.Text = "Icon (Not Recommended)"
+        Me.chkIcon.UseVisualStyleBackColor = True
+        '
+        'chkVersion
+        '
+        Me.chkVersion.AutoSize = True
+        Me.chkVersion.Location = New System.Drawing.Point(6, 88)
+        Me.chkVersion.Name = "chkVersion"
+        Me.chkVersion.Size = New System.Drawing.Size(61, 17)
+        Me.chkVersion.TabIndex = 3
+        Me.chkVersion.Text = "Version"
+        Me.chkVersion.UseVisualStyleBackColor = True
+        '
+        'chkCompany
+        '
+        Me.chkCompany.AutoSize = True
+        Me.chkCompany.Location = New System.Drawing.Point(6, 65)
+        Me.chkCompany.Name = "chkCompany"
+        Me.chkCompany.Size = New System.Drawing.Size(70, 17)
+        Me.chkCompany.TabIndex = 2
+        Me.chkCompany.Text = "Company"
+        Me.chkCompany.UseVisualStyleBackColor = True
+        '
+        'chkGamePath
+        '
+        Me.chkGamePath.AutoSize = True
+        Me.chkGamePath.Location = New System.Drawing.Point(6, 42)
+        Me.chkGamePath.Name = "chkGamePath"
+        Me.chkGamePath.Size = New System.Drawing.Size(180, 17)
+        Me.chkGamePath.TabIndex = 1
+        Me.chkGamePath.Text = "Game Path (Not Recommended)"
+        Me.chkGamePath.UseVisualStyleBackColor = True
+        '
+        'chkTimeStamp
+        '
+        Me.chkTimeStamp.AutoSize = True
+        Me.chkTimeStamp.Location = New System.Drawing.Point(6, 19)
+        Me.chkTimeStamp.Name = "chkTimeStamp"
+        Me.chkTimeStamp.Size = New System.Drawing.Size(133, 17)
+        Me.chkTimeStamp.TabIndex = 0
+        Me.chkTimeStamp.Text = "Save multiple backups"
+        Me.chkTimeStamp.UseVisualStyleBackColor = True
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(132, 180)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 2
+        Me.btnCancel.Text = "&Cancel"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'btnSave
+        '
+        Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnSave.Location = New System.Drawing.Point(52, 180)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 1
+        Me.btnSave.Text = "&Save"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
+        'frmSyncFields
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(219, 211)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.btnSave)
+        Me.Controls.Add(Me.grpFields)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmSyncFields"
+        Me.ShowIcon = False
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Optional Sync Fields"
+        Me.grpFields.ResumeLayout(False)
+        Me.grpFields.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents grpFields As GroupBox
+    Friend WithEvents chkMonitorGame As CheckBox
+    Friend WithEvents chkIcon As CheckBox
+    Friend WithEvents chkVersion As CheckBox
+    Friend WithEvents chkCompany As CheckBox
+    Friend WithEvents chkGamePath As CheckBox
+    Friend WithEvents chkTimeStamp As CheckBox
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents btnSave As Button
+End Class

GBM/Forms/frmSyncFields.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="fbBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

GBM/Forms/frmSyncFields.vb

@@ -0,0 +1,115 @@
+Imports GBM.My.Resources
+
+Public Class frmSyncFields
+    Private eSyncFields As clsGame.eOptionalSyncFields
+
+    Public Property SyncFields As clsGame.eOptionalSyncFields
+        Get
+            Return eSyncFields
+        End Get
+        Set(value As clsGame.eOptionalSyncFields)
+            eSyncFields = value
+        End Set
+    End Property
+
+    Private Sub LoadForm()
+        'Load fields
+        If (eSyncFields And clsGame.eOptionalSyncFields.Company) = clsGame.eOptionalSyncFields.Company Then
+            chkCompany.Checked = True
+        End If
+        If (eSyncFields And clsGame.eOptionalSyncFields.GamePath) = clsGame.eOptionalSyncFields.GamePath Then
+            chkGamePath.Checked = True
+        End If
+        If (eSyncFields And clsGame.eOptionalSyncFields.Icon) = clsGame.eOptionalSyncFields.Icon Then
+            chkIcon.Checked = True
+        End If
+        If (eSyncFields And clsGame.eOptionalSyncFields.MonitorGame) = clsGame.eOptionalSyncFields.MonitorGame Then
+            chkMonitorGame.Checked = True
+        End If
+        If (eSyncFields And clsGame.eOptionalSyncFields.TimeStamp) = clsGame.eOptionalSyncFields.TimeStamp Then
+            chkTimeStamp.Checked = True
+        End If
+        If (eSyncFields And clsGame.eOptionalSyncFields.Version) = clsGame.eOptionalSyncFields.Version Then
+            chkVersion.Checked = True
+        End If
+    End Sub
+
+    Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmSyncFields_FormName
+
+        'Set Form Text
+        btnCancel.Text = frmSyncFields_btnCancel
+        btnSave.Text = frmSyncFields_btnSave
+        grpFields.Text = frmSyncFields_grpFields
+        chkMonitorGame.Text = frmSyncFields_chkMonitorGame
+        chkIcon.Text = frmSyncFields_chkIcon
+        chkVersion.Text = frmSyncFields_chkVersion
+        chkCompany.Text = frmSyncFields_chkCompany
+        chkGamePath.Text = frmSyncFields_chkGamePath
+        chkTimeStamp.Text = frmSyncFields_chkTimeStamp
+    End Sub
+
+    Private Sub frmSyncFields_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SetForm()
+        LoadForm()
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+        Me.DialogResult = DialogResult.OK
+        Me.Close()
+    End Sub
+
+    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+        Me.DialogResult = DialogResult.Cancel
+        Me.Close()
+    End Sub
+
+    Private Sub chkTimeStamp_CheckedChanged(sender As Object, e As EventArgs) Handles chkTimeStamp.CheckedChanged
+        If chkTimeStamp.Checked Then
+            SyncFields = mgrCommon.SetSyncField(SyncFields, clsGame.eOptionalSyncFields.TimeStamp)
+        Else
+            SyncFields = mgrCommon.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)
+        Else
+            SyncFields = mgrCommon.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)
+        Else
+            SyncFields = mgrCommon.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)
+        Else
+            SyncFields = mgrCommon.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)
+        Else
+            SyncFields = mgrCommon.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)
+        Else
+            SyncFields = mgrCommon.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

@@ -90,14 +90,23 @@
     <PlatformTarget>x64</PlatformTarget>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent Condition="$(Platform)==x64">echo Running x64 Post Build Event... 
+    COPY /Y "$(SolutionDir)\GBM\x64\sqlite3.dll" .
+    RMDIR /S /Q Utilities\x86</PostBuildEvent>
+    <PostBuildEvent Condition="$(Platform)==x86">echo Running x86 Post Build Event... 
+    COPY /Y "$(SolutionDir)\GBM\x86\sqlite3.dll" .
+    RMDIR /S /Q Utilities\x64</PostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>References\Mono.Data.Sqlite.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -113,6 +122,7 @@
     <Import Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <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" />
@@ -187,6 +197,12 @@
       <DependentUpon>frmMain.vb</DependentUpon>
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\frmSyncFields.Designer.vb">
+      <DependentUpon>frmSyncFields.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\frmSyncFields.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\frmTags.Designer.vb">
       <DependentUpon>frmTags.vb</DependentUpon>
     </Compile>
@@ -206,6 +222,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" />
@@ -265,6 +282,9 @@
       <DependentUpon>frmMain.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\frmSyncFields.resx">
+      <DependentUpon>frmSyncFields.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\frmTags.resx">
       <DependentUpon>frmTags.vb</DependentUpon>
     </EmbeddedResource>
@@ -320,7 +340,15 @@
     <Content Include="License\credits.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="References\System.Data.SQLite.dll" />
+    <Content Include="References\Mono.Data.Sqlite.dll" />
+    <Content Include="Utilities\x64\7za.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <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" />
     <Content Include="Resources\Clock.png" />
@@ -332,30 +360,6 @@
     <Content Include="Resources\Inbox.png" />
     <Content Include="Resources\type.ico" />
     <Content Include="Resources\User.png" />
-    <Content Include="Utilities\x64\7za.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Utilities\x64\7za.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Utilities\x64\7zxa.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Utilities\x86\7za.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Utilities\x86\7za.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Utilities\x86\7zxa.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\SQLite.Interop.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\SQLite.Interop.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="Resources\Stopped.png" />
     <None Include="Resources\Detected.png" />
     <None Include="Resources\Ready.png" />
@@ -387,6 +391,7 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -394,5 +399,6 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
+
   -->
 </Project>

GBM/License/7z license.txt

@@ -3,7 +3,7 @@
       License for use and distribution
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      Copyright (C) 1999-2015 Igor Pavlov.
+      Copyright (C) 1999-2016 Igor Pavlov.
 
       7-Zip Extra files are under the GNU LGPL license.
 

GBM/License/license.txt

@@ -1,5 +1,5 @@
 GBM - Game Backup Monitor 
-Copyright (C) 2015 Michael J. Seiferling
+Copyright (C) 2016 Michael J. Seiferling
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,4 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Contact Information:
 
-mseiferling@gmail.com
+gamebackupmonitor@gmail.com

GBM/Managers/mgrBackup.vb

@@ -42,7 +42,7 @@ Public Class mgrBackup
         'Create manifest item
         oItem.Name = oGameInfo.Name
         'Keep the path relative to the manifest location
-        oItem.FileName = sBackupFile.Replace(Path.GetDirectoryName(mgrPath.RemoteDatabaseLocation) & "\", "")
+        oItem.FileName = sBackupFile.Replace(Path.GetDirectoryName(mgrPath.RemoteDatabaseLocation) & Path.DirectorySeparatorChar, "")
         oItem.RestorePath = oGameInfo.TruePath
         oItem.AbsolutePath = oGameInfo.AbsolutePath
         oItem.DateUpdated = dTimeStamp
@@ -50,15 +50,15 @@ Public Class mgrBackup
         oItem.CheckSum = sCheckSum
 
         'Save Remote Manifest
-        If mgrManifest.DoManifestCheck(oItem.Name, mgrSQLite.Database.Remote) Then
+        If mgrManifest.DoSpecificManifestCheck(oItem, mgrSQLite.Database.Remote) Then
-            mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Remote)
+            mgrManifest.DoManifestUpdateByID(oItem, mgrSQLite.Database.Remote)
         Else
             mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Remote)
         End If
 
         'Save Local Manifest
-        If mgrManifest.DoManifestCheck(oItem.Name, mgrSQLite.Database.Local) Then
+        If mgrManifest.DoGlobalManifestCheck(oItem.Name, mgrSQLite.Database.Local) Then
-            mgrManifest.DoManifestUpdate(oItem, mgrSQLite.Database.Local)
+            mgrManifest.DoManifestUpdateByName(oItem, mgrSQLite.Database.Local)
         Else
             mgrManifest.DoManifestAdd(oItem, mgrSQLite.Database.Local)
         End If
@@ -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 & "\" & sTypeItem & """")
+                        oStream.WriteLine("""" & sBackupPath & Path.DirectorySeparatorChar & sTypeItem & """")
                     Next
                 End If
                 oStream.Flush()
@@ -85,6 +85,71 @@ Public Class mgrBackup
         End Try
     End Sub
 
+    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)
+                Return False
+            End If
+        End If
+
+        If oSettings.ShowOverwriteWarning And File.Exists(sBackupFile) And Not oGame.AppendTimeStamp Then
+            If mgrCommon.ShowMessage(mgrBackup_ConfirmOverwrite, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorOverwriteAbort, oGame.Name), False, ToolTipIcon.Error, True)
+                Return False
+            End If
+        End If
+
+        Return True
+    End Function
+
+    Private Sub CheckOldBackups(ByVal oGame As clsGame)
+        Dim oGameBackups As List(Of clsBackup) = mgrManifest.DoManifestGetByName(oGame.Name, mgrSQLite.Database.Remote)
+        Dim oGameBackup As clsBackup
+        Dim sOldBackup As String
+        Dim iBackupCount As Integer = oGameBackups.Count
+        Dim iDelCount As Integer
+
+        'If we've hit or exceeded the maximum backup limit
+        If oGameBackups.Count >= oGame.BackupLimit Then
+            'How many do we need to delete
+            iDelCount = (oGameBackups.Count - oGame.BackupLimit) + 1
+
+            'Delete the oldest backup(s) (Manifest entry and backup file)
+            For i = 1 To iDelCount
+                oGameBackup = oGameBackups(oGameBackups.Count - i)
+                sOldBackup = Settings.BackupFolder & Path.DirectorySeparatorChar & oGameBackup.FileName
+
+                mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Remote)
+                mgrManifest.DoManifestDeletebyID(oGameBackup, mgrSQLite.Database.Local)
+                mgrCommon.DeleteFile(sOldBackup)
+                mgrCommon.DeleteDirectoryByBackup(Settings.BackupFolder & Path.DirectorySeparatorChar, oGameBackup)
+
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupLimitExceeded, Path.GetFileName(sOldBackup)), False, ToolTipIcon.Info, True)
+            Next
+        End If
+    End Sub
+
     Public Sub DoBackup(ByVal oBackupList As List(Of clsGame))
         Dim oGame As clsGame
         Dim bDoBackup As Boolean
@@ -109,15 +174,8 @@ Public Class mgrBackup
             CancelOperation = False
             RaiseEvent UpdateBackupInfo(oGame)
 
-            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)
-                    bDoBackup = False
-                End If
-            End If
-
             If oSettings.CreateSubFolder Then
-                sBackupFile = sBackupFile & "\" & oGame.Name
+                sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name
                 Try
                     If Not Directory.Exists(sBackupFile) Then
                         Directory.CreateDirectory(sBackupFile)
@@ -129,22 +187,16 @@ Public Class mgrBackup
             End If
 
             If oGame.AppendTimeStamp Then
-                sBackupFile = sBackupFile & "\" & oGame.Name & sTimeStamp & ".7z"
+                CheckOldBackups(oGame)
+                sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & sTimeStamp & ".7z"
             Else
-                sBackupFile = sBackupFile & "\" & oGame.Name & ".7z"
+                sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name & ".7z"
-            End If
-
-            If oSettings.ShowOverwriteWarning And File.Exists(sBackupFile) Then
-                If mgrCommon.ShowMessage(mgrBackup_ConfirmOverwrite, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
-                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorOverwriteAbort, oGame.Name), False, ToolTipIcon.Error, True)
-                    bDoBackup = False
-                End If
             End If
 
             If bDoBackup Then
                 If oGame.AbsolutePath = False Then
                     If oGame.Path <> String.Empty Then
-                        sSavePath = oGame.ProcessPath & "\" & oGame.Path
+                        sSavePath = oGame.ProcessPath & Path.DirectorySeparatorChar & oGame.Path
                     Else
                         sSavePath = oGame.ProcessPath
                     End If
@@ -161,39 +213,51 @@ Public Class mgrBackup
                 BuildFileList(sSavePath, oGame.ExcludeList, mgrPath.ExcludeFileLocation)
 
                 Try
-                    'Need to delete any prior archive if it exists, the 7za utility does not support overwriting or deleting existing archives.
-                    'If we let 7za update existing archives it will lead to excessive bloat with games that routinely add and remove files with many different file names.
-                    If File.Exists(sBackupFile) Then
-                        File.Delete(sBackupFile)
-                    End If
-
                     If Directory.Exists(sSavePath) Then
-                        prs7z.StartInfo.Arguments = "a -t7z " & "-i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
+                        If Settings.Is7zUtilityValid Then
-                        prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
+                            'Need to delete any prior archive if it exists, the 7za utility does not support overwriting or deleting existing archives.
-                        prs7z.StartInfo.UseShellExecute = False
+                            'If we let 7za update existing archives it will lead to excessive bloat with games that routinely add and remove files with many different file names.
-                        prs7z.StartInfo.RedirectStandardOutput = True
+                            If File.Exists(sBackupFile) Then
-                        prs7z.StartInfo.CreateNoWindow = True
+                                File.Delete(sBackupFile)
-                        prs7z.Start()
-                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupInProgress, sSavePath), False, ToolTipIcon.Info, True)
-                        While Not prs7z.StandardOutput.EndOfStream
-                            If CancelOperation Then
-                                prs7z.Kill()
-                                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorFullAbort, oGame.Name), True, ToolTipIcon.Error, True)
-                                Exit While
                             End If
-                            RaiseEvent UpdateLog(prs7z.StandardOutput.ReadLine, False, ToolTipIcon.Info, False)
+
-                        End While
+                            prs7z.StartInfo.Arguments = "a" & oSettings.Prepared7zArguments & "-t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
-                        prs7z.WaitForExit()
+                            prs7z.StartInfo.FileName = oSettings.Utility7zLocation
-                        If Not CancelOperation Then
+                            prs7z.StartInfo.UseShellExecute = False
-                            If prs7z.ExitCode = 0 Then
+                            prs7z.StartInfo.RedirectStandardOutput = True
-                                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, oGame.Name), False, ToolTipIcon.Info, True)
+                            prs7z.StartInfo.CreateNoWindow = True
-                                bBackupCompleted = True
+                            prs7z.Start()
-                            Else
+                            RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupInProgress, sSavePath), False, ToolTipIcon.Info, True)
-                                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupWarnings, oGame.Name), True, ToolTipIcon.Warning, True)
+                            While Not prs7z.StandardOutput.EndOfStream
-                                bBackupCompleted = False
+                                If CancelOperation Then
+                                    prs7z.Kill()
+                                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorFullAbort, oGame.Name), True, ToolTipIcon.Error, True)
+                                    Exit While
+                                End If
+                                RaiseEvent UpdateLog(prs7z.StandardOutput.ReadLine, False, ToolTipIcon.Info, False)
+                            End While
+                            prs7z.WaitForExit()
+                            If Not CancelOperation Then
+                                Select Case prs7z.ExitCode
+                                    Case 0
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, New String() {oGame.Name, mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sBackupFile))}), False, ToolTipIcon.Info, True)
+                                        bBackupCompleted = True
+                                    Case 1
+                                        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
+                                    Case 7
+                                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zCommandFailure, oGame.Name), True, ToolTipIcon.Error, True)
+                                        bBackupCompleted = False
+                                End Select
                             End If
+                            prs7z.Dispose()
+                        Else
+                            RaiseEvent UpdateLog(App_Invalid7zDetected, True, ToolTipIcon.Error, True)
+                            bBackupCompleted = False
                         End If
-                        prs7z.Dispose()
                     Else
                         RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorNoSavePath, oGame.Name), True, ToolTipIcon.Error, True)
                         bBackupCompleted = False
@@ -201,10 +265,10 @@ Public Class mgrBackup
 
                     'Write Main Manifest
                     If bBackupCompleted Then
-                        If oSettings.CheckSum Then
+
-                            RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_GenerateHash, oGame.Name), False, ToolTipIcon.Info, True)
+                        'Generate checksum for new backup
-                            sHash = mgrHash.Generate_SHA256_Hash(sBackupFile)                            
+                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_GenerateHash, oGame.Name), False, ToolTipIcon.Info, True)
-                        End If
+                        sHash = mgrHash.Generate_SHA256_Hash(sBackupFile)
 
                         If Not DoManifestUpdate(oGame, sBackupFile, dTimeStamp, sHash) Then
                             RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorManifestFailure, oGame.Name), True, ToolTipIcon.Error, True)

GBM/Managers/mgrCommon.vb

@@ -1,8 +1,28 @@
 Imports GBM.My.Resources
 Imports System.Net
+Imports System.IO
+Imports System.Security.Principal
+Imports System.Text.RegularExpressions
 
 Public Class mgrCommon
 
+    'These need to be updated when upgrading the packaged 7z utility
+    Private Shared sUtility64Hash As String = "05ACEE3BAC0C6C4E396116EF27B953F992DE8D28DD14D317977F45692304C318" 'v16.02 7za.exe x64
+    Private Shared sUtility32Hash As String = "7AA7056DB4348229A288EEF49027B94C0D8D1A3C3AEDC6FA89B640334C7B37E9" 'v16.02 7za.exe x86
+
+    Public Shared ReadOnly Property UtilityHash As String
+        Get
+            Select Case mgrPath.ReleaseType
+                Case 64
+                    Return sUtility64Hash
+                Case 32
+                    Return sUtility32Hash
+                Case Else
+                    Return sUtility32Hash
+            End Select
+        End Get
+    End Property
+
     Public Shared ReadOnly Property BuildVersion As Integer
         Get
             Return My.Application.Info.Version.Build
@@ -11,7 +31,7 @@ Public Class mgrCommon
 
     Public Shared ReadOnly Property AppVersion As Integer
         Get
-            Return (My.Application.Info.Version.Major * 100) + My.Application.Info.Version.Minor
+            Return (My.Application.Info.Version.Major * 100) + (My.Application.Info.Version.Minor * 10) + My.Application.Info.Version.Build
         End Get
     End Property
 
@@ -19,6 +39,7 @@ Public Class mgrCommon
         Try
             Dim request As WebRequest = WebRequest.Create(URL)
             Dim response As WebResponse = request.GetResponse()
+            response.Close()
         Catch ex As Exception
             Return False
         End Try
@@ -41,30 +62,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 fbBrowser.ShowDialog() = Windows.Forms.DialogResult.OK Then
+        If bSavedPath Then
-            Return fbBrowser.FileName
+            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
 
-        Return String.Empty
+        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
@@ -80,12 +137,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
 
@@ -96,6 +172,11 @@ Public Class mgrCommon
         Dim sExemptList As String() = {"dosbox", "scummvm"}
         Dim bFound As Boolean = False
 
+        'We can't search if we don't have a configuration
+        If oGame.Temporary Then
+            Return True
+        End If
+
         For Each s As String In sExemptList
             If oGame.ProcessName.ToLower.Contains(s) Then bFound = True
         Next
@@ -107,12 +188,18 @@ Public Class mgrCommon
         End If
     End Function
 
-    Public Shared Function IsElevated() As Boolean
+    Public Shared Function IsUnix() As Boolean
-        If My.User.IsInRole(ApplicationServices.BuiltInRole.Administrator) Then
+        If Path.DirectorySeparatorChar = "/" Then
             Return True
-        Else
-            Return False
         End If
+
+        Return False
+    End Function
+
+    Public Shared Function IsElevated() As Boolean
+        Dim oID As WindowsIdentity = WindowsIdentity.GetCurrent
+        Dim oPrincipal As New WindowsPrincipal(oID)
+        Return oPrincipal.IsInRole(WindowsBuiltInRole.Administrator)
     End Function
 
     Public Shared Sub RestartAsAdmin()
@@ -126,6 +213,219 @@ Public Class mgrCommon
         oProcess.Start()
     End Sub
 
+    Public Shared Function SetSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
+        Return eSyncFields Or eSyncField
+    End Function
+
+    Public Shared Function RemoveSyncField(ByVal eSyncFields As clsGame.eOptionalSyncFields, ByVal eSyncField As clsGame.eOptionalSyncFields) As clsGame.eOptionalSyncFields
+        Return eSyncFields And (Not eSyncField)
+    End Function
+
+    'Get a file size
+    Public Shared Function GetFileSize(ByVal sFile As String) As Long
+        Dim oFileInfo As FileInfo
+        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 WildcardToRegex(ByVal sPattern As String) As String
+        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())
+        Dim oFolder As DirectoryInfo
+        Dim bInclude As Boolean
+        Dim bExclude As Boolean
+        Dim lSize As Long = 0
+
+        Try
+            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
+    Public Shared Sub DeleteFile(ByVal sPath As String, Optional ByVal bRecycle As Boolean = True)
+        If File.Exists(sPath) Then
+            If IsUnix() Then
+                File.Delete(sPath)
+            Else
+                If bRecycle Then
+                    My.Computer.FileSystem.DeleteFile(sPath, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
+                Else
+                    File.Delete(sPath)
+                End If
+            End If
+        End If
+    End Sub
+
+    'Delete directory based on OS type
+    Public Shared Sub DeleteDirectory(ByVal sPath As String, Optional ByVal bRecursive As Boolean = False)
+        If Directory.Exists(sPath) Then
+            If IsUnix() Then
+                Directory.Delete(sPath, bRecursive)
+            Else
+                My.Computer.FileSystem.DeleteDirectory(sPath, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
+            End If
+        End If
+    End Sub
+
+    'Delete a sub-folder based on the provided backup information
+    Public Shared Sub DeleteDirectoryByBackup(ByVal sBackupFolder As String, ByVal oBackup As clsBackup)
+        Dim oDir As DirectoryInfo
+        Dim sDir As String = sBackupFolder & oBackup.Name
+
+        'Delete sub directory if it's empty
+        If oBackup.FileName.StartsWith(oBackup.Name & Path.DirectorySeparatorChar) Then
+            If Directory.Exists(sDir) Then
+                'Check if there's any sub-directories or files remaining
+                oDir = New DirectoryInfo(sDir)
+                If oDir.GetDirectories.Length = 0 And oDir.GetFiles.Length = 0 Then
+                    'Folder is empty,  delete the empty sub-folder
+                    If Directory.Exists(sDir) Then DeleteDirectory(sDir)
+                End If
+            End If
+        End If
+    End Sub
+
+    'Save string as text file
+    Public Shared Sub SaveText(ByVal sText As String, ByVal sPath As String)
+        Dim oStream As StreamWriter
+
+        Try
+            If File.Exists(sPath) Then DeleteFile(sPath, False)
+            oStream = New StreamWriter(sPath)
+            oStream.Write(sText)
+            oStream.Flush()
+            oStream.Close()
+        Catch ex As Exception
+            ShowMessage(mgrCommon_ErrorWritingTextFile, ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
     'Handles no extra parameters
     Public Shared Function ShowMessage(ByVal sMsg As String, ByVal oType As MsgBoxStyle) As MsgBoxResult
         Dim oResult As MsgBoxResult
@@ -178,6 +478,15 @@ Public Class mgrCommon
         Return sString
     End Function
 
+    'Compare functions
+    Public Shared Function CompareImportTagsByName(oItem1 As Tag, oItem2 As Tag) As Integer
+        Return String.Compare(oItem1.Name, oItem2.Name)
+    End Function
+
+    Public Shared Function CompareByListBoxItemByValue(sItem1 As KeyValuePair(Of String, String), sItem2 As KeyValuePair(Of String, String)) As Integer
+        Return String.Compare(sItem1.Value, sItem2.Value)
+    End Function
+
     'Maintenance Only - Function for string management
     Public Shared Sub GetAllStrings(ByVal ctlParent As Control, ByRef sResource As String, ByRef sCode As String, ByVal sFormName As String)
         For Each ctl As Control In ctlParent.Controls

GBM/Managers/mgrGlobals.vb

@@ -1,4 +0,0 @@
-Public Class mgrGlobals
-    Public Shared LocalDatabaseHash As String = String.Empty
-    Public Shared RemoteDatabaseHash As String = String.Empty
-End Class

GBM/Managers/mgrManifest.vb

@@ -1,6 +1,37 @@
 Public Class mgrManifest
 
-    Public Shared Function ReadManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsBackup
+        Dim oBackupItem As clsBackup
+
+        oBackupItem = New clsBackup
+        oBackupItem.ID = CStr(dr("ManifestID"))
+        oBackupItem.Name = CStr(dr("Name"))
+        oBackupItem.FileName = CStr(dr("FileName"))
+        oBackupItem.RestorePath = CStr(dr("RestorePath"))
+        oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
+        oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
+        oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
+        If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
+
+        Return oBackupItem
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oBackupItem As clsBackup) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oBackupItem.ID)
+        hshParams.Add("Name", oBackupItem.Name)
+        hshParams.Add("FileName", oBackupItem.FileName)
+        hshParams.Add("Path", oBackupItem.TruePath)
+        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
+        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
+        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
+        hshParams.Add("CheckSum", oBackupItem.CheckSum)
+
+        Return hshParams
+    End Function
+
+    Public Shared Function ReadFullManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
@@ -11,15 +42,26 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oBackupItem = New clsBackup
+            oBackupItem = MapToObject(dr)
-            oBackupItem.ID = CStr(dr("ManifestID"))
+            slList.Add(oBackupItem.ID, oBackupItem)
-            oBackupItem.Name = CStr(dr("Name"))
+        Next
-            oBackupItem.FileName = CStr(dr("FileName"))
+
-            oBackupItem.RestorePath = CStr(dr("RestorePath"))
+        Return slList
-            oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
+
-            oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
+    End Function
-            oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
+
-            If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
+    Public Shared Function ReadLatestManifest(ByVal iSelectDB As mgrSQLite.Database) As SortedList
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim oBackupItem As clsBackup
+        Dim slList As New SortedList
+
+        sSQL = "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, Max(DateUpdated) As DateUpdated, UpdatedBy, CheckSum FROM manifest GROUP BY Name ORDER By Name ASC"
+        oData = oDatabase.ReadParamData(sSQL, New Hashtable)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
             slList.Add(oBackupItem.Name, oBackupItem)
         Next
 
@@ -27,7 +69,80 @@
 
     End Function
 
-    Public Shared Function DoManifestCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
+    Public Shared Function DoManifestGetByName(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As List(Of clsBackup)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim oBackupItem As New clsBackup
+        Dim oList As New List(Of clsBackup)
+
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE Name = @Name ORDER BY DateUpdated Desc"
+
+        hshParams.Add("Name", sName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
+            oList.Add(oBackupItem)
+        Next
+
+        Return oList
+    End Function
+
+    Public Shared Function DoManifestGetByID(ByVal sID As String, ByVal iSelectDB As mgrSQLite.Database) As clsBackup
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+        Dim oBackupItem As New clsBackup
+        Dim oList As New List(Of clsBackup)
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE ManifestID = @ID ORDER BY DateUpdated Desc"
+
+        hshParams.Add("ID", sID)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        For Each dr As DataRow In oData.Tables(0).Rows
+            oBackupItem = MapToObject(dr)
+        Next
+
+        Return oBackupItem
+    End Function
+
+    'This should only be used to update specific entries in the remote manifest
+    Public Shared Function DoSpecificManifestCheck(ByRef oItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database) As Boolean
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim oData As DataSet
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "SELECT * from manifest "
+        sSQL &= "WHERE Name = @Name AND FileName = @FileName"
+
+        hshParams.Add("Name", oItem.Name)
+        hshParams.Add("FileName", oItem.FileName)
+
+        oData = oDatabase.ReadParamData(sSQL, hshParams)
+
+        If oData.Tables(0).Rows.Count > 0 Then
+            For Each dr As DataRow In oData.Tables(0).Rows
+                oItem.ID = CStr(dr("ManifestID"))
+            Next
+            Return True
+        Else
+            Return False
+        End If
+
+    End Function
+
+    'This should only be used to update entries in the local manifest
+    Public Shared Function DoGlobalManifestCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
@@ -48,12 +163,11 @@
 
     End Function
 
-    Public Shared Function DoManifestGetByName(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As clsBackup
+    Public Shared Function DoManifestNameCheck(ByVal sName As String, ByVal iSelectDB As mgrSQLite.Database) As Boolean
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim oData As DataSet
         Dim sSQL As String
         Dim hshParams As New Hashtable
-        Dim oBackupItem As New clsBackup
 
         sSQL = "SELECT * from manifest "
         sSQL &= "WHERE Name = @Name"
@@ -62,82 +176,55 @@
 
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
-        For Each dr As DataRow In oData.Tables(0).Rows
+        If oData.Tables(0).Rows.Count > 0 Then
-            oBackupItem = New clsBackup
+            Return True
-            oBackupItem.ID = CStr(dr("ManifestID"))
+        Else
-            oBackupItem.Name = CStr(dr("Name"))
+            Return False
-            oBackupItem.FileName = CStr(dr("FileName"))
+        End If
-            oBackupItem.RestorePath = CStr(dr("RestorePath"))
-            oBackupItem.AbsolutePath = CBool(dr("AbsolutePath"))
-            oBackupItem.DateUpdated = mgrCommon.UnixToDate(dr("DateUpdated"))
-            oBackupItem.UpdatedBy = CStr(dr("UpdatedBy"))
-            If Not IsDBNull(dr("CheckSum")) Then oBackupItem.CheckSum = CStr(dr("CheckSum"))
-        Next
 
-        Return oBackupItem
     End Function
 
     Public Shared Sub DoManifestAdd(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO manifest VALUES (@ID, @Name, @FileName, @Path, @AbsolutePath, @DateUpdated, @UpdatedBy, @CheckSum)"
 
-        hshParams.Add("ID", oBackupItem.ID)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("Name", oBackupItem.Name)
-        hshParams.Add("FileName", oBackupItem.FileName)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
-    Public Shared Sub DoManifestUpdate(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestUpdateByName(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, "
         sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE Name = @QueryName"
 
-        hshParams.Add("Name", oBackupItem.Name)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("FileName", oBackupItem.FileName)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
         hshParams.Add("QueryName", oBackupItem.Name)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
-    Public Shared Sub DoManifestNameUpdate(ByVal sOriginalName As String, ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestUpdateByID(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE manifest SET Name = @Name, FileName = @FileName, RestorePath = @Path, AbsolutePath = @AbsolutePath, "
-        sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE Name = @QueryName"
+        sSQL &= "DateUpdated = @DateUpdated, UpdatedBy = @UpdatedBy, CheckSum = @CheckSum WHERE ManifestID = @QueryID"
 
-        hshParams.Add("Name", oBackupItem.Name)
+        hshParams = SetCoreParameters(oBackupItem)
-        hshParams.Add("FileName", oBackupItem.FileName)
+        hshParams.Add("QueryID", oBackupItem.ID)
-        hshParams.Add("Path", oBackupItem.TruePath)
-        hshParams.Add("AbsolutePath", oBackupItem.AbsolutePath)
-        hshParams.Add("DateUpdated", oBackupItem.DateUpdatedUnix)
-        hshParams.Add("UpdatedBy", oBackupItem.UpdatedBy)
-        hshParams.Add("CheckSum", oBackupItem.CheckSum)
-        hshParams.Add("QueryName", sOriginalName)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
-
     End Sub
 
-    Public Shared Sub DoManifestDelete(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+    Public Shared Sub DoManifestDeletebyName(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
         Dim hshParams As New Hashtable
@@ -150,6 +237,19 @@
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
+    Public Shared Sub DoManifestDeletebyID(ByVal oBackupItem As clsBackup, ByVal iSelectDB As mgrSQLite.Database)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
+        Dim sSQL As String
+        Dim hshParams As New Hashtable
+
+        sSQL = "DELETE FROM manifest "
+        sSQL &= "WHERE ManifestID = @ID"
+
+        hshParams.Add("ID", oBackupItem.ID)
+
+        oDatabase.RunParamQuery(sSQL, hshParams)
+    End Sub
+
     Public Shared Sub DoManifestHashWipe()
         Dim oLocalDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim oRemoteDatabase As New mgrSQLite(mgrSQLite.Database.Remote)

GBM/Managers/mgrPath.vb

@@ -5,10 +5,11 @@ Imports System.Reflection
 
 Public Class mgrPath
     'Important Note: Any changes to sSettingsRoot & sDBLocation need to be mirrored in frmMain.vb -> VerifyGameDataPath
-    Private Shared sSettingsRoot As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) & "\gbm"
+    Private Shared sSettingsRoot As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) & Path.DirectorySeparatorChar & "gbm"
-    Private Shared sDBLocation As String = sSettingsRoot & "\gbm.s3db"
+    Private Shared sDBLocation As String = sSettingsRoot & Path.DirectorySeparatorChar & "gbm.s3db"
-    Private Shared sIncludeFile As String = sSettingsRoot & "\gbm_include.txt"
+    Private Shared sIncludeFile As String = sSettingsRoot & Path.DirectorySeparatorChar & "gbm_include.txt"
-    Private Shared sExcludeFile As String = sSettingsRoot & "\gbm_exclude.txt"
+    Private Shared sExcludeFile As String = sSettingsRoot & Path.DirectorySeparatorChar & "gbm_exclude.txt"
+    Private Shared sLogFile As String = sSettingsRoot & Path.DirectorySeparatorChar & "gbm_log_" & Date.Now.ToString("dd-MM-yyyy-HH-mm-ss") & ".txt"
     Private Shared sRemoteDatabaseLocation As String
     Private Shared hshCustomVariables As Hashtable
     Private Shared oReleaseType As ProcessorArchitecture = AssemblyName.GetAssemblyName(Application.ExecutablePath()).ProcessorArchitecture
@@ -36,8 +37,12 @@ Public Class mgrPath
         End Get
     End Property
 
-    Shared ReadOnly Property Utility7zLocation As String
+    Shared ReadOnly Property Default7zLocation As String
         Get
+            If mgrCommon.IsUnix Then
+                Return "/usr/bin/7za"
+            End If
+
             Select Case oReleaseType
                 Case ProcessorArchitecture.Amd64
                     Return Application.StartupPath & "\Utilities\x64\7za.exe"
@@ -73,6 +78,12 @@ Public Class mgrPath
         End Get
     End Property
 
+    Shared ReadOnly Property LogFileLocation As String
+        Get
+            Return sLogFile
+        End Get
+    End Property
+
     Shared ReadOnly Property SettingsRoot As String
         Get
             Return sSettingsRoot
@@ -84,7 +95,7 @@ Public Class mgrPath
             Return sRemoteDatabaseLocation
         End Get
         Set(value As String)
-            sRemoteDatabaseLocation = value & "\gbm.s3db"
+            sRemoteDatabaseLocation = value & Path.DirectorySeparatorChar & "gbm.s3db"
         End Set
     End Property
 
@@ -111,20 +122,28 @@ Public Class mgrPath
         Dim i As Integer = 0
         Dim iRemove As Integer = 0
         Dim iBackFolders As Integer = 0
-        Dim bDeep As Boolean
+        Dim bDeep As Boolean        
+        Dim cDS As Char = Path.DirectorySeparatorChar 'Set the directory seperator based on the OS
 
-        'We are working with a case insenstive file system,  ensure a uniform case
+        If Not mgrCommon.IsUnix Then
-        sProcessPath = sProcessPath.ToLower
+            'If we are working with a case insenstive file system, use a uniform case to reduce possible issues 
-        sSavePath = sSavePath.ToLower
+            sProcessPath = sProcessPath.ToLower
+            sSavePath = sSavePath.ToLower
+        Else
+            'If we are on Unix trim the root off
+            sProcessPath = sProcessPath.TrimStart(cDS)
+            sSavePath = sSavePath.TrimStart(cDS)
+        End If
 
         'We need to ensure we have a single trailing slash on the parameters
-        sProcessPath = sProcessPath.TrimEnd("\")
+        sProcessPath = sProcessPath.TrimEnd(cDS)
-        sSavePath = sSavePath.TrimEnd("\")
+        sSavePath = sSavePath.TrimEnd(cDS)
-        sProcessPath &= "\"
+        sProcessPath &= cDS
-        sSavePath &= "\"
+        sSavePath &= cDS
+
 
         'Determines the direction we need to go, we always want to be relative to the process location
-        If sSavePath.Split("\").Length > sProcessPath.Split("\").Length Then
+        If sSavePath.Split(cDS).Length > sProcessPath.Split(cDS).Length Then
             sPath1 = sProcessPath
             sPath2 = sSavePath
             bDeep = True
@@ -135,8 +154,8 @@ Public Class mgrPath
         End If
 
         'Build an array of folders to work with from each path
-        sPath1Array = sPath1.Split("\")
+        sPath1Array = sPath1.Split(cDS)
-        sPath2Array = sPath2.Split("\")
+        sPath2Array = sPath2.Split(cDS)
 
         'Take the shortest path and remove the common folders from both
         For Each s As String In sPath1Array
@@ -148,25 +167,25 @@ Public Class mgrPath
         Next
 
         'Remove the trailing slashes 
-        sPath1 = sPath1.TrimEnd("\")
+        sPath1 = sPath1.TrimEnd(cDS)
-        sPath2 = sPath2.TrimEnd("\")
+        sPath2 = sPath2.TrimEnd(cDS)
 
         'Determine which way we go
         If bDeep Then
             If sPath1.Length > 0 Then
-                iBackFolders = sPath1.Split("\").Length
+                iBackFolders = sPath1.Split(cDS).Length
             End If
             sResult = sPath2
         Else
             If sPath2.Length > 0 Then
-                iBackFolders = sPath2.Split("\").Length
+                iBackFolders = sPath2.Split(cDS).Length
             End If
             sResult = sPath1
         End If
 
         'Insert direction modifiers based on how many folders are left
         For i = 1 To iBackFolders
-            sResult = "..\" & sResult
+            sResult = ".." & cDS & sResult
         Next i
 
         'Done
@@ -181,13 +200,12 @@ Public Class mgrPath
         Dim sCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
         Dim oCustomVariable As clsPathVariable
 
-        If sValue.Contains("*mydocs*") Then
-            Return sValue.Replace("*mydocs*", sMyDocs)
-        End If
 
-        If sValue.Contains("*publicdocs*") Then
+        For Each oCustomVariable In hshCustomVariables.Values
-            Return sValue.Replace("*publicdocs*", sPublicDocs)
+            If sValue.Contains(oCustomVariable.FormattedName) Then
-        End If
+                Return sValue.Replace(oCustomVariable.FormattedName, oCustomVariable.Path)
+            End If
+        Next
 
         If sValue.Contains("*appdatalocal*") Then
             Return sValue.Replace("*appdatalocal*", sAppDataLocal)
@@ -197,15 +215,21 @@ Public Class mgrPath
             Return sValue.Replace("*appdataroaming*", sAppDataRoaming)
         End If
 
-        If sValue.Contains("*currentuser*") Then
+        'This needs to be tested last for Unix compatability
-            Return sValue.Replace("*currentuser*", sCurrentUser)
+        If sValue.Contains("*mydocs*") Then
+            Return sValue.Replace("*mydocs*", sMyDocs)
         End If
 
-        For Each oCustomVariable In hshCustomVariables.Values
+        'Don't use these in Unix
-            If sValue.Contains(oCustomVariable.FormattedName) Then
+        If Not mgrCommon.IsUnix Then
-                Return sValue.Replace(oCustomVariable.FormattedName, oCustomVariable.Path)
+            If sValue.Contains("*publicdocs*") Then
+                Return sValue.Replace("*publicdocs*", sPublicDocs)
             End If
-        Next
+
+            If sValue.Contains("*currentuser*") Then
+                Return sValue.Replace("*currentuser*", sCurrentUser)
+            End If
+        End If
 
         Return sValue
     End Function
@@ -218,13 +242,11 @@ Public Class mgrPath
         Dim sCurrentUser As String = "*currentuser*"
         Dim oCustomVariable As clsPathVariable
 
-        If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)) Then
+        For Each oCustomVariable In hshCustomVariables.Values
-            Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), sMyDocs)
+            If sValue.Contains(oCustomVariable.Path) Then
-        End If
+                Return sValue.Replace(oCustomVariable.Path, oCustomVariable.FormattedName)
-
+            End If
-        If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments)) Then
+        Next
-            Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), sPublicDocs)
-        End If
 
         If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)) Then
             Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), sAppDataLocal)
@@ -234,15 +256,21 @@ Public Class mgrPath
             Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), sAppDataRoaming)
         End If
 
-        If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) Then
+        'This needs to be tested last for Unix compatability
-            Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), sCurrentUser)
+        If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)) Then
+            Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), sMyDocs)
         End If
 
-        For Each oCustomVariable In hshCustomVariables.Values
+        'Don't use these in Unix
-            If sValue.Contains(oCustomVariable.Path) Then
+        If Not mgrCommon.IsUnix Then
-                Return sValue.Replace(oCustomVariable.Path, oCustomVariable.FormattedName)
+            If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments)) Then
+                Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), sPublicDocs)
             End If
-        Next
+
+            If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) Then
+                Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), sCurrentUser)
+            End If
+        End If
 
         Return sValue
     End Function
@@ -252,11 +280,16 @@ Public Class mgrPath
         Dim hshCustomVariables As Hashtable = mgrVariables.ReadVariables
         Dim oCustomVariable As clsPathVariable
 
-        hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
+
-        hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
         hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData))
         hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData))
-        hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
+        hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
+
+        'Don't use these in Unix
+        If Not mgrCommon.IsUnix Then
+            hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
+            hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
+        End If
 
         'Load Custom Variables
         For Each oCustomVariable In hshCustomVariables.Values
@@ -302,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
@@ -313,6 +346,7 @@ Public Class mgrPath
         Dim sFolder As String = String.Empty
         Dim bSearchFailed As Boolean = False
 
+        frmFind.GameName = sGameName
         frmFind.SearchItem = sProcess & ".*"
         frmFind.FolderSearch = False
 
@@ -333,13 +367,7 @@ Public Class mgrPath
             frmFind.ShowDialog()
 
             If frmFind.FoundItem <> String.Empty Then
-                sFolder = IO.Path.GetDirectoryName(frmFind.FoundItem)
+                Return frmFind.FoundItem
-                sMessage = mgrCommon.FormatString(mgrPath_ConfirmPathCorrect, New String() {sGameName, sFolder})
-                If mgrCommon.ShowMessage(sMessage, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
-                    Return sFolder
-                Else
-                    sFolder = String.Empty
-                End If
             Else
                 bSearchFailed = True
             End If
@@ -353,6 +381,8 @@ Public Class mgrPath
             If mgrCommon.ShowMessage(sMessage, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                 sFolder = SetManualgamePath()
             End If
+
+            frmFind.Dispose()
         End If
 
         Return sFolder

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,40 +72,159 @@ 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
-                oDuplicateGames.Add(o.ShallowCopy)
+                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
 
-    Public Function SearchRunningProcesses(ByVal hshScanList As Hashtable, ByRef bNeedsPath As Boolean, ByRef iErrorCode As Integer) As Boolean
+    '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
+    Private Function GetUnixProcessArguments(ByVal prs As Process) As String()
+        Dim sArguments As String        
+        Try
+            sArguments = File.ReadAllText("/proc/" & prs.Id.ToString() & "/cmdline")
+            Return sArguments.Split(vbNullChar)
+        Catch ex As Exception
+            Return New String() {String.Empty}
+        End Try
+    End Function
+
+    '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
+
+        Try
+            prsls = New Process
+            prsls.StartInfo.FileName = "/bin/readlink"
+            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()
+            Return slsinfo.Trim()
+        Catch ex As Exception
+            Return String.Empty
+        End Try
+    End Function
+
+    Public Function SearchRunningProcesses(ByVal hshScanList As Hashtable, ByRef bNeedsPath As Boolean, ByRef iErrorCode As Integer, ByVal bDebugMode As Boolean) As Boolean
         Dim prsList() As Process = Process.GetProcesses
         Dim sProcessCheck As String = String.Empty
+        Dim sProcessList As String = String.Empty
+        Dim bWineProcess As Boolean = False
 
         For Each prsCurrent As Process In prsList
-            sProcessCheck = prsCurrent.ProcessName
+            'This needs to be wrapped due to issues with Mono.
+            Try
+                sProcessCheck = prsCurrent.ProcessName
+
+                'Unix Handler
+                'We need some special handling for Wine processes
+                If mgrCommon.IsUnix And (sProcessCheck.ToLower = "wine-preloader" Or sProcessCheck.ToLower = "wine64-preloader") Then
+                    Dim sWinePath As String()
+                    'We can't use Path.GetFileName here, Wine uses the Windows seperator in arguments and Mono expects a different one in Unix.
+                    sWinePath = GetUnixProcessArguments(prsCurrent)(0).Split("\")
+                    sProcessCheck = sWinePath(sWinePath.Length - 1).Replace(".exe", "")
+                    bWineProcess = True
+                Else
+                    bWineProcess = False
+                End If
+
+                If bDebugMode And mgrCommon.IsUnix Then
+                    sProcessList &= prsCurrent.Id & " " & prsCurrent.ProcessName & " " & GetUnixProcessArguments(prsCurrent)(0) & vbCrLf
+                ElseIf bDebugMode Then
+                    sProcessList &= prsCurrent.Id & " " & prsCurrent.ProcessName & vbCrLf
+                End If
+            Catch ex As Exception
+                'Do Nothing
+            End Try
 
             If hshScanList.ContainsKey(sProcessCheck) Then
                 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
-                        oGame.ProcessPath = Path.GetDirectoryName(prsCurrent.MainModule.FileName)
+                        If Not bWineProcess Then
+                            oGame.ProcessPath = Path.GetDirectoryName(prsCurrent.MainModule.FileName)
+                        Else
+                            oGame.ProcessPath = GetUnixSymLinkDirectory(prsCurrent)
+                        End If
                     Catch exWin32 As System.ComponentModel.Win32Exception
                         'If an exception occurs the process is:
                         'Running as administrator and the app isn't.
@@ -117,10 +236,12 @@ Public Class mgrProcesses
                             bNeedsPath = True
                             iErrorCode = 299
                         Else
+                            If bDebugMode Then mgrCommon.ShowMessage(exWin32.NativeErrorCode & " " & exWin32.Message & vbCrLf & vbCrLf & exWin32.StackTrace, MsgBoxStyle.Critical)
                             'A different failure occured,  drop out and continue to scan.
                             Return False
                         End If
                     Catch exAll As Exception
+                        If bDebugMode Then mgrCommon.ShowMessage(exAll.Message & vbCrLf & vbCrLf & exAll.StackTrace, MsgBoxStyle.Critical)
                         'A different failure occured,  drop out and continue to scan.
                         Return False
                     End Try
@@ -137,6 +258,8 @@ Public Class mgrProcesses
             End If
         Next
 
+        If bDebugMode Then mgrCommon.SaveText(sProcessList, mgrPath.SettingsRoot & "/gbm_process_list.txt")
+
         Return False
     End Function
 

GBM/Managers/mgrRestore.vb

@@ -28,39 +28,28 @@ Public Class mgrRestore
     Public Event UpdateRestoreInfo(oRestoreInfo As clsBackup)
     Public Event SetLastAction(sMessage As String)
 
-    Private Shared Function CheckForPathOverride(ByRef oCheckBackup As clsBackup, ByVal oCheckGame As clsGame) As Boolean
+    Public Shared Sub DoPathOverride(ByRef oCheckBackup As clsBackup, ByVal oCheckGame As clsGame)
-        Dim oResult As MsgBoxResult
+        'Always override the manifest restore path with the current configuration path if possible
-
+        If Not oCheckGame.Temporary Then
-        If oCheckBackup.RestorePath <> oCheckGame.Path Then
+            If Path.IsPathRooted(oCheckGame.Path) Then
-            oResult = mgrCommon.ShowMessage(mgrRestore_ConfirmPathMismatch, oCheckBackup.CroppedName, MsgBoxStyle.YesNoCancel)
+                oCheckBackup.AbsolutePath = True
-            If oResult = MsgBoxResult.Yes Then
+            Else
-                If Path.IsPathRooted(oCheckGame.Path) Then
+                oCheckBackup.AbsolutePath = False
-                    oCheckBackup.AbsolutePath = True
-                    oCheckBackup.RestorePath = oCheckGame.Path
-                Else
-                    oCheckBackup.RestorePath = oCheckGame.Path
-                End If
-            ElseIf oResult = MsgBoxResult.Cancel Then
-                Return False
             End If
+            oCheckBackup.RestorePath = oCheckGame.Path
         End If
-
+    End Sub
-        Return True
-    End Function
 
     Public Shared Function CheckPath(ByRef oRestoreInfo As clsBackup, ByVal oGame As clsGame, ByRef bTriggerReload As Boolean) As Boolean
         Dim sProcess As String
         Dim sRestorePath As String
         Dim bNoAuto As Boolean
 
-        'Before we do anything check if we need to override the current path
+        DoPathOverride(oRestoreInfo, oGame)
-        If Not CheckForPathOverride(oRestoreInfo, oGame) Then
-            Return False
-        End If
 
         If Not oRestoreInfo.AbsolutePath Then
             If oGame.ProcessPath <> String.Empty Then
-                oRestoreInfo.RelativeRestorePath = oGame.ProcessPath & "\" & oRestoreInfo.RestorePath
+                oRestoreInfo.RelativeRestorePath = oGame.ProcessPath & Path.DirectorySeparatorChar & oRestoreInfo.RestorePath
             Else
                 sProcess = oGame.TrueProcess
                 If mgrCommon.IsProcessNotSearchable(oGame) Then bNoAuto = True
@@ -73,7 +62,7 @@ Public Class mgrRestore
                     bTriggerReload = True
 
                     'Set path for restore
-                    oRestoreInfo.RelativeRestorePath = sRestorePath & "\" & oRestoreInfo.RestorePath
+                    oRestoreInfo.RelativeRestorePath = sRestorePath & Path.DirectorySeparatorChar & oRestoreInfo.RestorePath
                 Else
                     Return False
                 End If
@@ -91,8 +80,8 @@ Public Class mgrRestore
         Dim bLocal As Boolean = False
         Dim bRemote As Boolean = False
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         If slLocalManifest.Contains(sAppName) Then
             oLocalItem = DirectCast(slLocalManifest(sAppName), clsBackup)
@@ -107,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
@@ -128,26 +115,18 @@ Public Class mgrRestore
         Dim bLocal As Boolean = False
         Dim bRemote As Boolean = False
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         For Each oItem As clsBackup In slRemoteManifest.Values
             If slLocalManifest.Contains(oItem.Name) Then
                 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
 
@@ -159,33 +138,81 @@ Public Class mgrRestore
         Dim slRemoteManifest As SortedList
         Dim slRemovedItems As New SortedList
 
-        slLocalManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Local)
+        slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local)
-        slRemoteManifest = mgrManifest.ReadManifest(mgrSQLite.Database.Remote)
+        slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote)
 
         For Each oItem As clsBackup In slLocalManifest.Values
             If Not slRemoteManifest.Contains(oItem.Name) Then
                 slRemovedItems.Add(oItem.Name, oItem)
-                mgrManifest.DoManifestDelete(oItem, mgrSQLite.Database.Local)
+                mgrManifest.DoManifestDeletebyName(oItem, mgrSQLite.Database.Local)
             End If
         Next
 
         Return slRemovedItems
     End Function
 
+    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
+
+        If oBackupInfo.AbsolutePath Then
+            sExtractPath = oBackupInfo.RestorePath
+        Else
+            sExtractPath = oBackupInfo.RelativeRestorePath
+        End If
+
+        'Check if restore location exists, prompt to create if it doesn't.
+        If Not Directory.Exists(sExtractPath) Then
+            If mgrCommon.ShowMessage(mgrRestore_ConfirmCreatePath, sExtractPath, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                Try
+                    Directory.CreateDirectory(sExtractPath)
+                Catch ex As Exception
+                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorCreatePath, ex.Message), False, ToolTipIcon.Error, True)
+                    Return False
+                End Try
+            Else
+                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 oBackupInfo.CheckSum <> String.Empty Then
+            sHash = mgrHash.Generate_SHA256_Hash(sBackupFile)
+            If sHash <> oBackupInfo.CheckSum Then
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorFailedCheck, oBackupInfo.Name), False, ToolTipIcon.Info, True)
+                If mgrCommon.ShowMessage(mgrRestore_ConfirmFailedCheck, oBackupInfo.Name, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
+                    RaiseEvent UpdateLog(mgrRestore_ErrorCheckAbort, False, ToolTipIcon.Info, True)
+                    Return False
+                End If
+            Else
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_Verified, oBackupInfo.Name), False, ToolTipIcon.Info, True)
+            End If
+        Else
+            RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_NoVerify, oBackupInfo.Name), False, ToolTipIcon.Info, True)
+        End If
+
+
+        Return True
+    End Function
+
     Public Sub DoRestore(ByVal oRestoreList As List(Of clsBackup))
         Dim prs7z As Process
         Dim sBackupFile As String
         Dim sExtractPath As String
-        Dim bDoRestore As Boolean
         Dim bRestoreCompleted As Boolean
-        Dim sHash As String
 
         For Each oBackupInfo In oRestoreList
             'Init
             prs7z = New Process
-            sBackupFile = oSettings.BackupFolder & "\" & oBackupInfo.FileName
+            sBackupFile = oSettings.BackupFolder & Path.DirectorySeparatorChar & oBackupInfo.FileName
             sExtractPath = String.Empty
-            bDoRestore = True
             bRestoreCompleted = False
             CancelOperation = False
             RaiseEvent UpdateRestoreInfo(oBackupInfo)
@@ -196,44 +223,11 @@ Public Class mgrRestore
                 sExtractPath = oBackupInfo.RelativeRestorePath
             End If
 
-            'Check if restore location exists, prompt to create if it doesn't.
+            Try
-            If Not Directory.Exists(sExtractPath) Then
+                If File.Exists(sBackupFile) Then
-                If mgrCommon.ShowMessage(mgrRestore_ConfirmCreatePath, sExtractPath, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                    If Settings.Is7zUtilityValid Then
-                    Try
+                        prs7z.StartInfo.Arguments = "x" & oSettings.Prepared7zArguments & """" & sBackupFile & """ -o""" & sExtractPath & Path.DirectorySeparatorChar & """ -aoa -r"
-                        Directory.CreateDirectory(sExtractPath)
+                        prs7z.StartInfo.FileName = oSettings.Utility7zLocation
-                    Catch ex As Exception
-                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorCreatePath, ex.Message), False, ToolTipIcon.Error, True)
-                        bDoRestore = False
-                    End Try
-                Else
-                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorNoPath, sExtractPath), False, ToolTipIcon.Error, True)
-                    bDoRestore = False
-                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
-                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorFailedCheck, oBackupInfo.Name), False, ToolTipIcon.Info, True)
-                        If mgrCommon.ShowMessage(mgrRestore_ConfirmFailedCheck, oBackupInfo.Name, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
-                            RaiseEvent UpdateLog(mgrRestore_ErrorCheckAbort, False, ToolTipIcon.Info, True)
-                            bDoRestore = False
-                        End If
-                    Else
-                        RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_Verified, oBackupInfo.Name), False, ToolTipIcon.Info, True)
-                    End If
-                Else
-                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_NoVerify, oBackupInfo.Name), False, ToolTipIcon.Info, True)
-                End If
-            End If
-
-            If bDoRestore Then
-                Try
-                    If File.Exists(sBackupFile) Then
-                        prs7z.StartInfo.Arguments = "x """ & sBackupFile & """ -o""" & sExtractPath & "\"" -aoa -r"
-                        prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
                         prs7z.StartInfo.UseShellExecute = False
                         prs7z.StartInfo.RedirectStandardOutput = True
                         prs7z.StartInfo.CreateNoWindow = True
@@ -259,26 +253,29 @@ Public Class mgrRestore
                         End If
                         prs7z.Dispose()
                     Else
-                        RaiseEvent UpdateLog(mgrRestore_ErrorNoBackup, True, ToolTipIcon.Error, True)
+                        RaiseEvent UpdateLog(App_Invalid7zDetected, True, ToolTipIcon.Error, True)
+                        bRestoreCompleted = False
                     End If
-
+                Else
-                    If bRestoreCompleted Then
+                    RaiseEvent UpdateLog(mgrRestore_ErrorNoBackup, True, ToolTipIcon.Error, True)
-                        'Save Local Manifest
+                End If
-                        If mgrManifest.DoManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
-                            mgrManifest.DoManifestUpdate(oBackupInfo, mgrSQLite.Database.Local)
-                        Else
-                            mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local)
-                        End If
-                    End If
-                Catch ex As Exception
-                    RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorOtherFailure, ex.Message), False, ToolTipIcon.Error, True)
-                End Try
 
                 If bRestoreCompleted Then
-                    RaiseEvent SetLastAction(mgrCommon.FormatString(mgrRestore_ActionComplete, oBackupInfo.CroppedName))
+                    'Save Local Manifest
-                Else
+                    If mgrManifest.DoGlobalManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
-                    RaiseEvent SetLastAction(mgrCommon.FormatString(mgrRestore_ActionFailed, oBackupInfo.CroppedName))
+                        mgrManifest.DoManifestUpdateByName(oBackupInfo, mgrSQLite.Database.Local)
+                    Else
+                        mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local)
+                    End If
                 End If
+            Catch ex As Exception
+                RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorOtherFailure, ex.Message), False, ToolTipIcon.Error, True)
+            End Try
+
+            If bRestoreCompleted Then
+                RaiseEvent SetLastAction(mgrCommon.FormatString(mgrRestore_ActionComplete, oBackupInfo.CroppedName))
+            Else
+                RaiseEvent SetLastAction(mgrCommon.FormatString(mgrRestore_ActionFailed, oBackupInfo.CroppedName))
             End If
         Next
     End Sub

GBM/Managers/mgrSQLite.vb

@@ -1,6 +1,6 @@
 Imports GBM.My.Resources
 Imports System.IO
-Imports System.Data.SQLite
+Imports Mono.Data.Sqlite
 
 Public Class mgrSQLite
 
@@ -72,14 +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);"
+                   "SupressBackup BOOLEAN NOT NULL, SupressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " &
+                   "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL);"
+
+            '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, " &
-                   "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); "
@@ -91,7 +95,7 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE variables (VariableID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);"
 
             'Add Tables (Local Manifest)
-            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL UNIQUE, Name TEXT NOT NULL PRIMARY KEY, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
+            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
             'Set Version
@@ -110,16 +114,16 @@ Public Class mgrSQLite
 
         Try
             'Create the DB
-            SQLiteConnection.CreateFile(sDatabaseLocation)
+            SqliteConnection.CreateFile(sDatabaseLocation)
 
             'Add Tables (Remote 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, " &
-                   "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 UNIQUE, Name TEXT NOT NULL PRIMARY KEY, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
+            sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
             'Add Tables (Remote Tags)
@@ -154,7 +158,7 @@ Public Class mgrSQLite
 
     Public Sub Connect()
         If CheckDB() Then
-            db = New SQLiteConnection(sConnectString)
+            db = New SqliteConnection(sConnectString)
             db.Open()
         Else
             CreateDB()
@@ -166,18 +170,27 @@ Public Class mgrSQLite
         db.Close()
     End Sub
 
-    Private Sub BuildParams(ByRef command As SQLiteCommand, ByRef hshParams As Hashtable)
+    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)
         Next
     End Sub
 
     Public Function RunParamQuery(ByVal sSQL As String, ByVal hshParams As Hashtable) As Boolean
-        Dim trans As SQLiteTransaction
+        Dim trans As SqliteTransaction
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         BuildParams(command, hshParams)
         trans = db.BeginTransaction()
 
@@ -185,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
@@ -197,11 +210,11 @@ Public Class mgrSQLite
     End Function
 
     Public Function RunMassParamQuery(ByVal sSQL As String, ByVal oParamList As List(Of Hashtable)) As Boolean
-        Dim trans As SQLiteTransaction
+        Dim trans As SqliteTransaction
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         trans = db.BeginTransaction()
 
         Try
@@ -211,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
@@ -223,16 +236,17 @@ Public Class mgrSQLite
     End Function
 
     Public Function ReadParamData(ByVal sSQL As String, ByVal hshParams As Hashtable) As DataSet
-        Dim adapter As SQLiteDataAdapter
+        Dim adapter As SqliteDataAdapter
-        Dim command As SQLiteCommand
+        Dim command As SqliteCommand
         Dim oData As New DataSet
 
         Connect()
-        command = New SQLiteCommand(sSQL, db)
+        command = New SqliteCommand(sSQL, db)
         BuildParams(command, hshParams)
 
         Try
-            adapter = New SQLiteDataAdapter(command)
+            adapter = New SqliteDataAdapter()
+            adapter.SelectCommand = command
             adapter.Fill(oData)
         Catch ex As Exception
             mgrCommon.ShowMessage(mgrSQLite_ErrorQueryFailure, New String() {sSQL, ex.Message}, MsgBoxStyle.Exclamation)
@@ -506,6 +520,166 @@ Public Class mgrSQLite
             End If
         End If
 
+        '0.96 Upgrade
+        If GetDatabaseVersion() < 96 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v95")
+
+                'Add new setting                
+                sSQL = "ALTER TABLE settings ADD COLUMN CompressionLevel INTEGER NOT NULL DEFAULT 5;"
+
+                sSQL &= "PRAGMA user_version=96"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v95")
+
+                sSQL = "PRAGMA user_version=96"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
+
+        '0.97 Upgrade
+        If GetDatabaseVersion() < 97 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v96")
+
+                'Add new settings        
+                sSQL = "ALTER TABLE settings ADD COLUMN Custom7zArguments TEXT;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN Custom7zLocation TEXT;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN SyncFields INTEGER NOT NULL DEFAULT 32;"
+                sSQL &= "ALTER TABLE settings ADD COLUMN AutoSaveLog BOOLEAN NOT NULL DEFAULT 0;"
+                sSQL &= "PRAGMA user_version=97"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v96")
+
+                sSQL = "PRAGMA user_version=97"
+
+                RunParamQuery(sSQL, New Hashtable)
+            End If
+        End If
+
+        '0.98 Upgrade
+        If GetDatabaseVersion() < 98 Then
+            If eDatabase = Database.Local Then
+                'Backup DB before starting
+                BackupDB("v97")
+
+                'Overhaul Manifest Table
+                sSQL = "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
+                sSQL &= "INSERT INTO manifest_new (ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy) "
+                sSQL &= "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy FROM manifest;"
+                sSQL &= "DROP TABLE manifest; ALTER TABLE manifest_new RENAME TO manifest;"
+
+                'Add backup limit field
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;"
+
+                sSQL &= "PRAGMA user_version=98"
+
+                RunParamQuery(sSQL, New Hashtable)
+
+                'Run a compact
+                CompactDatabase()
+            End If
+            If eDatabase = Database.Remote Then
+                'Backup DB before starting
+                BackupDB("v97")
+
+                'Overhaul Manifest Table
+                sSQL = "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
+                sSQL &= "INSERT INTO manifest_new (ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy) "
+                sSQL &= "SELECT ManifestID, Name, FileName, RestorePath, AbsolutePath, DateUpdated, UpdatedBy FROM manifest;"
+                sSQL &= "DROP TABLE manifest; ALTER TABLE manifest_new RENAME TO manifest;"
+
+                'Add backup limit field
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN BackupLimit INTEGER NOT NULL DEFAULT 5;"
+
+                sSQL &= "PRAGMA user_version=98"
+
+                RunParamQuery(sSQL, New Hashtable)
+
+                'Run a compact
+                CompactDatabase()
+            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
@@ -513,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,12 +9,18 @@ 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
+    Private iCompressionLevel As Integer = 5
+    Private s7zArguments As String = String.Empty
+    Private s7zLocation As String = String.Empty
     Private sBackupFolder As String = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).TrimEnd(New Char() {"\", "/"})
+    Private eSyncFields As clsGame.eOptionalSyncFields = clsGame.eOptionalSyncFields.None Or clsGame.eOptionalSyncFields.TimeStamp
+    Private bAutoSaveLog As Boolean = False
 
     Property StartWithWindows As Boolean
         Get
@@ -88,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
@@ -97,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
@@ -133,6 +148,81 @@ Public Class mgrSettings
         End Set
     End Property
 
+    Property CompressionLevel As Integer
+        Get
+            Return iCompressionLevel
+        End Get
+        Set(value As Integer)
+            iCompressionLevel = value
+        End Set
+    End Property
+
+    Property Custom7zArguments As String
+        Get
+            Return s7zArguments
+        End Get
+        Set(value As String)
+            s7zArguments = value
+        End Set
+    End Property
+
+    ReadOnly Property Prepared7zArguments As String
+        Get
+            'Prepare custom 7z arguments
+            Dim sPreparedArguments As String
+            If s7zArguments <> String.Empty Then
+                'Surround the arguments with spaces to be inserted into command
+                sPreparedArguments = " " & s7zArguments & " "
+            Else
+                'The command always needs at least one space inserted
+                sPreparedArguments = " "
+            End If
+            Return sPreparedArguments
+        End Get
+    End Property
+
+    Property Custom7zLocation As String
+        Get
+            Return s7zLocation
+        End Get
+        Set(value As String)
+            s7zLocation = value
+        End Set
+    End Property
+
+    ReadOnly Property Is7zUtilityValid As Boolean
+        Get
+            'We don't use a packaged 7za on Unix, assume valid.
+            If mgrCommon.IsUnix Then
+                Return True
+            End If
+
+            If s7zLocation = String.Empty Then
+                'Verify stored hash of the default utility if we're using it
+                Return mgrCommon.UtilityHash = mgrHash.Generate_SHA256_Hash(mgrPath.Default7zLocation)
+            Else
+                'When using a custom utility assume it's valid, we have no way to be sure.
+                Return True
+            End If
+        End Get
+    End Property
+
+    ReadOnly Property Utility7zLocation As String
+        Get
+            'Return default utility when custom setting is not used
+            If s7zLocation = String.Empty Then
+                Return mgrPath.Default7zLocation
+            Else
+                'Check if custom utility is available, if not use the default utility
+                If File.Exists(s7zLocation) Then
+                    Return s7zLocation
+                Else
+                    Return mgrPath.Default7zLocation
+                End If
+            End If
+        End Get
+    End Property
+
     Property BackupFolder As String
         Get
             Return sBackupFolder
@@ -142,6 +232,24 @@ Public Class mgrSettings
         End Set
     End Property
 
+    Property SyncFields As clsGame.eOptionalSyncFields
+        Get
+            Return eSyncFields
+        End Get
+        Set(value As clsGame.eOptionalSyncFields)
+            eSyncFields = value
+        End Set
+    End Property
+
+    Property AutoSaveLog As Boolean
+        Get
+            Return bAutoSaveLog
+        End Get
+        Set(value As Boolean)
+            bAutoSaveLog = value
+        End Set
+    End Property
+
     Private Sub SaveFromClass()
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
@@ -151,8 +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)"
+        sSQL &= "@TimeTracking, @SupressBackup, @SupressBackupThreshold, @CompressionLevel, @Custom7zArguments, @Custom7zLocation, "
+        sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark)"
 
         hshParams.Add("MonitorOnStartup", MonitorOnStartup)
         hshParams.Add("StartToTray", StartToTray)
@@ -163,12 +272,17 @@ 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)
         hshParams.Add("SupressBackupThreshold", SupressBackupThreshold)
-
+        hshParams.Add("CompressionLevel", CompressionLevel)
+        hshParams.Add("Custom7zArguments", Custom7zArguments)
+        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
 
@@ -192,11 +306,17 @@ 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"))
             SupressBackupThreshold = CInt(dr("SupressBackupThreshold"))
+            CompressionLevel = CInt(dr("CompressionLevel"))
+            If Not IsDBNull(dr("Custom7zArguments")) Then Custom7zArguments = CStr(dr("Custom7zArguments"))
+            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/mgrTags.vb

@@ -1,26 +1,44 @@
 Public Class mgrTags
 
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsTag
+        Dim oTag As New clsTag
+
+        oTag.ID = CStr(dr("TagID"))
+        oTag.Name = CStr(dr("Name"))
+
+        Return oTag
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oTag As clsTag) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oTag.ID)
+        hshParams.Add("Name", oTag.Name)
+
+        Return hshParams
+    End Function
+
     Public Shared Sub DoTagAdd(ByVal oTag As clsTag, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO tags VALUES (@ID, @Name)"
-        hshParams.Add("ID", oTag.ID)
+
-        hshParams.Add("Name", oTag.Name)
+        hshParams = SetCoreParameters(oTag)
+
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
     Public Shared Sub DoTagUpdate(ByVal oTag As clsTag, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
         Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE tags SET Name=@Name "
         sSQL &= "WHERE TagID = @ID"
 
-        hshParams.Add("Name", oTag.Name)
+        hshParams = SetCoreParameters(oTag)
-        hshParams.Add("ID", oTag.ID)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
 
@@ -57,9 +75,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
         Next
 
         Return oTag
@@ -80,9 +96,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
         Next
 
         Return oTag
@@ -124,9 +138,7 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oTag = New clsTag
+            oTag = MapToObject(dr)
-            oTag.ID = CStr(dr("TagID"))
-            oTag.Name = CStr(dr("Name"))
             hshList.Add(oTag.Name, oTag)
         Next
 

GBM/Managers/mgrVariables.vb

@@ -1,5 +1,25 @@
 Public Class mgrVariables
 
+    Private Shared Function MapToObject(ByVal dr As DataRow) As clsPathVariable
+        Dim oCustomVariable As New clsPathVariable
+
+        oCustomVariable.ID = CStr(dr("VariableID"))
+        oCustomVariable.Name = CStr(dr("Name"))
+        oCustomVariable.Path = CStr(dr("Path"))
+
+        Return oCustomVariable
+    End Function
+
+    Private Shared Function SetCoreParameters(ByVal oCustomVariable As clsPathVariable) As Hashtable
+        Dim hshParams As New Hashtable
+
+        hshParams.Add("ID", oCustomVariable.ID)
+        hshParams.Add("Name", oCustomVariable.Name)
+        hshParams.Add("Path", oCustomVariable.Path)
+
+        Return hshParams
+    End Function
+
     Public Shared Sub DoPathUpdate(ByVal sOld As String, ByVal sNew As String)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
@@ -15,26 +35,22 @@
     Public Shared Sub DoVariableAdd(ByVal oCustomVariable As clsPathVariable)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "INSERT INTO variables VALUES (@ID, @Name, @Path)"
-        hshParams.Add("ID", oCustomVariable.ID)
+        hshParams = SetCoreParameters(oCustomVariable)
-        hshParams.Add("Name", oCustomVariable.Name)
-        hshParams.Add("Path", oCustomVariable.Path)
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
     Public Shared Sub DoVariableUpdate(ByVal oCustomVariable As clsPathVariable)
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim sSQL As String
-        Dim hshParams As New Hashtable
+        Dim hshParams As Hashtable
 
         sSQL = "UPDATE variables SET Name=@Name, Path = @Path "
         sSQL &= "WHERE VariableID = @ID"
 
-        hshParams.Add("Name", oCustomVariable.Name)
+        hshParams = SetCoreParameters(oCustomVariable)
-        hshParams.Add("Path", oCustomVariable.Path)
-        hshParams.Add("ID", oCustomVariable.ID)
 
         oDatabase.RunParamQuery(sSQL, hshParams)
 
@@ -69,10 +85,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
         Next
 
         Return oCustomVariable
@@ -93,10 +106,7 @@
         oData = oDatabase.ReadParamData(sSQL, hshParams)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
         Next
 
         Return oCustomVariable
@@ -138,10 +148,7 @@
         oData = oDatabase.ReadParamData(sSQL, New Hashtable)
 
         For Each dr As DataRow In oData.Tables(0).Rows
-            oCustomVariable = New clsPathVariable
+            oCustomVariable = MapToObject(dr)
-            oCustomVariable.ID = CStr(dr("VariableID"))
-            oCustomVariable.Name = CStr(dr("Name"))
-            oCustomVariable.Path = CStr(dr("Path"))
             hshList.Add(oCustomVariable.Name, oCustomVariable)
         Next
 

GBM/Managers/mgrXML.vb

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

GBM/My Project/AssemblyInfo.vb

@@ -13,14 +13,14 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyTitle("Game Backup Monitor")> 
 <Assembly: AssemblyDescription("Game Backup Monitor")> 
 <Assembly: AssemblyCompany("Michael J. Seiferling")> 
-<Assembly: AssemblyProduct("Game Backup Monitor")> 
+<Assembly: AssemblyProduct("Game Backup Monitor")>
-<Assembly: AssemblyCopyright("Copyright © 2015 Michael J. Seiferling")> 
+<Assembly: AssemblyCopyright("Copyright © 2017 Michael J. Seiferling")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)> 
 
 'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("bc5c563d-71b2-47f4-a318-3313baf26540")> 
+<Assembly: Guid("bc5c563d-71b2-47f4-a318-3313baf26540")>
 
 ' Version information for an assembly consists of the following four values:
 '
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.95.*")> 
+<Assembly: AssemblyVersion("1.0.3.*")>
-<Assembly: AssemblyFileVersion("0.95.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.3.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 

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] Beta ([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>
@@ -140,7 +140,7 @@
     <value>This will rebuild all databases and shrink them to an optimal size.[BR]This should only be used if your gbm.s3db files are becoming very large.[BR][BR]Do you wish to continue?</value>
   </data>
   <data name="App_Copyright" xml:space="preserve">
-    <value>2015 Michael J. Seiferling</value>
+    <value>[PARAM] Michael J. Seiferling</value>
   </data>
   <data name="frmMain_Exit" xml:space="preserve">
     <value>Are you sure you want to exit?  Your games will no longer be monitored.</value>
@@ -194,10 +194,10 @@
     <value>[PARAM] is a 64-bit game, GBM cannot detect the required information to save your backup.</value>
   </data>
   <data name="frmMain_Error7zip" xml:space="preserve">
-    <value>7-Zip was not found in the Game Backup Monitor utilities folder.  The application cannot continue.</value>
+    <value>7-Zip was not found.  The application cannot continue.</value>
   </data>
   <data name="frmMain_ErrorAdminBackup" xml:space="preserve">
-    <value>[PARAM] is running as Administrator and GBM is not, GBM cannot detect the required information to save your backup.</value>
+    <value>[PARAM] was running as Administrator and GBM is not, GBM cannot detect the required information to save your backup.</value>
   </data>
   <data name="frmMain_ErrorAdminDetect" xml:space="preserve">
     <value>[PARAM] is running as Administrator and GBM is not.[BR]You cannot cancel monitoring at this time.[BR][BR]Run GBM as Administrator to prevent this issue.</value>
@@ -227,10 +227,10 @@
     <value>The GBM data (Version [PARAM]) in your backup folder is too new for your version of GBM (Version [PARAM])[BR][BR]All computers sharing a backup folder must use the same version of GBM.  The application cannot proceed.</value>
   </data>
   <data name="frmMain_ErrorMulti64" xml:space="preserve">
-    <value>Multiple possible 64-bit games have been detected, GBM cannot detect the path to identify your game or save your backup.[BR][BR]Please install the 64-bit version of GBM to detect and backup this game properly.</value>
+    <value>Install the 64-bit version of GBM to detect the last running game.</value>
   </data>
   <data name="frmMain_ErrorMultiAdmin" xml:space="preserve">
-    <value>Multiple possible games have been detected running as Administrator and GBM is not, GBM cannot detect the path to identify your game or save your backup.[BR][BR]Please run GBM as Administrator to properly detect and backup this game.</value>
+    <value>Restart GBM as Administrator to detect the last running game.</value>
   </data>
   <data name="frmMain_ErrorRelativePath" xml:space="preserve">
     <value>[PARAM] uses a relative path and has never been detected on this computer.</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,14 +424,8 @@
   <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] by [PARAM]</value>
+    <value>[PARAM] ([PARAM])</value>
   </data>
   <data name="frmGameManager_btnAdd" xml:space="preserve">
     <value>+</value>
@@ -503,7 +497,7 @@
     <value>Monitor only</value>
   </data>
   <data name="frmGameManager_chkTimeStamp" xml:space="preserve">
-    <value>Timestamp each backup</value>
+    <value>Save multiple backups</value>
   </data>
   <data name="frmGameManager_ChooseCustomIcon" xml:space="preserve">
     <value>Choose a custom icon for the game</value>
@@ -527,10 +521,7 @@
     <value>Are you sure you want to run a backup for [PARAM]?  This will close the form.</value>
   </data>
   <data name="frmGameManager_ConfirmBackupDelete" xml:space="preserve">
-    <value>This will delete the backup file and all records of this backup.  This cannot be undone. [BR][BR]Do you want to remove the data for [PARAM]?</value>
+    <value>This will delete the selected backup file.  This cannot be undone. [BR][BR]Do you want to delete [PARAM]?</value>
-  </data>
-  <data name="frmGameManager_ConfirmBackupFolderDelete" xml:space="preserve">
-    <value>The backup folder [PARAM] still contains [PARAM] directories and [PARAM] files.[BR][BR]Do you want to delete the contents and remove the sub-folder for this game?</value>
   </data>
   <data name="frmGameManager_ConfirmGameDelete" xml:space="preserve">
     <value>Are you sure you want to delete [PARAM]?  This cannot be undone.[BR][BR]This will not delete any backup files that already exist for this game.</value>
@@ -566,7 +557,7 @@
     <value>A game with this exact name and process already exists.</value>
   </data>
   <data name="frmGameManager_ErrorNoBackupData" xml:space="preserve">
-    <value>The selected game(s) have no backup data.</value>
+    <value>The selected game(s) have no backup data or can't be restored with their current configuration.</value>
   </data>
   <data name="frmGameManager_ErrorNoBackupExists" xml:space="preserve">
     <value>The backup file does not exist.</value>
@@ -616,11 +607,11 @@
   <data name="frmGameManager_lblCompany" xml:space="preserve">
     <value>Company:</value>
   </data>
-  <data name="frmGameManager_lblCurrentBackup" xml:space="preserve">
+  <data name="frmGameManager_lblRemote" xml:space="preserve">
-    <value>Current Backup:</value>
+    <value>Backup Data:</value>
   </data>
-  <data name="frmGameManager_lblFileSize" xml:space="preserve">
+  <data name="frmGameManager_lblBackupFile" xml:space="preserve">
-    <value>Backup Size:</value>
+    <value>Backup File:</value>
   </data>
   <data name="frmGameManager_lblGamePath" xml:space="preserve">
     <value>Game Path:</value>
@@ -631,8 +622,8 @@
   <data name="frmGameManager_lblIcon" xml:space="preserve">
     <value>Icon:</value>
   </data>
-  <data name="frmGameManager_lblLastBackup" xml:space="preserve">
+  <data name="frmGameManager_lblLocalData" xml:space="preserve">
-    <value>Local Backup:</value>
+    <value>Local Data:</value>
   </data>
   <data name="frmGameManager_lblName" xml:space="preserve">
     <value>Name:</value>
@@ -649,8 +640,8 @@
   <data name="frmGameManager_lblVersion" xml:space="preserve">
     <value>Version:</value>
   </data>
-  <data name="frmGameManager_Never" xml:space="preserve">
+  <data name="frmGameManager_None" xml:space="preserve">
-    <value>Never</value>
+    <value>None</value>
   </data>
   <data name="frmGameManager_optAllGames" xml:space="preserve">
     <value>All</value>
@@ -662,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>
@@ -704,10 +695,10 @@
     <value>...</value>
   </data>
   <data name="frmAddWizard_chkFolderSave" xml:space="preserve">
-    <value>Save Entire Folder</value>
+    <value>Save entire folder</value>
   </data>
   <data name="frmAddWizard_chkTimeStamp" xml:space="preserve">
-    <value>Time Stamp Backup</value>
+    <value>Save multiple backups</value>
   </data>
   <data name="frmAddWizard_ChooseProcess" xml:space="preserve">
     <value>Choose exe file that starts the game</value>
@@ -772,12 +763,6 @@
   <data name="frmAddWizard_ItemsSelectedNone" xml:space="preserve">
     <value>0 item(s) selected</value>
   </data>
-  <data name="frmAddWizard_lblDrag1" xml:space="preserve">
-    <value>Drag a shortcut here to complete this step.</value>
-  </data>
-  <data name="frmAddWizard_lblDrag2" xml:space="preserve">
-    <value>Drag a shortcut here to complete this step.</value>
-  </data>
   <data name="frmAddWizard_lblExcludePath" xml:space="preserve">
     <value>Save Path</value>
   </data>
@@ -791,7 +776,7 @@
     <value>Saved Game Folder:</value>
   </data>
   <data name="frmAddWizard_lblStep1Instructions" xml:space="preserve">
-    <value>The name will be automatically filtered for length and invalid characters. </value>
+    <value>The name will be automatically filtered for length and invalid characters.  You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.</value>
   </data>
   <data name="frmAddWizard_lblStep1Intro" xml:space="preserve">
     <value>Enter the name of the game to monitor:</value>
@@ -800,7 +785,7 @@
     <value>Game Name</value>
   </data>
   <data name="frmAddWizard_lblStep2Instructions" xml:space="preserve">
-    <value>Some games use launchers.  Do not monitor launchers,  be sure to choose the game's actual exe file.</value>
+    <value>Some games use launchers.  Do not monitor launchers,  be sure to choose the game's actual exe file.  You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.</value>
   </data>
   <data name="frmAddWizard_lblStep2Intro" xml:space="preserve">
     <value>Choose the game's executable file or shortcut:</value>
@@ -815,7 +800,7 @@
     <value>Choose Files to Backup</value>
   </data>
   <data name="frmAddWizard_lblStep3Instructions" xml:space="preserve">
-    <value>If you're unsure of exactly which files to backup,  make sure Save Entire Folder is checked.  You can also time stamp your backup files to make incremental backups.</value>
+    <value>If you're unsure of exactly which files to backup,  make sure Save entire folder is checked.  You can also choose to save multiple backups and set a limit on how many to keep.</value>
   </data>
   <data name="frmAddWizard_lblStep3Intro" xml:space="preserve">
     <value>Choose the location of your game's save files:</value>
@@ -860,7 +845,7 @@
     <value>Save Path</value>
   </data>
   <data name="frmAddWizard_Summary_Timestamp" xml:space="preserve">
-    <value>Timestamp</value>
+    <value>Multiple Backups</value>
   </data>
   <data name="frmAdvancedImport_btnCancel" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -871,11 +856,11 @@
   <data name="frmAdvancedImport_FormName" xml:space="preserve">
     <value>Import Game Configurations</value>
   </data>
-  <data name="frmAdvancedImport_NewConfigs" xml:space="preserve">
+  <data name="frmAdvancedImport_Configs" xml:space="preserve">
-    <value>[PARAM] new configurations available.</value>
+    <value>Configurations ([PARAM])</value>
   </data>
   <data name="frmAdvancedImport_Selected" xml:space="preserve">
-    <value>[PARAM] Selected</value>
+    <value>Selected ([PARAM])</value>
   </data>
   <data name="frmChooseGame_btnCancel" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -896,7 +881,7 @@
     <value>Search</value>
   </data>
   <data name="frmFileFolderSearch_SwitchDrives" xml:space="preserve">
-    <value>The location was not found on the [PARAM] drive.  Do you wish to search the [PARAM] drive?</value>
+    <value>Do you wish to search the [PARAM] drive?</value>
   </data>
   <data name="frmFilter_btnAdd" xml:space="preserve">
     <value>&gt;</value>
@@ -1084,9 +1069,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>
@@ -1096,8 +1078,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>
@@ -1112,7 +1094,7 @@
     <value>Backup only when session time exceeds</value>
   </data>
   <data name="frmSettings_chkSync" xml:space="preserve">
-    <value>Sync game list data with backup folder</value>
+    <value>Enable syncing</value>
   </data>
   <data name="frmSettings_chkTimeTracking" xml:space="preserve">
     <value>Enable time tracking</value>
@@ -1123,17 +1105,14 @@
   <data name="frmSettings_FormName" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="frmSettings_grpBackup" xml:space="preserve">
+  <data name="frmSettings_grpStartup" xml:space="preserve">
-    <value>Backup and Restore</value>
+    <value>Startup</value>
   </data>
-  <data name="frmSettings_grpGeneral" xml:space="preserve">
+  <data name="frmSettings_grpFolderOptions" xml:space="preserve">
-    <value>General</value>
+    <value>Folders</value>
-  </data>
-  <data name="frmSettings_grpPaths" xml:space="preserve">
-    <value>Paths</value>
   </data>
   <data name="frmSettings_lblBackupFolder" xml:space="preserve">
-    <value>Backup Folder</value>
+    <value>Backup Folder:</value>
   </data>
   <data name="frmSettings_lblMinutes" xml:space="preserve">
     <value>minutes</value>
@@ -1307,19 +1286,19 @@
     <value>Do you wish to manually set the game path? (Path will be saved)</value>
   </data>
   <data name="mgrBackup_ActionComplete" xml:space="preserve">
-    <value>[PARAM] backup completed</value>
+    <value>[PARAM] backup completed.</value>
   </data>
   <data name="mgrBackup_ActionFailed" xml:space="preserve">
-    <value>[PARAM] backup failed</value>
+    <value>[PARAM] backup failed.</value>
   </data>
   <data name="mgrBackup_BackupComplete" xml:space="preserve">
-    <value>[PARAM] backup completed.</value>
+    <value>[PARAM] backup ([PARAM]) completed. </value>
   </data>
   <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>
@@ -1355,7 +1334,7 @@
     <value>Generating SHA-256 hash for [PARAM] backup file.</value>
   </data>
   <data name="mgrCommon_FilesFilter" xml:space="preserve">
-    <value>[PARAM] files (*.[PARAM])|*.[PARAM]</value>
+    <value>[PARAM] files (*.[PARAM])|*.[PARAM]|All files (*.*)|*.*</value>
   </data>
   <data name="mgrCommon_No" xml:space="preserve">
     <value>No</value>
@@ -1367,7 +1346,7 @@
     <value>Would you like to apply a filter to your export?</value>
   </data>
   <data name="mgrMonitorList_ConfirmExistingData" xml:space="preserve">
-    <value>GBM data already exists in the backup folder.[BR][BR]Do you want to make your local game list the new master game list in this folder? (Recommended)[BR][BR]Choosing No will sync your local game list to the current master game list in this folder.</value>
+    <value>The sync settings have changed and data already exists in the backup folder.[BR][BR]Do you want to make your current game data on this PC the new master game data in this folder? (Highly Recommended)[BR][BR]Choosing No will sync your game data on this PC to the current master game data in this folder.</value>
   </data>
   <data name="mgrMonitorList_ExportComplete" xml:space="preserve">
     <value>Export Complete.  [PARAM] item(s) have been exported.</value>
@@ -1412,10 +1391,10 @@
     <value>[PARAM] was located in the following folder:[BR][BR][PARAM][BR][BR]Is this correct?</value>
   </data>
   <data name="mgrRestore_ActionComplete" xml:space="preserve">
-    <value>[PARAM] backup restored</value>
+    <value>[PARAM] backup restored.</value>
   </data>
   <data name="mgrRestore_ActionFailed" xml:space="preserve">
-    <value>[PARAM] restore failed</value>
+    <value>[PARAM] restore failed.</value>
   </data>
   <data name="mgrRestore_ConfirmCreatePath" xml:space="preserve">
     <value>The restore path [PARAM] does not exist.[BR][BR]Do you want to create the folder and continue?</value>
@@ -1483,4 +1462,343 @@
   <data name="mgrXML_ErrorImportFailure" xml:space="preserve">
     <value>The XML file cannot be read, it may be an invalid format or corrupted.[BR][BR][PARAM]</value>
   </data>
+  <data name="frmGameManager_DefaultExportFileName" xml:space="preserve">
+    <value>Game Backup Monitor Export</value>
+  </data>
+  <data name="frmMain_ChooseLogFile" xml:space="preserve">
+    <value>Choose a location for the log file</value>
+  </data>
+  <data name="frmMain_ConfirmLogClear" xml:space="preserve">
+    <value>Are you sure you want to clear the log?</value>
+  </data>
+  <data name="frmMain_DefaultLogFileName" xml:space="preserve">
+    <value>Game Backup Monitor Log</value>
+  </data>
+  <data name="frmMain_gMonLogClear" xml:space="preserve">
+    <value>&amp;Clear</value>
+  </data>
+  <data name="frmMain_gMonLogSave" xml:space="preserve">
+    <value>&amp;Save</value>
+  </data>
+  <data name="frmMain_gMonToolsLog" xml:space="preserve">
+    <value>&amp;Log</value>
+  </data>
+  <data name="frmMain_LogAutoSave" xml:space="preserve">
+    <value>The session log reached maximum length and has been auto-saved to [PARAM].</value>
+  </data>
+  <data name="frmMain_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="mgrCommon_ErrorWritingTextFile" xml:space="preserve">
+    <value>An error has occured writing the text file.[BR][BR][PARAM]</value>
+  </data>
+  <data name="frmSettings_cboCompression_Fast" xml:space="preserve">
+    <value>Fast</value>
+  </data>
+  <data name="frmSettings_cboCompression_Fastest" xml:space="preserve">
+    <value>Fastest</value>
+  </data>
+  <data name="frmSettings_cboCompression_Maximum" xml:space="preserve">
+    <value>Maximum</value>
+  </data>
+  <data name="frmSettings_cboCompression_None" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="frmSettings_cboCompression_Normal" xml:space="preserve">
+    <value>Normal</value>
+  </data>
+  <data name="frmSettings_cboCompression_Ultra" xml:space="preserve">
+    <value>Ultra</value>
+  </data>
+  <data name="frmSettings_grp7zGeneral" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="frmSettings_lblCompression" xml:space="preserve">
+    <value>Compression:</value>
+  </data>
+  <data name="frmMain_CommandFail" xml:space="preserve">
+    <value>The command has failed.</value>
+  </data>
+  <data name="frmMain_CommandSucess" xml:space="preserve">
+    <value>The command was executed successfully.</value>
+  </data>
+  <data name="frmMain_DeveloperConsole" xml:space="preserve">
+    <value>Developer Console</value>
+  </data>
+  <data name="frmMain_EnterCommand" xml:space="preserve">
+    <value>Enter Command</value>
+  </data>
+  <data name="frmMain_ErrorCommandBadParam" xml:space="preserve">
+    <value>Bad parameter ([PARAM]) for command [PARAM].</value>
+  </data>
+  <data name="frmMain_ErrorCommandInvalid" xml:space="preserve">
+    <value>The command [PARAM] was not recognized.</value>
+  </data>
+  <data name="frmMain_ErrorMissingParams" xml:space="preserve">
+    <value>The command [PARAM] requires more parameters.</value>
+  </data>
+  <data name="frmMain_ErrorInitFailure" xml:space="preserve">
+    <value>An unexpected error occured while initializing GBM.[BR][BR][PARAM][BR][BR]Do you wish to continue anyway? (Not Recommended)</value>
+  </data>
+  <data name="App_ErrorUnixNotAvailable" xml:space="preserve">
+    <value>This function is currently not available on a Unix based operating system.</value>
+  </data>
+  <data name="frmMain_PNGFilter" xml:space="preserve">
+    <value>PNG files (*.png)|*.png</value>
+  </data>
+  <data name="frmAdvancedImport_lblFilter" xml:space="preserve">
+    <value>Filter:</value>
+  </data>
+  <data name="frmAdvancedImport_ColumnName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="frmAdvancedImport_ColumnProcess" xml:space="preserve">
+    <value>Monitored Process</value>
+  </data>
+  <data name="frmAdvancedImport_ColumnTags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
+  <data name="frmAdvancedImport_Filtered" xml:space="preserve">
+    <value>[Filtered]</value>
+  </data>
+  <data name="frmAdvancedImport_chkSelectAll" xml:space="preserve">
+    <value>Select All</value>
+  </data>
+  <data name="frmMain_AtTime" xml:space="preserve">
+    <value>at [PARAM].</value>
+  </data>
+  <data name="frmFileFolderSearch_btnOk" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="frmFileFolderSearch_lblResults" xml:space="preserve">
+    <value>Search Results</value>
+  </data>
+  <data name="frmFileFolderSearch_SearchComplete" xml:space="preserve">
+    <value>Search Complete!</value>
+  </data>
+  <data name="frmFileFolderSearch_SearchCancel" xml:space="preserve">
+    <value>Search Aborted!</value>
+  </data>
+  <data name="frmSettings_btnDefaults" xml:space="preserve">
+    <value>Set &amp;Defaults</value>
+  </data>
+  <data name="frmSettings_lblArguments" xml:space="preserve">
+    <value>Custom Arguments:</value>
+  </data>
+  <data name="frmSettings_lblLocation" xml:space="preserve">
+    <value>Custom Location:</value>
+  </data>
+  <data name="frmSettings_7zaFileType" xml:space="preserve">
+    <value>Executable</value>
+  </data>
+  <data name="frmSettings_Browse7za" xml:space="preserve">
+    <value>Locate 7-Zip Console (7za)</value>
+  </data>
+  <data name="frmSettings_WarningArguments" xml:space="preserve">
+    <value>Invalid or poorly formatted 7-Zip arguments can cause backup or restore operations to fail.[BR][BR]If problems occur, clear the custom arguments and try again.</value>
+  </data>
+  <data name="frmMain_Error7zCustom" xml:space="preserve">
+    <value>The custom 7-Zip utility could not be found at:[BR][BR][PARAM][BR][BR]Please check your settings, the default 7-Zip utility will be used.</value>
+  </data>
+  <data name="frmSettings_ConfirmDefaults" xml:space="preserve">
+    <value>Do you want to revert all settings to their defaults?</value>
+  </data>
+  <data name="frmSettings_ErrorLocation" xml:space="preserve">
+    <value>The custom 7-Zip location [PARAM] does not exist.</value>
+  </data>
+  <data name="frmSettings_WarningLocation" xml:space="preserve">
+    <value>You have chosen a custom utility that does not appear to be 7-Zip. [BR][BR]GBM only supports the use of 7-Zip Console (7za).</value>
+  </data>
+  <data name="App_Invalid7zDetected" xml:space="preserve">
+    <value>7-Zip (7za.exe) is invalid and has been prevented from running.</value>
+  </data>
+  <data name="frmGameManager_lblQuickFilter" xml:space="preserve">
+    <value>Quick Filter:</value>
+  </data>
+  <data name="frmGameManager_ErrorNoValidBackup" xml:space="preserve">
+    <value>A backup cannot be run on the selected game(s) with their current configuration.</value>
+  </data>
+  <data name="frmSettings_btnOptionalFields" xml:space="preserve">
+    <value>Choose &amp;Optional Fields...</value>
+  </data>
+  <data name="frmSyncFields_btnCancel" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="frmSyncFields_btnSave" xml:space="preserve">
+    <value>&amp;Save</value>
+  </data>
+  <data name="frmSyncFields_chkCompany" xml:space="preserve">
+    <value>Company</value>
+  </data>
+  <data name="frmSyncFields_chkGamePath" xml:space="preserve">
+    <value>Game Path (Not Recommended)</value>
+  </data>
+  <data name="frmSyncFields_chkIcon" xml:space="preserve">
+    <value>Icon (Not Recommended)</value>
+  </data>
+  <data name="frmSyncFields_chkMonitorGame" xml:space="preserve">
+    <value>Monitor this game</value>
+  </data>
+  <data name="frmSyncFields_chkTimeStamp" xml:space="preserve">
+    <value>Save multiple backups</value>
+  </data>
+  <data name="frmSyncFields_chkVersion" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="frmSyncFields_FormName" xml:space="preserve">
+    <value>Optional Sync Fields</value>
+  </data>
+  <data name="frmSyncFields_grpFields" xml:space="preserve">
+    <value>Available Fields</value>
+  </data>
+  <data name="frmMain_LogAutoClear" xml:space="preserve">
+    <value>The session log reached maximum length and has been cleared.</value>
+  </data>
+  <data name="frmSettings_chkAutoSaveLog" xml:space="preserve">
+    <value>Autosave log when max length is exceeded</value>
+  </data>
+  <data name="frmSettings_grpGameData" xml:space="preserve">
+    <value>Game Data</value>
+  </data>
+  <data name="frmSettings_lstSettings_7z" xml:space="preserve">
+    <value>7-Zip</value>
+  </data>
+  <data name="frmSettings_lstSettings_BackupRestore" xml:space="preserve">
+    <value>Backup and Restore</value>
+  </data>
+  <data name="frmSettings_lstSettings_General" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="frmSettings_grp7zAdvanced" xml:space="preserve">
+    <value>Advanced</value>
+  </data>
+  <data name="frmSettings_grp7zInformation" xml:space="preserve">
+    <value>Version Information</value>
+  </data>
+  <data name="App_NotAvailable" xml:space="preserve">
+    <value>N/A</value>
+  </data>
+  <data name="App_URLImportLinux" xml:space="preserve">
+    <value>http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml</value>
+  </data>
+  <data name="frmGameManager_BrowseBackup" xml:space="preserve">
+    <value>Choose a new [PARAM] backup file</value>
+  </data>
+  <data name="frmGameManager_BrowseBackupType" xml:space="preserve">
+    <value>7-Zip</value>
+  </data>
+  <data name="frmGameManager_btnChangeBackup" xml:space="preserve">
+    <value>&amp;Change Backup File</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupChange" xml:space="preserve">
+    <value>[PARAM] will be the new backup file for [PARAM].[BR][BR]Is this correct?</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupChangeRestore" xml:space="preserve">
+    <value>Do you want to restore [PARAM] now?</value>
+  </data>
+  <data name="frmGameManager_ErrorBackupChangeFileName" xml:space="preserve">
+    <value>[PARAM] is already the current backup file.</value>
+  </data>
+  <data name="frmGameManager_ErrorBackupChangePath" xml:space="preserve">
+    <value>You cannot choose a file located outside the current [PARAM] backup folder.</value>
+  </data>
+  <data name="frmGameManager_lblLimit" xml:space="preserve">
+    <value>Backup Limit</value>
+  </data>
+  <data name="mgrBackup_BackupLimitExceeded" xml:space="preserve">
+    <value>[PARAM] was automatically removed.</value>
+  </data>
+  <data name="frmGameManager_cmsDeleteAll" xml:space="preserve">
+    <value>&amp;All Files</value>
+  </data>
+  <data name="frmGameManager_cmsDeleteOne" xml:space="preserve">
+    <value>&amp;Selected File</value>
+  </data>
+  <data name="frmGameManager_ConfirmBackupDeleteAll" xml:space="preserve">
+    <value>This will delete all backup files for [PARAM].  This cannot be undone. [BR][BR]Do you want to continue?</value>
+  </data>
+  <data name="frmAddWizard_lblLimit" xml:space="preserve">
+    <value>Backup Limit</value>
+  </data>
+  <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>
 </root>

GBM/readme.txt

@@ -1,36 +1,14 @@
-Game Backup Monitor v0.95 Readme
+Game Backup Monitor v1.03 Readme
 http://mikemaximus.github.io/gbm-web/
 gamebackupmonitor@gmail.com
 
-January 1, 2016
+August 2, 2017
 
-Disclaimer:
+New in 1.03
 
-This is beta release software.  You may still encounter some bugs.
+- (Windows) You can no longer Alt-Tab to GBM while it's minimized to the system tray.  This was an unintentional change in v1.02 and caused various bugs.
-
+- (Windows) Fixed various issues and inconsistent behavior when using the system tray and menu.
-Important Upgrade Notice:
+- (Linux) Free drive space is now checked correctly when performing a backup.  GBM now requires "df" (Coreutils) on Linux.
-
+- (All) Error messages related to SQLite will now be displayed correctly, instead of forcing the application to exit.
-- v0.95 changes how DOSBox games are detected and will break DOSBox configurations from prior versions.  Sorry for the inconvenience.
-- To repair a configuration, you'll need to delete the DOS executable part of the process field and make sure the case matches the DOSBox executable being used by the game.  
-- For example, Capitalism Plus using a process of "dosbox:CAPPLUS" and DOSBox.exe would become just "DOSBox".  
-- You can use the new "Custom" filter to easily find and update all your DOSBox games in the Game Manager.
-- Due to this change GBM can only detect DOS games that are using their own copy of DOSBox in a unique location.  Most users will be unaffected, classic games sold online are already packaged in this format.
-- Official configurations for DOSBox games are updated for this change.
-
-New in 0.95
-
-- Fixed a regression that caused non-critical fields (Game Path, Company, Version, Icon, Enabled, Monitor Only) to be wiped or reset on sync.
-- The "Check for new backups" feature has been renamed and redesigned. Instead of an annoying pop-up, it now shows a simple notification in the main menu or tray menu.
-- Added the ability to trigger backups only after a certain session time has elapsed (Global Setting), this setting will be disabled by default.
-- You can now cancel out of the "Choose Game" window when GBM detects multiple games may be running.
-- Added the ability to filter by game information such as name, process and company.
-- Many UI improvements and fixes with filtering.  The "Tag" filter is now called "Custom" filter, due to the new options available.
-- Added a new, more intuitive way of including and excluding items in a backup.  See the Game Manager section of the GBM manual for details.
-- Updated the "Add Game Wizard" to use the new include / exclude and tagging features.
-- Removed the special handling of DOSBox games for future proofing, DOSBox games will now be handled like all other games.
-- Moved the import and export game list features from the Tools menu into the Game Manager.
-- Made some visual improvements to the main app window.
-- Made changes that will allow GBM to be easily translated to other languages.
-- Many minor UI improvements and bug fixes.
 
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html

README.md

@@ -1,14 +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 Windows game or application.
+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 Only<br />
+**Language**: English ([Translation FAQ](http://mikemaximus.github.io/gbm-web/translations.html))<br />
-**Platform**: Windows Only (.NET 4)
+**Platform**: Windows (.NET 4) & Linux (Mono)
 
-[Game Backup Monitor FAQ] (http://mikemaximus.github.io/gbm-web/faq.html) <br />
+[About Game Backup Monitor](http://mikemaximus.github.io/gbm-web/about.html) <br />
-[Game Backup Monitor Manual] (http://mikemaximus.github.io/gbm-web/manual.html) <br />
+[Game Backup Monitor FAQ](http://mikemaximus.github.io/gbm-web/faq.html) <br />
-[List of Preconfigured Games] (http://mikemaximus.github.io/gbm-web/GBM_Official.xml) <br /> <br />
+[Game Backup Monitor Manual](http://mikemaximus.github.io/gbm-web/manual.html) <br />
-Updates regarding this project are available via the [Game Backup Monitor web site] (http://mikemaximus.github.io/gbm-web/).
+[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/).