diff --git a/GUIs.ClipboardWatcher/ProfileFilter.vb b/GUIs.ClipboardWatcher/ProfileFilter.vb index 2069e544..54c266b2 100644 --- a/GUIs.ClipboardWatcher/ProfileFilter.vb +++ b/GUIs.ClipboardWatcher/ProfileFilter.vb @@ -346,14 +346,14 @@ Public Class ProfileFilter Dim oDTDocSearches As DataTable Try - oDTDataSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") + oDTDataSearches = Database.GetDatatable($"SELECT COUNT_COMMAND, CONN_ID FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") Catch ex As Exception _Logger.Error(ex) Continue For End Try Try - oDTDocSearches = Database.GetDatatable($"SELECT COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") + oDTDocSearches = Database.GetDatatable($"SELECT COUNT_COMMAND, CONN_ID FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID = {oProfile.Guid}") Catch ex As Exception _Logger.Error(ex) Continue For diff --git a/GUIs.ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb index efe02308..e8330992 100644 --- a/GUIs.ZooFlow/My Project/AssemblyInfo.vb +++ b/GUIs.ZooFlow/My Project/AssemblyInfo.vb @@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices - + diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 9741815a..a01743d2 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,2 +1,3 @@ DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/frmAdmin.vb b/GUIs.ZooFlow/frmAdmin.vb index fd30ca45..513bb659 100644 --- a/GUIs.ZooFlow/frmAdmin.vb +++ b/GUIs.ZooFlow/frmAdmin.vb @@ -7,7 +7,6 @@ Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.GUIs.ZooFlow.OnFlowFormStateChangedEvent.FlowFormState -Imports DigitalData.Modules.ClipboardWatcher Imports DigitalData.GUIs.ClipboardWatcher Partial Public Class frmAdmin diff --git a/Windows/NativeMethods.vb b/Windows/NativeMethods.vb index ceda71c9..443cb9fd 100644 --- a/Windows/NativeMethods.vb +++ b/Windows/NativeMethods.vb @@ -2,6 +2,9 @@ Imports System.Text Public Class NativeMethods + Public Declare Function GetWindowTextLength Lib "user32.dll" Alias "GetWindowTextLengthA" (ByVal hwnd As Int32) As Integer + Public Declare Function GetWindowText Lib "user32.dll" Alias "GetWindowTextA" (ByVal hWnd As IntPtr, ByVal WinTitle As String, ByVal MaxLength As Integer) As Integer + Public Shared Function GetDC(ByVal hwnd As IntPtr) As IntPtr End Function @@ -24,12 +27,6 @@ Public Class NativeMethods Public Shared Function GetForegroundWindow() As IntPtr End Function - Public Shared Function GetWindowText(ByVal hWnd As IntPtr, ByVal WinTitle As String, ByVal MaxLength As Integer) As Integer - End Function - - Public Shared Function GetWindowTextLength(ByVal hwnd As Int32) As Integer - End Function - Public Shared Function GetWindowThreadProcessId(ByVal hwnd As IntPtr, ByRef lpdwProcessID As Integer) As Integer End Function