diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index cfc6554..b40a468 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -1496,7 +1496,7 @@ Public Class frmGameManager
sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False)
If sLocation <> String.Empty Then
- If mgrMonitorList.DoImport(sLocation) Then
+ If mgrMonitorList.DoImport(sLocation, False) Then
mgrMonitorList.SyncMonitorLists(Settings.SyncFields)
LoadData()
LoadBackupData()
@@ -1526,7 +1526,7 @@ Public Class frmGameManager
End If
If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
- If mgrMonitorList.DoImport(sImportURL) Then
+ If mgrMonitorList.DoImport(sImportURL, True) Then
mgrMonitorList.SyncMonitorLists(Settings.SyncFields)
LoadData()
LoadBackupData()
diff --git a/GBM/Forms/frmStartUpWizard.vb b/GBM/Forms/frmStartUpWizard.vb
index 8b31c19..3813e2a 100644
--- a/GBM/Forms/frmStartUpWizard.vb
+++ b/GBM/Forms/frmStartUpWizard.vb
@@ -105,7 +105,7 @@ Public Class frmStartUpWizard
End If
If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
- If mgrMonitorList.DoImport(sImportURL) Then
+ If mgrMonitorList.DoImport(sImportURL, True) Then
oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList)
mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
End If
diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb
index 1667d4d..d8925f5 100644
--- a/GBM/Managers/mgrMonitorList.vb
+++ b/GBM/Managers/mgrMonitorList.vb
@@ -782,11 +782,20 @@ Public Class mgrMonitorList
Return oList
End Function
- Public Shared Function DoImport(ByVal sPath As String) As Boolean
+ Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean) As Boolean
+ Dim sWarning As String
+
+ 'Set Warning Message
+ If bOfficial Then
+ sWarning = mgrMonitorList_ConfirmOfficialGameIDSync
+ Else
+ sWarning = mgrMonitorList_ConfirmFileGameIDSync
+ End If
+
If (sPath.IndexOf("http://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Or
(sPath.IndexOf("https://", 0, StringComparison.CurrentCultureIgnoreCase) > -1) Then
If mgrCommon.CheckAddress(sPath) Then
- If mgrCommon.ShowMessage(mgrMonitorList_ConfirmGameIDSync, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If mgrCommon.ShowMessage(sWarning, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
ImportSyncGameID(sPath, True)
End If
ImportMonitorList(sPath, True)
@@ -797,7 +806,7 @@ Public Class mgrMonitorList
End If
Else
If File.Exists(sPath) Then
- If mgrCommon.ShowMessage(mgrMonitorList_ConfirmGameIDSync, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If mgrCommon.ShowMessage(sWarning, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
ImportSyncGameID(sPath)
End If
ImportMonitorList(sPath)
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index a03ee87..0e562e4 100644
--- a/GBM/My Project/Resources.Designer.vb
+++ b/GBM/My Project/Resources.Designer.vb
@@ -5438,11 +5438,20 @@ 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 work as intended, your existing game configurations need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers? (Recommened).
+ ''' Looks up a localized string similar to Do you want to sync your local game ids with this export file? (Not Recommended) [BR][BR]You should only do this if you're managing your own game configurations..
'''
- Friend ReadOnly Property mgrMonitorList_ConfirmGameIDSync() As String
+ Friend ReadOnly Property mgrMonitorList_ConfirmFileGameIDSync() As String
Get
- Return ResourceManager.GetString("mgrMonitorList_ConfirmGameIDSync", resourceCulture)
+ Return ResourceManager.GetString("mgrMonitorList_ConfirmFileGameIDSync", resourceCulture)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized string similar to Do you want to sync your local game ids with the official game list? (Recommended)[BR][BR]This allows you to easily keep your game configurations up to date if they change in the future..
+ '''
+ Friend ReadOnly Property mgrMonitorList_ConfirmOfficialGameIDSync() As String
+ Get
+ Return ResourceManager.GetString("mgrMonitorList_ConfirmOfficialGameIDSync", resourceCulture)
End Get
End Property
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index 4dc637f..9848fc4 100644
--- a/GBM/My Project/Resources.resx
+++ b/GBM/My Project/Resources.resx
@@ -2026,8 +2026,8 @@
Game ID
-
- GBM now uses a unique identifier for each game. For the import feature to work as intended, your existing game configurations need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers? (Recommened)
+
+ Do you want to sync your local game ids with the official game list? (Recommended)[BR][BR]This allows you to easily keep your game configurations up to date if they change in the future.
This file cannot be used to sync game indentifiers. It was created with an older version of GBM.
@@ -2035,4 +2035,7 @@
This export file was created with a version of GBM prior to 1.1.0 and does not contain unique game identifiers.[BR][BR]Do you still want to import configurations from this file? (Not Recommended)
+
+ Do you want to sync your local game ids with this export file? (Not Recommended) [BR][BR]You should only do this if you're managing your own game configurations.
+
\ No newline at end of file