From d46bc38bdc1d22a477aadeb7081ac43ec830518c Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Wed, 24 Aug 2016 20:57:09 -0600 Subject: [PATCH] Minor string changes --- GBM/Forms/frmGameManager.Designer.vb | 6 +++--- GBM/Forms/frmGameManager.vb | 12 ++++++++---- GBM/My Project/Resources.Designer.vb | 15 ++++++++++++--- GBM/My Project/Resources.resx | 7 +++++-- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index f06a0ee..291581f 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -794,18 +794,18 @@ Partial Class frmGameManager Me.cmsDeleteBackup.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmsDeleteOne, Me.cmsDeleteAll}) Me.cmsDeleteBackup.Name = "cmsDeleteBackup" Me.cmsDeleteBackup.ShowImageMargin = False - Me.cmsDeleteBackup.Size = New System.Drawing.Size(128, 70) + Me.cmsDeleteBackup.Size = New System.Drawing.Size(115, 48) ' '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" ' '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" ' 'frmGameManager diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index d3c4aa4..7ae3a73 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -573,12 +573,15 @@ Public Class frmGameManager Dim oCurrentBackups As List(Of clsBackup) Dim sFileName As String Dim oComboItems As New List(Of KeyValuePair(Of String, String)) + Dim bLocalData As Boolean = False + Dim bRemoteData As Boolean = False 'cboRemoteBackup cboRemoteBackup.ValueMember = "Key" cboRemoteBackup.DisplayMember = "Value" If oRemoteBackupData.Contains(oApp.Name) Then + bRemoteData = True oCurrentBackups = mgrManifest.DoManifestGetByName(oApp.Name, mgrSQLite.Database.Remote) For Each oCurrentBackup In oCurrentBackups @@ -603,7 +606,7 @@ Public Class frmGameManager mgrRestore.DoPathOverride(CurrentBackupItem, oApp) lblRestorePathData.Text = CurrentBackupItem.RestorePath 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 lblRestorePathData.Text = String.Empty btnOpenBackupFile.Enabled = False @@ -615,16 +618,17 @@ Public Class frmGameManager cboRemoteBackup.DataSource = oComboItems If oLocalBackupData.Contains(oApp.Name) Then + bLocalData = True oBackupInfo = DirectCast(oLocalBackupData(oApp.Name), clsBackup) lblLocalBackupData.Text = mgrCommon.FormatString(frmGameManager_BackupTimeAndName, New String() {oBackupInfo.DateUpdated, oBackupInfo.UpdatedBy}) Else - lblLocalBackupData.Text = frmGameManager_Never + lblLocalBackupData.Text = frmGameManager_Unknown End If - If oComboItems(0).Value = frmGameManager_Never And lblLocalBackupData.Text = frmGameManager_Never Then + If Not bRemoteData And Not bLocalData Then btnMarkAsRestored.Enabled = False 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 lblLocalBackupData.ForeColor = Color.Red ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 1e362f6..bcd5682 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1906,11 +1906,11 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Never. + ''' Looks up a localized string similar to None. ''' - Friend ReadOnly Property frmGameManager_Never() As String + Friend ReadOnly Property frmGameManager_None() As String Get - Return ResourceManager.GetString("frmGameManager_Never", resourceCulture) + Return ResourceManager.GetString("frmGameManager_None", resourceCulture) End Get End Property @@ -1959,6 +1959,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Unknown. + ''' + Friend ReadOnly Property frmGameManager_Unknown() As String + Get + Return ResourceManager.GetString("frmGameManager_Unknown", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Up to Date!. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index a5d7a7a..3a20f38 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -646,8 +646,8 @@ Version: - - Never + + None All @@ -1729,4 +1729,7 @@ Backup Limit + + Unknown + \ No newline at end of file