more granular error messages when profiles dont match
This commit is contained in:
parent
7e6ba6131d
commit
512f6fd17a
@ -155,22 +155,25 @@ Public Class frmStart
|
|||||||
|
|
||||||
oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents)
|
oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByClipboardRegex")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByClipboardRegex")
|
||||||
|
|
||||||
oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName)
|
oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByProcess")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByProcess")
|
||||||
|
|
||||||
oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle)
|
oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterWindowsByWindowTitleRegex")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterWindowsByWindowTitleRegex")
|
||||||
|
|
||||||
oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, Handle)
|
oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, Handle)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByFocusedControl")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByFocusedControl")
|
||||||
|
CURRENT_MATCHING_PROFILES = oProfiles.ToList()
|
||||||
|
|
||||||
oProfiles = oProfileFilter.FilterProfilesBySearchResults(oProfiles, oEnvironment.Database, oEnvironment.User, ClipboardContents)
|
oProfiles = oProfileFilter.FilterProfilesBySearchResults(oProfiles, oEnvironment.Database, oEnvironment.User, ClipboardContents)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesBySearchResults")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesBySearchResults")
|
||||||
|
|
||||||
oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles)
|
oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles)
|
||||||
oProfiles = oProfileFilter.ClearDuplicateProfiles(oProfiles)
|
oProfiles = oProfileFilter.ClearDuplicateProfiles(oProfiles)
|
||||||
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "CleanUp")
|
oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "CleanUp")
|
||||||
oProfiles = oProfiles.ToList()
|
|
||||||
|
|
||||||
|
CURRENT_PROFILES_WITH_RESULTS = oProfiles.ToList()
|
||||||
|
|
||||||
CURRENT_MATCHING_PROFILES = oProfiles
|
|
||||||
CURRENT_CLIPBOARD_CONTENTS = ClipboardContents
|
CURRENT_CLIPBOARD_CONTENTS = ClipboardContents
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text)
|
MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text)
|
||||||
@ -182,13 +185,18 @@ Public Class frmStart
|
|||||||
If HotKeyID = HOTKEY_TRIGGER_WATCHER Then
|
If HotKeyID = HOTKEY_TRIGGER_WATCHER Then
|
||||||
If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then
|
If CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then
|
||||||
If MONITORING_ACTIVE = True Then
|
If MONITORING_ACTIVE = True Then
|
||||||
If CURRENT_MATCHING_PROFILES.Count > 0 Then
|
If CURRENT_MATCHING_PROFILES.Count = 0 Then
|
||||||
CHECK_PROFILE_MATCH()
|
|
||||||
Else
|
|
||||||
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
||||||
NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden."
|
NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden."
|
||||||
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
||||||
NotifyIconMain.ShowBalloonTip(2000)
|
NotifyIconMain.ShowBalloonTip(2000)
|
||||||
|
ElseIf CURRENT_PROFILES_WITH_RESULTS.count = 0 Then
|
||||||
|
NotifyIconMain.BalloonTipTitle = "Clipboard Watcher"
|
||||||
|
NotifyIconMain.BalloonTipText = "Es wurden weder Dokumente noch Daten gefunden!"
|
||||||
|
NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning
|
||||||
|
NotifyIconMain.ShowBalloonTip(2000)
|
||||||
|
Else
|
||||||
|
OpenMatchForm()
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@ -197,7 +205,7 @@ Public Class frmStart
|
|||||||
Change_Monitoring_State()
|
Change_Monitoring_State()
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
Sub CHECK_PROFILE_MATCH()
|
Sub OpenMatchForm()
|
||||||
Logger.Debug("...now CHECK_PROFILE_MATCH...")
|
Logger.Debug("...now CHECK_PROFILE_MATCH...")
|
||||||
Dim oProfiles = CURRENT_MATCHING_PROFILES
|
Dim oProfiles = CURRENT_MATCHING_PROFILES
|
||||||
Dim oEnv = GetEnvironment()
|
Dim oEnv = GetEnvironment()
|
||||||
@ -209,6 +217,7 @@ Public Class frmStart
|
|||||||
}
|
}
|
||||||
|
|
||||||
Dim oForm As New frmMatch(LogConfig, oEnv, oParams)
|
Dim oForm As New frmMatch(LogConfig, oEnv, oParams)
|
||||||
|
|
||||||
_MatchForm = oForm
|
_MatchForm = oForm
|
||||||
oForm.Show()
|
oForm.Show()
|
||||||
End Sub
|
End Sub
|
||||||
|
|||||||
@ -54,6 +54,7 @@ Module modCurrent
|
|||||||
Public DT_CONNECTIONS As MyDataset.TBDD_CONNECTIONDataTable
|
Public DT_CONNECTIONS As MyDataset.TBDD_CONNECTIONDataTable
|
||||||
|
|
||||||
Public CURRENT_MATCHING_PROFILES As New List(Of ProfileData)
|
Public CURRENT_MATCHING_PROFILES As New List(Of ProfileData)
|
||||||
|
Public CURRENT_PROFILES_WITH_RESULTS As New List(Of ProfileData)
|
||||||
|
|
||||||
Public CURRENT_CLIPBOARD_CONTENTS
|
Public CURRENT_CLIPBOARD_CONTENTS
|
||||||
'Public CURR_MATCH_WM_SEARCH
|
'Public CURR_MATCH_WM_SEARCH
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user