Updates for issue #67

2017-02-19 21:22:57 -06:00
parent 5a9b3c99b3
commit 3bd4cbd0bd
8 changed files with 419 additions and 199 deletions
@@ -55,7 +55,7 @@ Public Class frmMain
    Public hshScanList As Hashtable
    Public oSettings As New mgrSettings

-    Delegate Sub UpdateNotifierCallBack(ByVal iCount As Integer)
+    Delegate Sub UpdateNotifierCallBack(ByVal iCount As Integer, ByVal bRestored As Boolean)
    Delegate Sub UpdateLogCallBack(ByVal sLogUpdate As String, ByVal bTrayUpdate As Boolean, ByVal objIcon As System.Windows.Forms.ToolTipIcon, ByVal bTimeStamp As Boolean)
    Delegate Sub WorkingGameInfoCallBack(ByVal sTitle As String, ByVal sStatus1 As String, ByVal sStatus2 As String, ByVal sStatus3 As String)
    Delegate Sub UpdateStatusCallBack(ByVal sStatus As String)
@@ -331,17 +331,25 @@ Public Class frmMain
        End If
    End Sub

-    Private Sub UpdateNotifier(ByVal iCount As Integer)
+    Private Sub UpdateNotifier(ByVal iCount As Integer, ByVal bRestored As Boolean)
        'Thread Safe
        If Me.InvokeRequired = True Then
            Dim d As New UpdateNotifierCallBack(AddressOf UpdateNotifier)
-            Me.Invoke(d, New Object() {iCount})
+            Me.Invoke(d, New Object() {iCount, bRestored})
        Else
            Dim sNotification As String
            If iCount > 1 Then
-                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationMulti, iCount)
+                If bRestored Then
+                    sNotification = mgrCommon.FormatString(frmMain_RestoreNotificationMulti, iCount)
+                Else
+                    sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationMulti, iCount)
+                End If
            Else
-                sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationSingle, iCount)
+                If bRestored Then
+                    sNotification = mgrCommon.FormatString(frmMain_RestoreNotificationSingle, iCount)
+                Else
+                    sNotification = mgrCommon.FormatString(frmMain_NewSaveNotificationSingle, iCount)
+                End If
            End If
            gMonNotification.Image = Icon_Inbox
            gMonTrayNotification.Image = Icon_Inbox
@@ -368,8 +376,10 @@ Public Class frmMain
        Dim sFileName As String
        Dim sExtractPath As String
        Dim bFinished As Boolean = True
+        Dim hshRestore As Hashtable
+        Dim hshGames As Hashtable

-        'Bail out and shut down the timer if there's nothing to do
+        'Shut down the timer and bail out if there's nothing to do
        If slRestoreData.Count = 0 Then
            tmRestoreCheck.Stop()
            tmRestoreCheck.Enabled = False
@@ -391,18 +401,20 @@ Public Class frmMain
            End If

            'Check if the restore location exists,  if not we assume the game is not installed and should be auto-marked.
-            If oBackup.AbsolutePath Then
-                sExtractPath = oBackup.RestorePath
-            Else
-                sExtractPath = oBackup.RelativeRestorePath
-            End If
-            If Not IO.Directory.Exists(sExtractPath) Then
-                If mgrManifest.DoGlobalManifestCheck(de.Key, mgrSQLite.Database.Local) Then
-                    mgrManifest.DoManifestUpdateByName(de.Value, mgrSQLite.Database.Local)
+            If oSettings.AutoMark Then
+                If oBackup.AbsolutePath Then
+                    sExtractPath = oBackup.RestorePath
                Else
-                    mgrManifest.DoManifestAdd(de.Value, mgrSQLite.Database.Local)
+                    sExtractPath = oBackup.RelativeRestorePath
+                End If
+                If Not IO.Directory.Exists(sExtractPath) Then
+                    If mgrManifest.DoGlobalManifestCheck(de.Key, mgrSQLite.Database.Local) Then
+                        mgrManifest.DoManifestUpdateByName(de.Value, mgrSQLite.Database.Local)
+                    Else
+                        mgrManifest.DoManifestAdd(de.Value, mgrSQLite.Database.Local)
+                    End If
+                    sNotInstalled.Add(de.Key)
                End If
-                sNotInstalled.Add(de.Key)
            End If
        Next

@@ -418,9 +430,27 @@ Public Class frmMain
            UpdateLog(mgrCommon.FormatString(frmMain_AutoMarked, s), False, ToolTipIcon.Info, True)
        Next

-        'When backup files are ready update the notifier
-        If slRestoreData.Count > 0 Then
-            UpdateNotifier(slRestoreData.Count)
+        'Automatically restore backup files
+        If oSettings.AutoRestore Then
+            If slRestoreData.Count > 0 Then
+                hshRestore = New Hashtable
+                For Each de As DictionaryEntry In slRestoreData
+                    hshGames = mgrMonitorList.DoListGetbyName(de.Key)
+                    If hshGames.Count = 1 Then
+                        hshRestore.Add(hshGames(0), de.Value)
+                    Else
+                        UpdateLog(mgrCommon.FormatString(frmMain_AutoRestoreFailure, de.Key), False, ToolTipIcon.Info, True)
+                    End If
+                Next
+                RunRestore(hshRestore)
+            End If
+        End If
+
+        'Update the notifier
+        If oSettings.RestoreOnLaunch Then
+            If slRestoreData.Count > 0 Then
+                UpdateNotifier(slRestoreData.Count, oSettings.AutoMark)
+            End If
        End If

        'Shutdown if we are finished
@@ -846,7 +876,7 @@ Public Class frmMain
    End Sub

    Private Sub CheckForNewBackups()
-        If oSettings.RestoreOnLaunch Then
+        If oSettings.RestoreOnLaunch Or oSettings.AutoRestore Or oSettings.AutoMark Then
            StartRestoreCheck()
        End If
    End Sub
@@ -23,7 +23,6 @@ Partial Class frmSettings
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox()
-        Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
        Me.grpStartup = New System.Windows.Forms.GroupBox()
        Me.chkStartWindows = New System.Windows.Forms.CheckBox()
        Me.chkStartToTray = New System.Windows.Forms.CheckBox()
@@ -39,12 +38,6 @@ Partial Class frmSettings
        Me.chkCreateFolder = New System.Windows.Forms.CheckBox()
        Me.btnSave = New System.Windows.Forms.Button()
        Me.btnCancel = New System.Windows.Forms.Button()
-        Me.lblMinutes = New System.Windows.Forms.Label()
-        Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown()
-        Me.chkSupressBackup = New System.Windows.Forms.CheckBox()
-        Me.chkCheckSum = New System.Windows.Forms.CheckBox()
-        Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox()
-        Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
        Me.grp7zGeneral = New System.Windows.Forms.GroupBox()
        Me.cboCompression = New System.Windows.Forms.ComboBox()
        Me.lblCompression = New System.Windows.Forms.Label()
@@ -57,17 +50,28 @@ Partial Class frmSettings
        Me.lbl7zProduct = New System.Windows.Forms.Label()
        Me.btnDefaults = New System.Windows.Forms.Button()
        Me.pnlBackup = New System.Windows.Forms.Panel()
+        Me.lblMinutes = New System.Windows.Forms.Label()
+        Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown()
+        Me.chkSupressBackup = New System.Windows.Forms.CheckBox()
+        Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
+        Me.chkCheckSum = New System.Windows.Forms.CheckBox()
+        Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
+        Me.grpBackupHandling = New System.Windows.Forms.GroupBox()
+        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.chkRestoreNotify = New System.Windows.Forms.CheckBox()
+        Me.chkAutoRestore = New System.Windows.Forms.CheckBox()
        Me.grpStartup.SuspendLayout()
        Me.grpFolderOptions.SuspendLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.grp7zGeneral.SuspendLayout()
        Me.pnlBackup.SuspendLayout()
+        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.grpBackupHandling.SuspendLayout()
        Me.pnl7z.SuspendLayout()
        Me.grp7zAdvanced.SuspendLayout()
        Me.grp7zInformation.SuspendLayout()
@@ -78,31 +82,24 @@ Partial Class frmSettings
        'chkMonitorOnStartup
        '
        Me.chkMonitorOnStartup.AutoSize = True
-        Me.chkMonitorOnStartup.Location = New System.Drawing.Point(6, 65)
+        Me.chkMonitorOnStartup.Location = New System.Drawing.Point(8, 80)
+        Me.chkMonitorOnStartup.Margin = New System.Windows.Forms.Padding(4)
        Me.chkMonitorOnStartup.Name = "chkMonitorOnStartup"
-        Me.chkMonitorOnStartup.Size = New System.Drawing.Size(146, 17)
+        Me.chkMonitorOnStartup.Size = New System.Drawing.Size(192, 21)
        Me.chkMonitorOnStartup.TabIndex = 2
        Me.chkMonitorOnStartup.Text = "Start monitoring at launch"
        Me.chkMonitorOnStartup.UseVisualStyleBackColor = True
        '
-        'chkBackupConfirm
-        '
-        Me.chkBackupConfirm.AutoSize = True
-        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 88)
-        Me.chkBackupConfirm.Name = "chkBackupConfirm"
-        Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
-        Me.chkBackupConfirm.TabIndex = 1
-        Me.chkBackupConfirm.Text = "Disable backup confirmation"
-        Me.chkBackupConfirm.UseVisualStyleBackColor = True
-        '
        'grpStartup
        '
        Me.grpStartup.Controls.Add(Me.chkStartWindows)
        Me.grpStartup.Controls.Add(Me.chkStartToTray)
        Me.grpStartup.Controls.Add(Me.chkMonitorOnStartup)
-        Me.grpStartup.Location = New System.Drawing.Point(6, 12)
+        Me.grpStartup.Location = New System.Drawing.Point(8, 15)
+        Me.grpStartup.Margin = New System.Windows.Forms.Padding(4)
        Me.grpStartup.Name = "grpStartup"
-        Me.grpStartup.Size = New System.Drawing.Size(354, 90)
+        Me.grpStartup.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpStartup.Size = New System.Drawing.Size(472, 111)
        Me.grpStartup.TabIndex = 0
        Me.grpStartup.TabStop = False
        Me.grpStartup.Text = "Startup"
@@ -110,9 +107,10 @@ Partial Class frmSettings
        'chkStartWindows
        '
        Me.chkStartWindows.AutoSize = True
-        Me.chkStartWindows.Location = New System.Drawing.Point(6, 19)
+        Me.chkStartWindows.Location = New System.Drawing.Point(8, 23)
+        Me.chkStartWindows.Margin = New System.Windows.Forms.Padding(4)
        Me.chkStartWindows.Name = "chkStartWindows"
-        Me.chkStartWindows.Size = New System.Drawing.Size(117, 17)
+        Me.chkStartWindows.Size = New System.Drawing.Size(148, 21)
        Me.chkStartWindows.TabIndex = 0
        Me.chkStartWindows.Text = "Start with Windows"
        Me.chkStartWindows.UseVisualStyleBackColor = True
@@ -120,9 +118,10 @@ Partial Class frmSettings
        'chkStartToTray
        '
        Me.chkStartToTray.AutoSize = True
-        Me.chkStartToTray.Location = New System.Drawing.Point(6, 42)
+        Me.chkStartToTray.Location = New System.Drawing.Point(8, 52)
+        Me.chkStartToTray.Margin = New System.Windows.Forms.Padding(4)
        Me.chkStartToTray.Name = "chkStartToTray"
-        Me.chkStartToTray.Size = New System.Drawing.Size(115, 17)
+        Me.chkStartToTray.Size = New System.Drawing.Size(152, 21)
        Me.chkStartToTray.TabIndex = 1
        Me.chkStartToTray.Text = "Start to system tray"
        Me.chkStartToTray.UseVisualStyleBackColor = True
@@ -130,18 +129,20 @@ Partial Class frmSettings
        'chkAutoSaveLog
        '
        Me.chkAutoSaveLog.AutoSize = True
-        Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204)
+        Me.chkAutoSaveLog.Location = New System.Drawing.Point(8, 251)
+        Me.chkAutoSaveLog.Margin = New System.Windows.Forms.Padding(4)
        Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
-        Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
+        Me.chkAutoSaveLog.Size = New System.Drawing.Size(300, 21)
        Me.chkAutoSaveLog.TabIndex = 7
        Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
        Me.chkAutoSaveLog.UseVisualStyleBackColor = True
        '
        'btnOptionalFields
        '
-        Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38)
+        Me.btnOptionalFields.Location = New System.Drawing.Point(147, 47)
+        Me.btnOptionalFields.Margin = New System.Windows.Forms.Padding(4)
        Me.btnOptionalFields.Name = "btnOptionalFields"
-        Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23)
+        Me.btnOptionalFields.Size = New System.Drawing.Size(179, 28)
        Me.btnOptionalFields.TabIndex = 6
        Me.btnOptionalFields.Text = "Choose &Optional Fields..."
        Me.btnOptionalFields.UseVisualStyleBackColor = True
@@ -149,9 +150,10 @@ Partial Class frmSettings
        'chkTimeTracking
        '
        Me.chkTimeTracking.AutoSize = True
-        Me.chkTimeTracking.Location = New System.Drawing.Point(6, 19)
+        Me.chkTimeTracking.Location = New System.Drawing.Point(8, 23)
+        Me.chkTimeTracking.Margin = New System.Windows.Forms.Padding(4)
        Me.chkTimeTracking.Name = "chkTimeTracking"
-        Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17)
+        Me.chkTimeTracking.Size = New System.Drawing.Size(158, 21)
        Me.chkTimeTracking.TabIndex = 4
        Me.chkTimeTracking.Text = "Enable time tracking"
        Me.chkTimeTracking.UseVisualStyleBackColor = True
@@ -159,9 +161,10 @@ Partial Class frmSettings
        'chkSync
        '
        Me.chkSync.AutoSize = True
-        Me.chkSync.Location = New System.Drawing.Point(6, 42)
+        Me.chkSync.Location = New System.Drawing.Point(8, 52)
+        Me.chkSync.Margin = New System.Windows.Forms.Padding(4)
        Me.chkSync.Name = "chkSync"
-        Me.chkSync.Size = New System.Drawing.Size(98, 17)
+        Me.chkSync.Size = New System.Drawing.Size(126, 21)
        Me.chkSync.TabIndex = 5
        Me.chkSync.Text = "Enable syncing"
        Me.chkSync.UseVisualStyleBackColor = True
@@ -169,9 +172,10 @@ Partial Class frmSettings
        'chkShowDetectionTips
        '
        Me.chkShowDetectionTips.AutoSize = True
-        Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181)
+        Me.chkShowDetectionTips.Location = New System.Drawing.Point(8, 223)
+        Me.chkShowDetectionTips.Margin = New System.Windows.Forms.Padding(4)
        Me.chkShowDetectionTips.Name = "chkShowDetectionTips"
-        Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17)
+        Me.chkShowDetectionTips.Size = New System.Drawing.Size(205, 21)
        Me.chkShowDetectionTips.TabIndex = 3
        Me.chkShowDetectionTips.Text = "Show detection notifications"
        Me.chkShowDetectionTips.UseVisualStyleBackColor = True
@@ -182,18 +186,21 @@ Partial Class frmSettings
        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.Location = New System.Drawing.Point(8, 15)
+        Me.grpFolderOptions.Margin = New System.Windows.Forms.Padding(4)
        Me.grpFolderOptions.Name = "grpFolderOptions"
-        Me.grpFolderOptions.Size = New System.Drawing.Size(354, 70)
+        Me.grpFolderOptions.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpFolderOptions.Size = New System.Drawing.Size(472, 86)
        Me.grpFolderOptions.TabIndex = 1
        Me.grpFolderOptions.TabStop = False
        Me.grpFolderOptions.Text = "Folders"
        '
        'btnBackupFolder
        '
-        Me.btnBackupFolder.Location = New System.Drawing.Point(313, 17)
+        Me.btnBackupFolder.Location = New System.Drawing.Point(417, 21)
+        Me.btnBackupFolder.Margin = New System.Windows.Forms.Padding(4)
        Me.btnBackupFolder.Name = "btnBackupFolder"
-        Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20)
+        Me.btnBackupFolder.Size = New System.Drawing.Size(36, 25)
        Me.btnBackupFolder.TabIndex = 2
        Me.btnBackupFolder.Text = "..."
        Me.btnBackupFolder.UseVisualStyleBackColor = True
@@ -201,25 +208,28 @@ Partial Class frmSettings
        'lblBackupFolder
        '
        Me.lblBackupFolder.AutoSize = True
-        Me.lblBackupFolder.Location = New System.Drawing.Point(6, 20)
+        Me.lblBackupFolder.Location = New System.Drawing.Point(8, 25)
+        Me.lblBackupFolder.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblBackupFolder.Name = "lblBackupFolder"
-        Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13)
+        Me.lblBackupFolder.Size = New System.Drawing.Size(103, 17)
        Me.lblBackupFolder.TabIndex = 0
        Me.lblBackupFolder.Text = "Backup Folder:"
        '
        'txtBackupFolder
        '
-        Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17)
+        Me.txtBackupFolder.Location = New System.Drawing.Point(121, 21)
+        Me.txtBackupFolder.Margin = New System.Windows.Forms.Padding(4)
        Me.txtBackupFolder.Name = "txtBackupFolder"
-        Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20)
+        Me.txtBackupFolder.Size = New System.Drawing.Size(287, 22)
        Me.txtBackupFolder.TabIndex = 1
        '
        'chkCreateFolder
        '
        Me.chkCreateFolder.AutoSize = True
-        Me.chkCreateFolder.Location = New System.Drawing.Point(9, 43)
+        Me.chkCreateFolder.Location = New System.Drawing.Point(12, 53)
+        Me.chkCreateFolder.Margin = New System.Windows.Forms.Padding(4)
        Me.chkCreateFolder.Name = "chkCreateFolder"
-        Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17)
+        Me.chkCreateFolder.Size = New System.Drawing.Size(247, 21)
        Me.chkCreateFolder.TabIndex = 3
        Me.chkCreateFolder.Text = "Create a sub-folder for each game"
        Me.chkCreateFolder.UseVisualStyleBackColor = True
@@ -227,9 +237,10 @@ Partial Class frmSettings
        'btnSave
        '
        Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.btnSave.Location = New System.Drawing.Point(384, 321)
+        Me.btnSave.Location = New System.Drawing.Point(512, 395)
+        Me.btnSave.Margin = New System.Windows.Forms.Padding(4)
        Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.Size = New System.Drawing.Size(100, 28)
        Me.btnSave.TabIndex = 5
        Me.btnSave.Text = "&Save"
        Me.btnSave.UseVisualStyleBackColor = True
@@ -237,77 +248,23 @@ Partial Class frmSettings
        'btnCancel
        '
        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.Location = New System.Drawing.Point(465, 321)
+        Me.btnCancel.Location = New System.Drawing.Point(620, 395)
+        Me.btnCancel.Margin = New System.Windows.Forms.Padding(4)
        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.Size = New System.Drawing.Size(100, 28)
        Me.btnCancel.TabIndex = 6
        Me.btnCancel.Text = "&Cancel"
        Me.btnCancel.UseVisualStyleBackColor = True
        '
-        'lblMinutes
-        '
-        Me.lblMinutes.AutoSize = True
-        Me.lblMinutes.Location = New System.Drawing.Point(286, 181)
-        Me.lblMinutes.Name = "lblMinutes"
-        Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
-        Me.lblMinutes.TabIndex = 7
-        Me.lblMinutes.Text = "minutes"
-        '
-        'nudSupressBackupThreshold
-        '
-        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 179)
-        Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
-        Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
-        Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20)
-        Me.nudSupressBackupThreshold.TabIndex = 6
-        '
-        'chkSupressBackup
-        '
-        Me.chkSupressBackup.AutoSize = True
-        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 180)
-        Me.chkSupressBackup.Name = "chkSupressBackup"
-        Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17)
-        Me.chkSupressBackup.TabIndex = 5
-        Me.chkSupressBackup.Text = "Backup only when session time exceeds"
-        Me.chkSupressBackup.UseVisualStyleBackColor = True
-        '
-        'chkCheckSum
-        '
-        Me.chkCheckSum.AutoSize = True
-        Me.chkCheckSum.Location = New System.Drawing.Point(6, 134)
-        Me.chkCheckSum.Name = "chkCheckSum"
-        Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
-        Me.chkCheckSum.TabIndex = 3
-        Me.chkCheckSum.Text = "Verify backup files with a checksum"
-        Me.chkCheckSum.UseVisualStyleBackColor = True
-        '
-        'chkRestoreOnLaunch
-        '
-        Me.chkRestoreOnLaunch.AutoSize = True
-        Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 157)
-        Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch"
-        Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17)
-        Me.chkRestoreOnLaunch.TabIndex = 4
-        Me.chkRestoreOnLaunch.Text = "Notify when there are new backup files to restore"
-        Me.chkRestoreOnLaunch.UseVisualStyleBackColor = True
-        '
-        'chkOverwriteWarning
-        '
-        Me.chkOverwriteWarning.AutoSize = True
-        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 111)
-        Me.chkOverwriteWarning.Name = "chkOverwriteWarning"
-        Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17)
-        Me.chkOverwriteWarning.TabIndex = 2
-        Me.chkOverwriteWarning.Text = "Show overwrite warning"
-        Me.chkOverwriteWarning.UseVisualStyleBackColor = True
-        '
        'grp7zGeneral
        '
        Me.grp7zGeneral.Controls.Add(Me.cboCompression)
        Me.grp7zGeneral.Controls.Add(Me.lblCompression)
-        Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12)
+        Me.grp7zGeneral.Location = New System.Drawing.Point(8, 15)
+        Me.grp7zGeneral.Margin = New System.Windows.Forms.Padding(4)
        Me.grp7zGeneral.Name = "grp7zGeneral"
-        Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50)
+        Me.grp7zGeneral.Padding = New System.Windows.Forms.Padding(4)
+        Me.grp7zGeneral.Size = New System.Drawing.Size(472, 62)
        Me.grp7zGeneral.TabIndex = 0
        Me.grp7zGeneral.TabStop = False
        Me.grp7zGeneral.Text = "General"
@@ -316,84 +273,94 @@ Partial Class frmSettings
        '
        Me.cboCompression.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboCompression.FormattingEnabled = True
-        Me.cboCompression.Location = New System.Drawing.Point(110, 17)
+        Me.cboCompression.Location = New System.Drawing.Point(147, 21)
+        Me.cboCompression.Margin = New System.Windows.Forms.Padding(4)
        Me.cboCompression.Name = "cboCompression"
-        Me.cboCompression.Size = New System.Drawing.Size(238, 21)
+        Me.cboCompression.Size = New System.Drawing.Size(316, 24)
        Me.cboCompression.TabIndex = 1
        '
        'lblCompression
        '
        Me.lblCompression.AutoSize = True
-        Me.lblCompression.Location = New System.Drawing.Point(6, 20)
+        Me.lblCompression.Location = New System.Drawing.Point(8, 25)
+        Me.lblCompression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblCompression.Name = "lblCompression"
-        Me.lblCompression.Size = New System.Drawing.Size(70, 13)
+        Me.lblCompression.Size = New System.Drawing.Size(94, 17)
        Me.lblCompression.TabIndex = 0
        Me.lblCompression.Text = "Compression:"
        '
        'btn7zLocation
        '
-        Me.btn7zLocation.Location = New System.Drawing.Point(313, 41)
+        Me.btn7zLocation.Location = New System.Drawing.Point(417, 50)
+        Me.btn7zLocation.Margin = New System.Windows.Forms.Padding(4)
        Me.btn7zLocation.Name = "btn7zLocation"
-        Me.btn7zLocation.Size = New System.Drawing.Size(27, 20)
+        Me.btn7zLocation.Size = New System.Drawing.Size(36, 25)
        Me.btn7zLocation.TabIndex = 5
        Me.btn7zLocation.Text = "..."
        Me.btn7zLocation.UseVisualStyleBackColor = True
        '
        'txt7zLocation
        '
-        Me.txt7zLocation.Location = New System.Drawing.Point(110, 41)
+        Me.txt7zLocation.Location = New System.Drawing.Point(147, 50)
+        Me.txt7zLocation.Margin = New System.Windows.Forms.Padding(4)
        Me.txt7zLocation.Name = "txt7zLocation"
-        Me.txt7zLocation.Size = New System.Drawing.Size(197, 20)
+        Me.txt7zLocation.Size = New System.Drawing.Size(261, 22)
        Me.txt7zLocation.TabIndex = 4
        '
        'lblLocation
        '
        Me.lblLocation.AutoSize = True
-        Me.lblLocation.Location = New System.Drawing.Point(6, 44)
+        Me.lblLocation.Location = New System.Drawing.Point(8, 54)
+        Me.lblLocation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblLocation.Name = "lblLocation"
-        Me.lblLocation.Size = New System.Drawing.Size(89, 13)
+        Me.lblLocation.Size = New System.Drawing.Size(117, 17)
        Me.lblLocation.TabIndex = 4
        Me.lblLocation.Text = "Custom Location:"
        '
        'txt7zArguments
        '
-        Me.txt7zArguments.Location = New System.Drawing.Point(110, 15)
+        Me.txt7zArguments.Location = New System.Drawing.Point(147, 18)
+        Me.txt7zArguments.Margin = New System.Windows.Forms.Padding(4)
        Me.txt7zArguments.Name = "txt7zArguments"
-        Me.txt7zArguments.Size = New System.Drawing.Size(238, 20)
+        Me.txt7zArguments.Size = New System.Drawing.Size(316, 22)
        Me.txt7zArguments.TabIndex = 3
        '
        'lblArguments
        '
        Me.lblArguments.AutoSize = True
-        Me.lblArguments.Location = New System.Drawing.Point(6, 20)
+        Me.lblArguments.Location = New System.Drawing.Point(8, 25)
+        Me.lblArguments.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblArguments.Name = "lblArguments"
-        Me.lblArguments.Size = New System.Drawing.Size(98, 13)
+        Me.lblArguments.Size = New System.Drawing.Size(131, 17)
        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.Location = New System.Drawing.Point(12, 42)
+        Me.lbl7zCopyright.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lbl7zCopyright.Name = "lbl7zCopyright"
-        Me.lbl7zCopyright.Size = New System.Drawing.Size(339, 17)
+        Me.lbl7zCopyright.Size = New System.Drawing.Size(452, 21)
        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.Location = New System.Drawing.Point(12, 21)
+        Me.lbl7zProduct.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lbl7zProduct.Name = "lbl7zProduct"
-        Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17)
+        Me.lbl7zProduct.Size = New System.Drawing.Size(452, 21)
        Me.lbl7zProduct.TabIndex = 7
        Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
        'btnDefaults
        '
-        Me.btnDefaults.Location = New System.Drawing.Point(12, 321)
+        Me.btnDefaults.Location = New System.Drawing.Point(16, 395)
+        Me.btnDefaults.Margin = New System.Windows.Forms.Padding(4)
        Me.btnDefaults.Name = "btnDefaults"
-        Me.btnDefaults.Size = New System.Drawing.Size(110, 23)
+        Me.btnDefaults.Size = New System.Drawing.Size(147, 28)
        Me.btnDefaults.TabIndex = 4
        Me.btnDefaults.Text = "Set &Defaults"
        Me.btnDefaults.UseVisualStyleBackColor = True
@@ -402,25 +369,113 @@ Partial Class frmSettings
        '
        Me.pnlBackup.Controls.Add(Me.lblMinutes)
        Me.pnlBackup.Controls.Add(Me.nudSupressBackupThreshold)
-        Me.pnlBackup.Controls.Add(Me.grpFolderOptions)
        Me.pnlBackup.Controls.Add(Me.chkSupressBackup)
        Me.pnlBackup.Controls.Add(Me.chkBackupConfirm)
        Me.pnlBackup.Controls.Add(Me.chkCheckSum)
        Me.pnlBackup.Controls.Add(Me.chkOverwriteWarning)
-        Me.pnlBackup.Controls.Add(Me.chkRestoreOnLaunch)
-        Me.pnlBackup.Location = New System.Drawing.Point(180, 0)
+        Me.pnlBackup.Controls.Add(Me.grpBackupHandling)
+        Me.pnlBackup.Controls.Add(Me.grpFolderOptions)
+        Me.pnlBackup.Location = New System.Drawing.Point(240, 0)
+        Me.pnlBackup.Margin = New System.Windows.Forms.Padding(4)
        Me.pnlBackup.Name = "pnlBackup"
-        Me.pnlBackup.Size = New System.Drawing.Size(367, 314)
+        Me.pnlBackup.Size = New System.Drawing.Size(489, 386)
        Me.pnlBackup.TabIndex = 3
        '
+        'lblMinutes
+        '
+        Me.lblMinutes.AutoSize = True
+        Me.lblMinutes.Location = New System.Drawing.Point(381, 309)
+        Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblMinutes.Name = "lblMinutes"
+        Me.lblMinutes.Size = New System.Drawing.Size(57, 17)
+        Me.lblMinutes.TabIndex = 14
+        Me.lblMinutes.Text = "minutes"
+        '
+        'nudSupressBackupThreshold
+        '
+        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(305, 306)
+        Me.nudSupressBackupThreshold.Margin = New System.Windows.Forms.Padding(4)
+        Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
+        Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
+        Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(68, 22)
+        Me.nudSupressBackupThreshold.TabIndex = 13
+        '
+        'chkSupressBackup
+        '
+        Me.chkSupressBackup.AutoSize = True
+        Me.chkSupressBackup.Location = New System.Drawing.Point(8, 308)
+        Me.chkSupressBackup.Margin = New System.Windows.Forms.Padding(4)
+        Me.chkSupressBackup.Name = "chkSupressBackup"
+        Me.chkSupressBackup.Size = New System.Drawing.Size(282, 21)
+        Me.chkSupressBackup.TabIndex = 12
+        Me.chkSupressBackup.Text = "Backup only when session time exceeds"
+        Me.chkSupressBackup.UseVisualStyleBackColor = True
+        '
+        'chkBackupConfirm
+        '
+        Me.chkBackupConfirm.AutoSize = True
+        Me.chkBackupConfirm.Location = New System.Drawing.Point(8, 222)
+        Me.chkBackupConfirm.Margin = New System.Windows.Forms.Padding(4)
+        Me.chkBackupConfirm.Name = "chkBackupConfirm"
+        Me.chkBackupConfirm.Size = New System.Drawing.Size(208, 21)
+        Me.chkBackupConfirm.TabIndex = 9
+        Me.chkBackupConfirm.Text = "Disable backup confirmation"
+        Me.chkBackupConfirm.UseVisualStyleBackColor = True
+        '
+        'chkCheckSum
+        '
+        Me.chkCheckSum.AutoSize = True
+        Me.chkCheckSum.Location = New System.Drawing.Point(8, 279)
+        Me.chkCheckSum.Margin = New System.Windows.Forms.Padding(4)
+        Me.chkCheckSum.Name = "chkCheckSum"
+        Me.chkCheckSum.Size = New System.Drawing.Size(252, 21)
+        Me.chkCheckSum.TabIndex = 11
+        Me.chkCheckSum.Text = "Verify backup files with a checksum"
+        Me.chkCheckSum.UseVisualStyleBackColor = True
+        '
+        'chkOverwriteWarning
+        '
+        Me.chkOverwriteWarning.AutoSize = True
+        Me.chkOverwriteWarning.Location = New System.Drawing.Point(8, 251)
+        Me.chkOverwriteWarning.Margin = New System.Windows.Forms.Padding(4)
+        Me.chkOverwriteWarning.Name = "chkOverwriteWarning"
+        Me.chkOverwriteWarning.Size = New System.Drawing.Size(178, 21)
+        Me.chkOverwriteWarning.TabIndex = 10
+        Me.chkOverwriteWarning.Text = "Show overwrite warning"
+        Me.chkOverwriteWarning.UseVisualStyleBackColor = True
+        '
+        'grpBackupHandling
+        '
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoRestore)
+        Me.grpBackupHandling.Controls.Add(Me.chkRestoreNotify)
+        Me.grpBackupHandling.Controls.Add(Me.chkAutoMark)
+        Me.grpBackupHandling.Location = New System.Drawing.Point(8, 108)
+        Me.grpBackupHandling.Name = "grpBackupHandling"
+        Me.grpBackupHandling.Size = New System.Drawing.Size(472, 107)
+        Me.grpBackupHandling.TabIndex = 8
+        Me.grpBackupHandling.TabStop = False
+        Me.grpBackupHandling.Text = "Backup Handling"
+        '
+        'chkAutoMark
+        '
+        Me.chkAutoMark.AutoSize = True
+        Me.chkAutoMark.Location = New System.Drawing.Point(11, 78)
+        Me.chkAutoMark.Margin = New System.Windows.Forms.Padding(4)
+        Me.chkAutoMark.Name = "chkAutoMark"
+        Me.chkAutoMark.Size = New System.Drawing.Size(395, 21)
+        Me.chkAutoMark.TabIndex = 5
+        Me.chkAutoMark.Text = "Automatically mark 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.Location = New System.Drawing.Point(240, 0)
+        Me.pnl7z.Margin = New System.Windows.Forms.Padding(4)
        Me.pnl7z.Name = "pnl7z"
-        Me.pnl7z.Size = New System.Drawing.Size(367, 314)
+        Me.pnl7z.Size = New System.Drawing.Size(489, 386)
        Me.pnl7z.TabIndex = 2
        '
        'grp7zAdvanced
@@ -430,9 +485,11 @@ Partial Class frmSettings
        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.Location = New System.Drawing.Point(8, 84)
+        Me.grp7zAdvanced.Margin = New System.Windows.Forms.Padding(4)
        Me.grp7zAdvanced.Name = "grp7zAdvanced"
-        Me.grp7zAdvanced.Size = New System.Drawing.Size(354, 73)
+        Me.grp7zAdvanced.Padding = New System.Windows.Forms.Padding(4)
+        Me.grp7zAdvanced.Size = New System.Drawing.Size(472, 90)
        Me.grp7zAdvanced.TabIndex = 2
        Me.grp7zAdvanced.TabStop = False
        Me.grp7zAdvanced.Text = "Advanced"
@@ -441,9 +498,11 @@ Partial Class frmSettings
        '
        Me.grp7zInformation.Controls.Add(Me.lbl7zProduct)
        Me.grp7zInformation.Controls.Add(Me.lbl7zCopyright)
-        Me.grp7zInformation.Location = New System.Drawing.Point(6, 146)
+        Me.grp7zInformation.Location = New System.Drawing.Point(8, 180)
+        Me.grp7zInformation.Margin = New System.Windows.Forms.Padding(4)
        Me.grp7zInformation.Name = "grp7zInformation"
-        Me.grp7zInformation.Size = New System.Drawing.Size(354, 63)
+        Me.grp7zInformation.Padding = New System.Windows.Forms.Padding(4)
+        Me.grp7zInformation.Size = New System.Drawing.Size(472, 78)
        Me.grp7zInformation.TabIndex = 1
        Me.grp7zInformation.TabStop = False
        Me.grp7zInformation.Text = "Utility Information"
@@ -454,9 +513,10 @@ Partial Class frmSettings
        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.Location = New System.Drawing.Point(240, 0)
+        Me.pnlGeneral.Margin = New System.Windows.Forms.Padding(4)
        Me.pnlGeneral.Name = "pnlGeneral"
-        Me.pnlGeneral.Size = New System.Drawing.Size(367, 314)
+        Me.pnlGeneral.Size = New System.Drawing.Size(489, 386)
        Me.pnlGeneral.TabIndex = 1
        '
        'grpGameData
@@ -464,9 +524,11 @@ Partial Class frmSettings
        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.Location = New System.Drawing.Point(8, 130)
+        Me.grpGameData.Margin = New System.Windows.Forms.Padding(4)
        Me.grpGameData.Name = "grpGameData"
-        Me.grpGameData.Size = New System.Drawing.Size(354, 69)
+        Me.grpGameData.Padding = New System.Windows.Forms.Padding(4)
+        Me.grpGameData.Size = New System.Drawing.Size(472, 85)
        Me.grpGameData.TabIndex = 1
        Me.grpGameData.TabStop = False
        Me.grpGameData.Text = "Game Data"
@@ -474,24 +536,47 @@ Partial Class frmSettings
        'lstSettings
        '
        Me.lstSettings.FormattingEnabled = True
-        Me.lstSettings.Location = New System.Drawing.Point(12, 12)
+        Me.lstSettings.ItemHeight = 16
+        Me.lstSettings.Location = New System.Drawing.Point(16, 15)
+        Me.lstSettings.Margin = New System.Windows.Forms.Padding(4)
        Me.lstSettings.Name = "lstSettings"
-        Me.lstSettings.Size = New System.Drawing.Size(162, 303)
+        Me.lstSettings.Size = New System.Drawing.Size(215, 372)
        Me.lstSettings.TabIndex = 0
        '
+        'chkRestoreNotify
+        '
+        Me.chkRestoreNotify.AutoSize = True
+        Me.chkRestoreNotify.Location = New System.Drawing.Point(11, 23)
+        Me.chkRestoreNotify.Name = "chkRestoreNotify"
+        Me.chkRestoreNotify.Size = New System.Drawing.Size(257, 21)
+        Me.chkRestoreNotify.TabIndex = 8
+        Me.chkRestoreNotify.Text = "Notify about new backups to restore"
+        Me.chkRestoreNotify.UseVisualStyleBackColor = True
+        '
+        'chkAutoRestore
+        '
+        Me.chkAutoRestore.AutoSize = True
+        Me.chkAutoRestore.Location = New System.Drawing.Point(11, 50)
+        Me.chkAutoRestore.Name = "chkAutoRestore"
+        Me.chkAutoRestore.Size = New System.Drawing.Size(248, 21)
+        Me.chkAutoRestore.TabIndex = 9
+        Me.chkAutoRestore.Text = "Automatically restore new backups"
+        Me.chkAutoRestore.UseVisualStyleBackColor = True
+        '
        'frmSettings
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(554, 361)
+        Me.ClientSize = New System.Drawing.Size(739, 444)
+        Me.Controls.Add(Me.pnlBackup)
        Me.Controls.Add(Me.lstSettings)
        Me.Controls.Add(Me.btnDefaults)
        Me.Controls.Add(Me.btnCancel)
        Me.Controls.Add(Me.btnSave)
        Me.Controls.Add(Me.pnlGeneral)
        Me.Controls.Add(Me.pnl7z)
-        Me.Controls.Add(Me.pnlBackup)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.Margin = New System.Windows.Forms.Padding(4)
        Me.MaximizeBox = False
        Me.MinimizeBox = False
        Me.Name = "frmSettings"
@@ -503,11 +588,13 @@ Partial Class frmSettings
        Me.grpStartup.PerformLayout()
        Me.grpFolderOptions.ResumeLayout(False)
        Me.grpFolderOptions.PerformLayout()
-        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
        Me.grp7zGeneral.ResumeLayout(False)
        Me.grp7zGeneral.PerformLayout()
        Me.pnlBackup.ResumeLayout(False)
        Me.pnlBackup.PerformLayout()
+        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.grpBackupHandling.ResumeLayout(False)
+        Me.grpBackupHandling.PerformLayout()
        Me.pnl7z.ResumeLayout(False)
        Me.grp7zAdvanced.ResumeLayout(False)
        Me.grp7zAdvanced.PerformLayout()
@@ -520,7 +607,6 @@ Partial Class frmSettings

    End Sub
    Friend WithEvents chkMonitorOnStartup As System.Windows.Forms.CheckBox
-    Friend WithEvents chkBackupConfirm As System.Windows.Forms.CheckBox
    Friend WithEvents grpStartup As System.Windows.Forms.GroupBox
    Friend WithEvents grpFolderOptions As System.Windows.Forms.GroupBox
    Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox
@@ -530,16 +616,10 @@ Partial Class frmSettings
    Friend WithEvents btnBackupFolder As System.Windows.Forms.Button
    Friend WithEvents chkShowDetectionTips As System.Windows.Forms.CheckBox
    Friend WithEvents chkStartToTray As System.Windows.Forms.CheckBox
-    Friend WithEvents chkOverwriteWarning As System.Windows.Forms.CheckBox
    Friend WithEvents chkCreateFolder As System.Windows.Forms.CheckBox
-    Friend WithEvents chkRestoreOnLaunch As System.Windows.Forms.CheckBox
    Friend WithEvents chkSync As System.Windows.Forms.CheckBox
-    Friend WithEvents chkCheckSum As System.Windows.Forms.CheckBox
    Friend WithEvents chkStartWindows As System.Windows.Forms.CheckBox
    Friend WithEvents chkTimeTracking As System.Windows.Forms.CheckBox
-    Friend WithEvents lblMinutes As Label
-    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
-    Friend WithEvents chkSupressBackup As CheckBox
    Friend WithEvents grp7zGeneral As GroupBox
    Friend WithEvents cboCompression As ComboBox
    Friend WithEvents lblCompression As Label
@@ -560,4 +640,14 @@ Partial Class frmSettings
    Friend WithEvents lstSettings As ListBox
    Friend WithEvents grp7zAdvanced As GroupBox
    Friend WithEvents grp7zInformation As GroupBox
+    Friend WithEvents lblMinutes As Label
+    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
+    Friend WithEvents chkSupressBackup As CheckBox
+    Friend WithEvents chkBackupConfirm As CheckBox
+    Friend WithEvents chkCheckSum 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
@@ -48,7 +48,9 @@ Public Class frmSettings
        oSettings.DisableConfirmation = chkBackupConfirm.Checked
        oSettings.CreateSubFolder = chkCreateFolder.Checked
        oSettings.ShowOverwriteWarning = chkOverwriteWarning.Checked
-        oSettings.RestoreOnLaunch = chkRestoreOnLaunch.Checked
+        oSettings.RestoreOnLaunch = chkRestoreNotify.Checked
+        oSettings.AutoRestore = chkAutoRestore.Checked
+        oSettings.AutoMark = chkAutoMark.Checked
        oSettings.TimeTracking = chkTimeTracking.Checked
        oSettings.SupressBackup = chkSupressBackup.Checked
        oSettings.SupressBackupThreshold = nudSupressBackupThreshold.Value
@@ -177,7 +179,9 @@ Public Class frmSettings
        chkBackupConfirm.Checked = oSettings.DisableConfirmation
        chkCreateFolder.Checked = oSettings.CreateSubFolder
        chkOverwriteWarning.Checked = oSettings.ShowOverwriteWarning
-        chkRestoreOnLaunch.Checked = oSettings.RestoreOnLaunch
+        chkRestoreNotify.Checked = oSettings.RestoreOnLaunch
+        chkAutoRestore.Checked = oSettings.AutoRestore
+        chkAutoMark.Checked = oSettings.AutoMark
        txtBackupFolder.Text = oSettings.BackupFolder
        chkSync.Checked = oSettings.Sync
        chkCheckSum.Checked = oSettings.CheckSum
@@ -280,7 +284,10 @@ Public Class frmSettings
        lblMinutes.Text = frmSettings_lblMinutes
        chkSupressBackup.Text = frmSettings_chkSupressBackup
        chkCheckSum.Text = frmSettings_chkCheckSum
-        chkRestoreOnLaunch.Text = frmSettings_chkRestoreOnLaunch
+        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
@@ -352,7 +359,7 @@ Public Class frmSettings
        End If
    End Sub

-    Private Sub chkSupressBackup_CheckedChanged(sender As Object, e As EventArgs) Handles chkSupressBackup.CheckedChanged
+    Private Sub chkSupressBackup_CheckedChanged(sender As Object, e As EventArgs)
        nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
    End Sub

@@ -375,4 +382,5 @@ Public Class frmSettings
    Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged
        ChangePanel()
    End Sub
+
 End Class