From 203c745f0925402f3ddc5c654f9ab25a25c135d0 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Fri, 22 Mar 2019 07:36:04 -0600 Subject: [PATCH] Remove "Sync Game IDs" warning when importing on Game Manager --- GBM/Forms/frmMain.vb | 4 ++-- GBM/Managers/mgrMonitorList.vb | 15 +++------------ GBM/Managers/mgrSettings.vb | 7 +------ GBM/My Project/Resources.Designer.vb | 13 ++----------- GBM/My Project/Resources.resx | 7 ++----- GBM/readme.txt | 7 +++++-- 6 files changed, 15 insertions(+), 38 deletions(-) diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 9b471f4..db5fe46 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -1104,12 +1104,12 @@ Public Class frmMain End If If bOfficial Then - mgrMonitorList.SyncGameIDs(sLocation, oSettings, True) + mgrMonitorList.SyncGameIDs(sLocation, True) Else sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False) If sLocation <> String.Empty Then - mgrMonitorList.SyncGameIDs(sLocation, oSettings, False) + mgrMonitorList.SyncGameIDs(sLocation, False) End If End If diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 4a6231b..70f090b 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -794,19 +794,13 @@ Public Class mgrMonitorList Return oList End Function - Public Shared Function SyncGameIDs(ByVal sPath As String, ByRef oSettings As mgrSettings, ByVal bOfficial As Boolean) As Boolean + Public Shared Function SyncGameIDs(ByVal sPath As String, ByVal bOfficial As Boolean) As Boolean Dim sWarning As String If bOfficial Then - If (oSettings.SuppressMessages And mgrSettings.eSuppressMessages.GameIDSync) = mgrSettings.eSuppressMessages.GameIDSync Then - sWarning = mgrMonitorList_ConfirmOfficialGameIDSync - Else - sWarning = mgrMonitorList_ConfirmInitialOfficialGameIDSync - oSettings.SuppressMessages = oSettings.SetMessageField(oSettings.SuppressMessages, mgrSettings.eSuppressMessages.GameIDSync) - oSettings.SaveSettings() - End If + sWarning = mgrMonitorList_ConfirmOfficialGameIDSync Else - sWarning = mgrMonitorList_ConfirmFileGameIDSync + sWarning = mgrMonitorList_ConfirmFileGameIDSync End If If mgrCommon.ShowMessage(sWarning, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then @@ -833,9 +827,6 @@ 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, Optional ByVal bWinConfigsInLinux As Boolean = False) As Boolean If mgrCommon.IsAddress(sPath) Then If mgrCommon.CheckAddress(sPath) 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, bWinConfigsInLinux) Return True Else diff --git a/GBM/Managers/mgrSettings.vb b/GBM/Managers/mgrSettings.vb index de5f9ff..42e623d 100644 --- a/GBM/Managers/mgrSettings.vb +++ b/GBM/Managers/mgrSettings.vb @@ -30,7 +30,7 @@ Public Class mgrSettings Public Enum eSuppressMessages None = 0 - GameIDSync = 1 + Unused = 1 'Do not remove to maintain compatability, re-use for a future field. BackupImport = 2 WinConfigsInLinux = 4 WineConfig = 16 @@ -318,11 +318,6 @@ Public Class mgrSettings End Set End Property - Sub New() - 'The GameIDsync message should be suppressed on all new databases - SuppressMessages = SetMessageField(SuppressMessages, eSuppressMessages.GameIDSync) - End Sub - Private Sub SaveFromClass() Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local) Dim sSQL As String diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 7d2c827..3bc823a 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -6368,7 +6368,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Do you want to sync your game identifiers with this export file?[BR][BR]You should only do this if you're managing your own game configurations. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. + ''' Looks up a localized string similar to Do you want to sync your game identifiers with this export file?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature.. ''' Friend ReadOnly Property mgrMonitorList_ConfirmFileGameIDSync() As String Get @@ -6377,16 +6377,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to GBM now uses a unique identifier for each game. For the import feature to recognize game configurations from a prior version, they need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers with the official list?[BR][BR]This feature is available anytime from the "Tools" menu. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. - ''' - Friend ReadOnly Property mgrMonitorList_ConfirmInitialOfficialGameIDSync() As String - Get - Return ResourceManager.GetString("mgrMonitorList_ConfirmInitialOfficialGameIDSync", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Do you want to sync your game identifiers with the official game list?[BR][BR]This allows the import feature to recognize game configurations from a prior version. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. + ''' Looks up a localized string similar to Do you want to sync your game identifiers with the official game list?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature.. ''' Friend ReadOnly Property mgrMonitorList_ConfirmOfficialGameIDSync() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 050481f..39523ea 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2020,9 +2020,6 @@ Game ID - - GBM now uses a unique identifier for each game. For the import feature to recognize game configurations from a prior version, they need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers with the official list?[BR][BR]This feature is available anytime from the "Tools" menu. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. - This file cannot be used to sync game indentifiers. It was created with an older version of GBM. @@ -2030,7 +2027,7 @@ This export file was created with a version of GBM prior to 1.1.5 and may contain incompatible configuration data.[BR][BR]Do you still want to import configurations from this file? (Not Recommended) - Do you want to sync your game identifiers with this export file?[BR][BR]You should only do this if you're managing your own game configurations. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. + Do you want to sync your game identifiers with this export file?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature. S&ync Game IDs @@ -2042,7 +2039,7 @@ &Official List... - Do you want to sync your game identifiers with the official game list?[BR][BR]This allows the import feature to recognize game configurations from a prior version. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. + Do you want to sync your game identifiers with the official game list?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature. &Reset Warnings diff --git a/GBM/readme.txt b/GBM/readme.txt index 0104bd6..80a3a5b 100644 --- a/GBM/readme.txt +++ b/GBM/readme.txt @@ -2,7 +2,7 @@ Game Backup Monitor v1.1.8 Readme http://mikemaximus.github.io/gbm-web/ gamebackupmonitor@gmail.com -March 21, 2019 +March 22, 2019 New in 1.1.8 @@ -26,7 +26,10 @@ All Platforms: - "Windows" and "Linux" are the only valid choices at this time and only Linux users are allowed to change this field. - Changed how GBM initilizes on startup to fix some long standing issues. - Fixed some inconsistencies with form icons and when forms are shown in the task bar. - +- GBM no longer provides a warning about "Syncing Game IDs" when importing configurations in the Game Manager. + - The warning was very confusing and is no longer relevant to most users. + - The "Sync Game IDs" Tool will continue to be available for now, but the messaging has been changed warning not to use it without reading the manual first. + Windows: - Updated SQLite to 3.27.2