From de157d516c6a736681f9dd9da293e7c57c8c0769 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Mon, 19 Mar 2018 08:38:26 -0600 Subject: [PATCH 1/2] Fixed a triggering spelling error --- GBM/Forms/frmMain.vb | 10 +- GBM/Forms/frmSettings.Designer.vb | 156 +++++++++++++-------------- GBM/Forms/frmSettings.vb | 18 ++-- GBM/Managers/mgrMonitorList.vb | 6 +- GBM/Managers/mgrSQLite.vb | 12 +-- GBM/Managers/mgrSettings.vb | 48 ++++----- GBM/My Project/Resources.Designer.vb | 4 +- GBM/My Project/Resources.resx | 2 +- GBM/readme.txt | 2 +- 9 files changed, 129 insertions(+), 129 deletions(-) diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index d63db73..cd5c279 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -295,7 +295,7 @@ Public Class frmMain OperationStarted(False) If oProcess.GameInfo.MonitorOnly = False Then - If SupressSession() Then + If SuppressSession() Then bDoBackup = False UpdateLog(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.Name), False) SetLastAction(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.CroppedName)) @@ -718,7 +718,7 @@ Public Class frmMain Private Sub HandleSession() Dim oSession As clsSession - If Not SupressSession() Then + If Not SuppressSession() Then 'Record Session oSession = New clsSession oSession.MonitorID = oProcess.GameInfo.ID @@ -729,11 +729,11 @@ Public Class frmMain End If End Sub - Private Function SupressSession() As Boolean + Private Function SuppressSession() As Boolean Dim iSession As Integer - If oSettings.SupressBackup Then + If oSettings.SuppressBackup Then iSession = Math.Ceiling(oProcess.TimeSpent.TotalMinutes) - If iSession > oSettings.SupressBackupThreshold Then + If iSession > oSettings.SuppressBackupThreshold Then Return False Else Return True diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index 1f12cea..51254c8 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -46,6 +46,7 @@ Partial Class frmSettings Me.lbl7zProduct = New System.Windows.Forms.Label() Me.btnDefaults = New System.Windows.Forms.Button() Me.pnlBackup = New System.Windows.Forms.Panel() + Me.grpBackupConfirmations = New System.Windows.Forms.GroupBox() Me.chkBackupConfirm = New System.Windows.Forms.CheckBox() Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox() Me.grpBackupHandling = New System.Windows.Forms.GroupBox() @@ -56,38 +57,37 @@ Partial Class frmSettings Me.grp7zAdvanced = New System.Windows.Forms.GroupBox() Me.grp7zInformation = New System.Windows.Forms.GroupBox() Me.pnlGeneral = New System.Windows.Forms.Panel() + Me.grpGameMonitoringOptions = New System.Windows.Forms.GroupBox() + Me.chkSuppressBackup = New System.Windows.Forms.CheckBox() Me.lblMinutes = New System.Windows.Forms.Label() - Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown() - Me.chkSupressBackup = New System.Windows.Forms.CheckBox() + Me.nudSuppressBackupThreshold = New System.Windows.Forms.NumericUpDown() + Me.grpLogOptions = New System.Windows.Forms.GroupBox() + Me.chkDisableSyncMessages = New System.Windows.Forms.CheckBox() Me.grpGameData = New System.Windows.Forms.GroupBox() Me.chkSessionTracking = New System.Windows.Forms.CheckBox() Me.lstSettings = New System.Windows.Forms.ListBox() Me.btnResetMessages = New System.Windows.Forms.Button() - Me.grpBackupConfirmations = New System.Windows.Forms.GroupBox() Me.pnlStartup = New System.Windows.Forms.Panel() Me.grpStartup = New System.Windows.Forms.GroupBox() Me.chkBackupOnLaunch = New System.Windows.Forms.CheckBox() Me.chkStartWindows = New System.Windows.Forms.CheckBox() Me.chkStartToTray = New System.Windows.Forms.CheckBox() Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() - Me.grpLogOptions = New System.Windows.Forms.GroupBox() - Me.chkDisableSyncMessages = New System.Windows.Forms.CheckBox() - Me.grpGameMonitoringOptions = New System.Windows.Forms.GroupBox() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() Me.pnlBackup.SuspendLayout() + Me.grpBackupConfirmations.SuspendLayout() Me.grpBackupHandling.SuspendLayout() Me.pnl7z.SuspendLayout() Me.grp7zAdvanced.SuspendLayout() Me.grp7zInformation.SuspendLayout() Me.pnlGeneral.SuspendLayout() - CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpGameMonitoringOptions.SuspendLayout() + CType(Me.nudSuppressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpLogOptions.SuspendLayout() Me.grpGameData.SuspendLayout() - Me.grpBackupConfirmations.SuspendLayout() Me.pnlStartup.SuspendLayout() Me.grpStartup.SuspendLayout() - Me.grpLogOptions.SuspendLayout() - Me.grpGameMonitoringOptions.SuspendLayout() Me.SuspendLayout() ' 'chkAutoSaveLog @@ -315,6 +315,17 @@ Partial Class frmSettings Me.pnlBackup.Size = New System.Drawing.Size(367, 314) Me.pnlBackup.TabIndex = 3 ' + 'grpBackupConfirmations + ' + Me.grpBackupConfirmations.Controls.Add(Me.chkBackupConfirm) + Me.grpBackupConfirmations.Controls.Add(Me.chkOverwriteWarning) + Me.grpBackupConfirmations.Location = New System.Drawing.Point(6, 200) + Me.grpBackupConfirmations.Name = "grpBackupConfirmations" + Me.grpBackupConfirmations.Size = New System.Drawing.Size(354, 65) + Me.grpBackupConfirmations.TabIndex = 2 + Me.grpBackupConfirmations.TabStop = False + Me.grpBackupConfirmations.Text = "Backup Confirmations" + ' 'chkBackupConfirm ' Me.chkBackupConfirm.AutoSize = True @@ -426,6 +437,29 @@ Partial Class frmSettings Me.pnlGeneral.Size = New System.Drawing.Size(367, 314) Me.pnlGeneral.TabIndex = 1 ' + 'grpGameMonitoringOptions + ' + Me.grpGameMonitoringOptions.Controls.Add(Me.chkSuppressBackup) + Me.grpGameMonitoringOptions.Controls.Add(Me.lblMinutes) + Me.grpGameMonitoringOptions.Controls.Add(Me.chkShowDetectionTips) + Me.grpGameMonitoringOptions.Controls.Add(Me.nudSuppressBackupThreshold) + Me.grpGameMonitoringOptions.Location = New System.Drawing.Point(6, 115) + Me.grpGameMonitoringOptions.Name = "grpGameMonitoringOptions" + Me.grpGameMonitoringOptions.Size = New System.Drawing.Size(354, 65) + Me.grpGameMonitoringOptions.TabIndex = 1 + Me.grpGameMonitoringOptions.TabStop = False + Me.grpGameMonitoringOptions.Text = "Game Monitoring Options" + ' + 'chkSuppressBackup + ' + Me.chkSuppressBackup.AutoSize = True + Me.chkSuppressBackup.Location = New System.Drawing.Point(6, 18) + Me.chkSuppressBackup.Name = "chkSuppressBackup" + Me.chkSuppressBackup.Size = New System.Drawing.Size(158, 17) + Me.chkSuppressBackup.TabIndex = 2 + Me.chkSuppressBackup.Text = "Ignore sessions shorter than" + Me.chkSuppressBackup.UseVisualStyleBackColor = True + ' 'lblMinutes ' Me.lblMinutes.AutoSize = True @@ -435,23 +469,34 @@ Partial Class frmSettings Me.lblMinutes.TabIndex = 17 Me.lblMinutes.Text = "minutes" ' - 'nudSupressBackupThreshold + 'nudSuppressBackupThreshold ' - Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(170, 17) - Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) - Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold" - Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20) - Me.nudSupressBackupThreshold.TabIndex = 3 + Me.nudSuppressBackupThreshold.Location = New System.Drawing.Point(170, 17) + Me.nudSuppressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) + Me.nudSuppressBackupThreshold.Name = "nudSuppressBackupThreshold" + Me.nudSuppressBackupThreshold.Size = New System.Drawing.Size(51, 20) + Me.nudSuppressBackupThreshold.TabIndex = 3 ' - 'chkSupressBackup + 'grpLogOptions ' - Me.chkSupressBackup.AutoSize = True - Me.chkSupressBackup.Location = New System.Drawing.Point(6, 18) - Me.chkSupressBackup.Name = "chkSupressBackup" - Me.chkSupressBackup.Size = New System.Drawing.Size(158, 17) - Me.chkSupressBackup.TabIndex = 2 - Me.chkSupressBackup.Text = "Ignore sessions shorter than" - Me.chkSupressBackup.UseVisualStyleBackColor = True + Me.grpLogOptions.Controls.Add(Me.chkDisableSyncMessages) + Me.grpLogOptions.Controls.Add(Me.chkAutoSaveLog) + Me.grpLogOptions.Location = New System.Drawing.Point(6, 186) + Me.grpLogOptions.Name = "grpLogOptions" + Me.grpLogOptions.Size = New System.Drawing.Size(354, 65) + Me.grpLogOptions.TabIndex = 2 + Me.grpLogOptions.TabStop = False + Me.grpLogOptions.Text = "Log Options" + ' + 'chkDisableSyncMessages + ' + Me.chkDisableSyncMessages.AutoSize = True + Me.chkDisableSyncMessages.Location = New System.Drawing.Point(6, 19) + Me.chkDisableSyncMessages.Name = "chkDisableSyncMessages" + Me.chkDisableSyncMessages.Size = New System.Drawing.Size(166, 17) + Me.chkDisableSyncMessages.TabIndex = 0 + Me.chkDisableSyncMessages.Text = "Disable sync event messages" + Me.chkDisableSyncMessages.UseVisualStyleBackColor = True ' 'grpGameData ' @@ -492,17 +537,6 @@ Partial Class frmSettings Me.btnResetMessages.Text = "&Reset Warnings" Me.btnResetMessages.UseVisualStyleBackColor = True ' - 'grpBackupConfirmations - ' - Me.grpBackupConfirmations.Controls.Add(Me.chkBackupConfirm) - Me.grpBackupConfirmations.Controls.Add(Me.chkOverwriteWarning) - Me.grpBackupConfirmations.Location = New System.Drawing.Point(6, 200) - Me.grpBackupConfirmations.Name = "grpBackupConfirmations" - Me.grpBackupConfirmations.Size = New System.Drawing.Size(354, 65) - Me.grpBackupConfirmations.TabIndex = 2 - Me.grpBackupConfirmations.TabStop = False - Me.grpBackupConfirmations.Text = "Backup Confirmations" - ' 'pnlStartup ' Me.pnlStartup.Controls.Add(Me.grpStartup) @@ -564,40 +598,6 @@ Partial Class frmSettings Me.chkMonitorOnStartup.Text = "Start monitoring on launch" Me.chkMonitorOnStartup.UseVisualStyleBackColor = True ' - 'grpLogOptions - ' - Me.grpLogOptions.Controls.Add(Me.chkDisableSyncMessages) - Me.grpLogOptions.Controls.Add(Me.chkAutoSaveLog) - Me.grpLogOptions.Location = New System.Drawing.Point(6, 193) - Me.grpLogOptions.Name = "grpLogOptions" - Me.grpLogOptions.Size = New System.Drawing.Size(354, 65) - Me.grpLogOptions.TabIndex = 2 - Me.grpLogOptions.TabStop = False - Me.grpLogOptions.Text = "Log Options" - ' - 'chkDisableSyncMessages - ' - Me.chkDisableSyncMessages.AutoSize = True - Me.chkDisableSyncMessages.Location = New System.Drawing.Point(6, 19) - Me.chkDisableSyncMessages.Name = "chkDisableSyncMessages" - Me.chkDisableSyncMessages.Size = New System.Drawing.Size(166, 17) - Me.chkDisableSyncMessages.TabIndex = 0 - Me.chkDisableSyncMessages.Text = "Disable sync event messages" - Me.chkDisableSyncMessages.UseVisualStyleBackColor = True - ' - 'grpGameMonitoringOptions - ' - Me.grpGameMonitoringOptions.Controls.Add(Me.chkSupressBackup) - Me.grpGameMonitoringOptions.Controls.Add(Me.lblMinutes) - Me.grpGameMonitoringOptions.Controls.Add(Me.chkShowDetectionTips) - Me.grpGameMonitoringOptions.Controls.Add(Me.nudSupressBackupThreshold) - Me.grpGameMonitoringOptions.Location = New System.Drawing.Point(6, 115) - Me.grpGameMonitoringOptions.Name = "grpGameMonitoringOptions" - Me.grpGameMonitoringOptions.Size = New System.Drawing.Size(354, 72) - Me.grpGameMonitoringOptions.TabIndex = 1 - Me.grpGameMonitoringOptions.TabStop = False - Me.grpGameMonitoringOptions.Text = "Game Monitoring Options" - ' 'frmSettings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -625,6 +625,8 @@ Partial Class frmSettings Me.grp7zGeneral.ResumeLayout(False) Me.grp7zGeneral.PerformLayout() Me.pnlBackup.ResumeLayout(False) + Me.grpBackupConfirmations.ResumeLayout(False) + Me.grpBackupConfirmations.PerformLayout() Me.grpBackupHandling.ResumeLayout(False) Me.grpBackupHandling.PerformLayout() Me.pnl7z.ResumeLayout(False) @@ -632,18 +634,16 @@ Partial Class frmSettings Me.grp7zAdvanced.PerformLayout() Me.grp7zInformation.ResumeLayout(False) Me.pnlGeneral.ResumeLayout(False) - CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpGameMonitoringOptions.ResumeLayout(False) + Me.grpGameMonitoringOptions.PerformLayout() + CType(Me.nudSuppressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpLogOptions.ResumeLayout(False) + Me.grpLogOptions.PerformLayout() Me.grpGameData.ResumeLayout(False) Me.grpGameData.PerformLayout() - Me.grpBackupConfirmations.ResumeLayout(False) - Me.grpBackupConfirmations.PerformLayout() Me.pnlStartup.ResumeLayout(False) Me.grpStartup.ResumeLayout(False) Me.grpStartup.PerformLayout() - Me.grpLogOptions.ResumeLayout(False) - Me.grpLogOptions.PerformLayout() - Me.grpGameMonitoringOptions.ResumeLayout(False) - Me.grpGameMonitoringOptions.PerformLayout() Me.ResumeLayout(False) End Sub @@ -684,8 +684,8 @@ Partial Class frmSettings Friend WithEvents chkRestoreNotify As CheckBox Friend WithEvents chkSessionTracking As CheckBox Friend WithEvents lblMinutes As Label - Friend WithEvents nudSupressBackupThreshold As NumericUpDown - Friend WithEvents chkSupressBackup As CheckBox + Friend WithEvents nudSuppressBackupThreshold As NumericUpDown + Friend WithEvents chkSuppressBackup As CheckBox Friend WithEvents btnResetMessages As Button Friend WithEvents chkUseGameID As CheckBox Friend WithEvents grpBackupConfirmations As GroupBox diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index 5aeb310..59584ae 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -60,8 +60,8 @@ Public Class frmSettings oSettings.AutoMark = chkAutoMark.Checked oSettings.TimeTracking = chkTimeTracking.Checked oSettings.SessionTracking = chkSessionTracking.Checked - oSettings.SupressBackup = chkSupressBackup.Checked - oSettings.SupressBackupThreshold = nudSupressBackupThreshold.Value + oSettings.SuppressBackup = chkSuppressBackup.Checked + oSettings.SuppressBackupThreshold = nudSuppressBackupThreshold.Value oSettings.CompressionLevel = cboCompression.SelectedValue If oSettings.Custom7zArguments <> txt7zArguments.Text.Trim And txt7zArguments.Text.Trim <> String.Empty Then @@ -167,7 +167,7 @@ Public Class frmSettings Private Sub ResetMessages() If mgrCommon.ShowMessage(frmSettings_ConfirmMessageReset, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - oSettings.SupressMessages = mgrSettings.eSupressMessages.None + oSettings.SuppressMessages = mgrSettings.eSuppressMessages.None End If End Sub @@ -189,9 +189,9 @@ Public Class frmSettings txtBackupFolder.Text = oSettings.BackupFolder chkTimeTracking.Checked = oSettings.TimeTracking chkSessionTracking.Checked = oSettings.SessionTracking - chkSupressBackup.Checked = oSettings.SupressBackup - nudSupressBackupThreshold.Value = oSettings.SupressBackupThreshold - nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked + chkSuppressBackup.Checked = oSettings.SuppressBackup + nudSuppressBackupThreshold.Value = oSettings.SuppressBackupThreshold + nudSuppressBackupThreshold.Enabled = chkSuppressBackup.Checked cboCompression.SelectedValue = oSettings.CompressionLevel txt7zArguments.Text = oSettings.Custom7zArguments txt7zLocation.Text = oSettings.Custom7zLocation @@ -285,7 +285,7 @@ Public Class frmSettings 'Set Form Text lblMinutes.Text = frmSettings_lblMinutes - chkSupressBackup.Text = frmSettings_chkSupressBackup + chkSuppressBackup.Text = frmSettings_chkSuppressBackup grpBackupHandling.Text = frmSettings_grpBackupHandling chkRestoreNotify.Text = frmSettings_chkRestoreNotify chkAutoRestore.Text = frmSettings_chkAutoRestore @@ -368,8 +368,8 @@ Public Class frmSettings End If End Sub - Private Sub chkSupressBackup_CheckedChanged(sender As Object, e As EventArgs) Handles chkSupressBackup.CheckedChanged - nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked + Private Sub chkSuppressBackup_CheckedChanged(sender As Object, e As EventArgs) Handles chkSuppressBackup.CheckedChanged + nudSuppressBackupThreshold.Enabled = chkSuppressBackup.Checked End Sub Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 4c38f18..403eb3e 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -795,11 +795,11 @@ Public Class mgrMonitorList Dim sWarning As String If bOfficial Then - If (oSettings.SupressMessages And mgrSettings.eSupressMessages.GameIDSync) = mgrSettings.eSupressMessages.GameIDSync Then + If (oSettings.SuppressMessages And mgrSettings.eSuppressMessages.GameIDSync) = mgrSettings.eSuppressMessages.GameIDSync Then sWarning = mgrMonitorList_ConfirmOfficialGameIDSync Else sWarning = mgrMonitorList_ConfirmInitialOfficialGameIDSync - oSettings.SupressMessages = oSettings.SetMessageField(oSettings.SupressMessages, mgrSettings.eSupressMessages.GameIDSync) + oSettings.SuppressMessages = oSettings.SetMessageField(oSettings.SuppressMessages, mgrSettings.eSuppressMessages.GameIDSync) oSettings.SaveSettings() End If Else @@ -830,7 +830,7 @@ Public Class mgrMonitorList Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean, ByRef oSettings As mgrSettings, Optional ByVal bStartUpWizard As Boolean = False) As Boolean If mgrCommon.IsAddress(sPath) Then If mgrCommon.CheckAddress(sPath) Then - If bOfficial And Not bStartUpWizard And Not ((oSettings.SupressMessages And mgrSettings.eSupressMessages.GameIDSync) = mgrSettings.eSupressMessages.GameIDSync) Then + If bOfficial And Not bStartUpWizard And Not ((oSettings.SuppressMessages And mgrSettings.eSuppressMessages.GameIDSync) = mgrSettings.eSuppressMessages.GameIDSync) Then SyncGameIDs(sPath, oSettings, True) End If ImportMonitorList(sPath, True) diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb index bd76c59..e13dad1 100644 --- a/GBM/Managers/mgrSQLite.vb +++ b/GBM/Managers/mgrSQLite.vb @@ -73,9 +73,9 @@ Public Class mgrSQLite sSql = "CREATE TABLE settings (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " & "DisableConfirmation BOOLEAN NOT NULL, CreateSubFolder BOOLEAN NOT NULL, ShowOverwriteWarning BOOLEAN NOT NULL, RestoreOnLaunch BOOLEAN NOT NULL, " & "BackupFolder TEXT NOT NULL, StartWithWindows BOOLEAN NOT NULL, TimeTracking BOOLEAN NOT NULL, " & - "SupressBackup BOOLEAN NOT NULL, SupressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " & + "SuppressBackup BOOLEAN NOT NULL, SuppressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " & "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL, SessionTracking BOOLEAN NOT NULL, " & - "SupressMessages INTEGER NOT NULL, BackupOnLaunch BOOLEAN NOT NULL, UseGameID BOOLEAN NOT NULL, DisableSyncMessages BOOLEAN NOT NULL);" + "SuppressMessages INTEGER NOT NULL, BackupOnLaunch BOOLEAN NOT NULL, UseGameID BOOLEAN NOT NULL, DisableSyncMessages BOOLEAN NOT NULL);" 'Add Tables (SavedPath) sSql &= "CREATE TABLE savedpath (PathName TEXT NOT NULL PRIMARY KEY, Path TEXT NOT NULL);" @@ -781,12 +781,12 @@ Public Class mgrSQLite sSQL &= "CREATE TABLE settings_new (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " & "DisableConfirmation BOOLEAN NOT NULL, CreateSubFolder BOOLEAN NOT NULL, ShowOverwriteWarning BOOLEAN NOT NULL, RestoreOnLaunch BOOLEAN NOT NULL, " & "BackupFolder TEXT NOT NULL, StartWithWindows BOOLEAN NOT NULL, TimeTracking BOOLEAN NOT NULL, " & - "SupressBackup BOOLEAN NOT NULL, SupressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " & + "SuppressBackup BOOLEAN NOT NULL, SuppressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " & "Custom7zLocation TEXT, SyncFields INTEGER NOT NULL, AutoSaveLog BOOLEAN NOT NULL, AutoRestore BOOLEAN NOT NULL, AutoMark BOOLEAN NOT NULL, SessionTracking BOOLEAN NOT NULL, " & - "SupressMessages INTEGER NOT NULL, BackupOnLaunch BOOLEAN NOT NULL, UseGameID BOOLEAN NOT NULL, DisableSyncMessages BOOLEAN NOT NULL);" + "SuppressMessages INTEGER NOT NULL, BackupOnLaunch BOOLEAN NOT NULL, UseGameID BOOLEAN NOT NULL, DisableSyncMessages BOOLEAN NOT NULL);" sSQL &= "INSERT INTO settings_new(SettingsID, MonitorOnStartup, StartToTray, ShowDetectionToolTips, DisableConfirmation, CreateSubFolder, ShowOverwriteWarning, RestoreOnLaunch, " & - "BackupFolder, StartWithWindows, TimeTracking, SupressBackup, SupressBackupThreshold, CompressionLevel, Custom7zArguments, Custom7zLocation, SyncFields, AutoSaveLog, " & - "AutoRestore, AutoMark, SessionTracking, SupressMessages, BackupOnLaunch, UseGameID, DisableSyncMessages) SELECT SettingsID, MonitorOnStartup, StartToTray, ShowDetectionToolTips, DisableConfirmation, CreateSubFolder, ShowOverwriteWarning, RestoreOnLaunch, " & + "BackupFolder, StartWithWindows, TimeTracking, SuppressBackup, SuppressBackupThreshold, CompressionLevel, Custom7zArguments, Custom7zLocation, SyncFields, AutoSaveLog, " & + "AutoRestore, AutoMark, SessionTracking, SuppressMessages, BackupOnLaunch, UseGameID, DisableSyncMessages) SELECT SettingsID, MonitorOnStartup, StartToTray, ShowDetectionToolTips, DisableConfirmation, CreateSubFolder, ShowOverwriteWarning, RestoreOnLaunch, " & "BackupFolder, StartWithWindows, TimeTracking, SupressBackup, SupressBackupThreshold, CompressionLevel, Custom7zArguments, Custom7zLocation, SyncFields, AutoSaveLog, " & "AutoRestore, AutoMark, SessionTracking, 0, 1, 0, 1 FROM settings;" & "DROP TABLE settings; ALTER TABLE settings_new RENAME TO settings;" diff --git a/GBM/Managers/mgrSettings.vb b/GBM/Managers/mgrSettings.vb index d1a416d..a8314f0 100644 --- a/GBM/Managers/mgrSettings.vb +++ b/GBM/Managers/mgrSettings.vb @@ -13,20 +13,20 @@ Public Class mgrSettings Private bAutoMark As Boolean = False Private bTimeTracking As Boolean = True Private bSessionTracking As Boolean = False - Private bSupressBackup As Boolean = False - Private iSupressBackupThreshold As Integer = 10 + Private bSuppressBackup As Boolean = False + Private iSuppressBackupThreshold As Integer = 10 Private iCompressionLevel As Integer = 5 Private s7zArguments As String = String.Empty Private s7zLocation As String = String.Empty Private sBackupFolder As String = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).TrimEnd(New Char() {"\", "/"}) Private eSyncFields As clsGame.eOptionalSyncFields = clsGame.eOptionalSyncFields.None Or clsGame.eOptionalSyncFields.TimeStamp - Private eMessages As eSupressMessages = eSupressMessages.None + Private eMessages As eSuppressMessages = eSuppressMessages.None Private bAutoSaveLog As Boolean = False Private bBackupOnLaunch As Boolean = True Private bUseGameID As Boolean = False Private bDisableSyncMessages As Boolean = True - Public Enum eSupressMessages + Public Enum eSuppressMessages None = 0 GameIDSync = 1 End Enum @@ -139,21 +139,21 @@ Public Class mgrSettings End Set End Property - Property SupressBackup As Boolean + Property SuppressBackup As Boolean Get - Return bSupressBackup + Return bSuppressBackup End Get Set(value As Boolean) - bSupressBackup = value + bSuppressBackup = value End Set End Property - Property SupressBackupThreshold As Integer + Property SuppressBackupThreshold As Integer Get - Return iSupressBackupThreshold + Return iSuppressBackupThreshold End Get Set(value As Integer) - iSupressBackupThreshold = value + iSuppressBackupThreshold = value End Set End Property @@ -259,11 +259,11 @@ Public Class mgrSettings End Set End Property - Property SupressMessages As eSupressMessages + Property SuppressMessages As eSuppressMessages Get Return eMessages End Get - Set(value As eSupressMessages) + Set(value As eSuppressMessages) eMessages = value End Set End Property @@ -296,8 +296,8 @@ Public Class mgrSettings End Property Sub New() - 'The GameIDsync message should be supressed on all new databases - SupressMessages = SetMessageField(SupressMessages, eSupressMessages.GameIDSync) + 'The GameIDsync message should be suppressed on all new databases + SuppressMessages = SetMessageField(SuppressMessages, eSuppressMessages.GameIDSync) End Sub Private Sub SaveFromClass() @@ -307,8 +307,8 @@ Public Class mgrSettings sSQL = "INSERT OR REPLACE INTO settings VALUES (1, @MonitorOnStartup, @StartToTray, @ShowDetectionToolTips, @DisableConfirmation, " sSQL &= "@CreateSubFolder, @ShowOverwriteWarning, @RestoreOnLaunch, @BackupFolder, @StartWithWindows, " - sSQL &= "@TimeTracking, @SupressBackup, @SupressBackupThreshold, @CompressionLevel, @Custom7zArguments, @Custom7zLocation, " - sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark, @SessionTracking, @SupressMessages, @BackupOnLaunch, @UseGameID, " + sSQL &= "@TimeTracking, @SuppressBackup, @SuppressBackupThreshold, @CompressionLevel, @Custom7zArguments, @Custom7zLocation, " + sSQL &= "@SyncFields, @AutoSaveLog, @AutoRestore, @AutoMark, @SessionTracking, @SuppressMessages, @BackupOnLaunch, @UseGameID, " sSQL &= "@DisableSyncMessages)" hshParams.Add("MonitorOnStartup", MonitorOnStartup) @@ -321,8 +321,8 @@ Public Class mgrSettings hshParams.Add("BackupFolder", BackupFolder) hshParams.Add("StartWithWindows", StartWithWindows) hshParams.Add("TimeTracking", TimeTracking) - hshParams.Add("SupressBackup", SupressBackup) - hshParams.Add("SupressBackupThreshold", SupressBackupThreshold) + hshParams.Add("SuppressBackup", SuppressBackup) + hshParams.Add("SuppressBackupThreshold", SuppressBackupThreshold) hshParams.Add("CompressionLevel", CompressionLevel) hshParams.Add("Custom7zArguments", Custom7zArguments) hshParams.Add("Custom7zLocation", Custom7zLocation) @@ -331,7 +331,7 @@ Public Class mgrSettings hshParams.Add("AutoRestore", AutoRestore) hshParams.Add("AutoMark", AutoMark) hshParams.Add("SessionTracking", SessionTracking) - hshParams.Add("SupressMessages", SupressMessages) + hshParams.Add("SuppressMessages", SuppressMessages) hshParams.Add("BackupOnLaunch", BackupOnLaunch) hshParams.Add("UseGameID", UseGameID) hshParams.Add("DisableSyncMessages", DisableSyncMessages) @@ -360,8 +360,8 @@ Public Class mgrSettings BackupFolder = CStr(dr("BackupFolder")) StartWithWindows = CBool(dr("StartWithWindows")) TimeTracking = CBool(dr("TimeTracking")) - SupressBackup = CBool(dr("SupressBackup")) - SupressBackupThreshold = CInt(dr("SupressBackupThreshold")) + SuppressBackup = CBool(dr("SuppressBackup")) + SuppressBackupThreshold = CInt(dr("SuppressBackupThreshold")) CompressionLevel = CInt(dr("CompressionLevel")) If Not IsDBNull(dr("Custom7zArguments")) Then Custom7zArguments = CStr(dr("Custom7zArguments")) If Not IsDBNull(dr("Custom7zLocation")) Then Custom7zLocation = CStr(dr("Custom7zLocation")) @@ -370,7 +370,7 @@ Public Class mgrSettings AutoRestore = CBool(dr("AutoRestore")) AutoMark = CBool(dr("AutoMark")) SessionTracking = CBool(dr("SessionTracking")) - SupressMessages = CInt(dr("SupressMessages")) + SuppressMessages = CInt(dr("SuppressMessages")) BackupOnLaunch = CBool(dr("BackupOnLaunch")) UseGameID = CBool(dr("UseGameID")) DisableSyncMessages = CBool(dr("DisableSyncMessages")) @@ -393,11 +393,11 @@ Public Class mgrSettings mgrPath.RemoteDatabaseLocation = Me.BackupFolder End Sub - Public Function SetMessageField(ByVal eMessages As eSupressMessages, ByVal eMessage As eSupressMessages) As eSupressMessages + Public Function SetMessageField(ByVal eMessages As eSuppressMessages, ByVal eMessage As eSuppressMessages) As eSuppressMessages Return eMessages Or eMessage End Function - Public Function RemoveMessageField(ByVal eMessages As eSupressMessages, ByVal eMessage As eSupressMessages) As eSupressMessages + Public Function RemoveMessageField(ByVal eMessages As eSuppressMessages, ByVal eMessage As eSuppressMessages) As eSuppressMessages Return eMessages And (Not eMessage) End Function diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index b7be52c..65e1fc4 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -4536,9 +4536,9 @@ Namespace My.Resources ''' ''' Looks up a localized string similar to Ignore sessions shorter than. ''' - Friend ReadOnly Property frmSettings_chkSupressBackup() As String + Friend ReadOnly Property frmSettings_chkSuppressBackup() As String Get - Return ResourceManager.GetString("frmSettings_chkSupressBackup", resourceCulture) + Return ResourceManager.GetString("frmSettings_chkSuppressBackup", resourceCulture) End Get End Property diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 9772b3f..78cbe5e 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1078,7 +1078,7 @@ Start with Windows - + Ignore sessions shorter than diff --git a/GBM/readme.txt b/GBM/readme.txt index 269aa8d..712de45 100644 --- a/GBM/readme.txt +++ b/GBM/readme.txt @@ -42,7 +42,7 @@ All Platforms: - Added "Backup GBM data files on launch" to the settings. A long overdue feature, this will backup both the remote and local databases (as gbm.s3db.launch.bak) each time GBM starts. - This new setting is enabled by default. - Only one backup is kept, the prior one will be overwritten. - - Added the ability to display messages or warnings that can be supressed after one view. These messages can be reset via the Settings screen. + - Added the ability to display messages or warnings that can be suppressed after one view. These messages can be reset via the Settings screen. - The "Enable Sync" feature is now mandatory and the option been removed from Settings. - The "Clean Local Manifest" feature has been removed. It is not required because manfiest entries are no longer orphaned by design. Existing orphaned entries will be removed during the v1.1.0 database upgrade. - Added "Sync Game IDs" feature. This allows the user to update their game configuration identifiers to match the official list or an export file. From e8b0650a9a2688ceb33ed9781eb44eef2ab4f399 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Mon, 19 Mar 2018 09:24:17 -0600 Subject: [PATCH 2/2] Updated official configurations notice in readme.txt --- GBM/readme.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GBM/readme.txt b/GBM/readme.txt index 712de45..4f049d4 100644 --- a/GBM/readme.txt +++ b/GBM/readme.txt @@ -90,8 +90,9 @@ Known Issues: Important Notices: -1. Configurations on the official game list are no longer fully compatible with older GBM versions. - - Technically they will work, but any game imported with a special character in it's name, such as a colon, will not create backup files correctly. - - These characters can be manually removed from the game name after importing in an older version, then the configurations will function properly. +1. Configurations on the official game lists are no longer compatible with older GBM versions. + - Configurations can now use Regular Expressions to detect when a game is running, which old versions of GBM will not understand how to handle. + - Configurations can now use any character in the game name, which may cause backups to fail in old versions of GBM. + - The last official lists compatible with v1.0.7 and lower will be archived and available to download from the GBM website for users who wish to stay on an older version. The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html \ No newline at end of file