diff --git a/app/DD_Clipboard_Searcher/ClassProfileFilter.vb b/app/DD_Clipboard_Searcher/ClassProfileFilter.vb index 66d676e..083752d 100644 --- a/app/DD_Clipboard_Searcher/ClassProfileFilter.vb +++ b/app/DD_Clipboard_Searcher/ClassProfileFilter.vb @@ -185,7 +185,7 @@ Public Class ClassProfileFilter Private Function NewControlNode(Profile As ProfileData, Control As ControlData, IsMatch As Boolean) As TreeNode Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH") - Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}" + Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}: {IsMatch.ToString}" Dim oNode As New TreeNode() With { .Text = oText, diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index b54cfcc..6146f86 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -67,6 +67,7 @@ + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx b/app/DD_Clipboard_Searcher/My Project/licenses.licx index 8ee8cbe..0a7bcfb 100644 --- a/app/DD_Clipboard_Searcher/My Project/licenses.licx +++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx @@ -1,16 +1,17 @@ -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.RatingControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGauges.Win.GaugeControl, DevExpress.XtraGauges.v18.1.Win, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.RatingControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_Clipboard_Searcher/frmProfileMatch.Designer.vb b/app/DD_Clipboard_Searcher/frmProfileMatch.Designer.vb index c593dae..54923b0 100644 --- a/app/DD_Clipboard_Searcher/frmProfileMatch.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmProfileMatch.Designer.vb @@ -42,9 +42,9 @@ Partial Class frmProfileMatch Me.Label1.ForeColor = System.Drawing.Color.White Me.Label1.Location = New System.Drawing.Point(12, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(348, 19) + Me.Label1.Size = New System.Drawing.Size(356, 19) Me.Label1.TabIndex = 2 - Me.Label1.Text = "Es wurde(n) {0} für Ihre Suche nach {1} gefunden:" + Me.Label1.Text = "Es wurde(n) {0} für Ihre Suche nach '{1}' gefunden:" ' 'TileControlMatch ' diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index f34c2b9..33fa9c3 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -126,6 +126,10 @@ Public Class frmStart Dim oProfileFilter As ClassProfileFilter Dim oFocusedControl As IntPtr = FocusedControlinActiveWindow(Handle) Try + CurrMatchTreeView.Nodes.Clear() + CurrMatchTreeView.ImageList = ImageList1 + CurrMatchTreeView.SelectedImageIndex = 0 + oProfileFilter = New ClassProfileFilter( DT_USER_PROFILES, DTPROFILE_REL_PROCESS, @@ -133,26 +137,28 @@ Public Class frmStart DTPROFILE_REL_CONTROL, CurrMatchTreeView) Catch ex As Exception - MsgBox("Fehler beim Laden der Profile. Möglicherweise liegt ein Konfigurationsfehler vor.", MsgBoxStyle.Critical, Text) + Logger.Error(ex) + MsgBox("Fehler beim Laden der Profile. Möglicherweise liegt ein Konfigurationsfehler vor. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text) Exit Sub End Try - Dim oProfiles = oProfileFilter.Profiles.AsEnumerable() - CurrMatchTreeView.Nodes.Clear() - CurrMatchTreeView.ImageList = ImageList1 - CurrMatchTreeView.SelectedImageIndex = 0 + Try + Dim oProfiles = oProfileFilter.Profiles.AsEnumerable() - oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents) - oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName) - oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle) - 'oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, oFocusedControl.ToString) - oProfiles = oProfileFilter.FilterProfilesByFocusedControlLocation(oProfiles, ClipboardContents, Handle) - oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles) - oProfiles = oProfileFilter.ClearDuplicateProfiles(oProfiles) - oProfiles = oProfiles.ToList() + oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents) + oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName) + oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle) + oProfiles = oProfileFilter.FilterProfilesByFocusedControlLocation(oProfiles, ClipboardContents, Handle) + oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles) + oProfiles = oProfileFilter.ClearDuplicateProfiles(oProfiles) + oProfiles = oProfiles.ToList() - CURRENT_MATCHING_PROFILES = oProfiles - CURRENT_CLIPBOARD_CONTENTS = ClipboardContents + CURRENT_MATCHING_PROFILES = oProfiles + CURRENT_CLIPBOARD_CONTENTS = ClipboardContents + Catch ex As Exception + MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.") + Logger.Error(ex) + End Try End Sub Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles Hotkey.HotKeyPressed diff --git a/app/DD_Clipboard_Searcher/frmTreeView.Designer.vb b/app/DD_Clipboard_Searcher/frmTreeView.Designer.vb index 6213482..5d48a5c 100644 --- a/app/DD_Clipboard_Searcher/frmTreeView.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmTreeView.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmTreeView Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmTreeView 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTreeView)) @@ -41,8 +41,11 @@ Partial Class frmTreeView 'TreeView1 ' Me.TreeView1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TreeView1.ImageIndex = 0 + Me.TreeView1.ImageList = Me.ImageList1 Me.TreeView1.Location = New System.Drawing.Point(0, 0) Me.TreeView1.Name = "TreeView1" + Me.TreeView1.SelectedImageIndex = 0 Me.TreeView1.Size = New System.Drawing.Size(933, 463) Me.TreeView1.TabIndex = 2 ' diff --git a/app/DD_Clipboard_Searcher/frmTreeView.resx b/app/DD_Clipboard_Searcher/frmTreeView.resx index 335678d..585dadd 100644 --- a/app/DD_Clipboard_Searcher/frmTreeView.resx +++ b/app/DD_Clipboard_Searcher/frmTreeView.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA