Moved strings to resource (frmAdvancedImport, frmChooseGame, frmFileFolderSearch, frmFilter)

GBM/Forms/frmAdvancedImport.vb

@@ -1,4 +1,6 @@
-Public Class frmAdvancedImport
+Imports GBM.My.Resources
+
+Public Class frmAdvancedImport
 
     Private hshImportData As Hashtable
     Private bSelectAll As Boolean = False
@@ -36,8 +38,15 @@
     End Sub
 
     Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmAdvancedImport_FormName
+
+        'Set Form Text
+        btnCancel.Text = frmAdvancedImport_btnCancel
+        btnImport.Text = frmAdvancedImport_btnImport
+
         chkSelectAll.Checked = True
-        lblGames.Text = ImportData.Count & " new configurations available."
+        lblGames.Text = mgrCommon.FormatString(frmAdvancedImport_NewConfigs, ImportData.Count)
     End Sub
 
     Private Sub BuildList()
@@ -52,7 +61,7 @@
     End Sub
 
     Private Sub UpdateSelected()
-        lblSelected.Text = lstGames.CheckedItems.Count & " Selected"
+        lblSelected.Text = mgrCommon.FormatString(frmAdvancedImport_Selected, lstGames.CheckedItems.Count)
     End Sub
 
     Private Sub frmAdvancedImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -61,11 +70,6 @@
         LoadData()
         SelectToggle()
         bIsLoading = False
-
-        Dim sResource As String = String.Empty
-        Dim sCode As String = String.Empty
-        mgrCommon.GetAllStrings(Me, sResource, sCode, "frmAdvancedImport")
-        Clipboard.SetText(sResource & vbCrLf & vbCrLf & sCode)
     End Sub
 
     Private Sub chkSelectAll_CheckedChanged(sender As Object, e As EventArgs) Handles chkSelectAll.CheckedChanged

GBM/Forms/frmChooseGame.vb

@@ -1,4 +1,6 @@
-Public Class frmChooseGame
+Imports GBM.My.Resources
+
+Public Class frmChooseGame
 
     Private oProcess As mgrProcesses
     Private oGame As clsGame
@@ -49,9 +51,25 @@
         Me.Close()
     End Sub
 
+    Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmChooseGame_FormName
+
+        'Set Form Text
+        btnCancel.Text = frmChooseGame_btnCancel
+        btnChoose.Text = frmChooseGame_btnChoose
+        lblChoose.Text = frmChooseGame_lblChoose
+    End Sub
+
     Private Sub frmChooseGame_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
+        SetForm()
         FillComboBox()
         Me.Focus()
+
+        Dim sResource As String = String.Empty
+        Dim sCode As String = String.Empty
+        mgrCommon.GetAllStrings(Me, sResource, sCode, "frmChooseGame")
+        Clipboard.SetText(sResource & vbCrLf & vbCrLf & sCode)
     End Sub
 
     Private Sub btnChoose_Click(sender As System.Object, e As System.EventArgs) Handles btnChoose.Click

GBM/Forms/frmFileFolderSearch.vb

@@ -1,4 +1,5 @@
-Imports System.IO
+Imports GBM.My.Resources
+Imports System.IO
 
 Public Class frmFileFolderSearch
     Private sSearchItem As String
@@ -135,9 +136,7 @@ Public Class frmFileFolderSearch
         If FoundItem = "Cancel" Then FoundItem = String.Empty
 
         If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
-            oResult = mgrCommon.ShowMessage("The location was not found on the " & oSearchDrive.Root.ToString & _
-                             " drive.  Do you wish to search the " & oDrives(iCurrentDrive).RootDirectory.ToString & _
-                             " drive?", MsgBoxStyle.YesNo)
+            oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oSearchDrive.Root.ToString, oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
             If oResult = MsgBoxResult.Yes Then
                 Search(oDrives(iCurrentDrive))
             Else
@@ -150,7 +149,16 @@ Public Class frmFileFolderSearch
         End If
     End Sub
 
+    Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmFileFolderSearch_FormName
+
+        'Set Form Text
+        btnCancel.Text = frmFileFolderSearch_btnCancel
+    End Sub
+
     Private Sub frmFileFolderSearch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SetForm()
         GetDrives()
         Search(oDrives(iCurrentDrive))
     End Sub

GBM/Forms/frmFilter.vb

@@ -1,4 +1,6 @@
-Public Class frmFilter
+Imports GBM.My.Resources
+
+Public Class frmFilter
 
     Public Enum eFilterType As Integer
         NoFilter = 1
@@ -111,10 +113,11 @@
         If optGameInfo.Checked Then
             'Set Filter Type
             If optAnd.Checked Then
-                eCurrentFilterType = eFilterType.FieldAnd                
+                eCurrentFilterType = eFilterType.FieldAnd
             Else
                 eCurrentFilterType = eFilterType.FieldOr
             End If
+
             'Set String Filter
             If txtName.Text <> String.Empty Then
                 hshStringFilters.Add("Name", txtName.Text)
@@ -144,7 +147,29 @@
 
     End Sub
 
+    Private Sub SetForm()
+        'Set Form Name
+        Me.Text = frmFilter_FormName
+
+        'Set Form Text
+        optOr.Text = frmFilter_optOr
+        optAnd.Text = frmFilter_optAnd
+        lblCompany.Text = frmFilter_lblCompany
+        lblProcess.Text = frmFilter_lblProcess
+        lblName.Text = frmFilter_lblName
+        optAll.Text = frmFilter_optAll
+        optAny.Text = frmFilter_optAny
+        lblGameTags.Text = frmFilter_lblGameTags
+        lblTags.Text = frmFilter_lblTags
+        btnRemove.Text = frmFilter_btnRemove
+        btnAdd.Text = frmFilter_btnAdd
+        btnOK.Text = frmFilter_btnOK
+        optTag.Text = frmFilter_optTag
+        optGameInfo.Text = frmFilter_optGameInfo
+    End Sub
+
     Private Sub frmGameTags_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SetForm()
         optGameInfo.Checked = True
         LoadData()
     End Sub