From 4d83be9ef320380aab394a55f036a25290150881 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sat, 17 Mar 2018 16:10:13 -0600 Subject: [PATCH] Updated some text and validation on Add Game Wizard --- GBM/Forms/frmAddWizard.Designer.vb | 5 ++--- GBM/Forms/frmAddWizard.vb | 4 ++++ GBM/My Project/Resources.Designer.vb | 4 ++-- GBM/My Project/Resources.resx | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/GBM/Forms/frmAddWizard.Designer.vb b/GBM/Forms/frmAddWizard.Designer.vb index 22679d6..8b292a4 100644 --- a/GBM/Forms/frmAddWizard.Designer.vb +++ b/GBM/Forms/frmAddWizard.Designer.vb @@ -124,9 +124,8 @@ Partial Class frmAddWizard Me.lblStep1Instructions.Name = "lblStep1Instructions" Me.lblStep1Instructions.Size = New System.Drawing.Size(303, 85) Me.lblStep1Instructions.TabIndex = 6 - Me.lblStep1Instructions.Text = "The name will be automatically filtered for length and invalid characters. You m" & - "ay drag and drop a shortcut here to complete this step, only Windows shortcuts a" & - "re currently supported." + Me.lblStep1Instructions.Text = "You may drag and drop a shortcut here to complete this step, only Windows shortcu" & + "ts are currently supported." ' 'txtName ' diff --git a/GBM/Forms/frmAddWizard.vb b/GBM/Forms/frmAddWizard.vb index 57bbe29..eadf9c0 100644 --- a/GBM/Forms/frmAddWizard.vb +++ b/GBM/Forms/frmAddWizard.vb @@ -204,6 +204,8 @@ Public Class frmAddWizard End Function Private Function ValidateProcessPath(ByVal strPath As String, ByRef sErrorMessage As String) As Boolean + strPath = mgrPath.ValidatePathForOS(strPath) + If strPath.Trim = String.Empty Then sErrorMessage = frmAddWizard_ErrorValidProcess txtProcessPath.Focus() @@ -232,6 +234,8 @@ Public Class frmAddWizard End Function Private Function ValidateSavePath(ByVal strPath As String, ByRef sErrorMessage As String) As Boolean + strPath = mgrPath.ValidatePathForOS(strPath) + If strPath.Trim = String.Empty Then sErrorMessage = frmAddWizard_ErrorValidSavePath txtSavePath.Focus() diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 7ea4b9a..5cff069 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -529,7 +529,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The name will be automatically filtered for length and invalid characters. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.. + ''' Looks up a localized string similar to You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.. ''' Friend ReadOnly Property frmAddWizard_lblStep1Instructions() As String Get @@ -556,7 +556,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Some games use launchers. Do not monitor launchers, be sure to choose the game's actual exe file. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.. + ''' Looks up a localized string similar to Some games use launchers. Do not monitor launchers, be sure to choose the game's actual executable file. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported.. ''' Friend ReadOnly Property frmAddWizard_lblStep2Instructions() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index e16cf84..19fbc30 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -773,7 +773,7 @@ Saved Game Folder: - The name will be automatically filtered for length and invalid characters. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported. + You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported. Enter the name of the game to monitor: @@ -782,7 +782,7 @@ Game Name - Some games use launchers. Do not monitor launchers, be sure to choose the game's actual exe file. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported. + Some games use launchers. Do not monitor launchers, be sure to choose the game's actual executable file. You may drag and drop a shortcut here to complete this step, only Windows shortcuts are currently supported. Choose the game's executable file or shortcut: