Changes for issue #52

2016-06-10 12:06:01 -06:00
parent 8b779f6d66
commit e288c77ba8
9 changed files with 438 additions and 332 deletions
@@ -22,21 +22,21 @@ Partial Class frmSettings
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox()
        Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
-        Me.grpGeneral = New System.Windows.Forms.GroupBox()
+        Me.grpStartup = New System.Windows.Forms.GroupBox()
+        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.chkStartWindows = New System.Windows.Forms.CheckBox()
        Me.chkShowDetectionTips = New System.Windows.Forms.CheckBox()
-        Me.chkStartToTray = New System.Windows.Forms.CheckBox()
        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()
@@ -46,26 +46,35 @@ Partial Class frmSettings
        Me.chkCheckSum = 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.grp7z = New System.Windows.Forms.GroupBox()
-        Me.pbUtilityStatus = New System.Windows.Forms.PictureBox()
+        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.cboCompression = New System.Windows.Forms.ComboBox()
-        Me.lblCompression = New System.Windows.Forms.Label()
        Me.lbl7zProduct = New System.Windows.Forms.Label()
        Me.btnDefaults = New System.Windows.Forms.Button()
-        Me.ttUtilityStatus = New System.Windows.Forms.ToolTip(Me.components)
-        Me.grpGeneral.SuspendLayout()
+        Me.pnlBackup = New System.Windows.Forms.Panel()
+        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.grpPaths.SuspendLayout()
        Me.grpBackup.SuspendLayout()
        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.grp7z.SuspendLayout()
-        CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.grp7zGeneral.SuspendLayout()
+        Me.pnlBackup.SuspendLayout()
+        Me.pnl7z.SuspendLayout()
+        Me.grp7zAdvanced.SuspendLayout()
+        Me.grp7zInformation.SuspendLayout()
+        Me.pnlGeneral.SuspendLayout()
+        Me.grpGameData.SuspendLayout()
        Me.SuspendLayout()
        '
        'chkMonitorOnStartup
@@ -81,69 +90,24 @@ Partial Class frmSettings
        'chkBackupConfirm
        '
        Me.chkBackupConfirm.AutoSize = True
-        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 42)
+        Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 19)
        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
        '
-        'grpGeneral
+        'grpStartup
        '
-        Me.grpGeneral.Controls.Add(Me.chkAutoSaveLog)
-        Me.grpGeneral.Controls.Add(Me.btnOptionalFields)
-        Me.grpGeneral.Controls.Add(Me.chkTimeTracking)
-        Me.grpGeneral.Controls.Add(Me.chkSync)
-        Me.grpGeneral.Controls.Add(Me.chkStartWindows)
-        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, 187)
-        Me.grpGeneral.TabIndex = 0
-        Me.grpGeneral.TabStop = False
-        Me.grpGeneral.Text = "General"
-        '
-        'chkAutoSaveLog
-        '
-        Me.chkAutoSaveLog.AutoSize = True
-        Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 111)
-        Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
-        Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
-        Me.chkAutoSaveLog.TabIndex = 7
-        Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
-        Me.chkAutoSaveLog.UseVisualStyleBackColor = True
-        '
-        'btnOptionalFields
-        '
-        Me.btnOptionalFields.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.btnOptionalFields.Location = New System.Drawing.Point(110, 153)
-        Me.btnOptionalFields.Name = "btnOptionalFields"
-        Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23)
-        Me.btnOptionalFields.TabIndex = 6
-        Me.btnOptionalFields.Text = "Choose &Optional Fields..."
-        Me.btnOptionalFields.UseVisualStyleBackColor = True
-        '
-        'chkTimeTracking
-        '
-        Me.chkTimeTracking.AutoSize = True
-        Me.chkTimeTracking.Location = New System.Drawing.Point(6, 134)
-        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
-        '
-        'chkSync
-        '
-        Me.chkSync.AutoSize = True
-        Me.chkSync.Location = New System.Drawing.Point(6, 157)
-        Me.chkSync.Name = "chkSync"
-        Me.chkSync.Size = New System.Drawing.Size(98, 17)
-        Me.chkSync.TabIndex = 5
-        Me.chkSync.Text = "Enable syncing"
-        Me.chkSync.UseVisualStyleBackColor = True
+        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.Name = "grpStartup"
+        Me.grpStartup.Size = New System.Drawing.Size(354, 90)
+        Me.grpStartup.TabIndex = 0
+        Me.grpStartup.TabStop = False
+        Me.grpStartup.Text = "Startup"
        '
        'chkStartWindows
        '
@@ -155,16 +119,6 @@ Partial Class frmSettings
        Me.chkStartWindows.Text = "Start with Windows"
        Me.chkStartWindows.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
@@ -175,21 +129,72 @@ Partial Class frmSettings
        Me.chkStartToTray.Text = "Start to system tray"
        Me.chkStartToTray.UseVisualStyleBackColor = True
        '
+        'chkAutoSaveLog
+        '
+        Me.chkAutoSaveLog.AutoSize = True
+        Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204)
+        Me.chkAutoSaveLog.Name = "chkAutoSaveLog"
+        Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17)
+        Me.chkAutoSaveLog.TabIndex = 7
+        Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded"
+        Me.chkAutoSaveLog.UseVisualStyleBackColor = True
+        '
+        'btnOptionalFields
+        '
+        Me.btnOptionalFields.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38)
+        Me.btnOptionalFields.Name = "btnOptionalFields"
+        Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23)
+        Me.btnOptionalFields.TabIndex = 6
+        Me.btnOptionalFields.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 = 4
+        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 = 5
+        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 = 3
+        Me.chkShowDetectionTips.Text = "Show detection notifications"
+        Me.chkShowDetectionTips.UseVisualStyleBackColor = True
+        '
        'grpPaths
        '
        Me.grpPaths.Controls.Add(Me.btnBackupFolder)
        Me.grpPaths.Controls.Add(Me.lblBackupFolder)
        Me.grpPaths.Controls.Add(Me.txtBackupFolder)
-        Me.grpPaths.Location = New System.Drawing.Point(12, 205)
+        Me.grpPaths.Controls.Add(Me.chkCreateFolder)
+        Me.grpPaths.Location = New System.Drawing.Point(6, 158)
        Me.grpPaths.Name = "grpPaths"
-        Me.grpPaths.Size = New System.Drawing.Size(360, 60)
-        Me.grpPaths.TabIndex = 3
+        Me.grpPaths.Size = New System.Drawing.Size(354, 70)
+        Me.grpPaths.TabIndex = 1
        Me.grpPaths.TabStop = False
        Me.grpPaths.Text = "Paths"
        '
        'btnBackupFolder
        '
-        Me.btnBackupFolder.Location = New System.Drawing.Point(327, 24)
+        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
@@ -199,7 +204,7 @@ Partial Class frmSettings
        '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(79, 13)
        Me.lblBackupFolder.TabIndex = 0
@@ -207,15 +212,25 @@ Partial Class frmSettings
        '
        'txtBackupFolder
        '
-        Me.txtBackupFolder.Location = New System.Drawing.Point(91, 24)
+        Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17)
        Me.txtBackupFolder.Name = "txtBackupFolder"
-        Me.txtBackupFolder.Size = New System.Drawing.Size(230, 20)
+        Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20)
        Me.txtBackupFolder.TabIndex = 1
        '
+        '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 = 3
+        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(586, 326)
+        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 = 5
@@ -225,7 +240,7 @@ Partial Class frmSettings
        'btnCancel
        '
        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.Location = New System.Drawing.Point(667, 326)
+        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 = 6
@@ -240,19 +255,18 @@ Partial Class frmSettings
        Me.grpBackup.Controls.Add(Me.chkCheckSum)
        Me.grpBackup.Controls.Add(Me.chkRestoreOnLaunch)
        Me.grpBackup.Controls.Add(Me.chkOverwriteWarning)
-        Me.grpBackup.Controls.Add(Me.chkCreateFolder)
        Me.grpBackup.Controls.Add(Me.chkBackupConfirm)
-        Me.grpBackup.Location = New System.Drawing.Point(378, 12)
+        Me.grpBackup.Location = New System.Drawing.Point(6, 12)
        Me.grpBackup.Name = "grpBackup"
-        Me.grpBackup.Size = New System.Drawing.Size(360, 165)
-        Me.grpBackup.TabIndex = 2
+        Me.grpBackup.Size = New System.Drawing.Size(354, 140)
+        Me.grpBackup.TabIndex = 0
        Me.grpBackup.TabStop = False
        Me.grpBackup.Text = "Backup and Restore"
        '
        'lblMinutes
        '
        Me.lblMinutes.AutoSize = True
-        Me.lblMinutes.Location = New System.Drawing.Point(286, 135)
+        Me.lblMinutes.Location = New System.Drawing.Point(286, 112)
        Me.lblMinutes.Name = "lblMinutes"
        Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
        Me.lblMinutes.TabIndex = 7
@@ -260,7 +274,7 @@ Partial Class frmSettings
        '
        'nudSupressBackupThreshold
        '
-        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 133)
+        Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 110)
        Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
        Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
        Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20)
@@ -269,7 +283,7 @@ Partial Class frmSettings
        'chkSupressBackup
        '
        Me.chkSupressBackup.AutoSize = True
-        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 134)
+        Me.chkSupressBackup.Location = New System.Drawing.Point(6, 111)
        Me.chkSupressBackup.Name = "chkSupressBackup"
        Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17)
        Me.chkSupressBackup.TabIndex = 5
@@ -279,7 +293,7 @@ Partial Class frmSettings
        'chkCheckSum
        '
        Me.chkCheckSum.AutoSize = True
-        Me.chkCheckSum.Location = New System.Drawing.Point(6, 88)
+        Me.chkCheckSum.Location = New System.Drawing.Point(6, 65)
        Me.chkCheckSum.Name = "chkCheckSum"
        Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
        Me.chkCheckSum.TabIndex = 3
@@ -289,7 +303,7 @@ Partial Class frmSettings
        'chkRestoreOnLaunch
        '
        Me.chkRestoreOnLaunch.AutoSize = True
-        Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 111)
+        Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 88)
        Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch"
        Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17)
        Me.chkRestoreOnLaunch.TabIndex = 4
@@ -299,100 +313,23 @@ Partial Class frmSettings
        'chkOverwriteWarning
        '
        Me.chkOverwriteWarning.AutoSize = True
-        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 65)
+        Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 42)
        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
        '
-        'chkCreateFolder
+        'grp7zGeneral
        '
-        Me.chkCreateFolder.AutoSize = True
-        Me.chkCreateFolder.Location = New System.Drawing.Point(6, 19)
-        Me.chkCreateFolder.Name = "chkCreateFolder"
-        Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17)
-        Me.chkCreateFolder.TabIndex = 0
-        Me.chkCreateFolder.Text = "Create a sub-folder for each game"
-        Me.chkCreateFolder.UseVisualStyleBackColor = True
-        '
-        'grp7z
-        '
-        Me.grp7z.Controls.Add(Me.pbUtilityStatus)
-        Me.grp7z.Controls.Add(Me.btn7zLocation)
-        Me.grp7z.Controls.Add(Me.txt7zLocation)
-        Me.grp7z.Controls.Add(Me.lblLocation)
-        Me.grp7z.Controls.Add(Me.txt7zArguments)
-        Me.grp7z.Controls.Add(Me.lblArguments)
-        Me.grp7z.Controls.Add(Me.lbl7zCopyright)
-        Me.grp7z.Controls.Add(Me.cboCompression)
-        Me.grp7z.Controls.Add(Me.lblCompression)
-        Me.grp7z.Controls.Add(Me.lbl7zProduct)
-        Me.grp7z.Location = New System.Drawing.Point(378, 183)
-        Me.grp7z.Name = "grp7z"
-        Me.grp7z.Size = New System.Drawing.Size(360, 137)
-        Me.grp7z.TabIndex = 1
-        Me.grp7z.TabStop = False
-        Me.grp7z.Text = "7z Options"
-        '
-        'pbUtilityStatus
-        '
-        Me.pbUtilityStatus.Location = New System.Drawing.Point(319, 93)
-        Me.pbUtilityStatus.Name = "pbUtilityStatus"
-        Me.pbUtilityStatus.Size = New System.Drawing.Size(35, 35)
-        Me.pbUtilityStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.pbUtilityStatus.TabIndex = 7
-        Me.pbUtilityStatus.TabStop = False
-        '
-        'btn7zLocation
-        '
-        Me.btn7zLocation.Location = New System.Drawing.Point(327, 70)
-        Me.btn7zLocation.Name = "btn7zLocation"
-        Me.btn7zLocation.Size = New System.Drawing.Size(27, 20)
-        Me.btn7zLocation.TabIndex = 5
-        Me.btn7zLocation.Text = "..."
-        Me.btn7zLocation.UseVisualStyleBackColor = True
-        '
-        'txt7zLocation
-        '
-        Me.txt7zLocation.Location = New System.Drawing.Point(110, 70)
-        Me.txt7zLocation.Name = "txt7zLocation"
-        Me.txt7zLocation.Size = New System.Drawing.Size(211, 20)
-        Me.txt7zLocation.TabIndex = 4
-        '
-        'lblLocation
-        '
-        Me.lblLocation.AutoSize = True
-        Me.lblLocation.Location = New System.Drawing.Point(6, 73)
-        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, 44)
-        Me.txt7zArguments.Name = "txt7zArguments"
-        Me.txt7zArguments.Size = New System.Drawing.Size(244, 20)
-        Me.txt7zArguments.TabIndex = 3
-        '
-        'lblArguments
-        '
-        Me.lblArguments.AutoSize = True
-        Me.lblArguments.Location = New System.Drawing.Point(6, 47)
-        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, 110)
-        Me.lbl7zCopyright.Name = "lbl7zCopyright"
-        Me.lbl7zCopyright.Size = New System.Drawing.Size(301, 17)
-        Me.lbl7zCopyright.TabIndex = 8
-        Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.grp7zGeneral.Controls.Add(Me.cboCompression)
+        Me.grp7zGeneral.Controls.Add(Me.lblCompression)
+        Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12)
+        Me.grp7zGeneral.Name = "grp7zGeneral"
+        Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50)
+        Me.grp7zGeneral.TabIndex = 0
+        Me.grp7zGeneral.TabStop = False
+        Me.grp7zGeneral.Text = "General"
        '
        'cboCompression
        '
@@ -400,7 +337,7 @@ Partial Class frmSettings
        Me.cboCompression.FormattingEnabled = True
        Me.cboCompression.Location = New System.Drawing.Point(110, 17)
        Me.cboCompression.Name = "cboCompression"
-        Me.cboCompression.Size = New System.Drawing.Size(244, 21)
+        Me.cboCompression.Size = New System.Drawing.Size(238, 21)
        Me.cboCompression.TabIndex = 1
        '
        'lblCompression
@@ -412,36 +349,161 @@ Partial Class frmSettings
        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 = 5
+        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 = 4
+        '
+        '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 = 3
+        '
+        '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(6, 93)
+        Me.lbl7zProduct.Location = New System.Drawing.Point(9, 17)
        Me.lbl7zProduct.Name = "lbl7zProduct"
-        Me.lbl7zProduct.Size = New System.Drawing.Size(304, 17)
+        Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17)
        Me.lbl7zProduct.TabIndex = 7
-        Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
        'btnDefaults
        '
-        Me.btnDefaults.Location = New System.Drawing.Point(12, 326)
+        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.grpBackup)
+        Me.pnlBackup.Controls.Add(Me.grpPaths)
+        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
+        '
+        '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 = 2
+        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 = 1
+        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 = 7
+        '
        'frmSettings
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(749, 361)
+        Me.ClientSize = New System.Drawing.Size(554, 361)
+        Me.Controls.Add(Me.lstSettings)
        Me.Controls.Add(Me.btnDefaults)
-        Me.Controls.Add(Me.grp7z)
-        Me.Controls.Add(Me.grpBackup)
-        Me.Controls.Add(Me.grpPaths)
        Me.Controls.Add(Me.btnCancel)
        Me.Controls.Add(Me.btnSave)
-        Me.Controls.Add(Me.grpGeneral)
+        Me.Controls.Add(Me.pnl7z)
+        Me.Controls.Add(Me.pnlBackup)
+        Me.Controls.Add(Me.pnlGeneral)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.MaximizeBox = False
        Me.MinimizeBox = False
@@ -450,22 +512,30 @@ Partial Class frmSettings
        Me.ShowInTaskbar = False
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Settings"
-        Me.grpGeneral.ResumeLayout(False)
-        Me.grpGeneral.PerformLayout()
+        Me.grpStartup.ResumeLayout(False)
+        Me.grpStartup.PerformLayout()
        Me.grpPaths.ResumeLayout(False)
        Me.grpPaths.PerformLayout()
        Me.grpBackup.ResumeLayout(False)
        Me.grpBackup.PerformLayout()
        CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.grp7z.ResumeLayout(False)
-        Me.grp7z.PerformLayout()
-        CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.grp7zGeneral.ResumeLayout(False)
+        Me.grp7zGeneral.PerformLayout()
+        Me.pnlBackup.ResumeLayout(False)
+        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 grpGeneral As System.Windows.Forms.GroupBox
+    Friend WithEvents grpStartup 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
@@ -485,7 +555,7 @@ Partial Class frmSettings
    Friend WithEvents lblMinutes As Label
    Friend WithEvents nudSupressBackupThreshold As NumericUpDown
    Friend WithEvents chkSupressBackup As CheckBox
-    Friend WithEvents grp7z As GroupBox
+    Friend WithEvents grp7zGeneral As GroupBox
    Friend WithEvents cboCompression As ComboBox
    Friend WithEvents lblCompression As Label
    Friend WithEvents lbl7zProduct As Label
@@ -496,8 +566,13 @@ Partial Class frmSettings
    Friend WithEvents txt7zArguments As TextBox
    Friend WithEvents lblArguments As Label
    Friend WithEvents btnDefaults As Button
-    Friend WithEvents pbUtilityStatus As PictureBox
-    Friend WithEvents ttUtilityStatus As ToolTip
    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
 End Class
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="ttUtilityStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>32</value>
  </metadata>
@@ -86,7 +86,7 @@ Public Class frmSettings
        If oSettings.Custom7zLocation <> String.Empty Then
            If File.Exists(oSettings.Custom7zLocation) Then
                If Path.GetFileNameWithoutExtension(oSettings.Custom7zLocation) <> "7za" Then
-                    mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Exclamation)
+                    mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Critical)
                End If
            Else
                mgrCommon.ShowMessage(frmSettings_ErrorLocation, oSettings.Custom7zLocation, MsgBoxStyle.Critical)
@@ -113,12 +113,19 @@ Public Class frmSettings
        End If
    End Function

-    Private Sub Get7zInfo(ByVal sLocation As String)
+    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
-        If Not mgrCommon.IsUnix Then
+        '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
@@ -127,31 +134,29 @@ Public Class frmSettings

                'Get info
                Dim oFileInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(sLocation)
-                lbl7zProduct.Text = oFileInfo.FileDescription & " " & oFileInfo.ProductVersion
-                lbl7zCopyright.Text = oFileInfo.LegalCopyright

-                'Set Status
-                If bDefault Then
-                    If oSettings.Is7zUtilityValid Then
-                        pbUtilityStatus.Image = Utility_Valid
-                        ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
-                        ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Valid7z)
-                    Else
-                        pbUtilityStatus.Image = Utility_Invalid
-                        ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
-                        ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Invalid7z)
-                    End If
+                If oFileInfo.FileDescription = String.Empty Then
+                    sFileDescription = App_NotAvailable
                Else
-                    pbUtilityStatus.Image = Utility_Custom
-                    ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
-                    ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Custom7z)
+                    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
-                lbl7zProduct.Text = String.Empty
-                lbl7zCopyright.Text = String.Empty
-                pbUtilityStatus.Image = Utility_Invalid
-                ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
-                ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Failure7z)
+                grp7zInformation.Visible = False
            End Try
        End If
    End Sub
@@ -192,7 +197,7 @@ Public Class frmSettings
        End If

        'Retrieve 7z Info
-        Get7zInfo(oSettings.Custom7zLocation)
+        GetUtilityInfo(oSettings.Custom7zLocation)

        'Toggle Sync Button
        ToggleSyncButton()
@@ -200,6 +205,7 @@ Public Class frmSettings

    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"
@@ -213,6 +219,19 @@ Public Class frmSettings
        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()
@@ -232,6 +251,27 @@ Public Class frmSettings
        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
@@ -250,7 +290,8 @@ Public Class frmSettings
        grpPaths.Text = frmSettings_grpPaths
        btnBackupFolder.Text = frmSettings_btnBackupFolder
        lblBackupFolder.Text = frmSettings_lblBackupFolder
-        grpGeneral.Text = frmSettings_grpGeneral
+        grpStartup.Text = frmSettings_grpStartup
+        grpGameData.Text = frmSettings_grpGameData
        chkTimeTracking.Text = frmSettings_chkTimeTracking
        chkStartWindows.Text = frmSettings_chkStartWindows
        chkSync.Text = frmSettings_chkSync
@@ -258,7 +299,9 @@ Public Class frmSettings
        chkAutoSaveLog.Text = frmSettings_chkAutoSaveLog
        chkStartToTray.Text = frmSettings_chkStartToTray
        chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup
-        grp7z.Text = frmSettings_grp7z
+        grp7zGeneral.Text = frmSettings_grp7zGeneral
+        grp7zAdvanced.Text = frmSettings_grp7zAdvanced
+        grp7zInformation.Text = frmSettings_grp7zInformation
        lblCompression.Text = frmSettings_lblCompression
        btnDefaults.Text = frmSettings_btnDefaults
        lblArguments.Text = frmSettings_lblArguments
@@ -270,6 +313,11 @@ Public Class frmSettings
            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
@@ -307,7 +355,7 @@ Public Class frmSettings
        sNewLocation = mgrCommon.OpenFileBrowser(frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
        If sNewLocation <> String.Empty Then
            txt7zLocation.Text = sNewLocation
-            Get7zInfo(txt7zLocation.Text)
+            GetUtilityInfo(txt7zLocation.Text)
        End If
    End Sub

@@ -316,7 +364,7 @@ Public Class frmSettings
    End Sub

    Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave
-        Get7zInfo(txt7zLocation.Text.Trim)
+        GetUtilityInfo(txt7zLocation.Text.Trim)
    End Sub

    Private Sub btnDefaults_Click(sender As Object, e As EventArgs) Handles btnDefaults.Click
@@ -330,4 +378,8 @@ Public Class frmSettings
    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