AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename frmMain to frmAdmin, work on result forms

Browse Source
This commit is contained in:
Jonathan Jenne
2019-09-26 12:30:11 +02:00
parent f5d43edeef
commit 6a4992412f
13 changed files with 161 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ClipboardWatcher/ClipboardWatcher.vbproj
View File

@@ -144,6 +144,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vbproj">
<Project>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\Modules.Database\Database.vbproj">
<Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
<Name>Database</Name>

18
ClipboardWatcher/frmMatch.vb
View File

@@ -208,28 +208,28 @@ Public Class frmMatch
If OpenType = ProfileType.ANY Or OpenType = ProfileType.DOCS_ONLY Then
' Show Result Document Form
Dim oForm As New frmDocumentResult(_LogConfig, _Environment, _Params)
Dim oForm As New frmResult(_LogConfig, _Environment, _Params, frmResult.ResultType.Document)
AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
OpenForms.Add(oForm)
oForm.Show()
End If
'If OpenType = ProfileType.ANY Or OpenType = ProfileType.DATA_ONLY Then
' ' Show Result Data Form
' Dim oForm As New frmResultSQL(Me, oMatchingProfiles)
' AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
' OpenForms.Add(oForm)
If OpenType = ProfileType.ANY Or OpenType = ProfileType.DATA_ONLY Then
' Show Result Data Form
Dim oForm As New frmResult(_LogConfig, _Environment, _Params, frmResult.ResultType.Data)
AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
OpenForms.Add(oForm)
' oForm.Show()
'End If
oForm.Show()
End If
End Sub
Private Sub ProfileResultForm_Closed(sender As Object, e As FormClosedEventArgs)
Dim oShouldOpenAgain As Boolean = False
Dim oThisForm = New List(Of IResultForm) From {sender}
If TypeOf sender Is frmResultDoc Or TypeOf sender Is frmDocumentResult Then
If TypeOf sender Is frmResult Then
For Each oForm As IResultForm In OpenForms
' Determine if frmProfileMatch should be shown
If oForm.ShouldReturnToMatchForm Then