Small changes for issue #56

This commit is contained in:
Michael J. Seiferling
2016-08-18 17:01:27 -06:00
parent 77eb164a62
commit 588f51d496
3 changed files with 7 additions and 6 deletions
+3 -2
View File
@@ -1157,7 +1157,7 @@ Public Class frmGameManager
sNewBackup = mgrCommon.OpenFileBrowser(mgrCommon.FormatString(frmGameManager_BrowseBackup, CurrentGame.CroppedName), "7z", frmGameManager_BrowseBackupType, sBackupPath, False)
'Check that a selection was made and that it's not already the current file
'Check that a selection was made
If sNewBackup <> String.Empty Then
sNewBackupFile = Path.GetFileName(sNewBackup)
sNewBackupPath = Path.GetDirectoryName(sNewBackup)
@@ -1165,8 +1165,9 @@ Public Class frmGameManager
'The new file must be located in the current backup folder for the selected game
If sNewBackupPath <> sBackupPath Then
mgrCommon.ShowMessage(frmGameManager_ErrorBackupChangePath, CurrentGame.CroppedName, MsgBoxStyle.Exclamation)
'Check that the selection is a new file
ElseIf sNewBackupFile = sBackupFile Then
mgrCommon.ShowMessage(frmGameManager_ErrorBackupChangeFileName, New String() {sNewBackupFile, CurrentGame.CroppedName}, MsgBoxStyle.Exclamation)
mgrCommon.ShowMessage(frmGameManager_ErrorBackupChangeFileName, sNewBackupFile, MsgBoxStyle.Exclamation)
Else
'Verify that the user still wants to continue
If mgrCommon.ShowMessage(frmGameManager_ConfirmBackupChange, New String() {sNewBackupFile, CurrentGame.CroppedName}, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+2 -2
View File
@@ -1078,7 +1078,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Looks up a localized string similar to Choose a [PARAM] backup file.
''' Looks up a localized string similar to Choose a new [PARAM] backup file.
'''</summary>
Friend ReadOnly Property frmGameManager_BrowseBackup() As String
Get
@@ -1537,7 +1537,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] is already the current backup file for [PARAM]..
''' Looks up a localized string similar to [PARAM] is already the current backup file..
'''</summary>
Friend ReadOnly Property frmGameManager_ErrorBackupChangeFileName() As String
Get
+2 -2
View File
@@ -1694,7 +1694,7 @@
<value>http://mikemaximus.github.io/gbm-web/GBM_Official_Linux.xml</value>
</data>
<data name="frmGameManager_BrowseBackup" xml:space="preserve">
<value>Choose a [PARAM] backup file</value>
<value>Choose a new [PARAM] backup file</value>
</data>
<data name="frmGameManager_BrowseBackupType" xml:space="preserve">
<value>7-Zip</value>
@@ -1709,7 +1709,7 @@
<value>Do you want to restore [PARAM] now?</value>
</data>
<data name="frmGameManager_ErrorBackupChangeFileName" xml:space="preserve">
<value>[PARAM] is already the current backup file for [PARAM].</value>
<value>[PARAM] is already the current backup file.</value>
</data>
<data name="frmGameManager_ErrorBackupChangePath" xml:space="preserve">
<value>You cannot choose a file located outside the current [PARAM] backup folder.</value>