Changes for issue #52

This commit is contained in:
Michael J. Seiferling
2016-06-10 12:06:01 -06:00
parent 8b779f6d66
commit e288c77ba8
9 changed files with 438 additions and 332 deletions
+278 -203
View File
@@ -22,21 +22,21 @@ Partial Class frmSettings
'Do not modify it using the code editor. 'Do not modify it using the code editor.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox()
Me.chkBackupConfirm = 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.chkAutoSaveLog = New System.Windows.Forms.CheckBox()
Me.btnOptionalFields = New System.Windows.Forms.Button() Me.btnOptionalFields = New System.Windows.Forms.Button()
Me.chkTimeTracking = New System.Windows.Forms.CheckBox() Me.chkTimeTracking = New System.Windows.Forms.CheckBox()
Me.chkSync = 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.chkShowDetectionTips = New System.Windows.Forms.CheckBox()
Me.chkStartToTray = New System.Windows.Forms.CheckBox()
Me.grpPaths = New System.Windows.Forms.GroupBox() Me.grpPaths = New System.Windows.Forms.GroupBox()
Me.btnBackupFolder = New System.Windows.Forms.Button() Me.btnBackupFolder = New System.Windows.Forms.Button()
Me.lblBackupFolder = New System.Windows.Forms.Label() Me.lblBackupFolder = New System.Windows.Forms.Label()
Me.txtBackupFolder = New System.Windows.Forms.TextBox() Me.txtBackupFolder = New System.Windows.Forms.TextBox()
Me.chkCreateFolder = New System.Windows.Forms.CheckBox()
Me.btnSave = New System.Windows.Forms.Button() Me.btnSave = New System.Windows.Forms.Button()
Me.btnCancel = New System.Windows.Forms.Button() Me.btnCancel = New System.Windows.Forms.Button()
Me.grpBackup = New System.Windows.Forms.GroupBox() Me.grpBackup = New System.Windows.Forms.GroupBox()
@@ -46,26 +46,35 @@ Partial Class frmSettings
Me.chkCheckSum = New System.Windows.Forms.CheckBox() Me.chkCheckSum = New System.Windows.Forms.CheckBox()
Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox() Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox()
Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox() Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox()
Me.chkCreateFolder = New System.Windows.Forms.CheckBox() Me.grp7zGeneral = New System.Windows.Forms.GroupBox()
Me.grp7z = New System.Windows.Forms.GroupBox() Me.cboCompression = New System.Windows.Forms.ComboBox()
Me.pbUtilityStatus = New System.Windows.Forms.PictureBox() Me.lblCompression = New System.Windows.Forms.Label()
Me.btn7zLocation = New System.Windows.Forms.Button() Me.btn7zLocation = New System.Windows.Forms.Button()
Me.txt7zLocation = New System.Windows.Forms.TextBox() Me.txt7zLocation = New System.Windows.Forms.TextBox()
Me.lblLocation = New System.Windows.Forms.Label() Me.lblLocation = New System.Windows.Forms.Label()
Me.txt7zArguments = New System.Windows.Forms.TextBox() Me.txt7zArguments = New System.Windows.Forms.TextBox()
Me.lblArguments = New System.Windows.Forms.Label() Me.lblArguments = New System.Windows.Forms.Label()
Me.lbl7zCopyright = 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.lbl7zProduct = New System.Windows.Forms.Label()
Me.btnDefaults = New System.Windows.Forms.Button() Me.btnDefaults = New System.Windows.Forms.Button()
Me.ttUtilityStatus = New System.Windows.Forms.ToolTip(Me.components) Me.pnlBackup = New System.Windows.Forms.Panel()
Me.grpGeneral.SuspendLayout() 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.grpPaths.SuspendLayout()
Me.grpBackup.SuspendLayout() Me.grpBackup.SuspendLayout()
CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
Me.grp7z.SuspendLayout() Me.grp7zGeneral.SuspendLayout()
CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlBackup.SuspendLayout()
Me.pnl7z.SuspendLayout()
Me.grp7zAdvanced.SuspendLayout()
Me.grp7zInformation.SuspendLayout()
Me.pnlGeneral.SuspendLayout()
Me.grpGameData.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'chkMonitorOnStartup 'chkMonitorOnStartup
@@ -81,69 +90,24 @@ Partial Class frmSettings
'chkBackupConfirm 'chkBackupConfirm
' '
Me.chkBackupConfirm.AutoSize = True 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.Name = "chkBackupConfirm"
Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17) Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17)
Me.chkBackupConfirm.TabIndex = 1 Me.chkBackupConfirm.TabIndex = 1
Me.chkBackupConfirm.Text = "Disable backup confirmation" Me.chkBackupConfirm.Text = "Disable backup confirmation"
Me.chkBackupConfirm.UseVisualStyleBackColor = True Me.chkBackupConfirm.UseVisualStyleBackColor = True
' '
'grpGeneral 'grpStartup
' '
Me.grpGeneral.Controls.Add(Me.chkAutoSaveLog) Me.grpStartup.Controls.Add(Me.chkStartWindows)
Me.grpGeneral.Controls.Add(Me.btnOptionalFields) Me.grpStartup.Controls.Add(Me.chkStartToTray)
Me.grpGeneral.Controls.Add(Me.chkTimeTracking) Me.grpStartup.Controls.Add(Me.chkMonitorOnStartup)
Me.grpGeneral.Controls.Add(Me.chkSync) Me.grpStartup.Location = New System.Drawing.Point(6, 12)
Me.grpGeneral.Controls.Add(Me.chkStartWindows) Me.grpStartup.Name = "grpStartup"
Me.grpGeneral.Controls.Add(Me.chkShowDetectionTips) Me.grpStartup.Size = New System.Drawing.Size(354, 90)
Me.grpGeneral.Controls.Add(Me.chkStartToTray) Me.grpStartup.TabIndex = 0
Me.grpGeneral.Controls.Add(Me.chkMonitorOnStartup) Me.grpStartup.TabStop = False
Me.grpGeneral.Location = New System.Drawing.Point(12, 12) Me.grpStartup.Text = "Startup"
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
' '
'chkStartWindows 'chkStartWindows
' '
@@ -155,16 +119,6 @@ Partial Class frmSettings
Me.chkStartWindows.Text = "Start with Windows" Me.chkStartWindows.Text = "Start with Windows"
Me.chkStartWindows.UseVisualStyleBackColor = True 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 'chkStartToTray
' '
Me.chkStartToTray.AutoSize = True Me.chkStartToTray.AutoSize = True
@@ -175,21 +129,72 @@ Partial Class frmSettings
Me.chkStartToTray.Text = "Start to system tray" Me.chkStartToTray.Text = "Start to system tray"
Me.chkStartToTray.UseVisualStyleBackColor = True 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 'grpPaths
' '
Me.grpPaths.Controls.Add(Me.btnBackupFolder) Me.grpPaths.Controls.Add(Me.btnBackupFolder)
Me.grpPaths.Controls.Add(Me.lblBackupFolder) Me.grpPaths.Controls.Add(Me.lblBackupFolder)
Me.grpPaths.Controls.Add(Me.txtBackupFolder) 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.Name = "grpPaths"
Me.grpPaths.Size = New System.Drawing.Size(360, 60) Me.grpPaths.Size = New System.Drawing.Size(354, 70)
Me.grpPaths.TabIndex = 3 Me.grpPaths.TabIndex = 1
Me.grpPaths.TabStop = False Me.grpPaths.TabStop = False
Me.grpPaths.Text = "Paths" Me.grpPaths.Text = "Paths"
' '
'btnBackupFolder '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.Name = "btnBackupFolder"
Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20) Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20)
Me.btnBackupFolder.TabIndex = 2 Me.btnBackupFolder.TabIndex = 2
@@ -199,7 +204,7 @@ Partial Class frmSettings
'lblBackupFolder 'lblBackupFolder
' '
Me.lblBackupFolder.AutoSize = True 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.Name = "lblBackupFolder"
Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13) Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13)
Me.lblBackupFolder.TabIndex = 0 Me.lblBackupFolder.TabIndex = 0
@@ -207,15 +212,25 @@ Partial Class frmSettings
' '
'txtBackupFolder '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.Name = "txtBackupFolder"
Me.txtBackupFolder.Size = New System.Drawing.Size(230, 20) Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20)
Me.txtBackupFolder.TabIndex = 1 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 'btnSave
' '
Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK 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.Name = "btnSave"
Me.btnSave.Size = New System.Drawing.Size(75, 23) Me.btnSave.Size = New System.Drawing.Size(75, 23)
Me.btnSave.TabIndex = 5 Me.btnSave.TabIndex = 5
@@ -225,7 +240,7 @@ Partial Class frmSettings
'btnCancel 'btnCancel
' '
Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel 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.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(75, 23) Me.btnCancel.Size = New System.Drawing.Size(75, 23)
Me.btnCancel.TabIndex = 6 Me.btnCancel.TabIndex = 6
@@ -240,19 +255,18 @@ Partial Class frmSettings
Me.grpBackup.Controls.Add(Me.chkCheckSum) Me.grpBackup.Controls.Add(Me.chkCheckSum)
Me.grpBackup.Controls.Add(Me.chkRestoreOnLaunch) Me.grpBackup.Controls.Add(Me.chkRestoreOnLaunch)
Me.grpBackup.Controls.Add(Me.chkOverwriteWarning) Me.grpBackup.Controls.Add(Me.chkOverwriteWarning)
Me.grpBackup.Controls.Add(Me.chkCreateFolder)
Me.grpBackup.Controls.Add(Me.chkBackupConfirm) 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.Name = "grpBackup"
Me.grpBackup.Size = New System.Drawing.Size(360, 165) Me.grpBackup.Size = New System.Drawing.Size(354, 140)
Me.grpBackup.TabIndex = 2 Me.grpBackup.TabIndex = 0
Me.grpBackup.TabStop = False Me.grpBackup.TabStop = False
Me.grpBackup.Text = "Backup and Restore" Me.grpBackup.Text = "Backup and Restore"
' '
'lblMinutes 'lblMinutes
' '
Me.lblMinutes.AutoSize = True 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.Name = "lblMinutes"
Me.lblMinutes.Size = New System.Drawing.Size(43, 13) Me.lblMinutes.Size = New System.Drawing.Size(43, 13)
Me.lblMinutes.TabIndex = 7 Me.lblMinutes.TabIndex = 7
@@ -260,7 +274,7 @@ Partial Class frmSettings
' '
'nudSupressBackupThreshold '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.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold" Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold"
Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20) Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20)
@@ -269,7 +283,7 @@ Partial Class frmSettings
'chkSupressBackup 'chkSupressBackup
' '
Me.chkSupressBackup.AutoSize = True 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.Name = "chkSupressBackup"
Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17) Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17)
Me.chkSupressBackup.TabIndex = 5 Me.chkSupressBackup.TabIndex = 5
@@ -279,7 +293,7 @@ Partial Class frmSettings
'chkCheckSum 'chkCheckSum
' '
Me.chkCheckSum.AutoSize = True 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.Name = "chkCheckSum"
Me.chkCheckSum.Size = New System.Drawing.Size(195, 17) Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
Me.chkCheckSum.TabIndex = 3 Me.chkCheckSum.TabIndex = 3
@@ -289,7 +303,7 @@ Partial Class frmSettings
'chkRestoreOnLaunch 'chkRestoreOnLaunch
' '
Me.chkRestoreOnLaunch.AutoSize = True 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.Name = "chkRestoreOnLaunch"
Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17) Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17)
Me.chkRestoreOnLaunch.TabIndex = 4 Me.chkRestoreOnLaunch.TabIndex = 4
@@ -299,100 +313,23 @@ Partial Class frmSettings
'chkOverwriteWarning 'chkOverwriteWarning
' '
Me.chkOverwriteWarning.AutoSize = True 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.Name = "chkOverwriteWarning"
Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17) Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17)
Me.chkOverwriteWarning.TabIndex = 2 Me.chkOverwriteWarning.TabIndex = 2
Me.chkOverwriteWarning.Text = "Show overwrite warning" Me.chkOverwriteWarning.Text = "Show overwrite warning"
Me.chkOverwriteWarning.UseVisualStyleBackColor = True Me.chkOverwriteWarning.UseVisualStyleBackColor = True
' '
'chkCreateFolder 'grp7zGeneral
' '
Me.chkCreateFolder.AutoSize = True Me.grp7zGeneral.Controls.Add(Me.cboCompression)
Me.chkCreateFolder.Location = New System.Drawing.Point(6, 19) Me.grp7zGeneral.Controls.Add(Me.lblCompression)
Me.chkCreateFolder.Name = "chkCreateFolder" Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12)
Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17) Me.grp7zGeneral.Name = "grp7zGeneral"
Me.chkCreateFolder.TabIndex = 0 Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50)
Me.chkCreateFolder.Text = "Create a sub-folder for each game" Me.grp7zGeneral.TabIndex = 0
Me.chkCreateFolder.UseVisualStyleBackColor = True Me.grp7zGeneral.TabStop = False
' Me.grp7zGeneral.Text = "General"
'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
' '
'cboCompression 'cboCompression
' '
@@ -400,7 +337,7 @@ Partial Class frmSettings
Me.cboCompression.FormattingEnabled = True Me.cboCompression.FormattingEnabled = True
Me.cboCompression.Location = New System.Drawing.Point(110, 17) Me.cboCompression.Location = New System.Drawing.Point(110, 17)
Me.cboCompression.Name = "cboCompression" 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 Me.cboCompression.TabIndex = 1
' '
'lblCompression 'lblCompression
@@ -412,36 +349,161 @@ Partial Class frmSettings
Me.lblCompression.TabIndex = 0 Me.lblCompression.TabIndex = 0
Me.lblCompression.Text = "Compression:" 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 'lbl7zProduct
' '
Me.lbl7zProduct.AutoEllipsis = True 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.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.TabIndex = 7
Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
' '
'btnDefaults '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.Name = "btnDefaults"
Me.btnDefaults.Size = New System.Drawing.Size(110, 23) Me.btnDefaults.Size = New System.Drawing.Size(110, 23)
Me.btnDefaults.TabIndex = 4 Me.btnDefaults.TabIndex = 4
Me.btnDefaults.Text = "Set &Defaults" Me.btnDefaults.Text = "Set &Defaults"
Me.btnDefaults.UseVisualStyleBackColor = True 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 'frmSettings
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font 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.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.btnCancel)
Me.Controls.Add(Me.btnSave) 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.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.MaximizeBox = False Me.MaximizeBox = False
Me.MinimizeBox = False Me.MinimizeBox = False
@@ -450,22 +512,30 @@ Partial Class frmSettings
Me.ShowInTaskbar = False Me.ShowInTaskbar = False
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Settings" Me.Text = "Settings"
Me.grpGeneral.ResumeLayout(False) Me.grpStartup.ResumeLayout(False)
Me.grpGeneral.PerformLayout() Me.grpStartup.PerformLayout()
Me.grpPaths.ResumeLayout(False) Me.grpPaths.ResumeLayout(False)
Me.grpPaths.PerformLayout() Me.grpPaths.PerformLayout()
Me.grpBackup.ResumeLayout(False) Me.grpBackup.ResumeLayout(False)
Me.grpBackup.PerformLayout() Me.grpBackup.PerformLayout()
CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
Me.grp7z.ResumeLayout(False) Me.grp7zGeneral.ResumeLayout(False)
Me.grp7z.PerformLayout() Me.grp7zGeneral.PerformLayout()
CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).EndInit() 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) Me.ResumeLayout(False)
End Sub End Sub
Friend WithEvents chkMonitorOnStartup As System.Windows.Forms.CheckBox Friend WithEvents chkMonitorOnStartup As System.Windows.Forms.CheckBox
Friend WithEvents chkBackupConfirm 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 grpPaths As System.Windows.Forms.GroupBox
Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox
Friend WithEvents btnSave As System.Windows.Forms.Button Friend WithEvents btnSave As System.Windows.Forms.Button
@@ -485,7 +555,7 @@ Partial Class frmSettings
Friend WithEvents lblMinutes As Label Friend WithEvents lblMinutes As Label
Friend WithEvents nudSupressBackupThreshold As NumericUpDown Friend WithEvents nudSupressBackupThreshold As NumericUpDown
Friend WithEvents chkSupressBackup As CheckBox Friend WithEvents chkSupressBackup As CheckBox
Friend WithEvents grp7z As GroupBox Friend WithEvents grp7zGeneral As GroupBox
Friend WithEvents cboCompression As ComboBox Friend WithEvents cboCompression As ComboBox
Friend WithEvents lblCompression As Label Friend WithEvents lblCompression As Label
Friend WithEvents lbl7zProduct As Label Friend WithEvents lbl7zProduct As Label
@@ -496,8 +566,13 @@ Partial Class frmSettings
Friend WithEvents txt7zArguments As TextBox Friend WithEvents txt7zArguments As TextBox
Friend WithEvents lblArguments As Label Friend WithEvents lblArguments As Label
Friend WithEvents btnDefaults As Button Friend WithEvents btnDefaults As Button
Friend WithEvents pbUtilityStatus As PictureBox
Friend WithEvents ttUtilityStatus As ToolTip
Friend WithEvents btnOptionalFields As Button Friend WithEvents btnOptionalFields As Button
Friend WithEvents chkAutoSaveLog As CheckBox 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 End Class
-3
View File
@@ -117,9 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </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"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>32</value> <value>32</value>
</metadata> </metadata>
+82 -30
View File
@@ -86,7 +86,7 @@ Public Class frmSettings
If oSettings.Custom7zLocation <> String.Empty Then If oSettings.Custom7zLocation <> String.Empty Then
If File.Exists(oSettings.Custom7zLocation) Then If File.Exists(oSettings.Custom7zLocation) Then
If Path.GetFileNameWithoutExtension(oSettings.Custom7zLocation) <> "7za" Then If Path.GetFileNameWithoutExtension(oSettings.Custom7zLocation) <> "7za" Then
mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Exclamation) mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Critical)
End If End If
Else Else
mgrCommon.ShowMessage(frmSettings_ErrorLocation, oSettings.Custom7zLocation, MsgBoxStyle.Critical) mgrCommon.ShowMessage(frmSettings_ErrorLocation, oSettings.Custom7zLocation, MsgBoxStyle.Critical)
@@ -113,12 +113,19 @@ Public Class frmSettings
End If End If
End Function End Function
Private Sub Get7zInfo(ByVal sLocation As String) Private Sub GetUtilityInfo(ByVal sLocation As String)
Dim bDefault As Boolean = False Dim bDefault As Boolean = False
Dim sFileDescription As String
Dim sVersion As String
Dim sCopyright As String
'Ignore this function when on Unix 'Ignore this function when on Unix and hide the information data
If Not mgrCommon.IsUnix Then If mgrCommon.IsUnix Then
grp7zInformation.Visible = False
Else
Try Try
grp7zInformation.Visible = True
'Use default when no custom location is set 'Use default when no custom location is set
If sLocation = String.Empty Then If sLocation = String.Empty Then
sLocation = mgrPath.Default7zLocation sLocation = mgrPath.Default7zLocation
@@ -127,31 +134,29 @@ Public Class frmSettings
'Get info 'Get info
Dim oFileInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(sLocation) Dim oFileInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(sLocation)
lbl7zProduct.Text = oFileInfo.FileDescription & " " & oFileInfo.ProductVersion
lbl7zCopyright.Text = oFileInfo.LegalCopyright
'Set Status If oFileInfo.FileDescription = String.Empty Then
If bDefault Then sFileDescription = App_NotAvailable
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
Else Else
pbUtilityStatus.Image = Utility_Custom sFileDescription = oFileInfo.FileDescription
ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Custom7z)
End If 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 Catch ex As Exception
lbl7zProduct.Text = String.Empty grp7zInformation.Visible = False
lbl7zCopyright.Text = String.Empty
pbUtilityStatus.Image = Utility_Invalid
ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title
ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Failure7z)
End Try End Try
End If End If
End Sub End Sub
@@ -192,7 +197,7 @@ Public Class frmSettings
End If End If
'Retrieve 7z Info 'Retrieve 7z Info
Get7zInfo(oSettings.Custom7zLocation) GetUtilityInfo(oSettings.Custom7zLocation)
'Toggle Sync Button 'Toggle Sync Button
ToggleSyncButton() ToggleSyncButton()
@@ -200,6 +205,7 @@ Public Class frmSettings
Private Sub LoadCombos() Private Sub LoadCombos()
Dim oComboItems As New List(Of KeyValuePair(Of Integer, String)) Dim oComboItems As New List(Of KeyValuePair(Of Integer, String))
Dim oSettingsItems As New List(Of KeyValuePair(Of Integer, String))
'cboCompression 'cboCompression
cboCompression.ValueMember = "Key" cboCompression.ValueMember = "Key"
@@ -213,6 +219,19 @@ Public Class frmSettings
oComboItems.Add(New KeyValuePair(Of Integer, String)(9, frmSettings_cboCompression_Ultra)) oComboItems.Add(New KeyValuePair(Of Integer, String)(9, frmSettings_cboCompression_Ultra))
cboCompression.DataSource = oComboItems 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 End Sub
Private Sub ToggleSyncButton() Private Sub ToggleSyncButton()
@@ -232,6 +251,27 @@ Public Class frmSettings
End If End If
End Sub 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() Private Sub SetForm()
'Set Form Name 'Set Form Name
Me.Text = frmSettings_FormName Me.Text = frmSettings_FormName
@@ -250,7 +290,8 @@ Public Class frmSettings
grpPaths.Text = frmSettings_grpPaths grpPaths.Text = frmSettings_grpPaths
btnBackupFolder.Text = frmSettings_btnBackupFolder btnBackupFolder.Text = frmSettings_btnBackupFolder
lblBackupFolder.Text = frmSettings_lblBackupFolder lblBackupFolder.Text = frmSettings_lblBackupFolder
grpGeneral.Text = frmSettings_grpGeneral grpStartup.Text = frmSettings_grpStartup
grpGameData.Text = frmSettings_grpGameData
chkTimeTracking.Text = frmSettings_chkTimeTracking chkTimeTracking.Text = frmSettings_chkTimeTracking
chkStartWindows.Text = frmSettings_chkStartWindows chkStartWindows.Text = frmSettings_chkStartWindows
chkSync.Text = frmSettings_chkSync chkSync.Text = frmSettings_chkSync
@@ -258,7 +299,9 @@ Public Class frmSettings
chkAutoSaveLog.Text = frmSettings_chkAutoSaveLog chkAutoSaveLog.Text = frmSettings_chkAutoSaveLog
chkStartToTray.Text = frmSettings_chkStartToTray chkStartToTray.Text = frmSettings_chkStartToTray
chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup
grp7z.Text = frmSettings_grp7z grp7zGeneral.Text = frmSettings_grp7zGeneral
grp7zAdvanced.Text = frmSettings_grp7zAdvanced
grp7zInformation.Text = frmSettings_grp7zInformation
lblCompression.Text = frmSettings_lblCompression lblCompression.Text = frmSettings_lblCompression
btnDefaults.Text = frmSettings_btnDefaults btnDefaults.Text = frmSettings_btnDefaults
lblArguments.Text = frmSettings_lblArguments lblArguments.Text = frmSettings_lblArguments
@@ -270,6 +313,11 @@ Public Class frmSettings
chkStartToTray.Enabled = False chkStartToTray.Enabled = False
chkStartWindows.Enabled = False chkStartWindows.Enabled = False
End If End If
'Handle Panels
pnlGeneral.Visible = False
pnlBackup.Visible = False
pnl7z.Visible = False
End Sub End Sub
Private Sub btnSave_Click(sender As System.Object, e As System.EventArgs) Handles btnSave.Click 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) sNewLocation = mgrCommon.OpenFileBrowser(frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
If sNewLocation <> String.Empty Then If sNewLocation <> String.Empty Then
txt7zLocation.Text = sNewLocation txt7zLocation.Text = sNewLocation
Get7zInfo(txt7zLocation.Text) GetUtilityInfo(txt7zLocation.Text)
End If End If
End Sub End Sub
@@ -316,7 +364,7 @@ Public Class frmSettings
End Sub End Sub
Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave
Get7zInfo(txt7zLocation.Text.Trim) GetUtilityInfo(txt7zLocation.Text.Trim)
End Sub End Sub
Private Sub btnDefaults_Click(sender As Object, e As EventArgs) Handles btnDefaults.Click 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 Private Sub chkSync_CheckedChanged(sender As Object, e As EventArgs) Handles chkSync.CheckedChanged
ToggleSyncButton() ToggleSyncButton()
End Sub End Sub
Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged
ChangePanel()
End Sub
End Class End Class
-3
View File
@@ -338,9 +338,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="References\Mono.Data.Sqlite.dll" /> <Content Include="References\Mono.Data.Sqlite.dll" />
<Content Include="Resources\custom_7z.png" />
<Content Include="Resources\valid_7z.png" />
<Content Include="Resources\warning_7z.png" />
<Content Include="Utilities\x64\7za.exe"> <Content Include="Utilities\x64\7za.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
+52 -64
View File
@@ -132,6 +132,15 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to N/A.
'''</summary>
Friend ReadOnly Property App_NotAvailable() As String
Get
Return ResourceManager.GetString("App_NotAvailable", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/GBM_Official.xml. ''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/GBM_Official.xml.
'''</summary> '''</summary>
@@ -3382,11 +3391,29 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to 7-Zip Options. ''' Looks up a localized string similar to Advanced.
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_grp7z() As String Friend ReadOnly Property frmSettings_grp7zAdvanced() As String
Get Get
Return ResourceManager.GetString("frmSettings_grp7z", resourceCulture) Return ResourceManager.GetString("frmSettings_grp7zAdvanced", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to General.
'''</summary>
Friend ReadOnly Property frmSettings_grp7zGeneral() As String
Get
Return ResourceManager.GetString("frmSettings_grp7zGeneral", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Utility Information.
'''</summary>
Friend ReadOnly Property frmSettings_grp7zInformation() As String
Get
Return ResourceManager.GetString("frmSettings_grp7zInformation", resourceCulture)
End Get End Get
End Property End Property
@@ -3400,11 +3427,11 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to General. ''' Looks up a localized string similar to Game Data.
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_grpGeneral() As String Friend ReadOnly Property frmSettings_grpGameData() As String
Get Get
Return ResourceManager.GetString("frmSettings_grpGeneral", resourceCulture) Return ResourceManager.GetString("frmSettings_grpGameData", resourceCulture)
End Get End Get
End Property End Property
@@ -3417,6 +3444,15 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to Startup.
'''</summary>
Friend ReadOnly Property frmSettings_grpStartup() As String
Get
Return ResourceManager.GetString("frmSettings_grpStartup", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to Custom Arguments:. ''' Looks up a localized string similar to Custom Arguments:.
'''</summary> '''</summary>
@@ -3463,47 +3499,29 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to GBM is using a custom 7-Zip utility, it cannot be verified.. ''' Looks up a localized string similar to 7-Zip.
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_ttUtilityStatus_Custom7z() As String Friend ReadOnly Property frmSettings_lstSettings_7z() As String
Get Get
Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Custom7z", resourceCulture) Return ResourceManager.GetString("frmSettings_lstSettings_7z", resourceCulture)
End Get End Get
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to GBM could not verify the custom 7-Zip utility.. ''' Looks up a localized string similar to Backup and Restore.
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_ttUtilityStatus_Failure7z() As String Friend ReadOnly Property frmSettings_lstSettings_BackupRestore() As String
Get Get
Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Failure7z", resourceCulture) Return ResourceManager.GetString("frmSettings_lstSettings_BackupRestore", resourceCulture)
End Get End Get
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to GBM&apos;s default 7-Zip utility has failed verification, it cannot be used.. ''' Looks up a localized string similar to General.
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_ttUtilityStatus_Invalid7z() As String Friend ReadOnly Property frmSettings_lstSettings_General() As String
Get Get
Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Invalid7z", resourceCulture) Return ResourceManager.GetString("frmSettings_lstSettings_General", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 7-Zip Status.
'''</summary>
Friend ReadOnly Property frmSettings_ttUtilityStatus_Title() As String
Get
Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Title", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to GBM is using the default 7-Zip utility, it has been verified..
'''</summary>
Friend ReadOnly Property frmSettings_ttUtilityStatus_Valid7z() As String
Get
Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Valid7z", resourceCulture)
End Get End Get
End Property End Property
@@ -3517,7 +3535,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to You have chosen a custom utility that does not appear to be 7-Zip Console (7za). GBM only supports the use of 7-Zip.. ''' Looks up a localized string similar to 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)..
'''</summary> '''</summary>
Friend ReadOnly Property frmSettings_WarningLocation() As String Friend ReadOnly Property frmSettings_WarningLocation() As String
Get Get
@@ -4788,35 +4806,5 @@ Namespace My.Resources
Return ResourceManager.GetString("mgrXML_ErrorImportFailure", resourceCulture) Return ResourceManager.GetString("mgrXML_ErrorImportFailure", resourceCulture)
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Utility_Custom() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Utility_Custom", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Utility_Invalid() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Utility_Invalid", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Utility_Valid() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Utility_Valid", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
End Module End Module
End Namespace End Namespace
+26 -29
View File
@@ -1120,8 +1120,8 @@
<data name="frmSettings_grpBackup" xml:space="preserve"> <data name="frmSettings_grpBackup" xml:space="preserve">
<value>Backup and Restore</value> <value>Backup and Restore</value>
</data> </data>
<data name="frmSettings_grpGeneral" xml:space="preserve"> <data name="frmSettings_grpStartup" xml:space="preserve">
<value>General</value> <value>Startup</value>
</data> </data>
<data name="frmSettings_grpPaths" xml:space="preserve"> <data name="frmSettings_grpPaths" xml:space="preserve">
<value>Paths</value> <value>Paths</value>
@@ -1525,8 +1525,8 @@
<data name="frmSettings_cboCompression_Ultra" xml:space="preserve"> <data name="frmSettings_cboCompression_Ultra" xml:space="preserve">
<value>Ultra</value> <value>Ultra</value>
</data> </data>
<data name="frmSettings_grp7z" xml:space="preserve"> <data name="frmSettings_grp7zGeneral" xml:space="preserve">
<value>7-Zip Options</value> <value>General</value>
</data> </data>
<data name="frmSettings_lblCompression" xml:space="preserve"> <data name="frmSettings_lblCompression" xml:space="preserve">
<value>Compression:</value> <value>Compression:</value>
@@ -1625,35 +1625,11 @@
<value>The custom 7-Zip location [PARAM] does not exist.</value> <value>The custom 7-Zip location [PARAM] does not exist.</value>
</data> </data>
<data name="frmSettings_WarningLocation" xml:space="preserve"> <data name="frmSettings_WarningLocation" xml:space="preserve">
<value>You have chosen a custom utility that does not appear to be 7-Zip Console (7za). GBM only supports the use of 7-Zip.</value> <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>
<data name="App_Invalid7zDetected" xml:space="preserve"> <data name="App_Invalid7zDetected" xml:space="preserve">
<value>7-Zip (7za.exe) is invalid and has been prevented from running.</value> <value>7-Zip (7za.exe) is invalid and has been prevented from running.</value>
</data> </data>
<data name="Utility_Custom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\custom_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Utility_Valid" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\valid_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Utility_Invalid" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\warning_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="frmSettings_ttUtilityStatus_Custom7z" xml:space="preserve">
<value>GBM is using a custom 7-Zip utility, it cannot be verified.</value>
</data>
<data name="frmSettings_ttUtilityStatus_Failure7z" xml:space="preserve">
<value>GBM could not verify the custom 7-Zip utility.</value>
</data>
<data name="frmSettings_ttUtilityStatus_Invalid7z" xml:space="preserve">
<value>GBM's default 7-Zip utility has failed verification, it cannot be used.</value>
</data>
<data name="frmSettings_ttUtilityStatus_Title" xml:space="preserve">
<value>7-Zip Status</value>
</data>
<data name="frmSettings_ttUtilityStatus_Valid7z" xml:space="preserve">
<value>GBM is using the default 7-Zip utility, it has been verified.</value>
</data>
<data name="frmGameManager_lblQuickFilter" xml:space="preserve"> <data name="frmGameManager_lblQuickFilter" xml:space="preserve">
<value>Quick Filter:</value> <value>Quick Filter:</value>
</data> </data>
@@ -1699,4 +1675,25 @@
<data name="frmSettings_chkAutoSaveLog" xml:space="preserve"> <data name="frmSettings_chkAutoSaveLog" xml:space="preserve">
<value>Autosave log when max length is exceeded</value> <value>Autosave log when max length is exceeded</value>
</data> </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>Utility Information</value>
</data>
<data name="App_NotAvailable" xml:space="preserve">
<value>N/A</value>
</data>
</root> </root>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB