From 82f287f3221a0b5a12fce817cf50f81450134b8b Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Tue, 5 Dec 2017 19:55:39 -0600 Subject: [PATCH] Changed date display for issue #109 --- GBM/Forms/frmAdvancedImport.Designer.vb | 19 +++---------------- GBM/Forms/frmAdvancedImport.vb | 12 +++++------- GBM/My Project/Resources.Designer.vb | 9 --------- GBM/My Project/Resources.resx | 3 --- 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/GBM/Forms/frmAdvancedImport.Designer.vb b/GBM/Forms/frmAdvancedImport.Designer.vb index 5d3ecc5..d081c55 100644 --- a/GBM/Forms/frmAdvancedImport.Designer.vb +++ b/GBM/Forms/frmAdvancedImport.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmAdvancedImport Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmAdvancedImport 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.btnImport = New System.Windows.Forms.Button() Me.chkSelectAll = New System.Windows.Forms.CheckBox() @@ -30,7 +30,6 @@ Partial Class frmAdvancedImport Me.lstGames = New System.Windows.Forms.ListView() Me.txtFilter = New System.Windows.Forms.TextBox() Me.lblFilter = New System.Windows.Forms.Label() - Me.lblInfo = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'btnImport @@ -106,22 +105,11 @@ Partial Class frmAdvancedImport Me.lblFilter.Text = "Filter:" Me.lblFilter.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'lblInfo - ' - Me.lblInfo.AutoEllipsis = True - Me.lblInfo.Location = New System.Drawing.Point(88, 12) - Me.lblInfo.Name = "lblInfo" - Me.lblInfo.Size = New System.Drawing.Size(277, 14) - Me.lblInfo.TabIndex = 0 - Me.lblInfo.Text = "Import Information" - Me.lblInfo.TextAlign = System.Drawing.ContentAlignment.TopCenter - ' 'frmAdvancedImport ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(584, 411) - Me.Controls.Add(Me.lblInfo) Me.Controls.Add(Me.lblFilter) Me.Controls.Add(Me.txtFilter) Me.Controls.Add(Me.lstGames) @@ -149,5 +137,4 @@ Partial Class frmAdvancedImport Friend WithEvents lstGames As System.Windows.Forms.ListView Friend WithEvents txtFilter As System.Windows.Forms.TextBox Friend WithEvents lblFilter As System.Windows.Forms.Label - Friend WithEvents lblInfo As Label End Class diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb index fafbd3d..f2260b3 100644 --- a/GBM/Forms/frmAdvancedImport.vb +++ b/GBM/Forms/frmAdvancedImport.vb @@ -145,19 +145,17 @@ Public Class frmAdvancedImport 'Set Form Name Me.Text = frmAdvancedImport_FormName + 'Add configuration date to title if applicable + If ImportInfo.Exported <> 0 Then + Me.Text &= " [" & mgrCommon.UnixToDate(ImportInfo.Exported).Date & "]" + End If + 'Set Form Text lblFilter.Text = frmAdvancedImport_lblFilter btnCancel.Text = frmAdvancedImport_btnCancel btnImport.Text = frmAdvancedImport_btnImport chkSelectAll.Text = frmAdvancedImport_chkSelectAll - 'Import Information - If ImportInfo.Exported <> 0 Then - lblInfo.Text = mgrCommon.FormatString(frmAdvancedImport_lblInfo, New String() {mgrCommon.UnixToDate(ImportInfo.Exported).Date, mgrCommon.DisplayAppVersion}) - Else - lblInfo.Text = String.Empty - End If - chkSelectAll.Checked = True 'Init Filter Timer diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index ecae674..e5a32b4 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -807,15 +807,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Last Update: [PARAM] (v[PARAM]). - ''' - Friend ReadOnly Property frmAdvancedImport_lblInfo() As String - Get - Return ResourceManager.GetString("frmAdvancedImport_lblInfo", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to Selected ([PARAM]). ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 84c8c4b..0c37006 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1900,7 +1900,4 @@ Not - - Last Update: [PARAM] (v[PARAM]) - \ No newline at end of file