Changes for issue #54

This commit is contained in:
Michael J. Seiferling
2016-06-18 18:41:00 -06:00
parent f312e315b9
commit 86ffc75666
4 changed files with 24 additions and 20 deletions
+6 -4
View File
@@ -1297,14 +1297,16 @@ Public Class frmGameManager
End Sub End Sub
Private Sub ImportOfficialGameList() Private Sub ImportOfficialGameList()
Dim sImportURL As String
If mgrCommon.IsUnix Then If mgrCommon.IsUnix Then
If mgrCommon.ShowMessage(frmGameManager_ConfirmUnixImportWarning, MsgBoxStyle.YesNo) = MsgBoxResult.No Then sImportURL = App_URLImportLinux
Exit Sub Else
End If sImportURL = App_URLImport
End If End If
If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
If mgrMonitorList.DoImport(App_URLImport) Then If mgrMonitorList.DoImport(sImportURL) Then
LoadData() LoadData()
End If End If
End If End If
+6 -4
View File
@@ -98,14 +98,16 @@ Public Class frmStartUpWizard
End Sub End Sub
Private Sub DownloadSettings() Private Sub DownloadSettings()
Dim sImportURL As String
If mgrCommon.IsUnix Then If mgrCommon.IsUnix Then
If mgrCommon.ShowMessage(frmGameManager_ConfirmUnixImportWarning, MsgBoxStyle.YesNo) = MsgBoxResult.No Then sImportURL = App_URLImportLinux
Exit Sub Else
End If sImportURL = App_URLImport
End If End If
If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then 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) oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList)
If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields) If oSettings.Sync Then mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
End If End If
+9 -9
View File
@@ -150,6 +150,15 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml.
'''</summary>
Friend ReadOnly Property App_URLImportLinux() As String
Get
Return ResourceManager.GetString("App_URLImportLinux", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/manual.html. ''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/manual.html.
'''</summary> '''</summary>
@@ -1473,15 +1482,6 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' 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?.
'''</summary>
Friend ReadOnly Property frmGameManager_ConfirmUnixImportWarning() As String
Get
Return ResourceManager.GetString("frmGameManager_ConfirmUnixImportWarning", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to Game Backup Monitor Export. ''' Looks up a localized string similar to Game Backup Monitor Export.
'''</summary> '''</summary>
+3 -3
View File
@@ -1555,9 +1555,6 @@
<data name="App_ErrorUnixNotAvailable" xml:space="preserve"> <data name="App_ErrorUnixNotAvailable" xml:space="preserve">
<value>This function is currently not available on a Unix based operating system.</value> <value>This function is currently not available on a Unix based operating system.</value>
</data> </data>
<data name="frmGameManager_ConfirmUnixImportWarning" xml:space="preserve">
<value>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?</value>
</data>
<data name="frmMain_PNGFilter" xml:space="preserve"> <data name="frmMain_PNGFilter" xml:space="preserve">
<value>PNG files (*.png)|*.png</value> <value>PNG files (*.png)|*.png</value>
</data> </data>
@@ -1693,4 +1690,7 @@
<data name="App_NotAvailable" xml:space="preserve"> <data name="App_NotAvailable" xml:space="preserve">
<value>N/A</value> <value>N/A</value>
</data> </data>
<data name="App_URLImportLinux" xml:space="preserve">
<value>http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml</value>
</data>
</root> </root>