Minor search and builder fix

This commit is contained in:
Michael J. Seiferling
2016-03-24 12:24:54 -06:00
parent 83df2edc90
commit b458b89b46
5 changed files with 23 additions and 17 deletions
+3 -3
View File
@@ -71,12 +71,12 @@ Partial Class frmFileFolderSearch
'
'lblResults
'
Me.lblResults.AutoSize = True
Me.lblResults.Location = New System.Drawing.Point(9, 36)
Me.lblResults.Name = "lblResults"
Me.lblResults.Size = New System.Drawing.Size(45, 13)
Me.lblResults.Size = New System.Drawing.Size(463, 13)
Me.lblResults.TabIndex = 1
Me.lblResults.Text = "Results:"
Me.lblResults.Text = "Search Results"
Me.lblResults.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'frmFileFolderSearch
'
+9 -7
View File
@@ -168,15 +168,17 @@ Public Class frmFileFolderSearch
Private Sub EndSearch()
Dim oResult As MsgBoxResult
If FoundItem = "Cancel" Then FoundItem = String.Empty
If Not bShutdown Then
If FoundItem = "Cancel" Then FoundItem = String.Empty
If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
If oResult = MsgBoxResult.Yes Then
Search(oDrives(iCurrentDrive))
If oDrives.Count > iCurrentDrive And FoundItem = String.Empty Then
oResult = mgrCommon.ShowMessage(frmFileFolderSearch_SwitchDrives, New String() {oDrives(iCurrentDrive).RootDirectory.ToString}, MsgBoxStyle.YesNo)
If oResult = MsgBoxResult.Yes Then
Search(oDrives(iCurrentDrive))
End If
Else
SearchComplete()
End If
Else
SearchComplete()
End If
End Sub
+4
View File
@@ -335,6 +335,10 @@ Public Class frmIncludeExclude
Private Sub lstBuilder_AfterLabelEdit(sender As Object, e As LabelEditEventArgs) Handles lstBuilder.AfterLabelEdit
If Not e.Label Is Nothing Then
If e.Label = String.Empty Then
e.CancelEdit = True
End If
If lstBuilder.Items.ContainsKey(e.Label) Then
e.CancelEdit = True
Else
+6 -6
View File
@@ -842,7 +842,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmFileFolderSearch_btnOk", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Search.
'''</summary>
@@ -851,16 +851,16 @@ Namespace My.Resources
Return ResourceManager.GetString("frmFileFolderSearch_FormName", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Results:.
''' Looks up a localized string similar to Search Results.
'''</summary>
Friend ReadOnly Property frmFileFolderSearch_lblResults() As String
Get
Return ResourceManager.GetString("frmFileFolderSearch_lblResults", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Search Complete!.
'''</summary>
@@ -869,7 +869,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmFileFolderSearch_SearchComplete", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Do you wish to search the [PARAM] drive?.
'''</summary>
@@ -878,7 +878,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmFileFolderSearch_SwitchDrives", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to &gt;.
'''</summary>
+1 -1
View File
@@ -1589,7 +1589,7 @@
<value>&amp;OK</value>
</data>
<data name="frmFileFolderSearch_lblResults" xml:space="preserve">
<value>Results:</value>
<value>Search Results</value>
</data>
<data name="frmFileFolderSearch_SearchComplete" xml:space="preserve">
<value>Search Complete!</value>