Minor string changes
This commit is contained in:
Generated
+3
-3
@@ -794,18 +794,18 @@ Partial Class frmGameManager
|
|||||||
Me.cmsDeleteBackup.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmsDeleteOne, Me.cmsDeleteAll})
|
Me.cmsDeleteBackup.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmsDeleteOne, Me.cmsDeleteAll})
|
||||||
Me.cmsDeleteBackup.Name = "cmsDeleteBackup"
|
Me.cmsDeleteBackup.Name = "cmsDeleteBackup"
|
||||||
Me.cmsDeleteBackup.ShowImageMargin = False
|
Me.cmsDeleteBackup.ShowImageMargin = False
|
||||||
Me.cmsDeleteBackup.Size = New System.Drawing.Size(128, 70)
|
Me.cmsDeleteBackup.Size = New System.Drawing.Size(115, 48)
|
||||||
'
|
'
|
||||||
'cmsDeleteOne
|
'cmsDeleteOne
|
||||||
'
|
'
|
||||||
Me.cmsDeleteOne.Name = "cmsDeleteOne"
|
Me.cmsDeleteOne.Name = "cmsDeleteOne"
|
||||||
Me.cmsDeleteOne.Size = New System.Drawing.Size(127, 22)
|
Me.cmsDeleteOne.Size = New System.Drawing.Size(114, 22)
|
||||||
Me.cmsDeleteOne.Text = "&Selected File"
|
Me.cmsDeleteOne.Text = "&Selected File"
|
||||||
'
|
'
|
||||||
'cmsDeleteAll
|
'cmsDeleteAll
|
||||||
'
|
'
|
||||||
Me.cmsDeleteAll.Name = "cmsDeleteAll"
|
Me.cmsDeleteAll.Name = "cmsDeleteAll"
|
||||||
Me.cmsDeleteAll.Size = New System.Drawing.Size(127, 22)
|
Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22)
|
||||||
Me.cmsDeleteAll.Text = "&All Files"
|
Me.cmsDeleteAll.Text = "&All Files"
|
||||||
'
|
'
|
||||||
'frmGameManager
|
'frmGameManager
|
||||||
|
|||||||
@@ -573,12 +573,15 @@ Public Class frmGameManager
|
|||||||
Dim oCurrentBackups As List(Of clsBackup)
|
Dim oCurrentBackups As List(Of clsBackup)
|
||||||
Dim sFileName As String
|
Dim sFileName As String
|
||||||
Dim oComboItems As New List(Of KeyValuePair(Of String, String))
|
Dim oComboItems As New List(Of KeyValuePair(Of String, String))
|
||||||
|
Dim bLocalData As Boolean = False
|
||||||
|
Dim bRemoteData As Boolean = False
|
||||||
|
|
||||||
'cboRemoteBackup
|
'cboRemoteBackup
|
||||||
cboRemoteBackup.ValueMember = "Key"
|
cboRemoteBackup.ValueMember = "Key"
|
||||||
cboRemoteBackup.DisplayMember = "Value"
|
cboRemoteBackup.DisplayMember = "Value"
|
||||||
|
|
||||||
If oRemoteBackupData.Contains(oApp.Name) Then
|
If oRemoteBackupData.Contains(oApp.Name) Then
|
||||||
|
bRemoteData = True
|
||||||
oCurrentBackups = mgrManifest.DoManifestGetByName(oApp.Name, mgrSQLite.Database.Remote)
|
oCurrentBackups = mgrManifest.DoManifestGetByName(oApp.Name, mgrSQLite.Database.Remote)
|
||||||
|
|
||||||
For Each oCurrentBackup In oCurrentBackups
|
For Each oCurrentBackup In oCurrentBackups
|
||||||
@@ -603,7 +606,7 @@ Public Class frmGameManager
|
|||||||
mgrRestore.DoPathOverride(CurrentBackupItem, oApp)
|
mgrRestore.DoPathOverride(CurrentBackupItem, oApp)
|
||||||
lblRestorePathData.Text = CurrentBackupItem.RestorePath
|
lblRestorePathData.Text = CurrentBackupItem.RestorePath
|
||||||
Else
|
Else
|
||||||
oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_Never))
|
oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_None))
|
||||||
lblBackupFileData.Text = String.Empty
|
lblBackupFileData.Text = String.Empty
|
||||||
lblRestorePathData.Text = String.Empty
|
lblRestorePathData.Text = String.Empty
|
||||||
btnOpenBackupFile.Enabled = False
|
btnOpenBackupFile.Enabled = False
|
||||||
@@ -615,16 +618,17 @@ Public Class frmGameManager
|
|||||||
cboRemoteBackup.DataSource = oComboItems
|
cboRemoteBackup.DataSource = oComboItems
|
||||||
|
|
||||||
If oLocalBackupData.Contains(oApp.Name) Then
|
If oLocalBackupData.Contains(oApp.Name) Then
|
||||||
|
bLocalData = True
|
||||||
oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup)
|
oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup)
|
||||||
lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy})
|
lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy})
|
||||||
Else
|
Else
|
||||||
lblLocalBackupData.Text = frmGameManager_Never
|
lblLocalBackupData.Text = frmGameManager_Unknown
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text = frmGameManager_Never Then
|
If Not bRemoteData And Not bLocalData Then
|
||||||
btnMarkAsRestored.Enabled = False
|
btnMarkAsRestored.Enabled = False
|
||||||
lblLocalBackupData.ForeColor = Color.Black
|
lblLocalBackupData.ForeColor = Color.Black
|
||||||
ElseIf oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text <> frmGameManager_Never Then
|
ElseIf Not bRemoteData And bLocalData Then
|
||||||
btnMarkAsRestored.Enabled = False
|
btnMarkAsRestored.Enabled = False
|
||||||
lblLocalBackupData.ForeColor = Color.Red
|
lblLocalBackupData.ForeColor = Color.Red
|
||||||
ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then
|
ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then
|
||||||
|
|||||||
Generated
+12
-3
@@ -1906,11 +1906,11 @@ Namespace My.Resources
|
|||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Looks up a localized string similar to Never.
|
''' Looks up a localized string similar to None.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Friend ReadOnly Property frmGameManager_Never() As String
|
Friend ReadOnly Property frmGameManager_None() As String
|
||||||
Get
|
Get
|
||||||
Return ResourceManager.GetString("frmGameManager_Never", resourceCulture)
|
Return ResourceManager.GetString("frmGameManager_None", resourceCulture)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
@@ -1959,6 +1959,15 @@ Namespace My.Resources
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
'''<summary>
|
||||||
|
''' Looks up a localized string similar to Unknown.
|
||||||
|
'''</summary>
|
||||||
|
Friend ReadOnly Property frmGameManager_Unknown() As String
|
||||||
|
Get
|
||||||
|
Return ResourceManager.GetString("frmGameManager_Unknown", resourceCulture)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Looks up a localized string similar to Up to Date!.
|
''' Looks up a localized string similar to Up to Date!.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
|
|||||||
@@ -646,8 +646,8 @@
|
|||||||
<data name="frmGameManager_lblVersion" xml:space="preserve">
|
<data name="frmGameManager_lblVersion" xml:space="preserve">
|
||||||
<value>Version:</value>
|
<value>Version:</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="frmGameManager_Never" xml:space="preserve">
|
<data name="frmGameManager_None" xml:space="preserve">
|
||||||
<value>Never</value>
|
<value>None</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="frmGameManager_optAllGames" xml:space="preserve">
|
<data name="frmGameManager_optAllGames" xml:space="preserve">
|
||||||
<value>All</value>
|
<value>All</value>
|
||||||
@@ -1729,4 +1729,7 @@
|
|||||||
<data name="frmAddWizard_lblLimit" xml:space="preserve">
|
<data name="frmAddWizard_lblLimit" xml:space="preserve">
|
||||||
<value>Backup Limit</value>
|
<value>Backup Limit</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="frmGameManager_Unknown" xml:space="preserve">
|
||||||
|
<value>Unknown</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
Reference in New Issue
Block a user