From 512f6fd17a44f8ef670cfd95d6888847678eed0d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 28 Jul 2020 15:36:26 +0200 Subject: [PATCH] more granular error messages when profiles dont match --- app/DD_Clipboard_Searcher/frmStart.vb | 25 +++++++++++++++++-------- app/DD_Clipboard_Searcher/modCurrent.vb | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index 705f46b..92bc5fc 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -155,22 +155,25 @@ Public Class frmStart oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByClipboardRegex") + oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByProcess") + oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterWindowsByWindowTitleRegex") + oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, Handle) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesByFocusedControl") + CURRENT_MATCHING_PROFILES = oProfiles.ToList() + oProfiles = oProfileFilter.FilterProfilesBySearchResults(oProfiles, oEnvironment.Database, oEnvironment.User, ClipboardContents) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "FilterProfilesBySearchResults") + oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles) oProfiles = oProfileFilter.ClearDuplicateProfiles(oProfiles) oProfiles = oProfileFilter.LogRemainingProfiles(oProfiles, "CleanUp") - oProfiles = oProfiles.ToList() - - - CURRENT_MATCHING_PROFILES = oProfiles + CURRENT_PROFILES_WITH_RESULTS = oProfiles.ToList() CURRENT_CLIPBOARD_CONTENTS = ClipboardContents Catch ex As Exception 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 CURRENT_CLIPBOARD_CONTENTS IsNot Nothing Then If MONITORING_ACTIVE = True Then - If CURRENT_MATCHING_PROFILES.Count > 0 Then - CHECK_PROFILE_MATCH() - Else + If CURRENT_MATCHING_PROFILES.Count = 0 Then NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden." NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning 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 @@ -197,7 +205,7 @@ Public Class frmStart Change_Monitoring_State() End If End Sub - Sub CHECK_PROFILE_MATCH() + Sub OpenMatchForm() Logger.Debug("...now CHECK_PROFILE_MATCH...") Dim oProfiles = CURRENT_MATCHING_PROFILES Dim oEnv = GetEnvironment() @@ -209,6 +217,7 @@ Public Class frmStart } Dim oForm As New frmMatch(LogConfig, oEnv, oParams) + _MatchForm = oForm oForm.Show() End Sub diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index a052890..1e8106a 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -54,6 +54,7 @@ Module modCurrent Public DT_CONNECTIONS As MyDataset.TBDD_CONNECTIONDataTable Public CURRENT_MATCHING_PROFILES As New List(Of ProfileData) + Public CURRENT_PROFILES_WITH_RESULTS As New List(Of ProfileData) Public CURRENT_CLIPBOARD_CONTENTS 'Public CURR_MATCH_WM_SEARCH