From 86ffc756668bf2cf293bc76b3dc418013718e0d6 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sat, 18 Jun 2016 18:41:00 -0600 Subject: [PATCH] Changes for issue #54 --- GBM/Forms/frmGameManager.vb | 10 ++++++---- GBM/Forms/frmStartUpWizard.vb | 10 ++++++---- GBM/My Project/Resources.Designer.vb | 18 +++++++++--------- GBM/My Project/Resources.resx | 6 +++--- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 594f7b6..16723ce 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1297,14 +1297,16 @@ Public Class frmGameManager End Sub Private Sub ImportOfficialGameList() + Dim sImportURL As String + If mgrCommon.IsUnix Then - If mgrCommon.ShowMessage(frmGameManager_ConfirmUnixImportWarning, MsgBoxStyle.YesNo) = MsgBoxResult.No Then - Exit Sub - End If + sImportURL = App_URLImportLinux + Else + sImportURL = App_URLImport End If If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(App_URLImport) Then + If mgrMonitorList.DoImport(sImportURL) Then LoadData() End If End If diff --git a/GBM/Forms/frmStartUpWizard.vb b/GBM/Forms/frmStartUpWizard.vb index 71f2e8c..f3375eb 100644 --- a/GBM/Forms/frmStartUpWizard.vb +++ b/GBM/Forms/frmStartUpWizard.vb @@ -98,14 +98,16 @@ Public Class frmStartUpWizard End Sub Private Sub DownloadSettings() + Dim sImportURL As String + If mgrCommon.IsUnix Then - If mgrCommon.ShowMessage(frmGameManager_ConfirmUnixImportWarning, MsgBoxStyle.YesNo) = MsgBoxResult.No Then - Exit Sub - End If + sImportURL = App_URLImportLinux + Else + sImportURL = App_URLImport End If If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(App_URLImport) Then + If mgrMonitorList.DoImport(sImportURL) Then oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList) If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) End If diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index bef35a2..1302983 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -150,6 +150,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml. + ''' + Friend ReadOnly Property App_URLImportLinux() As String + Get + Return ResourceManager.GetString("App_URLImportLinux", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/manual.html. ''' @@ -1473,15 +1482,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to You appear to be using a Unix based operating system. The official list currently contains only Microsoft Windows game configurations.[BR][BR]Do you wish to continue?. - ''' - Friend ReadOnly Property frmGameManager_ConfirmUnixImportWarning() As String - Get - Return ResourceManager.GetString("frmGameManager_ConfirmUnixImportWarning", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to Game Backup Monitor Export. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 7379705..bbccad7 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1555,9 +1555,6 @@ This function is currently not available on a Unix based operating system. - - You appear to be using a Unix based operating system. The official list currently contains only Microsoft Windows game configurations.[BR][BR]Do you wish to continue? - PNG files (*.png)|*.png @@ -1693,4 +1690,7 @@ N/A + + http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml + \ No newline at end of file