AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small tweaks

Browse Source
This commit is contained in:
Jonathan Jenne 2019-10-22 15:52:13 +02:00
parent d254fd47f5
commit 499202ca79
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controls.DocumentViewer/DocumentViewer.vb
View File

@ -103,7 +103,6 @@ Public Class DocumentViewer
_docPath = FilePath _docPath = FilePath
GdViewer.DisplayFromFile(_docPath) GdViewer.DisplayFromFile(_docPath)
GdViewer.Focus()
RichEditControl1.Visible = False RichEditControl1.Visible = False
RichEditControl1.Dock = DockStyle.None RichEditControl1.Dock = DockStyle.None
@ -502,6 +501,7 @@ Public Class DocumentViewer
Try Try
IO.File.Delete(oFile) IO.File.Delete(oFile)
Catch ex As Exception Catch ex As Exception
_logger.Warn("Could not delete temp file {0}", oFile)
End Try End Try
Next Next
End Sub End Sub

33
GUIs.ClipboardWatcher/frmMatch.vb
View File

@ -62,7 +62,7 @@ Public Class frmMatch
oForm.ShowDialog() oForm.ShowDialog()
End Sub End Sub
Private Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Async Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Dim oCreatedTiles = CreateTiles() Dim oCreatedTiles = CreateTiles()
If oCreatedTiles = -1 Then If oCreatedTiles = -1 Then
@ -79,7 +79,19 @@ Public Class frmMatch
If oCreatedTiles = 1 Then If oCreatedTiles = 1 Then
Dim oProfile As ProfileData = _Params.MatchingProfiles.First() Dim oProfile As ProfileData = _Params.MatchingProfiles.First()
' TODO Open Result Forms Dim oProfileSearch As New ProfileSearches(_LogConfig, _Environment, _Params)
If oProfile.CountData > 0 Then
Dim oSearches = Await oProfileSearch.LoadDataSearchesAsync()
OpenDataResults(oProfile, oSearches)
Hide()
ElseIf oProfile.CountDocs > 0 Then
Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync()
OpenDocumentResults(oProfile, oSearches)
Hide()
End If
End If End If
End Sub End Sub
@ -94,14 +106,15 @@ Public Class frmMatch
oDataGroup.Items.Clear() oDataGroup.Items.Clear()
For Each oProfile As ProfileData In _Params.MatchingProfiles For Each oProfile As ProfileData In _Params.MatchingProfiles
If oProfile.ProfileType = ProfileType.ANY Then 'TODO: Add Support for Combined Result Lists
If oProfile.CountData > 0 And oProfile.CountDocs > 0 Then 'If oProfile.ProfileType = ProfileType.ANY Then
Dim oCountText = oProfile.CountData + oProfile.CountDocs ' If oProfile.CountData > 0 And oProfile.CountDocs > 0 Then
Dim oItem = CreateTile(oProfile, $"{oCountText} Ergebnisse") ' Dim oCountText = oProfile.CountData + oProfile.CountDocs
oDataDocumentsGroup.Items.Add(oItem) ' Dim oItem = CreateTile(oProfile, $"{oCountText} Ergebnisse")
oCreatedTiles += 1 ' oDataDocumentsGroup.Items.Add(oItem)
End If ' oCreatedTiles += 1
End If ' End If
'End If
If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DOCS_ONLY Then If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DOCS_ONLY Then
If oProfile.CountDocs > 0 Then If oProfile.CountDocs > 0 Then