diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config index 41b1bc5..65c9781 100644 --- a/app/DD_Clipboard_Searcher/App.config +++ b/app/DD_Clipboard_Searcher/App.config @@ -1,53 +1,85 @@ - - -
- - - - - - - - - - - - False - - - 555 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - False - - - 0, 0 - - - 0, 0 - - - - + + +
+ + +
+ + + + + + Skin/Office 2016 Colorful + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + 555 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + False + + + 0, 0 + + + 0, 0 + + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 8c2f261..9a03326 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -139,7 +139,7 @@ Public Class ClassInit End If End If 'Am System anmelden - clsLicense.Refresh_Licence(DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")) + ClassLicense.Refresh_Licence(DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")) 'Am System anmelden ' sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_ID) 'clsDatabase.Execute_non_Query(sql) diff --git a/app/DD_Clipboard_Searcher/clsLicense.vb b/app/DD_Clipboard_Searcher/ClassLicense.vb similarity index 98% rename from app/DD_Clipboard_Searcher/clsLicense.vb rename to app/DD_Clipboard_Searcher/ClassLicense.vb index 889bc10..ab25c45 100644 --- a/app/DD_Clipboard_Searcher/clsLicense.vb +++ b/app/DD_Clipboard_Searcher/ClassLicense.vb @@ -1,5 +1,5 @@ Imports DD_LIB_Standards -Public Class clsLicense +Public Class ClassLicense Private Shared lic_string As String Private Shared Sub Get_License(CLIENT_ID As Integer) Dim sql As String = String.Format("SELECT LICENSE_DDCBSEARCHER FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID) diff --git a/app/DD_Clipboard_Searcher/Class1.vb b/app/DD_Clipboard_Searcher/ClassWindow.vb similarity index 70% rename from app/DD_Clipboard_Searcher/Class1.vb rename to app/DD_Clipboard_Searcher/ClassWindow.vb index 621b466..2a2da9c 100644 --- a/app/DD_Clipboard_Searcher/Class1.vb +++ b/app/DD_Clipboard_Searcher/ClassWindow.vb @@ -1,6 +1,4 @@ -Imports Microsoft.VisualBasic.ControlChars -Imports System.Runtime.InteropServices -Imports DD_LIB_Standards +Imports System.Runtime.InteropServices Public Class ClipboardWatcher : Inherits NativeWindow : Implements IDisposable _ @@ -9,26 +7,32 @@ Public Class ClipboardWatcher : Inherits NativeWindow : Implements IDisposable Public Event Changed As EventHandler - Private _hview As IntPtr + Private ReadOnly _handle As IntPtr 'nur eine globale Instanz zulassen Public Shared Singleton As New ClipboardWatcher + Const WM_DRAWCLIPBOARD As Integer = &H308 + Private Sub New() MyBase.CreateHandle(New CreateParams) - _hview = SetClipboardViewer(MyBase.Handle) + _handle = SetClipboardViewer(MyBase.Handle) End Sub Protected Overrides Sub WndProc(ByRef m As Message) - Const WM_DRAWCLIPBOARD As Integer = &H308 Select Case m.Msg Case WM_DRAWCLIPBOARD - clsWINDOWSApi.Get_ForegroundWindow_Info() - 'Dim CapTxt As String = clsWINDOWSApi.GetCaption() - If IsNothing(CurrPROC_Name) Then Exit Sub - If CurrPROC_Name.StartsWith("DD_Clipboard_Watcher") Then Exit Sub - 'Logger.Debug(String.Format(" >>{0} - Clipboard ChangedEvent for process '{1}' fired!", Now.ToString, PROC_Name), False) - ' If CapTxt.ToUpper.StartsWith("DD") Then Exit Sub + Dim oWindow = ClassWindowAPI.GetWindowInfo() + + 'clsWINDOWSApi.Get_ForegroundWindow_Info() + If IsNothing(oWindow.ProcessName) Then + Exit Sub + End If + + If oWindow.ProcessName.StartsWith("DD_Clipboard_Watcher") Then + Exit Sub + End If + RaiseEvent Changed(Me, EventArgs.Empty) End Select MyBase.WndProc(m) @@ -48,7 +52,7 @@ Public Class ClipboardWatcher : Inherits NativeWindow : Implements IDisposable ' aufgerufen werden End If MyBase.DestroyHandle() - Dim H As IntPtr = SetClipboardViewer(_hview) + Dim H As IntPtr = SetClipboardViewer(_handle) End If Me.disposedValue = True End Sub diff --git a/app/DD_Clipboard_Searcher/ClassWindowAPI.vb b/app/DD_Clipboard_Searcher/ClassWindowAPI.vb new file mode 100644 index 0000000..a3c17e8 --- /dev/null +++ b/app/DD_Clipboard_Searcher/ClassWindowAPI.vb @@ -0,0 +1,185 @@ +Imports System.Text + +Public Class ClassWindowAPI + Const WM_GETTEXT As Int32 = &HD + Const WM_GETTEXTLENGTH As Int32 = &HE + + Public Class ApiWindow + Public MainWindowTitle As String = "" + Public ClassName As String = "" + Public hWnd As Int32 + End Class + + Public Class WindowInfo + Public WindowTitle As String = "" + Public ProcessName As String = "" + Public ClassName As String = "" + Public ProcessId As Integer = 0 + Public hWnd As Int32 + End Class + + Private Delegate Function EnumCallBackDelegate(ByVal hwnd As Integer, ByVal lParam As Integer) As Integer + + Private Declare Function GetForegroundWindow Lib "user32.dll" Alias "GetForegroundWindow" () As IntPtr + Private Declare Function GetWindowThreadProcessId Lib "user32.dll" (ByVal hwnd As IntPtr, ByRef lpdwProcessID As Integer) As Integer + Private Declare Function GetWindowText Lib "user32.dll" Alias "GetWindowTextA" (ByVal hWnd As IntPtr, ByVal WinTitle As String, ByVal MaxLength As Integer) As Integer + Private Declare Function GetWindowTextLength Lib "user32.dll" Alias "GetWindowTextLengthA" (ByVal hwnd As Int32) As Integer + + ' Top-level windows. + Private Declare Function EnumWindows Lib "user32" (ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer + + ' Child windows. + Private Declare Function EnumChildWindows Lib "user32" (ByVal hWndParent As Integer, ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer + + ' Get the window class. + Private Declare Function GetClassName Lib "user32" Alias "GetClassNameA" (ByVal hwnd As Integer, ByVal lpClassName As StringBuilder, ByVal nMaxCount As Integer) As Integer + + ' Test if the window is visible--only get visible ones. + Private Declare Function IsWindowVisible Lib "user32" (ByVal hwnd As Integer) As Integer + + ' Test if the window's parent--only get the one's without parents. + Private Declare Function GetParent Lib "user32" (ByVal hwnd As Integer) As Integer + + ' Get window text length signature. + Private Declare Function SendMessage Lib "user32" Alias "SendMessageA" (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As Int32) As Int32 + + ' Get window text signature. + Private Declare Function SendMessage Lib "user32" Alias "SendMessageA" (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As StringBuilder) As Int32 + + Private _listChildren As New List(Of WindowInfo) + Private _listTopLevel As New List(Of WindowInfo) + + Private _topLevelClass As String = "" + Private _childClass As String = "" + + ''' + ''' Get all top-level window information + ''' + ''' List of window information objects + Public Overloads Function GetTopLevelWindows() As List(Of WindowInfo) + + EnumWindows(AddressOf EnumWindowProc, &H0) + + Return _listTopLevel + + End Function + + Public Overloads Function GetTopLevelWindows(ByVal className As String) As List(Of WindowInfo) + _topLevelClass = className + + Return GetTopLevelWindows() + End Function + + ''' + ''' Get all child windows for the specific windows handle (hwnd). + ''' + ''' List of child windows for parent window + Public Overloads Function GetChildWindows(ByVal hwnd As Int32) As List(Of WindowInfo) + ' Clear the window list. + _listChildren = New List(Of WindowInfo) + + ' Start the enumeration process. + EnumChildWindows(hwnd, AddressOf EnumChildWindowProc, &H0) + + ' Return the children list when the process is completed. + Return _listChildren + End Function + + Public Overloads Function GetChildWindows(ByVal hwnd As Int32, ByVal childClass As String) As List(Of WindowInfo) + ' Set the search + _childClass = childClass + + Return GetChildWindows(hwnd) + End Function + + ''' + ''' Callback function that does the work of enumerating top-level windows. + ''' + ''' Discovered Window handle + ''' 1=keep going, 0=stop + Private Function EnumWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32 + + ' Eliminate windows that are not top-level. + If GetParent(hwnd) = 0 AndAlso CBool(IsWindowVisible(hwnd)) Then + + ' Get the window title / class name. + Dim oWindow As WindowInfo = GetWindowInfo(hwnd) + + ' Match the class name if searching for a specific window class. + If _topLevelClass.Length = 0 OrElse oWindow.ClassName.ToLower() = _topLevelClass.ToLower() Then + _listTopLevel.Add(oWindow) + End If + + End If + + ' To continue enumeration, return True (1), and to stop enumeration + ' return False (0). + ' When 1 is returned, enumeration continues until there are no + ' more windows left. + Return 1 + End Function + + ''' + ''' Callback function that does the work of enumerating child windows. + ''' + ''' Discovered Window handle + ''' 1=keep going, 0=stop + Private Function EnumChildWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32 + + Dim oWindow As WindowInfo = GetWindowInfo(hwnd) + + ' Attempt to match the child class, if one was specified, otherwise + ' enumerate all the child windows. + If _childClass.Length = 0 OrElse oWindow.ClassName.ToLower() = _childClass.ToLower() Then + _listChildren.Add(oWindow) + End If + + Return 1 + + End Function + + ''' + ''' Returns Information about the Window with `hWnd` + ''' + Public Shared Function GetWindowInfo(ByVal hWnd As Integer) As WindowInfo + Dim oPID As Integer = 0 + Dim oTitleLength As Int32 = GetWindowTextLength(hWnd) + Dim oWindowTitle As String = StrDup(oTitleLength + 1, "*") + Dim oClassBuilder As New StringBuilder(64) + + GetWindowText(hWnd, oWindowTitle, oTitleLength + 1) + GetWindowThreadProcessId(hWnd, oPID) + + If oPID = 0 Then + Return Nothing + End If + + Dim oProcess As Process = Process.GetProcessById(oPID) + + If oProcess Is Nothing Then + Return Nothing + End If + + GetClassName(hWnd, oClassBuilder, 64) + + Return New WindowInfo With { + .hWnd = hWnd, + .ClassName = oClassBuilder.ToString, + .ProcessId = oProcess.Id, + .ProcessName = oProcess.ProcessName, + .WindowTitle = oWindowTitle + } + End Function + + ''' + ''' Returns Information about the currently focused window + ''' + Public Shared Function GetWindowInfo() As WindowInfo + Dim hWnd As IntPtr = GetForegroundWindow() + If hWnd = IntPtr.Zero Then + Return Nothing + End If + + Return GetWindowInfo(hWnd) + End Function +End Class diff --git a/app/DD_Clipboard_Searcher/Windows.vb b/app/DD_Clipboard_Searcher/ClassWindowsAPI.vb similarity index 98% rename from app/DD_Clipboard_Searcher/Windows.vb rename to app/DD_Clipboard_Searcher/ClassWindowsAPI.vb index 44800db..9ec087f 100644 --- a/app/DD_Clipboard_Searcher/Windows.vb +++ b/app/DD_Clipboard_Searcher/ClassWindowsAPI.vb @@ -1,7 +1,7 @@ Imports System.Runtime.InteropServices Imports DigitalData.Modules.Logging -Public Class Windows +Public Class ClassWindowsAPI Private Const SEE_MASK_INVOKEIDLIST = &HC Private Const SEE_MASK_NOCLOSEPROCESS = &H40 Private Const SEE_MASK_FLAG_NO_UI = &H400 diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index cff0ced..6e79988 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -124,7 +124,7 @@ - + @@ -132,11 +132,10 @@ - + - - + ctrlApplicationAssignment.vb @@ -272,7 +271,7 @@ MyDataset.xsd - + diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx b/app/DD_Clipboard_Searcher/My Project/licenses.licx index 384259d..de8d5a3 100644 --- a/app/DD_Clipboard_Searcher/My Project/licenses.licx +++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx @@ -1,14 +1,15 @@ -DevExpress.XtraEditors.TileControl, 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.RepositoryItemButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.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.TextEdit, 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.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.XtraLayout.LayoutControl, DevExpress.XtraLayout.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.XtraBars.Ribbon.RibbonControl, 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.XtraEditors.CheckEdit, 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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.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.LookUpEdit, 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 +DevExpress.XtraEditors.DateEdit, 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 diff --git a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb index adca2d0..46dbf9e 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.Designer.vb +++ b/app/DD_Clipboard_Searcher/MyDataset.Designer.vb @@ -10356,30 +10356,9 @@ Namespace MyDatasetTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBCW_PROF_REL_WINDOW] WHERE (([GUID] = @Original_GUID) AND ([PROFILE"& _ - "_ID] = @Original_PROFILE_ID) AND ([PROCESS_NAME] = @Original_PROCESS_NAME) AND ("& _ - "[DESCRIPTION] = @Original_DESCRIPTION) AND ([REGEX] = @Original_REGEX) AND ([SEQ"& _ - "UENCE] = @Original_SEQUENCE) AND ([REGEX_CLIPBOARD] = @Original_REGEX_CLIPBOARD)"& _ - " AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED"& _ - "_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_"& _ - "WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) A"& _ - "ND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @"& _ - "Original_CHANGED_WHEN)))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROCESS_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_CLIPBOARD", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_CLIPBOARD", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBCW_PROF_REL_WINDOW] ([PROFILE_ID], [PROCESS_NAME], [DESCRIPTION], "& _ @@ -10401,47 +10380,27 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE [TBCW_PROF_REL_WINDOW] SET [PROFILE_ID] = @PROFILE_ID, [PROCESS_NAME] = @P"& _ - "ROCESS_NAME, [DESCRIPTION] = @DESCRIPTION, [REGEX] = @REGEX, [SEQUENCE] = @SEQUE"& _ - "NCE, [REGEX_CLIPBOARD] = @REGEX_CLIPBOARD, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN"& _ - "] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WH"& _ - "ERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([P"& _ - "ROCESS_NAME] = @Original_PROCESS_NAME) AND ([DESCRIPTION] = @Original_DESCRIPTIO"& _ - "N) AND ([REGEX] = @Original_REGEX) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([R"& _ - "EGEX_CLIPBOARD] = @Original_REGEX_CLIPBOARD) AND ([ADDED_WHO] = @Original_ADDED_"& _ - "WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @"& _ - "Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) O"& _ - "R ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [C"& _ - "HANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GU"& _ - "ID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADD"& _ - "ED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (G"& _ - "UID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PROFILE_ID = @PROFILE_ID, P"& _ + "ROCESS_NAME = @PROCESS_NAME, DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENC"& _ + "E = @SEQUENCE, REGEX_CLIPBOARD = @REGEX_CLIPBOARD, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" AD"& _ + "DED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHAN"& _ + "GED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, P"& _ + "ROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WH"& _ + "O, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID ="& _ + " @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_CLIPBOARD", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_CLIPBOARD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROCESS_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_CLIPBOARD", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_CLIPBOARD", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_CLIPBOARD", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_CLIPBOARD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub - - DELETE FROM [TBCW_PROF_REL_WINDOW] WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([PROCESS_NAME] = @Original_PROCESS_NAME) AND ([DESCRIPTION] = @Original_DESCRIPTION) AND ([REGEX] = @Original_REGEX) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([REGEX_CLIPBOARD] = @Original_REGEX_CLIPBOARD) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) + + DELETE FROM TBCW_PROF_REL_WINDOW +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - + @@ -578,35 +566,25 @@ FROM TBCW_PROF_REL_WINDOW WHERE PROCESS_NAME = @PROCESS_NAME AND PROF - - UPDATE [TBCW_PROF_REL_WINDOW] SET [PROFILE_ID] = @PROFILE_ID, [PROCESS_NAME] = @PROCESS_NAME, [DESCRIPTION] = @DESCRIPTION, [REGEX] = @REGEX, [SEQUENCE] = @SEQUENCE, [REGEX_CLIPBOARD] = @REGEX_CLIPBOARD, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([PROCESS_NAME] = @Original_PROCESS_NAME) AND ([DESCRIPTION] = @Original_DESCRIPTION) AND ([REGEX] = @Original_REGEX) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([REGEX_CLIPBOARD] = @Original_REGEX_CLIPBOARD) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))); + + UPDATE TBCW_PROF_REL_WINDOW +SET PROFILE_ID = @PROFILE_ID, PROCESS_NAME = @PROCESS_NAME, DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENCE = @SEQUENCE, REGEX_CLIPBOARD = @REGEX_CLIPBOARD, + ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN +WHERE (GUID = @Original_GUID); SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -737,7 +715,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -790,7 +768,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -807,7 +785,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -836,7 +814,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -847,7 +825,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -870,7 +848,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -918,7 +896,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -966,7 +944,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -983,7 +961,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -991,7 +969,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -1005,7 +983,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -1013,7 +991,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -1066,7 +1044,7 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - + @@ -1184,9 +1162,9 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - - - + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/clsWINDOWSApi.vb b/app/DD_Clipboard_Searcher/clsWINDOWSApi.vb deleted file mode 100644 index d13c961..0000000 --- a/app/DD_Clipboard_Searcher/clsWINDOWSApi.vb +++ /dev/null @@ -1,80 +0,0 @@ -Imports DD_LIB_Standards -Imports System.Text - -Public Class clsWINDOWSApi - Private Declare Function GetForegroundWindow Lib "user32.dll" Alias "GetForegroundWindow" () As IntPtr - Private Declare Auto Function GetWindowText Lib "user32.dll" (ByVal hWnd As IntPtr, ByVal lpString As System.Text.StringBuilder, ByVal cch As Integer) As Integer - Private Declare Function GetWindowThreadProcessId Lib "user32.dll" (ByVal hwnd As IntPtr, ByRef lpdwProcessID As Integer) As Integer - Private Declare Function GetWindowText Lib "user32.dll" Alias "GetWindowTextA" (ByVal hWnd As IntPtr, ByVal WinTitle As String, ByVal MaxLength As Integer) As Integer - Private Declare Function GetWindowTextLength Lib "user32.dll" Alias "GetWindowTextLengthA" (ByVal hwnd As Int32) As Integer - - Private Shared Function GetClassName(ByVal hWnd As IntPtr, - ByVal lpClassName As System.Text.StringBuilder, - ByVal nMaxCount As Integer) As Integer - ' Leave function empty - End Function - - Private Shared m_LastHwnd As Long - - Public Shared Function GetCaption() As String - Dim oCaption As New StringBuilder(256) - Dim hWnd As IntPtr = GetForegroundWindow() - Dim oPid As Integer = 0 - GetWindowThreadProcessId(hWnd, oPid) - - If oPid = 0 Then - Return String.Empty - Else - Return oCaption.ToString() - End If - End Function - Public Shared Function IsRelevantWindow(windowname As String) - Try - Dim oEnumerator As New clsWindowApi - 'Jedes Formularwindow durchlaufen - For Each oWindow As clsWindowApi.ApiWindow In oEnumerator.GetTopLevelWindows() - Logger.Debug(" ... top-window Name: " & oWindow.MainWindowTitle, False) - If oWindow.MainWindowTitle.Contains(windowname) Or oWindow.MainWindowTitle.ToLower = windowname.ToLower Then - Console.WriteLine(oWindow.MainWindowTitle) - Return False - End If - Next oWindow - Catch ex As Exception - MsgBox("Error in IsRelevantWindowt:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Logger.Info(">> Error in IsRelevantWindow:" & ex.Message, False) - Return False - End Try - End Function - - Public Shared Sub Get_ForegroundWindow_Info() - '—– Get the Handle to the Current Forground Window —– - Dim hWnd As IntPtr = GetForegroundWindow() - If hWnd = IntPtr.Zero Then Exit Sub - '—– Find the Length of the Window’s Title —– - Dim TitleLength As Int32 - TitleLength = GetWindowTextLength(hWnd) - '—– Find the Window’s Title —– - Dim WindowTitle As String = StrDup(TitleLength + 1, "*") - GetWindowText(hWnd, WindowTitle, TitleLength + 1) - '—– Find the PID of the Application that Owns the Window —– - Dim pid As Integer = 0 - GetWindowThreadProcessId(hWnd, pid) - If pid = 0 Then Exit Sub - '—– Get the actual PROCESS from the process ID —– - Dim proc As Process = Process.GetProcessById(pid) - If proc Is Nothing Then Exit Sub - Dim msg = pid.ToString & vbNewLine - CurrPROC_PID = pid.ToString - CurrPROC_Name = proc.ProcessName - msg &= vbNewLine & "Procname: " & proc.ProcessName - - msg &= vbNewLine & "MainWindowTitle: " & proc.MainWindowTitle - - msg &= vbNewLine & "WindowTitle: " & WindowTitle - CurrPROC_WindowTitle = WindowTitle - - msg &= vbNewLine & TitleLength.ToString - ' MsgBox(msg) - End Sub - -End Class diff --git a/app/DD_Clipboard_Searcher/clsWindowApivb.vb b/app/DD_Clipboard_Searcher/clsWindowApivb.vb deleted file mode 100644 index 0cbce68..0000000 --- a/app/DD_Clipboard_Searcher/clsWindowApivb.vb +++ /dev/null @@ -1,179 +0,0 @@ -Imports System.Data -Imports System.Runtime.InteropServices -Imports System.Text -Imports System.Collections.Generic -Public Class clsWindowApi - Public Class ApiWindow - Public MainWindowTitle As String = "" - Public ClassName As String = "" - Public hWnd As Int32 - End Class - - Private Delegate Function EnumCallBackDelegate(ByVal hwnd As Integer, ByVal lParam As Integer) As Integer - - ' Top-level windows. - Private Declare Function EnumWindows Lib "user32" _ - (ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer - - ' Child windows. - Private Declare Function EnumChildWindows Lib "user32" _ - (ByVal hWndParent As Integer, ByVal lpEnumFunc As EnumCallBackDelegate, ByVal lParam As Integer) As Integer - - ' Get the window class. - Private Declare Function GetClassName _ - Lib "user32" Alias "GetClassNameA" _ - (ByVal hwnd As Integer, ByVal lpClassName As StringBuilder, ByVal nMaxCount As Integer) As Integer - - ' Test if the window is visible--only get visible ones. - Private Declare Function IsWindowVisible Lib "user32" _ - (ByVal hwnd As Integer) As Integer - - ' Test if the window's parent--only get the one's without parents. - Private Declare Function GetParent Lib "user32" _ - (ByVal hwnd As Integer) As Integer - - ' Get window text length signature. - Private Declare Function SendMessage _ - Lib "user32" Alias "SendMessageA" _ - (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As Int32) As Int32 - - ' Get window text signature. - Private Declare Function SendMessage _ - Lib "user32" Alias "SendMessageA" _ - (ByVal hwnd As Int32, ByVal wMsg As Int32, ByVal wParam As Int32, ByVal lParam As StringBuilder) As Int32 - - Private _listChildren As New List(Of ApiWindow) - Private _listTopLevel As New List(Of ApiWindow) - - Private _topLevelClass As String = "" - Private _childClass As String = "" - - ''' - ''' Get all top-level window information - ''' - ''' List of window information objects - Public Overloads Function GetTopLevelWindows() As List(Of ApiWindow) - - EnumWindows(AddressOf EnumWindowProc, &H0) - - Return _listTopLevel - - End Function - - Public Overloads Function GetTopLevelWindows(ByVal className As String) As List(Of ApiWindow) - - _topLevelClass = className - - Return Me.GetTopLevelWindows() - - End Function - - ''' - ''' Get all child windows for the specific windows handle (hwnd). - ''' - ''' List of child windows for parent window - Public Overloads Function GetChildWindows(ByVal hwnd As Int32) As List(Of ApiWindow) - - ' Clear the window list. - _listChildren = New List(Of ApiWindow) - - ' Start the enumeration process. - EnumChildWindows(hwnd, AddressOf EnumChildWindowProc, &H0) - - ' Return the children list when the process is completed. - Return _listChildren - - End Function - - Public Overloads Function GetChildWindows(ByVal hwnd As Int32, ByVal childClass As String) As List(Of ApiWindow) - - ' Set the search - _childClass = childClass - - Return Me.GetChildWindows(hwnd) - - End Function - - ''' - ''' Callback function that does the work of enumerating top-level windows. - ''' - ''' Discovered Window handle - ''' 1=keep going, 0=stop - Private Function EnumWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32 - - ' Eliminate windows that are not top-level. - If GetParent(hwnd) = 0 AndAlso CBool(IsWindowVisible(hwnd)) Then - - ' Get the window title / class name. - Dim window As ApiWindow = GetWindowIdentification(hwnd) - - ' Match the class name if searching for a specific window class. - If _topLevelClass.Length = 0 OrElse window.ClassName.ToLower() = _topLevelClass.ToLower() Then - _listTopLevel.Add(window) - End If - - End If - - ' To continue enumeration, return True (1), and to stop enumeration - ' return False (0). - ' When 1 is returned, enumeration continues until there are no - ' more windows left. - - Return 1 - - End Function - - ''' - ''' Callback function that does the work of enumerating child windows. - ''' - ''' Discovered Window handle - ''' 1=keep going, 0=stop - Private Function EnumChildWindowProc(ByVal hwnd As Int32, ByVal lParam As Int32) As Int32 - - Dim window As ApiWindow = GetWindowIdentification(hwnd) - - ' Attempt to match the child class, if one was specified, otherwise - ' enumerate all the child windows. - If _childClass.Length = 0 OrElse window.ClassName.ToLower() = _childClass.ToLower() Then - _listChildren.Add(window) - End If - - Return 1 - - End Function - - ''' - ''' Build the ApiWindow object to hold information about the Window object. - ''' - Private Function GetWindowIdentification(ByVal hwnd As Integer) As ApiWindow - - Const WM_GETTEXT As Int32 = &HD - Const WM_GETTEXTLENGTH As Int32 = &HE - - Dim window As New ApiWindow() - - Dim title As New StringBuilder() - - ' Get the size of the string required to hold the window title. - Dim size As Int32 = SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0) - - ' If the return is 0, there is no title. - If size > 0 Then - title = New StringBuilder(size + 1) - - SendMessage(hwnd, WM_GETTEXT, title.Capacity, title) - End If - - ' Get the class name for the window. - Dim classBuilder As New StringBuilder(64) - GetClassName(hwnd, classBuilder, 64) - - ' Set the properties for the ApiWindow object. - window.ClassName = classBuilder.ToString() - window.MainWindowTitle = title.ToString() - window.hWnd = hwnd - - Return window - - End Function -End Class diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index 21014c5..c9152a7 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -142,6 +142,7 @@ Public Class ctrlApplicationAssignment Public Function Window_SaveAssignment() As Boolean Try + GridView_Window.CloseEditor() TBCW_PROF_REL_WINDOWBindingSource.EndEdit() If Not IsNothing(MyDataset.TBCW_PROF_REL_WINDOW.GetChanges) Then TBCW_PROF_REL_WINDOWBindingSource.EndEdit() diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index b5bf7bc..f7e5a25 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -91,7 +91,6 @@ Partial Class frmAdministration Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.layoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.layoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.layoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.layoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() @@ -100,20 +99,22 @@ Partial Class frmAdministration Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem3 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.layoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.TabPageData = New DevExpress.XtraTab.XtraTabPage() - Me.LayoutControl3 = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlData = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit12 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit13 = New DevExpress.XtraEditors.TextEdit() Me.CHANGED_WHOTextBox1 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit10 = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEdit2 = New DevExpress.XtraEditors.LookUpEdit() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.MemoEdit3 = New DevExpress.XtraEditors.MemoEdit() Me.MemoEdit4 = New DevExpress.XtraEditors.MemoEdit() Me.txtDATAGUID = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit10 = New DevExpress.XtraEditors.ComboBoxEdit() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() @@ -125,14 +126,37 @@ Partial Class frmAdministration Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.TabPageDocuments = New DevExpress.XtraTab.XtraTabPage() - Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlDocs = New DevExpress.XtraLayout.LayoutControl() + Me.CheckEdit3 = New DevExpress.XtraEditors.CheckEdit() + Me.TextEdit17 = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit15 = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit18 = New DevExpress.XtraEditors.TextEdit() + Me.CHANGED_WHOTextBox2 = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit16 = New DevExpress.XtraEditors.TextEdit() + Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() + Me.MemoEdit5 = New DevExpress.XtraEditors.MemoEdit() + Me.MemoEdit6 = New DevExpress.XtraEditors.MemoEdit() + Me.txtDOC_GUID = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit19 = New DevExpress.XtraEditors.ComboBoxEdit() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem31 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem33 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem32 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem34 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE = New DevExpress.XtraGrid.Columns.GridColumn() @@ -181,29 +205,6 @@ Partial Class frmAdministration Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() - Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() - Me.txtDOC_GUID = New DevExpress.XtraEditors.TextEdit() - Me.CHANGED_WHOTextBox2 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit15 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit16 = New DevExpress.XtraEditors.TextEdit() - Me.MemoEdit5 = New DevExpress.XtraEditors.MemoEdit() - Me.MemoEdit6 = New DevExpress.XtraEditors.MemoEdit() - Me.TextEdit17 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit18 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit19 = New DevExpress.XtraEditors.TextEdit() - Me.CheckEdit3 = New DevExpress.XtraEditors.CheckEdit() - Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem31 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem32 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem33 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem34 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -232,7 +233,6 @@ Partial Class frmAdministration CType(Me.GUIDTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() @@ -241,21 +241,23 @@ Partial Class frmAdministration CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPageData.SuspendLayout() - CType(Me.LayoutControl3, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl3.SuspendLayout() + CType(Me.LayoutControlData, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControlData.SuspendLayout() CType(Me.TextEdit12.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit13.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CHANGED_WHOTextBox1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit10.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtDATAGUID.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit10.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() @@ -267,14 +269,37 @@ Partial Class frmAdministration CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPageDocuments.SuspendLayout() - CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl2.SuspendLayout() + CType(Me.LayoutControlDocs, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControlDocs.SuspendLayout() + CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit17.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem33, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPageProcessAssignment.SuspendLayout() @@ -306,29 +331,6 @@ Partial Class frmAdministration CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit17.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem33, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBCW_PROFILESBindingSource @@ -348,7 +350,7 @@ Partial Class frmAdministration Me.GridControlProfiles.Location = New System.Drawing.Point(0, 0) Me.GridControlProfiles.MainView = Me.GridView1 Me.GridControlProfiles.Name = "GridControlProfiles" - Me.GridControlProfiles.Size = New System.Drawing.Size(159, 608) + Me.GridControlProfiles.Size = New System.Drawing.Size(159, 615) Me.GridControlProfiles.TabIndex = 18 Me.GridControlProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -379,7 +381,7 @@ Partial Class frmAdministration ' 'colNAME ' - Me.colNAME.Caption = "Name" + Me.colNAME.Caption = "Profil" Me.colNAME.FieldName = "NAME" Me.colNAME.Name = "colNAME" Me.colNAME.Visible = True @@ -443,7 +445,7 @@ Partial Class frmAdministration Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.TabPageGeneralSettings - Me.XtraTabControl3.Size = New System.Drawing.Size(1193, 608) + Me.XtraTabControl3.Size = New System.Drawing.Size(1194, 615) Me.XtraTabControl3.TabIndex = 21 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageGeneralSettings, Me.TabPageData, Me.TabPageDocuments, Me.TabPageProcessAssignment, Me.TabPageUserAssignment, Me.TabPageGroupAssignment}) ' @@ -451,8 +453,9 @@ Partial Class frmAdministration ' Me.TabPageGeneralSettings.AutoScroll = True Me.TabPageGeneralSettings.Controls.Add(Me.LayoutControl1) + Me.TabPageGeneralSettings.ImageOptions.Image = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.Image"), System.Drawing.Image) Me.TabPageGeneralSettings.Name = "TabPageGeneralSettings" - Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1187, 580) + Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1192, 587) Me.TabPageGeneralSettings.Text = "Allgemein" ' 'LayoutControl1 @@ -478,27 +481,27 @@ Partial Class frmAdministration 'textEdit3 ' Me.textEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.textEdit3.Location = New System.Drawing.Point(12, 98) + Me.textEdit3.Location = New System.Drawing.Point(107, 59) Me.textEdit3.Name = "textEdit3" - Me.textEdit3.Size = New System.Drawing.Size(364, 20) + Me.textEdit3.Size = New System.Drawing.Size(269, 20) Me.textEdit3.StyleController = Me.LayoutControl1 Me.textEdit3.TabIndex = 6 ' 'textEdit4 ' Me.textEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) - Me.textEdit4.Location = New System.Drawing.Point(12, 144) + Me.textEdit4.Location = New System.Drawing.Point(107, 109) Me.textEdit4.Name = "textEdit4" - Me.textEdit4.Size = New System.Drawing.Size(364, 20) + Me.textEdit4.Size = New System.Drawing.Size(269, 20) Me.textEdit4.StyleController = Me.LayoutControl1 Me.textEdit4.TabIndex = 7 ' 'textEdit5 ' Me.textEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.textEdit5.Location = New System.Drawing.Point(12, 189) + Me.textEdit5.Location = New System.Drawing.Point(107, 133) Me.textEdit5.Name = "textEdit5" - Me.textEdit5.Size = New System.Drawing.Size(364, 20) + Me.textEdit5.Size = New System.Drawing.Size(269, 20) Me.textEdit5.StyleController = Me.LayoutControl1 Me.textEdit5.TabIndex = 8 ' @@ -509,7 +512,7 @@ Partial Class frmAdministration Me.CheckEdit1.MenuManager = Me.RibbonControl2 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Profil Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(180, 19) + Me.CheckEdit1.Size = New System.Drawing.Size(364, 19) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 10 ' @@ -524,7 +527,7 @@ Partial Class frmAdministration Me.RibbonControl2.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage2}) Me.RibbonControl2.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl2.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl2.Size = New System.Drawing.Size(1357, 143) + Me.RibbonControl2.Size = New System.Drawing.Size(1365, 146) Me.RibbonControl2.StatusBar = Me.RibbonStatusBar1 ' 'ApplicationMenu1 @@ -735,8 +738,8 @@ Partial Class frmAdministration ' Me.RibbonGroupDataSearch.Enabled = False Me.RibbonGroupDataSearch.ItemLinks.Add(Me.BarButtonItem20) - Me.RibbonGroupDataSearch.ItemLinks.Add(Me.BarButtonItem21) Me.RibbonGroupDataSearch.ItemLinks.Add(Me.BarButtonItem22) + Me.RibbonGroupDataSearch.ItemLinks.Add(Me.BarButtonItem21) Me.RibbonGroupDataSearch.Name = "RibbonGroupDataSearch" Me.RibbonGroupDataSearch.Text = "Daten-Suchen" ' @@ -744,8 +747,8 @@ Partial Class frmAdministration ' Me.RibbonGroupDocSearch.Enabled = False Me.RibbonGroupDocSearch.ItemLinks.Add(Me.BarButtonItem15) - Me.RibbonGroupDocSearch.ItemLinks.Add(Me.BarButtonItem18) Me.RibbonGroupDocSearch.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonGroupDocSearch.ItemLinks.Add(Me.BarButtonItem18) Me.RibbonGroupDocSearch.Name = "RibbonGroupDocSearch" Me.RibbonGroupDocSearch.Text = "Dokument-Suchen" ' @@ -761,8 +764,8 @@ Partial Class frmAdministration ' Me.RibbonGroupWindow.Enabled = False Me.RibbonGroupWindow.ItemLinks.Add(Me.BarButtonItem7) - Me.RibbonGroupWindow.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonGroupWindow.ItemLinks.Add(Me.BarButtonItem9) + Me.RibbonGroupWindow.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonGroupWindow.Name = "RibbonGroupWindow" Me.RibbonGroupWindow.Text = "Fenster Zuordnung" ' @@ -785,15 +788,15 @@ Partial Class frmAdministration 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 751) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 761) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl2 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1357, 31) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1365, 21) ' 'textEdit2 ' Me.textEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "PROFILE_TYPE", True)) - Me.textEdit2.Location = New System.Drawing.Point(12, 52) + Me.textEdit2.Location = New System.Drawing.Point(107, 85) Me.textEdit2.Name = "textEdit2" Me.textEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.textEdit2.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("TYPE_NAME", "Profil Typ", 68, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) @@ -803,7 +806,7 @@ Partial Class frmAdministration Me.textEdit2.Properties.PopupSizeable = False Me.textEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.textEdit2.Properties.ValueMember = "TYPE_ID" - Me.textEdit2.Size = New System.Drawing.Size(364, 20) + Me.textEdit2.Size = New System.Drawing.Size(269, 20) Me.textEdit2.StyleController = Me.LayoutControl1 Me.textEdit2.TabIndex = 5 ' @@ -815,7 +818,7 @@ Partial Class frmAdministration 'TextEdit8 ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.TextEdit8.Location = New System.Drawing.Point(12, 246) + Me.TextEdit8.Location = New System.Drawing.Point(12, 173) Me.TextEdit8.Name = "TextEdit8" Me.TextEdit8.Properties.ReadOnly = True Me.TextEdit8.Size = New System.Drawing.Size(180, 20) @@ -825,7 +828,7 @@ Partial Class frmAdministration 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(196, 246) + Me.TextEdit7.Location = New System.Drawing.Point(196, 173) Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Properties.ReadOnly = True Me.TextEdit7.Size = New System.Drawing.Size(180, 20) @@ -835,7 +838,7 @@ Partial Class frmAdministration 'CHANGEDWHOTextBox ' Me.CHANGEDWHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(12, 286) + Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(12, 213) Me.CHANGEDWHOTextBox.Name = "CHANGEDWHOTextBox" Me.CHANGEDWHOTextBox.Properties.ReadOnly = True Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(180, 20) @@ -845,7 +848,7 @@ Partial Class frmAdministration 'TextEdit6 ' Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit6.Location = New System.Drawing.Point(196, 286) + Me.TextEdit6.Location = New System.Drawing.Point(196, 213) Me.TextEdit6.Name = "TextEdit6" Me.TextEdit6.Properties.ReadOnly = True Me.TextEdit6.Size = New System.Drawing.Size(180, 20) @@ -855,10 +858,11 @@ Partial Class frmAdministration 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.GUIDTextBox.Location = New System.Drawing.Point(291, 12) + Me.GUIDTextBox.Location = New System.Drawing.Point(107, 35) Me.GUIDTextBox.MenuManager = Me.RibbonControl2 Me.GUIDTextBox.Name = "GUIDTextBox" - Me.GUIDTextBox.Size = New System.Drawing.Size(85, 20) + Me.GUIDTextBox.Properties.ReadOnly = True + Me.GUIDTextBox.Size = New System.Drawing.Size(269, 20) Me.GUIDTextBox.StyleController = Me.LayoutControl1 Me.GUIDTextBox.TabIndex = 11 ' @@ -866,7 +870,7 @@ Partial Class frmAdministration ' Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup1.GroupBordersVisible = False - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.layoutControlItem2, Me.layoutControlItem3, Me.layoutControlItem4, Me.layoutControlItem5, Me.LayoutControlItem7, Me.layoutControlItem1, Me.layoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem20}) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.layoutControlItem2, Me.layoutControlItem4, Me.layoutControlItem5, Me.LayoutControlItem7, Me.layoutControlItem1, Me.layoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem20, Me.EmptySpaceItem3, Me.layoutControlItem3}) Me.LayoutControlGroup1.Name = "Root" Me.LayoutControlGroup1.Size = New System.Drawing.Size(388, 318) Me.LayoutControlGroup1.TextVisible = False @@ -875,55 +879,41 @@ Partial Class frmAdministration ' Me.layoutControlItem2.Control = Me.textEdit2 Me.layoutControlItem2.CustomizationFormText = "Profil Typ" - Me.layoutControlItem2.Location = New System.Drawing.Point(0, 24) - Me.layoutControlItem2.MinSize = New System.Drawing.Size(50, 25) + Me.layoutControlItem2.Location = New System.Drawing.Point(0, 73) + Me.layoutControlItem2.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem2.Name = "layoutControlItem2" - Me.layoutControlItem2.Size = New System.Drawing.Size(368, 46) + Me.layoutControlItem2.Size = New System.Drawing.Size(368, 24) Me.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem2.Text = "Profil Typ" - Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top + Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Left Me.layoutControlItem2.TextSize = New System.Drawing.Size(92, 13) ' - 'layoutControlItem3 - ' - Me.layoutControlItem3.Control = Me.textEdit3 - Me.layoutControlItem3.CustomizationFormText = "Name" - Me.layoutControlItem3.Location = New System.Drawing.Point(0, 70) - Me.layoutControlItem3.MaxSize = New System.Drawing.Size(404, 0) - Me.layoutControlItem3.MinSize = New System.Drawing.Size(116, 40) - Me.layoutControlItem3.Name = "layoutControlItem3" - Me.layoutControlItem3.Size = New System.Drawing.Size(368, 46) - Me.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom - Me.layoutControlItem3.Text = "Name" - Me.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top - Me.layoutControlItem3.TextSize = New System.Drawing.Size(92, 13) - ' 'layoutControlItem4 ' Me.layoutControlItem4.Control = Me.textEdit4 Me.layoutControlItem4.CustomizationFormText = "Kommentar" - Me.layoutControlItem4.Location = New System.Drawing.Point(0, 116) + Me.layoutControlItem4.Location = New System.Drawing.Point(0, 97) Me.layoutControlItem4.MaxSize = New System.Drawing.Size(404, 0) - Me.layoutControlItem4.MinSize = New System.Drawing.Size(116, 40) + Me.layoutControlItem4.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem4.Name = "layoutControlItem4" - Me.layoutControlItem4.Size = New System.Drawing.Size(368, 45) + Me.layoutControlItem4.Size = New System.Drawing.Size(368, 24) Me.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem4.Text = "Kommentar" - Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top + Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Left Me.layoutControlItem4.TextSize = New System.Drawing.Size(92, 13) ' 'layoutControlItem5 ' Me.layoutControlItem5.Control = Me.textEdit5 Me.layoutControlItem5.CustomizationFormText = "Regular Expression" - Me.layoutControlItem5.Location = New System.Drawing.Point(0, 161) + Me.layoutControlItem5.Location = New System.Drawing.Point(0, 121) Me.layoutControlItem5.MaxSize = New System.Drawing.Size(404, 0) - Me.layoutControlItem5.MinSize = New System.Drawing.Size(116, 40) + Me.layoutControlItem5.MinSize = New System.Drawing.Size(149, 24) Me.layoutControlItem5.Name = "layoutControlItem5" - Me.layoutControlItem5.Size = New System.Drawing.Size(368, 57) + Me.layoutControlItem5.Size = New System.Drawing.Size(368, 24) Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom Me.layoutControlItem5.Text = "Regular Expression" - Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top + Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Left Me.layoutControlItem5.TextSize = New System.Drawing.Size(92, 13) ' 'LayoutControlItem7 @@ -931,7 +921,7 @@ Partial Class frmAdministration Me.LayoutControlItem7.Control = Me.CheckEdit1 Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(184, 24) + Me.LayoutControlItem7.Size = New System.Drawing.Size(368, 23) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem7.TextVisible = False ' @@ -939,7 +929,7 @@ Partial Class frmAdministration ' Me.layoutControlItem1.Control = Me.TextEdit8 Me.layoutControlItem1.CustomizationFormText = "layoutControlItem1" - Me.layoutControlItem1.Location = New System.Drawing.Point(0, 218) + Me.layoutControlItem1.Location = New System.Drawing.Point(0, 145) Me.layoutControlItem1.Name = "layoutControlItem1" Me.layoutControlItem1.Size = New System.Drawing.Size(184, 40) Me.layoutControlItem1.Text = "Erstellt Wer" @@ -950,7 +940,7 @@ Partial Class frmAdministration ' Me.layoutControlItem6.Control = Me.TextEdit7 Me.layoutControlItem6.CustomizationFormText = "layoutControlItem2" - Me.layoutControlItem6.Location = New System.Drawing.Point(184, 218) + Me.layoutControlItem6.Location = New System.Drawing.Point(184, 145) Me.layoutControlItem6.Name = "layoutControlItem6" Me.layoutControlItem6.Size = New System.Drawing.Size(184, 40) Me.layoutControlItem6.Text = "Erstellt wann" @@ -961,7 +951,7 @@ Partial Class frmAdministration ' Me.LayoutControlItem8.Control = Me.CHANGEDWHOTextBox Me.LayoutControlItem8.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 258) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 185) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Size = New System.Drawing.Size(184, 40) Me.LayoutControlItem8.Text = "Geändert wer" @@ -972,7 +962,7 @@ Partial Class frmAdministration ' Me.LayoutControlItem9.Control = Me.TextEdit6 Me.LayoutControlItem9.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem9.Location = New System.Drawing.Point(184, 258) + Me.LayoutControlItem9.Location = New System.Drawing.Point(184, 185) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Size = New System.Drawing.Size(184, 40) Me.LayoutControlItem9.Text = "Geändert wann" @@ -982,113 +972,130 @@ Partial Class frmAdministration 'LayoutControlItem20 ' Me.LayoutControlItem20.Control = Me.GUIDTextBox - Me.LayoutControlItem20.Location = New System.Drawing.Point(184, 0) + Me.LayoutControlItem20.Location = New System.Drawing.Point(0, 23) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(184, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(368, 24) Me.LayoutControlItem20.Text = "ID" Me.LayoutControlItem20.TextSize = New System.Drawing.Size(92, 13) ' + 'EmptySpaceItem3 + ' + Me.EmptySpaceItem3.AllowHotTrack = False + Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 225) + Me.EmptySpaceItem3.Name = "EmptySpaceItem3" + Me.EmptySpaceItem3.Size = New System.Drawing.Size(368, 73) + Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0) + ' + 'layoutControlItem3 + ' + Me.layoutControlItem3.Control = Me.textEdit3 + Me.layoutControlItem3.CustomizationFormText = "Name" + Me.layoutControlItem3.Location = New System.Drawing.Point(0, 47) + Me.layoutControlItem3.MinSize = New System.Drawing.Size(149, 24) + Me.layoutControlItem3.Name = "layoutControlItem3" + Me.layoutControlItem3.Size = New System.Drawing.Size(368, 26) + Me.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom + Me.layoutControlItem3.Text = "Name" + Me.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Left + Me.layoutControlItem3.TextSize = New System.Drawing.Size(92, 13) + ' 'TabPageData ' - Me.TabPageData.Controls.Add(Me.LayoutControl3) + Me.TabPageData.Controls.Add(Me.LayoutControlData) Me.TabPageData.Controls.Add(Me.GridControl2) + Me.TabPageData.ImageOptions.Image = CType(resources.GetObject("TabPageData.ImageOptions.Image"), System.Drawing.Image) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1187, 580) + Me.TabPageData.Size = New System.Drawing.Size(1192, 590) Me.TabPageData.Text = "Daten-Suchen" ' - 'LayoutControl3 + 'LayoutControlData ' - Me.LayoutControl3.Controls.Add(Me.TextEdit12) - Me.LayoutControl3.Controls.Add(Me.TextEdit13) - Me.LayoutControl3.Controls.Add(Me.CHANGED_WHOTextBox1) - Me.LayoutControl3.Controls.Add(Me.TextEdit11) - Me.LayoutControl3.Controls.Add(Me.CheckEdit2) - Me.LayoutControl3.Controls.Add(Me.TextEdit9) - Me.LayoutControl3.Controls.Add(Me.TextEdit10) - Me.LayoutControl3.Controls.Add(Me.ComboBoxEdit2) - Me.LayoutControl3.Controls.Add(Me.MemoEdit3) - Me.LayoutControl3.Controls.Add(Me.MemoEdit4) - Me.LayoutControl3.Controls.Add(Me.txtDATAGUID) - Me.LayoutControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl3.Location = New System.Drawing.Point(200, 0) - Me.LayoutControl3.Name = "LayoutControl3" - Me.LayoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1013, 317, 650, 400) - Me.LayoutControl3.Root = Me.LayoutControlGroup3 - Me.LayoutControl3.Size = New System.Drawing.Size(987, 580) - Me.LayoutControl3.TabIndex = 26 - Me.LayoutControl3.Text = "LayoutControl3" + Me.LayoutControlData.Controls.Add(Me.TextEdit12) + Me.LayoutControlData.Controls.Add(Me.TextEdit13) + Me.LayoutControlData.Controls.Add(Me.CHANGED_WHOTextBox1) + Me.LayoutControlData.Controls.Add(Me.TextEdit11) + Me.LayoutControlData.Controls.Add(Me.CheckEdit2) + Me.LayoutControlData.Controls.Add(Me.TextEdit9) + Me.LayoutControlData.Controls.Add(Me.ComboBoxEdit2) + Me.LayoutControlData.Controls.Add(Me.MemoEdit3) + Me.LayoutControlData.Controls.Add(Me.MemoEdit4) + Me.LayoutControlData.Controls.Add(Me.txtDATAGUID) + Me.LayoutControlData.Controls.Add(Me.TextEdit10) + Me.LayoutControlData.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControlData.Location = New System.Drawing.Point(200, 0) + Me.LayoutControlData.Name = "LayoutControlData" + Me.LayoutControlData.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-714, 293, 650, 400) + Me.LayoutControlData.Root = Me.LayoutControlGroup3 + Me.LayoutControlData.Size = New System.Drawing.Size(992, 590) + Me.LayoutControlData.TabIndex = 26 + Me.LayoutControlData.Text = "LayoutControl3" ' 'TextEdit12 ' - Me.TextEdit12.Location = New System.Drawing.Point(12, 124) + Me.TextEdit12.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHO", True)) + Me.TextEdit12.Location = New System.Drawing.Point(12, 147) Me.TextEdit12.Name = "TextEdit12" Me.TextEdit12.Properties.ReadOnly = True - Me.TextEdit12.Size = New System.Drawing.Size(178, 20) - Me.TextEdit12.StyleController = Me.LayoutControl3 + Me.TextEdit12.Size = New System.Drawing.Size(127, 20) + Me.TextEdit12.StyleController = Me.LayoutControlData Me.TextEdit12.TabIndex = 4 ' 'TextEdit13 ' - Me.TextEdit13.Location = New System.Drawing.Point(194, 124) + Me.TextEdit13.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHEN", True)) + Me.TextEdit13.Location = New System.Drawing.Point(143, 147) Me.TextEdit13.Name = "TextEdit13" Me.TextEdit13.Properties.ReadOnly = True - Me.TextEdit13.Size = New System.Drawing.Size(186, 20) - Me.TextEdit13.StyleController = Me.LayoutControl3 + Me.TextEdit13.Size = New System.Drawing.Size(197, 20) + Me.TextEdit13.StyleController = Me.LayoutControlData Me.TextEdit13.TabIndex = 5 ' 'CHANGED_WHOTextBox1 ' - Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(12, 164) + Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHO", True)) + Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(12, 187) Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" Me.CHANGED_WHOTextBox1.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(178, 20) - Me.CHANGED_WHOTextBox1.StyleController = Me.LayoutControl3 + Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(127, 20) + Me.CHANGED_WHOTextBox1.StyleController = Me.LayoutControlData Me.CHANGED_WHOTextBox1.TabIndex = 6 ' 'TextEdit11 ' - Me.TextEdit11.Location = New System.Drawing.Point(194, 164) + Me.TextEdit11.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHEN", True)) + Me.TextEdit11.Location = New System.Drawing.Point(143, 187) Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(186, 20) - Me.TextEdit11.StyleController = Me.LayoutControl3 + Me.TextEdit11.Size = New System.Drawing.Size(197, 20) + Me.TextEdit11.StyleController = Me.LayoutControlData Me.TextEdit11.TabIndex = 7 ' 'CheckEdit2 ' + Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ACTIVE", True)) Me.CheckEdit2.Location = New System.Drawing.Point(12, 12) Me.CheckEdit2.MenuManager = Me.RibbonControl2 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Suche Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(182, 19) - Me.CheckEdit2.StyleController = Me.LayoutControl3 + Me.CheckEdit2.Size = New System.Drawing.Size(328, 19) + Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' 'TextEdit9 ' Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_TITLE", True)) Me.TextEdit9.EditValue = "" - Me.TextEdit9.Location = New System.Drawing.Point(140, 36) + Me.TextEdit9.Location = New System.Drawing.Point(140, 59) Me.TextEdit9.MenuManager = Me.RibbonControl2 Me.TextEdit9.Name = "TextEdit9" - Me.TextEdit9.Size = New System.Drawing.Size(240, 20) - Me.TextEdit9.StyleController = Me.LayoutControl3 + Me.TextEdit9.Size = New System.Drawing.Size(200, 20) + Me.TextEdit9.StyleController = Me.LayoutControlData Me.TextEdit9.TabIndex = 9 ' - 'TextEdit10 - ' - Me.TextEdit10.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_INDEX", True)) - Me.TextEdit10.Location = New System.Drawing.Point(140, 60) - Me.TextEdit10.MenuManager = Me.RibbonControl2 - Me.TextEdit10.Name = "TextEdit10" - Me.TextEdit10.Size = New System.Drawing.Size(240, 20) - Me.TextEdit10.StyleController = Me.LayoutControl3 - Me.TextEdit10.TabIndex = 10 - ' 'ComboBoxEdit2 ' Me.ComboBoxEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CONN_ID", True)) - Me.ComboBoxEdit2.Location = New System.Drawing.Point(140, 84) + Me.ComboBoxEdit2.Location = New System.Drawing.Point(140, 107) Me.ComboBoxEdit2.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit2.Name = "ComboBoxEdit2" Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1099,8 +1106,8 @@ Partial Class frmAdministration Me.ComboBoxEdit2.Properties.PopupSizeable = False Me.ComboBoxEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.ComboBoxEdit2.Properties.ValueMember = "GUID" - Me.ComboBoxEdit2.Size = New System.Drawing.Size(240, 20) - Me.ComboBoxEdit2.StyleController = Me.LayoutControl3 + Me.ComboBoxEdit2.Size = New System.Drawing.Size(200, 20) + Me.ComboBoxEdit2.StyleController = Me.LayoutControlData Me.ComboBoxEdit2.TabIndex = 11 ' 'TBDD_CONNECTIONBindingSource @@ -1111,44 +1118,58 @@ Partial Class frmAdministration 'MemoEdit3 ' Me.MemoEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit3.Location = New System.Drawing.Point(384, 28) + Me.MemoEdit3.Location = New System.Drawing.Point(344, 28) Me.MemoEdit3.MenuManager = Me.RibbonControl2 Me.MemoEdit3.Name = "MemoEdit3" Me.MemoEdit3.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit3.Properties.Appearance.Options.UseFont = True - Me.MemoEdit3.Size = New System.Drawing.Size(591, 233) - Me.MemoEdit3.StyleController = Me.LayoutControl3 + Me.MemoEdit3.Size = New System.Drawing.Size(636, 234) + Me.MemoEdit3.StyleController = Me.LayoutControlData Me.MemoEdit3.TabIndex = 12 ' 'MemoEdit4 ' Me.MemoEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(384, 281) + Me.MemoEdit4.Location = New System.Drawing.Point(344, 282) Me.MemoEdit4.MenuManager = Me.RibbonControl2 Me.MemoEdit4.Name = "MemoEdit4" Me.MemoEdit4.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit4.Properties.Appearance.Options.UseFont = True - Me.MemoEdit4.Size = New System.Drawing.Size(591, 287) - Me.MemoEdit4.StyleController = Me.LayoutControl3 + Me.MemoEdit4.Size = New System.Drawing.Size(636, 296) + Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' 'txtDATAGUID ' Me.txtDATAGUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "GUID", True)) - Me.txtDATAGUID.Location = New System.Drawing.Point(326, 12) + Me.txtDATAGUID.Location = New System.Drawing.Point(140, 35) Me.txtDATAGUID.MenuManager = Me.RibbonControl2 Me.txtDATAGUID.Name = "txtDATAGUID" - Me.txtDATAGUID.Size = New System.Drawing.Size(54, 20) - Me.txtDATAGUID.StyleController = Me.LayoutControl3 + Me.txtDATAGUID.Properties.ReadOnly = True + Me.txtDATAGUID.Size = New System.Drawing.Size(200, 20) + Me.txtDATAGUID.StyleController = Me.LayoutControlData Me.txtDATAGUID.TabIndex = 14 ' + 'TextEdit10 + ' + Me.TextEdit10.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_INDEX", True)) + Me.TextEdit10.Location = New System.Drawing.Point(140, 83) + Me.TextEdit10.MenuManager = Me.RibbonControl2 + Me.TextEdit10.Name = "TextEdit10" + Me.TextEdit10.Properties.AutoHeight = False + Me.TextEdit10.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.TextEdit10.Properties.Items.AddRange(New Object() {"0", "1", "2", "3", "4"}) + Me.TextEdit10.Size = New System.Drawing.Size(200, 20) + Me.TextEdit10.StyleController = Me.LayoutControlData + Me.TextEdit10.TabIndex = 10 + ' 'LayoutControlGroup3 ' Me.LayoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup3.GroupBordersVisible = False Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem16, Me.LayoutControlItem11, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem21, Me.LayoutControlItem22, Me.EmptySpaceItem1, Me.LayoutControlItem23}) Me.LayoutControlGroup3.Name = "Root" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(987, 580) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(992, 590) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1156,7 +1177,7 @@ Partial Class frmAdministration Me.LayoutControlItem10.Control = Me.CheckEdit2 Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(186, 24) + Me.LayoutControlItem10.Size = New System.Drawing.Size(332, 23) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' @@ -1164,9 +1185,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem14.Control = Me.TextEdit12 Me.LayoutControlItem14.CustomizationFormText = "layoutControlItem1" - Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 96) + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 119) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(182, 40) + Me.LayoutControlItem14.Size = New System.Drawing.Size(131, 40) Me.LayoutControlItem14.Text = "Erstellt wer:" Me.LayoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem14.TextSize = New System.Drawing.Size(125, 13) @@ -1175,9 +1196,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem15.Control = Me.TextEdit13 Me.LayoutControlItem15.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem15.Location = New System.Drawing.Point(182, 96) + Me.LayoutControlItem15.Location = New System.Drawing.Point(131, 119) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(190, 40) + Me.LayoutControlItem15.Size = New System.Drawing.Size(201, 40) Me.LayoutControlItem15.Text = "Erstellt wann:" Me.LayoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem15.TextSize = New System.Drawing.Size(125, 13) @@ -1186,9 +1207,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem17.Control = Me.TextEdit11 Me.LayoutControlItem17.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem17.Location = New System.Drawing.Point(182, 136) + Me.LayoutControlItem17.Location = New System.Drawing.Point(131, 159) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(190, 40) + Me.LayoutControlItem17.Size = New System.Drawing.Size(201, 40) Me.LayoutControlItem17.Text = "Geändert wann:" Me.LayoutControlItem17.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem17.TextSize = New System.Drawing.Size(125, 13) @@ -1197,9 +1218,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem16.Control = Me.CHANGED_WHOTextBox1 Me.LayoutControlItem16.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 136) + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 159) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(182, 40) + Me.LayoutControlItem16.Size = New System.Drawing.Size(131, 40) Me.LayoutControlItem16.Text = "Geändert wer:" Me.LayoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem16.TextSize = New System.Drawing.Size(125, 13) @@ -1207,36 +1228,36 @@ Partial Class frmAdministration 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit9 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 24) + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 47) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(372, 24) + Me.LayoutControlItem11.Size = New System.Drawing.Size(332, 24) Me.LayoutControlItem11.Text = "Titel:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.TextEdit10 - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 48) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 71) Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Size = New System.Drawing.Size(372, 24) - Me.LayoutControlItem12.Text = "Position:" + Me.LayoutControlItem12.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem12.Text = "Position/Reihenfolge:" Me.LayoutControlItem12.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.ComboBoxEdit2 - Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 72) + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 95) Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Size = New System.Drawing.Size(372, 24) - Me.LayoutControlItem13.Text = "Verbindung:" + Me.LayoutControlItem13.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem13.Text = "Datenbank-Verbindung:" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.MemoEdit3 - Me.LayoutControlItem21.Location = New System.Drawing.Point(372, 0) + Me.LayoutControlItem21.Location = New System.Drawing.Point(332, 0) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(595, 253) + Me.LayoutControlItem21.Size = New System.Drawing.Size(640, 254) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1244,30 +1265,30 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(372, 253) + Me.LayoutControlItem22.Location = New System.Drawing.Point(332, 254) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(595, 307) + Me.LayoutControlItem22.Size = New System.Drawing.Size(640, 316) Me.LayoutControlItem22.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem22.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem22.TextSize = New System.Drawing.Size(125, 13) ' - 'LayoutControlItem23 - ' - Me.LayoutControlItem23.Control = Me.txtDATAGUID - Me.LayoutControlItem23.Location = New System.Drawing.Point(186, 0) - Me.LayoutControlItem23.Name = "LayoutControlItem23" - Me.LayoutControlItem23.Size = New System.Drawing.Size(186, 24) - Me.LayoutControlItem23.Text = "ID:" - Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) - ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 176) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 199) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(372, 384) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(332, 371) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' + 'LayoutControlItem23 + ' + Me.LayoutControlItem23.Control = Me.txtDATAGUID + Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 23) + Me.LayoutControlItem23.Name = "LayoutControlItem23" + Me.LayoutControlItem23.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem23.Text = "ID:" + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) + ' 'GridControl2 ' Me.GridControl2.DataSource = Me.TBCW_PROF_DATA_SEARCHBindingSource @@ -1276,7 +1297,7 @@ Partial Class frmAdministration Me.GridControl2.MainView = Me.GridView3 Me.GridControl2.MenuManager = Me.RibbonControl2 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(200, 580) + Me.GridControl2.Size = New System.Drawing.Size(200, 590) Me.GridControl2.TabIndex = 10 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -1303,43 +1324,290 @@ Partial Class frmAdministration ' 'TabPageDocuments ' - Me.TabPageDocuments.Controls.Add(Me.LayoutControl2) + Me.TabPageDocuments.Controls.Add(Me.LayoutControlDocs) Me.TabPageDocuments.Controls.Add(Me.GridControl1) + Me.TabPageDocuments.ImageOptions.Image = CType(resources.GetObject("TabPageDocuments.ImageOptions.Image"), System.Drawing.Image) Me.TabPageDocuments.Name = "TabPageDocuments" - Me.TabPageDocuments.Size = New System.Drawing.Size(1187, 580) + Me.TabPageDocuments.Size = New System.Drawing.Size(1192, 587) Me.TabPageDocuments.Text = "Dokument-Suchen" ' - 'LayoutControl2 + 'LayoutControlDocs ' - Me.LayoutControl2.Controls.Add(Me.CheckEdit3) - Me.LayoutControl2.Controls.Add(Me.TextEdit17) - Me.LayoutControl2.Controls.Add(Me.TextEdit15) - Me.LayoutControl2.Controls.Add(Me.TextEdit18) - Me.LayoutControl2.Controls.Add(Me.CHANGED_WHOTextBox2) - Me.LayoutControl2.Controls.Add(Me.TextEdit16) - Me.LayoutControl2.Controls.Add(Me.TextEdit19) - Me.LayoutControl2.Controls.Add(Me.LookUpEdit1) - Me.LayoutControl2.Controls.Add(Me.MemoEdit5) - Me.LayoutControl2.Controls.Add(Me.MemoEdit6) - Me.LayoutControl2.Controls.Add(Me.txtDOC_GUID) - Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl2.Location = New System.Drawing.Point(200, 0) - Me.LayoutControl2.Name = "LayoutControl2" - Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-854, 328, 650, 400) - Me.LayoutControl2.Root = Me.LayoutControlGroup2 - Me.LayoutControl2.Size = New System.Drawing.Size(987, 580) - Me.LayoutControl2.TabIndex = 24 - Me.LayoutControl2.Text = "LayoutControl2" + Me.LayoutControlDocs.Controls.Add(Me.CheckEdit3) + Me.LayoutControlDocs.Controls.Add(Me.TextEdit17) + Me.LayoutControlDocs.Controls.Add(Me.TextEdit15) + Me.LayoutControlDocs.Controls.Add(Me.TextEdit18) + Me.LayoutControlDocs.Controls.Add(Me.CHANGED_WHOTextBox2) + Me.LayoutControlDocs.Controls.Add(Me.TextEdit16) + Me.LayoutControlDocs.Controls.Add(Me.LookUpEdit1) + Me.LayoutControlDocs.Controls.Add(Me.MemoEdit5) + Me.LayoutControlDocs.Controls.Add(Me.MemoEdit6) + Me.LayoutControlDocs.Controls.Add(Me.txtDOC_GUID) + Me.LayoutControlDocs.Controls.Add(Me.TextEdit19) + Me.LayoutControlDocs.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControlDocs.Location = New System.Drawing.Point(200, 0) + Me.LayoutControlDocs.Name = "LayoutControlDocs" + Me.LayoutControlDocs.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-854, 328, 650, 400) + Me.LayoutControlDocs.Root = Me.LayoutControlGroup2 + Me.LayoutControlDocs.Size = New System.Drawing.Size(992, 587) + Me.LayoutControlDocs.TabIndex = 24 + Me.LayoutControlDocs.Text = "LayoutControl2" + ' + 'CheckEdit3 + ' + Me.CheckEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ACTIVE", True)) + Me.CheckEdit3.Location = New System.Drawing.Point(12, 12) + Me.CheckEdit3.Name = "CheckEdit3" + Me.CheckEdit3.Properties.Caption = "Suche Aktiv" + Me.CheckEdit3.Size = New System.Drawing.Size(328, 19) + Me.CheckEdit3.StyleController = Me.LayoutControlDocs + Me.CheckEdit3.TabIndex = 8 + ' + 'TextEdit17 + ' + Me.TextEdit17.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) + Me.TextEdit17.Location = New System.Drawing.Point(12, 147) + Me.TextEdit17.Name = "TextEdit17" + Me.TextEdit17.Properties.ReadOnly = True + Me.TextEdit17.Size = New System.Drawing.Size(127, 20) + Me.TextEdit17.StyleController = Me.LayoutControlDocs + Me.TextEdit17.TabIndex = 4 + ' + 'TextEdit15 + ' + Me.TextEdit15.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) + Me.TextEdit15.Location = New System.Drawing.Point(143, 147) + Me.TextEdit15.Name = "TextEdit15" + Me.TextEdit15.Properties.ReadOnly = True + Me.TextEdit15.Size = New System.Drawing.Size(197, 20) + Me.TextEdit15.StyleController = Me.LayoutControlDocs + Me.TextEdit15.TabIndex = 5 + ' + 'TextEdit18 + ' + Me.TextEdit18.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) + Me.TextEdit18.Location = New System.Drawing.Point(143, 187) + Me.TextEdit18.Name = "TextEdit18" + Me.TextEdit18.Properties.ReadOnly = True + Me.TextEdit18.Size = New System.Drawing.Size(197, 20) + Me.TextEdit18.StyleController = Me.LayoutControlDocs + Me.TextEdit18.TabIndex = 7 + ' + 'CHANGED_WHOTextBox2 + ' + Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) + Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(12, 187) + Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" + Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True + Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(127, 20) + Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControlDocs + Me.CHANGED_WHOTextBox2.TabIndex = 6 + ' + 'TextEdit16 + ' + Me.TextEdit16.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) + Me.TextEdit16.EditValue = "" + Me.TextEdit16.Location = New System.Drawing.Point(140, 59) + Me.TextEdit16.Name = "TextEdit16" + Me.TextEdit16.Size = New System.Drawing.Size(200, 20) + Me.TextEdit16.StyleController = Me.LayoutControlDocs + Me.TextEdit16.TabIndex = 9 + ' + 'LookUpEdit1 + ' + Me.LookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CONN_ID", True)) + Me.LookUpEdit1.Location = New System.Drawing.Point(140, 107) + Me.LookUpEdit1.Name = "LookUpEdit1" + Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookUpEdit1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Verbindung", 80, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) + Me.LookUpEdit1.Properties.DataSource = Me.TBDD_CONNECTIONBindingSource + Me.LookUpEdit1.Properties.DisplayMember = "BEZEICHNUNG" + Me.LookUpEdit1.Properties.NullText = "" + Me.LookUpEdit1.Properties.PopupSizeable = False + Me.LookUpEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard + Me.LookUpEdit1.Properties.ValueMember = "GUID" + Me.LookUpEdit1.Size = New System.Drawing.Size(200, 20) + Me.LookUpEdit1.StyleController = Me.LayoutControlDocs + Me.LookUpEdit1.TabIndex = 11 + ' + 'MemoEdit5 + ' + Me.MemoEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) + Me.MemoEdit5.Location = New System.Drawing.Point(344, 28) + Me.MemoEdit5.Name = "MemoEdit5" + Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MemoEdit5.Properties.Appearance.Options.UseFont = True + Me.MemoEdit5.Size = New System.Drawing.Size(636, 233) + Me.MemoEdit5.StyleController = Me.LayoutControlDocs + Me.MemoEdit5.TabIndex = 12 + ' + 'MemoEdit6 + ' + Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) + Me.MemoEdit6.Location = New System.Drawing.Point(344, 281) + Me.MemoEdit6.Name = "MemoEdit6" + Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MemoEdit6.Properties.Appearance.Options.UseFont = True + Me.MemoEdit6.Size = New System.Drawing.Size(636, 294) + Me.MemoEdit6.StyleController = Me.LayoutControlDocs + Me.MemoEdit6.TabIndex = 13 + ' + 'txtDOC_GUID + ' + Me.txtDOC_GUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) + Me.txtDOC_GUID.Location = New System.Drawing.Point(140, 35) + Me.txtDOC_GUID.Name = "txtDOC_GUID" + Me.txtDOC_GUID.Properties.ReadOnly = True + Me.txtDOC_GUID.Size = New System.Drawing.Size(200, 20) + Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs + Me.txtDOC_GUID.TabIndex = 14 + ' + 'TextEdit19 + ' + Me.TextEdit19.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) + Me.TextEdit19.Location = New System.Drawing.Point(140, 83) + Me.TextEdit19.Name = "TextEdit19" + Me.TextEdit19.Properties.AutoHeight = False + Me.TextEdit19.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.TextEdit19.Properties.Items.AddRange(New Object() {"0", "1", "2", "3", "4"}) + Me.TextEdit19.Size = New System.Drawing.Size(200, 20) + Me.TextEdit19.StyleController = Me.LayoutControlDocs + Me.TextEdit19.TabIndex = 10 ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup2.GroupBordersVisible = False - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem24, Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.LayoutControlItem28, Me.EmptySpaceItem2, Me.LayoutControlItem34, Me.LayoutControlItem33, Me.LayoutControlItem32}) + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.EmptySpaceItem2, Me.LayoutControlItem33, Me.LayoutControlItem32, Me.LayoutControlItem34, Me.LayoutControlItem24, Me.LayoutControlItem28}) Me.LayoutControlGroup2.Name = "Root" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(987, 580) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(992, 587) Me.LayoutControlGroup2.TextVisible = False ' + 'LayoutControlItem29 + ' + Me.LayoutControlItem29.Control = Me.TextEdit16 + Me.LayoutControlItem29.CustomizationFormText = "Titel:" + Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 47) + Me.LayoutControlItem29.Name = "LayoutControlItem29" + Me.LayoutControlItem29.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem29.Text = "Titel:" + Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem30 + ' + Me.LayoutControlItem30.Control = Me.TextEdit19 + Me.LayoutControlItem30.CustomizationFormText = "Position:" + Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 71) + Me.LayoutControlItem30.Name = "LayoutControlItem30" + Me.LayoutControlItem30.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem30.Text = "Position/Reihenfolge:" + Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem31 + ' + Me.LayoutControlItem31.Control = Me.LookUpEdit1 + Me.LayoutControlItem31.CustomizationFormText = "Verbindung:" + Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 95) + Me.LayoutControlItem31.Name = "LayoutControlItem31" + Me.LayoutControlItem31.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem31.Text = "Datenbank-Verbindung:" + Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem25 + ' + Me.LayoutControlItem25.Control = Me.TextEdit17 + Me.LayoutControlItem25.CustomizationFormText = "layoutControlItem1" + Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 119) + Me.LayoutControlItem25.Name = "LayoutControlItem25" + Me.LayoutControlItem25.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem25.Text = "Erstellt wer:" + Me.LayoutControlItem25.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem25.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem27 + ' + Me.LayoutControlItem27.Control = Me.TextEdit18 + Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" + Me.LayoutControlItem27.Location = New System.Drawing.Point(131, 159) + Me.LayoutControlItem27.Name = "LayoutControlItem27" + Me.LayoutControlItem27.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem27.Text = "Geändert wann:" + Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem26 + ' + Me.LayoutControlItem26.Control = Me.TextEdit15 + Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" + Me.LayoutControlItem26.Location = New System.Drawing.Point(131, 119) + Me.LayoutControlItem26.Name = "LayoutControlItem26" + Me.LayoutControlItem26.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem26.Text = "Erstellt wann:" + Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) + ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 199) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(332, 371) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' + 'LayoutControlItem33 + ' + Me.LayoutControlItem33.Control = Me.MemoEdit6 + Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" + Me.LayoutControlItem33.Location = New System.Drawing.Point(332, 253) + Me.LayoutControlItem33.Name = "LayoutControlItem33" + Me.LayoutControlItem33.Size = New System.Drawing.Size(640, 314) + Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" + Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem32 + ' + Me.LayoutControlItem32.Control = Me.MemoEdit5 + Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" + Me.LayoutControlItem32.Location = New System.Drawing.Point(332, 0) + Me.LayoutControlItem32.Name = "LayoutControlItem32" + Me.LayoutControlItem32.Size = New System.Drawing.Size(640, 253) + Me.LayoutControlItem32.Text = "SQL für Suche:" + Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem34 + ' + Me.LayoutControlItem34.Control = Me.txtDOC_GUID + Me.LayoutControlItem34.CustomizationFormText = "ID:" + Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 23) + Me.LayoutControlItem34.Name = "LayoutControlItem34" + Me.LayoutControlItem34.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem34.Text = "ID:" + Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) + ' + 'LayoutControlItem24 + ' + Me.LayoutControlItem24.Control = Me.CheckEdit3 + Me.LayoutControlItem24.CustomizationFormText = "LayoutControlItem10" + Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem24.Name = "LayoutControlItem24" + Me.LayoutControlItem24.Size = New System.Drawing.Size(332, 23) + Me.LayoutControlItem24.Text = "LayoutControlItem10" + Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem24.TextVisible = False + ' + 'LayoutControlItem28 + ' + Me.LayoutControlItem28.Control = Me.CHANGED_WHOTextBox2 + Me.LayoutControlItem28.CustomizationFormText = "layoutControlItem3" + Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 159) + Me.LayoutControlItem28.Name = "LayoutControlItem28" + Me.LayoutControlItem28.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem28.Text = "Geändert wer:" + Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13) + ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBCW_PROF_DOC_SEARCHBindingSource @@ -1348,7 +1616,7 @@ Partial Class frmAdministration Me.GridControl1.MainView = Me.GridView2 Me.GridControl1.MenuManager = Me.RibbonControl2 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(200, 580) + Me.GridControl1.Size = New System.Drawing.Size(200, 587) Me.GridControl1.TabIndex = 10 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -1362,6 +1630,7 @@ Partial Class frmAdministration Me.GridView2.OptionsBehavior.Editable = False Me.GridView2.OptionsBehavior.ReadOnly = True Me.GridView2.OptionsView.EnableAppearanceEvenRow = True + Me.GridView2.OptionsView.ShowAutoFilterRow = True Me.GridView2.OptionsView.ShowGroupPanel = False ' 'colTAB_TITLE @@ -1375,8 +1644,9 @@ Partial Class frmAdministration 'TabPageProcessAssignment ' Me.TabPageProcessAssignment.Controls.Add(Me.CtrlApplicationAssignment1) + Me.TabPageProcessAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1187, 580) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1192, 587) Me.TabPageProcessAssignment.Text = "Anwendungs Zuordnung" ' 'CtrlApplicationAssignment1 @@ -1384,14 +1654,15 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.Dock = System.Windows.Forms.DockStyle.Fill Me.CtrlApplicationAssignment1.Location = New System.Drawing.Point(0, 0) Me.CtrlApplicationAssignment1.Name = "CtrlApplicationAssignment1" - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1187, 580) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1192, 587) Me.CtrlApplicationAssignment1.TabIndex = 2 ' 'TabPageUserAssignment ' Me.TabPageUserAssignment.Controls.Add(Me.SplitContainer1) + Me.TabPageUserAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1187, 580) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1192, 590) Me.TabPageUserAssignment.Text = "Benutzer Zuordnung" ' 'SplitContainer1 @@ -1410,8 +1681,8 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1187, 580) - Me.SplitContainer1.SplitterDistance = 285 + Me.SplitContainer1.Size = New System.Drawing.Size(1192, 590) + Me.SplitContainer1.SplitterDistance = 289 Me.SplitContainer1.TabIndex = 98 ' 'GridControlUserInProfile @@ -1421,7 +1692,7 @@ Partial Class frmAdministration Me.GridControlUserInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserInProfile.MainView = Me.GridViewUserInProfile Me.GridControlUserInProfile.Name = "GridControlUserInProfile" - Me.GridControlUserInProfile.Size = New System.Drawing.Size(1187, 260) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(1192, 264) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' @@ -1490,7 +1761,7 @@ Partial Class frmAdministration Me.Label1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(0, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(1187, 25) + Me.Label1.Size = New System.Drawing.Size(1192, 25) Me.Label1.TabIndex = 94 Me.Label1.Text = "Zugeordnete Benutzer:" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1503,7 +1774,7 @@ Partial Class frmAdministration Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" Me.GridControlUserNotInProfile.ShowOnlyPredefinedDetails = True - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1187, 266) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1192, 272) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -1564,7 +1835,7 @@ Partial Class frmAdministration Me.Label2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(0, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(1187, 25) + Me.Label2.Size = New System.Drawing.Size(1192, 25) Me.Label2.TabIndex = 97 Me.Label2.Text = "Nicht zugeordnete Benutzer:" Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1573,8 +1844,9 @@ Partial Class frmAdministration ' Me.TabPageGroupAssignment.AutoScroll = True Me.TabPageGroupAssignment.Controls.Add(Me.SplitContainer2) + Me.TabPageGroupAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1187, 580) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1192, 590) Me.TabPageGroupAssignment.Text = "Gruppen Zuordnung" ' 'SplitContainer2 @@ -1593,8 +1865,8 @@ Partial Class frmAdministration ' Me.SplitContainer2.Panel2.Controls.Add(Me.GridControlGroupNotInProfile) Me.SplitContainer2.Panel2.Controls.Add(Me.Label10) - Me.SplitContainer2.Size = New System.Drawing.Size(1187, 580) - Me.SplitContainer2.SplitterDistance = 282 + Me.SplitContainer2.Size = New System.Drawing.Size(1192, 590) + Me.SplitContainer2.SplitterDistance = 286 Me.SplitContainer2.TabIndex = 0 ' 'GridControlGroupInProfile @@ -1604,7 +1876,7 @@ Partial Class frmAdministration Me.GridControlGroupInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupInProfile.MainView = Me.GridViewGroupInProfile Me.GridControlGroupInProfile.Name = "GridControlGroupInProfile" - Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1187, 257) + Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1192, 261) Me.GridControlGroupInProfile.TabIndex = 1 Me.GridControlGroupInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupInProfile}) ' @@ -1654,7 +1926,7 @@ Partial Class frmAdministration Me.Label9.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.Location = New System.Drawing.Point(0, 0) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(1187, 25) + Me.Label9.Size = New System.Drawing.Size(1192, 25) Me.Label9.TabIndex = 0 Me.Label9.Text = "Zugeordnete Gruppen" Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1666,7 +1938,7 @@ Partial Class frmAdministration Me.GridControlGroupNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupNotInProfile.MainView = Me.GridViewGroupNotInProfile Me.GridControlGroupNotInProfile.Name = "GridControlGroupNotInProfile" - Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1187, 269) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1192, 275) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' @@ -1715,7 +1987,7 @@ Partial Class frmAdministration Me.Label10.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Location = New System.Drawing.Point(0, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(1187, 25) + Me.Label10.Size = New System.Drawing.Size(1192, 25) Me.Label10.TabIndex = 1 Me.Label10.Text = "Nicht zugeordnete Gruppen:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1749,13 +2021,13 @@ Partial Class frmAdministration 'SplitContainerControl1 ' Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 143) + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 146) Me.SplitContainerControl1.Name = "SplitContainerControl1" Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControlProfiles) Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1357, 608) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1365, 615) Me.SplitContainerControl1.SplitterPosition = 159 Me.SplitContainerControl1.TabIndex = 27 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -1808,254 +2080,12 @@ Partial Class frmAdministration Me.SimpleSeparator1.Name = "SimpleSeparator1" Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2) ' - 'LookUpEdit1 - ' - Me.LookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CONN_ID", True)) - Me.LookUpEdit1.Location = New System.Drawing.Point(140, 84) - Me.LookUpEdit1.Name = "LookUpEdit1" - Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookUpEdit1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Verbindung", 80, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) - Me.LookUpEdit1.Properties.DataSource = Me.TBDD_CONNECTIONBindingSource - Me.LookUpEdit1.Properties.DisplayMember = "BEZEICHNUNG" - Me.LookUpEdit1.Properties.NullText = "" - Me.LookUpEdit1.Properties.PopupSizeable = False - Me.LookUpEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard - Me.LookUpEdit1.Properties.ValueMember = "GUID" - Me.LookUpEdit1.Size = New System.Drawing.Size(163, 20) - Me.LookUpEdit1.StyleController = Me.LayoutControl2 - Me.LookUpEdit1.TabIndex = 11 - ' - 'txtDOC_GUID - ' - Me.txtDOC_GUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) - Me.txtDOC_GUID.Location = New System.Drawing.Point(222, 12) - Me.txtDOC_GUID.Name = "txtDOC_GUID" - Me.txtDOC_GUID.Size = New System.Drawing.Size(81, 20) - Me.txtDOC_GUID.StyleController = Me.LayoutControl2 - Me.txtDOC_GUID.TabIndex = 14 - ' - 'CHANGED_WHOTextBox2 - ' - Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(159, 164) - Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" - Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(144, 20) - Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControl2 - Me.CHANGED_WHOTextBox2.TabIndex = 6 - ' - 'TextEdit15 - ' - Me.TextEdit15.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit15.Location = New System.Drawing.Point(159, 124) - Me.TextEdit15.Name = "TextEdit15" - Me.TextEdit15.Properties.ReadOnly = True - Me.TextEdit15.Size = New System.Drawing.Size(144, 20) - Me.TextEdit15.StyleController = Me.LayoutControl2 - Me.TextEdit15.TabIndex = 5 - ' - 'TextEdit16 - ' - Me.TextEdit16.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) - Me.TextEdit16.EditValue = "" - Me.TextEdit16.Location = New System.Drawing.Point(140, 36) - Me.TextEdit16.Name = "TextEdit16" - Me.TextEdit16.Size = New System.Drawing.Size(163, 20) - Me.TextEdit16.StyleController = Me.LayoutControl2 - Me.TextEdit16.TabIndex = 9 - ' - 'MemoEdit5 - ' - Me.MemoEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit5.Location = New System.Drawing.Point(307, 28) - Me.MemoEdit5.Name = "MemoEdit5" - Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MemoEdit5.Properties.Appearance.Options.UseFont = True - Me.MemoEdit5.Size = New System.Drawing.Size(668, 242) - Me.MemoEdit5.StyleController = Me.LayoutControl2 - Me.MemoEdit5.TabIndex = 12 - ' - 'MemoEdit6 - ' - Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit6.Location = New System.Drawing.Point(307, 290) - Me.MemoEdit6.Name = "MemoEdit6" - Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MemoEdit6.Properties.Appearance.Options.UseFont = True - Me.MemoEdit6.Size = New System.Drawing.Size(668, 278) - Me.MemoEdit6.StyleController = Me.LayoutControl2 - Me.MemoEdit6.TabIndex = 13 - ' - 'TextEdit17 - ' - Me.TextEdit17.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) - Me.TextEdit17.Location = New System.Drawing.Point(12, 124) - Me.TextEdit17.Name = "TextEdit17" - Me.TextEdit17.Properties.ReadOnly = True - Me.TextEdit17.Size = New System.Drawing.Size(143, 20) - Me.TextEdit17.StyleController = Me.LayoutControl2 - Me.TextEdit17.TabIndex = 4 - ' - 'TextEdit18 - ' - Me.TextEdit18.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit18.Location = New System.Drawing.Point(12, 164) - Me.TextEdit18.Name = "TextEdit18" - Me.TextEdit18.Properties.ReadOnly = True - Me.TextEdit18.Size = New System.Drawing.Size(143, 20) - Me.TextEdit18.StyleController = Me.LayoutControl2 - Me.TextEdit18.TabIndex = 7 - ' - 'TextEdit19 - ' - Me.TextEdit19.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) - Me.TextEdit19.Location = New System.Drawing.Point(140, 60) - Me.TextEdit19.Name = "TextEdit19" - Me.TextEdit19.Size = New System.Drawing.Size(163, 20) - Me.TextEdit19.StyleController = Me.LayoutControl2 - Me.TextEdit19.TabIndex = 10 - ' - 'CheckEdit3 - ' - Me.CheckEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ACTIVE", True)) - Me.CheckEdit3.Location = New System.Drawing.Point(12, 12) - Me.CheckEdit3.Name = "CheckEdit3" - Me.CheckEdit3.Properties.Caption = "Suche Aktiv" - Me.CheckEdit3.Size = New System.Drawing.Size(78, 19) - Me.CheckEdit3.StyleController = Me.LayoutControl2 - Me.CheckEdit3.TabIndex = 8 - ' - 'LayoutControlItem24 - ' - Me.LayoutControlItem24.Control = Me.CheckEdit3 - Me.LayoutControlItem24.CustomizationFormText = "LayoutControlItem10" - Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem24.Name = "LayoutControlItem24" - Me.LayoutControlItem24.Size = New System.Drawing.Size(82, 24) - Me.LayoutControlItem24.Text = "LayoutControlItem10" - Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem24.TextVisible = False - ' - 'LayoutControlItem25 - ' - Me.LayoutControlItem25.Control = Me.TextEdit17 - Me.LayoutControlItem25.CustomizationFormText = "layoutControlItem1" - Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 96) - Me.LayoutControlItem25.Name = "LayoutControlItem25" - Me.LayoutControlItem25.Size = New System.Drawing.Size(147, 40) - Me.LayoutControlItem25.Text = "Erstellt wer:" - Me.LayoutControlItem25.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem25.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem26 - ' - Me.LayoutControlItem26.Control = Me.TextEdit15 - Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem26.Location = New System.Drawing.Point(147, 96) - Me.LayoutControlItem26.Name = "LayoutControlItem26" - Me.LayoutControlItem26.Size = New System.Drawing.Size(148, 40) - Me.LayoutControlItem26.Text = "Erstellt wann:" - Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem27 - ' - Me.LayoutControlItem27.Control = Me.TextEdit18 - Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 136) - Me.LayoutControlItem27.Name = "LayoutControlItem27" - Me.LayoutControlItem27.Size = New System.Drawing.Size(147, 40) - Me.LayoutControlItem27.Text = "Geändert wann:" - Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem28 - ' - Me.LayoutControlItem28.Control = Me.CHANGED_WHOTextBox2 - Me.LayoutControlItem28.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem28.Location = New System.Drawing.Point(147, 136) - Me.LayoutControlItem28.Name = "LayoutControlItem28" - Me.LayoutControlItem28.Size = New System.Drawing.Size(148, 40) - Me.LayoutControlItem28.Text = "Geändert wer:" - Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem29 - ' - Me.LayoutControlItem29.Control = Me.TextEdit16 - Me.LayoutControlItem29.CustomizationFormText = "Titel:" - Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 24) - Me.LayoutControlItem29.Name = "LayoutControlItem29" - Me.LayoutControlItem29.Size = New System.Drawing.Size(295, 24) - Me.LayoutControlItem29.Text = "Titel:" - Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem30 - ' - Me.LayoutControlItem30.Control = Me.TextEdit19 - Me.LayoutControlItem30.CustomizationFormText = "Position:" - Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 48) - Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(295, 24) - Me.LayoutControlItem30.Text = "Position:" - Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem31 - ' - Me.LayoutControlItem31.Control = Me.LookUpEdit1 - Me.LayoutControlItem31.CustomizationFormText = "Verbindung:" - Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 72) - Me.LayoutControlItem31.Name = "LayoutControlItem31" - Me.LayoutControlItem31.Size = New System.Drawing.Size(295, 24) - Me.LayoutControlItem31.Text = "Verbindung:" - Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem32 - ' - Me.LayoutControlItem32.Control = Me.MemoEdit5 - Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" - Me.LayoutControlItem32.Location = New System.Drawing.Point(295, 0) - Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(672, 262) - Me.LayoutControlItem32.Text = "SQL für Suche:" - Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem33 - ' - Me.LayoutControlItem33.Control = Me.MemoEdit6 - Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.Location = New System.Drawing.Point(295, 262) - Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(672, 298) - Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) - ' - 'LayoutControlItem34 - ' - Me.LayoutControlItem34.Control = Me.txtDOC_GUID - Me.LayoutControlItem34.CustomizationFormText = "ID:" - Me.LayoutControlItem34.Location = New System.Drawing.Point(82, 0) - Me.LayoutControlItem34.Name = "LayoutControlItem34" - Me.LayoutControlItem34.Size = New System.Drawing.Size(213, 24) - Me.LayoutControlItem34.Text = "ID:" - Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) - ' - 'EmptySpaceItem2 - ' - Me.EmptySpaceItem2.AllowHotTrack = False - Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 176) - Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(295, 384) - Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) - ' 'frmAdministration ' Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1357, 782) + Me.ClientSize = New System.Drawing.Size(1365, 782) Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl2) @@ -2094,7 +2124,6 @@ Partial Class frmAdministration CType(Me.GUIDTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() @@ -2103,21 +2132,23 @@ Partial Class frmAdministration CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPageData.ResumeLayout(False) - CType(Me.LayoutControl3, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl3.ResumeLayout(False) + CType(Me.LayoutControlData, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControlData.ResumeLayout(False) CType(Me.TextEdit12.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit13.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CHANGED_WHOTextBox1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit10.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtDATAGUID.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit10.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() @@ -2129,14 +2160,37 @@ Partial Class frmAdministration CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPageDocuments.ResumeLayout(False) - CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl2.ResumeLayout(False) + CType(Me.LayoutControlDocs, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControlDocs.ResumeLayout(False) + CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit17.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem33, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPageProcessAssignment.ResumeLayout(False) @@ -2168,29 +2222,6 @@ Partial Class frmAdministration CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit17.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem33, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem34, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2317,9 +2348,9 @@ Partial Class frmAdministration Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlDocs As DevExpress.XtraLayout.LayoutControl Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControl3 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlData As DevExpress.XtraLayout.LayoutControl Friend WithEvents TextEdit12 As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEdit13 As DevExpress.XtraEditors.TextEdit Friend WithEvents CHANGED_WHOTextBox1 As DevExpress.XtraEditors.TextEdit @@ -2337,7 +2368,6 @@ Partial Class frmAdministration Friend WithEvents SimpleSeparator1 As DevExpress.XtraLayout.SimpleSeparator Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit Friend WithEvents TextEdit9 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit10 As DevExpress.XtraEditors.TextEdit Friend WithEvents ComboBoxEdit2 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem @@ -2358,7 +2388,6 @@ Partial Class frmAdministration Friend WithEvents TextEdit18 As DevExpress.XtraEditors.TextEdit Friend WithEvents CHANGED_WHOTextBox2 As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEdit16 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit19 As DevExpress.XtraEditors.TextEdit Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents MemoEdit5 As DevExpress.XtraEditors.MemoEdit Friend WithEvents MemoEdit6 As DevExpress.XtraEditors.MemoEdit @@ -2375,4 +2404,7 @@ Partial Class frmAdministration Friend WithEvents LayoutControlItem33 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem34 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents EmptySpaceItem3 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents TextEdit19 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents TextEdit10 As DevExpress.XtraEditors.ComboBoxEdit End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index f60968b..8ba6b6f 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -123,6 +123,9 @@ 245, 17 + + 245, 17 + 345, 56 @@ -156,10 +159,32 @@ 17, 95 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBIb21lOx50 + ZDgAAADUSURBVDhPnZE9DoJAEIWxtfFkJl7AOwCNHQlmW6O30cTCRlAvY/zDdpw3YcgusLCx+GB4O+9L + yEbGGB8TZsPkms3XBwL6DZqhBcpbBstAJKECu3xkynrOuZyNCdrlKTNjHAm/m85YWc8gKVZmJxIrbwRD + ZUUkjCPBI6SsdCQIcVUIwFBZgUT3MwRLZl8HuqQLbezzE7PQAL/hLFTXhB5FKnwuSZ8AHecWnIU3l+7n + VHiVvQKZIyIS7BDz9xbTs0yF6hp3BNrzCjwEC8bwCoLpCP6Doh9wyB/S6rhfgQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAHXRFWHRUaXRsZQBEYXRhYmFz + ZTtEQjtTb3VyY2U7U3Rvcqyx6nIAAACISURBVDhPY/j//z/DuyNFICwAxFFAPAuIzwHxJyQM4oPEQfIg + dWB9IAwzwAiIlwLxfyIwSJ0RugFzkBQQg+egG/AOTQEh/I7qBlDsBTMgJiUQzdANSANiTyAmJhpB6tLQ + DQCFwQMgBimKA2JdIOZBwiA+SBwkD1I3Gga0CAOKMxMIk5Gd/zMAAEoW6kGN/QioAAAAAElFTkSuQmCC + + + + 1149, 134 + 997, 134 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -664,14 +689,53 @@ L0Mv7KiYDNEyrN2ITDbbQLQR1W7FJptlYLAVQ81hZLJZBgaHEdQcxyabbCB5HEPphcRkkw0kLyRQeiWb SvZKBqteSh0C/3IkyBUVhzEDwFAxX8WNKUBLjuuwh+QMOHQsy6ZmnyAWTdvtKUoNOMv9OV2PZvMLsfKg vDjYoZ0AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFnRFWHRUaXRsZQBUZXh0O1Bh + Z2U7UmVwb3J0dmFhAAAAAFVJREFUOE9j+P//P0UYzmhpafmPB/+D0sbImkEYxQB8ACTf19d3F90QkgwA + gl/ohpBkADIGAtIMQAZ4DfBt2oEXg8CoC2jtAmIA7QwgBWMYQB7+zwAAuicvos+uzscAAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAK3RFWHRUaXRsZQBTZXR1cDtD + dXN0b21pejtEZXNpZ247U2V0dGluZztQcm9wZXJ0OB+1IQAAAL5JREFUOE+tkzEOwyAMRXOMKMrKkiXK + QXqmSB17lJ6gF+qeOQv9D+HIg4cIOjwJ258vY2DIOYc8np8kjkqKNHAtJBrF5OJV5Mrq8pMYLfabEb7F + JmbxEmeFNTlqaNAWE+9qhTugLd0Wg2qCeySO2GyfN6BFE3zFLpYKa3JWny8DBUybgXFOE+wmMMi5Olr2 + JApcE0mGZYIlMKATq5v2+ItB3xGcoG2IzqD9GpXoe0gK+p6yM2n7TBES3fjOefgBxElwF8N/bLEAAAAA + SUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAMnRFWHRUaXRsZQBDdXN0b21l + cjtFbXBsb3llZTtQZXJzb247Q29udGFjdDtVc2VyO0NsaWVudH4RNugAAADNSURBVDhPpdExDkFBFAXQ + X4jeMkg0Kir03xrsRaWxCIuQ6EXCGv4KqL8CkXGvzLzMPP8xoTgymXffDaZwzv3l9TFbbLUh7OHiHWAM + Sc4qaMEJnHKGNkjWKuiCXg56IFmrYAJNyzQFyVoFS2haJs4kaxWM4AF6mXf8cyVrFdAOdAHvktynAj7Z + DcIyz9nPGMzh6PH8lrEKOrCC+M155h1nktUFA9jAHfi119D3eOYdZ8wwmxSUcIXwm79htowLqmiYq4oL + ajXMUUvB71zxBKd8P7UB7yhRAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAGHRFWHRUaXRsZQBUZWFtO1Bl + b3BsZTtHcm91cDtcOegWAAAA80lEQVQ4T6XQPQrCQBAFYJWAWHkGD6CdrQcQxDKthSeQQErFa1jYapnO + Kyh4CbGwF0yl63thJ0zWSREsPojz88yk5Zz7i1lsonyYbU9t2MHT20MHzLoVMAYXYM2sWwGxGrjCEiJv + AWeQfmwFpL75gbpz3sCZ1ArowwsuUHcOe5zp/wT4kAQOoM8RrLGX6B29zFuHMAA5R2ONvRFEZQB+dGED + N7jDFOQcWS5eG9jjDGe502PAEfQ/0Qp4jvzmM2t6hjIG5KrwgDXIOROveG1gjzMyn5ffwH+H8Jy5V3lt + vRMGWOeEMr0TBuhz6uR6pxLQnGt9AcOrflkk3vJqAAAAAElFTkSuQmCC 751, 134 - - 1149, 134 - 227, 134 diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index d7370ab..2873d60 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -2,6 +2,9 @@ Public Class frmAdministration Private SelectedProcessName As String + Private Const MAX_DATA_SEARCHES = 5 + Private Const MAX_DOC_SEARCHES = 5 + Class ProfileType Public Name As String Public Id As Int16 @@ -82,7 +85,7 @@ Public Class frmAdministration MyDataset.TBCW_PROFILES.PROFILE_TYPEColumn.DefaultValue = 0 MyDataset.TBCW_PROFILES.WD_SEARCHColumn.DefaultValue = String.Empty MyDataset.TBCW_PROFILES.REGEX_EXPRESSIONColumn.DefaultValue = ".+" - MyDataset.TBCW_PROFILES.ACTIVEColumn.DefaultValue = False + MyDataset.TBCW_PROFILES.ACTIVEColumn.DefaultValue = True XtraTabControl3.SelectedTabPage = TabPageGeneralSettings End Sub @@ -108,9 +111,15 @@ Public Class frmAdministration TBCW_PROF_DOC_SEARCHTableAdapter.Connection.ConnectionString = MyConnectionString TBCW_PROF_DOC_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DOC_SEARCH, GUIDTextBox.Text) + If MyDataset.TBCW_PROF_DOC_SEARCH.Count = 0 Then + LayoutControlDocs.Enabled = False + End If TBCW_PROF_DATA_SEARCHTableAdapter.Connection.ConnectionString = MyConnectionString TBCW_PROF_DATA_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DATA_SEARCH, GUIDTextBox.Text) + If MyDataset.TBCW_PROF_DATA_SEARCH.Count = 0 Then + LayoutControlData.Enabled = False + End If Catch ex As Exception MsgBox("Unexpected Error in Refresh Profile User: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -232,17 +241,23 @@ Public Class frmAdministration End Sub Private Sub TBCW_PROF_DATA_SEARCHBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBCW_PROF_DATA_SEARCHBindingSource.AddingNew + + MyDataset.TBCW_PROF_DATA_SEARCH.ADDED_WHOColumn.DefaultValue = Environment.UserName MyDataset.TBCW_PROF_DATA_SEARCH.PROFILE_IDColumn.DefaultValue = GUIDTextBox.Text MyDataset.TBCW_PROF_DATA_SEARCH.CONN_IDColumn.DefaultValue = 1 - MyDataset.TBCW_PROF_DATA_SEARCH.ACTIVEColumn.DefaultValue = False + MyDataset.TBCW_PROF_DATA_SEARCH.ACTIVEColumn.DefaultValue = True + + LayoutControlData.Enabled = True End Sub Private Sub TBCW_PROF_DOC_SEARCHBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBCW_PROF_DOC_SEARCHBindingSource.AddingNew MyDataset.TBCW_PROF_DOC_SEARCH.ADDED_WHOColumn.DefaultValue = Environment.UserName - MyDataset.TBCW_PROF_DOC_SEARCH.ACTIVEColumn.DefaultValue = False + MyDataset.TBCW_PROF_DOC_SEARCH.ACTIVEColumn.DefaultValue = True MyDataset.TBCW_PROF_DOC_SEARCH.PROFILE_IDColumn.DefaultValue = GUIDTextBox.Text MyDataset.TBCW_PROF_DOC_SEARCH.CONN_IDColumn.DefaultValue = 1 + + LayoutControlDocs.Enabled = True End Sub Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) @@ -302,7 +317,7 @@ Public Class frmAdministration MsgBox("Error while assigning process!", MsgBoxStyle.Critical, "Clipboard Watcher") End If - Status_Changed("Prozess gespeichert") + Status_Changed("Prozess zugeordnet") End Sub Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick @@ -314,7 +329,7 @@ Public Class frmAdministration MsgBox("Error while deleting assignment of process!", MsgBoxStyle.Critical, "Clipboard Watcher") End If - Status_Changed("Prozess gelöscht") + Status_Changed("Prozesszuordnung gelöscht") End Sub Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick @@ -322,7 +337,7 @@ Public Class frmAdministration MsgBox("Error while assigning window!", MsgBoxStyle.Critical, "Clipboard Watcher") End If - Status_Changed("Fenster gespeichert") + Status_Changed("Fenster zugeordnet") End Sub Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick @@ -334,7 +349,7 @@ Public Class frmAdministration MsgBox("Error while deleting assignment of window!", MsgBoxStyle.Critical, "Clipboard Watcher") End If - Status_Changed("Fenster-Zuordnung gelöscht") + Status_Changed("Fensterzuordnung gelöscht") End Sub Private Sub BarButtonItem11_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem11.ItemClick @@ -358,6 +373,8 @@ Public Class frmAdministration Refresh_ProfileData() GridViewUserNotInProfile.ClearSelection() + + Status_Changed($"{oSelectedRows.Count} Benutzer zugeordnet") Catch ex As Exception Logger.Error(ex) MsgBox("Unexpected Error while adding user-rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -385,6 +402,8 @@ Public Class frmAdministration Refresh_ProfileData() GridViewUserInProfile.ClearSelection() + + Status_Changed($"{oSelectedRows.Count} Benutzerzuordnungen gelöscht") Catch ex As Exception Logger.Error(ex) MsgBox("Unexpected Error in deleting ProfileUserRelation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -409,6 +428,8 @@ Public Class frmAdministration Refresh_Free_Groups(GUIDTextBox.Text) Refresh_ProfileData() + + Status_Changed($"{oSelectedGroups.Count} Gruppen zugeordnet") Catch ex As Exception MsgBox("Unexpected Error while adding Group-Rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -432,6 +453,8 @@ Public Class frmAdministration Refresh_Free_Groups(GUIDTextBox.Text) Refresh_ProfileData() + + Status_Changed($"{oSelectedGroups.Count} Gruppenzuordnungen gelöscht") Catch ex As Exception MsgBox("Unexpected Error in deleting Group-Rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -506,6 +529,8 @@ Public Class frmAdministration If CtrlApplicationAssignment1.Window_SaveAssignment() = False Then MsgBox("Error while saving window", MsgBoxStyle.Critical, Text) End If + + Status_Changed("Fensterzuordnung gespeichert") End Sub Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick @@ -514,6 +539,11 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem15_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem15.ItemClick + If TBCW_PROF_DOC_SEARCHBindingSource.Count = MAX_DOC_SEARCHES Then + MsgBox($"Es können nicht mehr als {MAX_DOC_SEARCHES} Dokument-Suchen angelegt werden!", MsgBoxStyle.Exclamation, Text) + Exit Sub + End If + TBCW_PROF_DOC_SEARCHBindingSource.AddNew() End Sub @@ -526,6 +556,7 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then TBCW_PROF_DATA_SEARCHTableAdapter.Delete(txtDATAGUID.Text) TBCW_PROF_DATA_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DATA_SEARCH, GUIDTextBox.Text) + Status_Changed("Daten-Suche gelöscht") End If End Sub @@ -536,6 +567,8 @@ Public Class frmAdministration CHANGED_WHOTextBox1.Text = Environment.UserName TBCW_PROF_DATA_SEARCHBindingSource.EndEdit() TBCW_PROF_DATA_SEARCHTableAdapter.Update(MyDataset.TBCW_PROF_DATA_SEARCH) + TBCW_PROF_DATA_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DATA_SEARCH, GUIDTextBox.Text) + Status_Changed("Daten-Suche gespeichert") End If Catch ex As NoNullAllowedException MsgBox("Ein oder mehrere Felder wurden nicht ausgefüllt:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, Text) @@ -545,6 +578,11 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem20_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem20.ItemClick + If TBCW_PROF_DATA_SEARCHBindingSource.Count = MAX_DATA_SEARCHES Then + MsgBox($"Es können nicht mehr als {MAX_DATA_SEARCHES} Daten-Suchen angelegt werden!", MsgBoxStyle.Exclamation, Text) + Exit Sub + End If + TBCW_PROF_DATA_SEARCHBindingSource.AddNew() End Sub @@ -553,6 +591,7 @@ Public Class frmAdministration If result = MsgBoxResult.Yes Then TBCW_PROF_DOC_SEARCHTableAdapter.Delete(txtDOC_GUID.Text) TBCW_PROF_DOC_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DOC_SEARCH, GUIDTextBox.Text) + Status_Changed("Dokument-Suche gelöscht") End If End Sub @@ -563,6 +602,8 @@ Public Class frmAdministration CHANGED_WHOTextBox2.Text = Environment.UserName TBCW_PROF_DOC_SEARCHBindingSource.EndEdit() TBCW_PROF_DOC_SEARCHTableAdapter.Update(MyDataset.TBCW_PROF_DOC_SEARCH) + TBCW_PROF_DOC_SEARCHTableAdapter.Fill(MyDataset.TBCW_PROF_DOC_SEARCH, GUIDTextBox.Text) + Status_Changed("Dokument-Suche gespeichert") End If Catch ex As NoNullAllowedException MsgBox("Ein oder mehrere Felder wurden nicht ausgefüllt:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, Text) diff --git a/app/DD_Clipboard_Searcher/frmConnection.Designer.vb b/app/DD_Clipboard_Searcher/frmConnection.Designer.vb index 6f45e33..f6bfbf6 100644 --- a/app/DD_Clipboard_Searcher/frmConnection.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmConnection.Designer.vb @@ -44,7 +44,6 @@ Partial Class frmConnection Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn() Me.colSQL_PROVIDER = New DevExpress.XtraGrid.Columns.GridColumn() Me.chkWinAuth = New System.Windows.Forms.CheckBox() - Me.Button1 = New System.Windows.Forms.Button() Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.DATENBANKComboBox = New System.Windows.Forms.ComboBox() Me.SQL_PROVIDERComboBox = New System.Windows.Forms.ComboBox() @@ -67,6 +66,7 @@ Partial Class frmConnection Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() BEZEICHNUNGLabel = New System.Windows.Forms.Label() SQL_PROVIDERLabel = New System.Windows.Forms.Label() SERVERLabel = New System.Windows.Forms.Label() @@ -205,7 +205,6 @@ Partial Class frmConnection Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1) Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.chkWinAuth) - Me.SplitContainerControl1.Panel2.Controls.Add(Me.Button1) Me.SplitContainerControl1.Panel2.Controls.Add(GUIDLabel) Me.SplitContainerControl1.Panel2.Controls.Add(Me.GUIDTextBox) Me.SplitContainerControl1.Panel2.Controls.Add(Me.DATENBANKComboBox) @@ -283,24 +282,13 @@ Partial Class frmConnection 'chkWinAuth ' Me.chkWinAuth.AutoSize = True - Me.chkWinAuth.Location = New System.Drawing.Point(17, 217) + Me.chkWinAuth.Location = New System.Drawing.Point(223, 181) Me.chkWinAuth.Name = "chkWinAuth" Me.chkWinAuth.Size = New System.Drawing.Size(154, 17) Me.chkWinAuth.TabIndex = 31 Me.chkWinAuth.Text = "Windows Authentifizierung" Me.chkWinAuth.UseVisualStyleBackColor = True ' - 'Button1 - ' - Me.Button1.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.startwithoutdebugging_6556 - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(223, 166) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(200, 34) - Me.Button1.TabIndex = 30 - Me.Button1.Text = "Verbindungstest" - Me.Button1.UseVisualStyleBackColor = True - ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GUID", True)) @@ -430,9 +418,9 @@ Partial Class frmConnection 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonAdd, Me.BarButtonDelete, Me.BarButtonSave}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonAdd, Me.BarButtonDelete, Me.BarButtonSave, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -473,8 +461,9 @@ Partial Class frmConnection 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonAdd) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonDelete) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonSave) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonDelete) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Verbindungen" ' @@ -490,6 +479,14 @@ Partial Class frmConnection Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Verbindungstest" + Me.BarButtonItem1.Id = 4 + Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'frmConnection ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -533,7 +530,6 @@ Partial Class frmConnection Friend WithEvents ERSTELLTWANNDateTimePicker As DateTimePicker Friend WithEvents GEANDERTWERTextBox As TextBox Friend WithEvents DATENBANKComboBox As ComboBox - Friend WithEvents Button1 As Button Friend WithEvents colBEZEICHNUNG As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colSQL_PROVIDER As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents chkWinAuth As CheckBox @@ -547,4 +543,5 @@ Partial Class frmConnection Friend WithEvents BarButtonDelete As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents GUIDTextBox As TextBox + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_Clipboard_Searcher/frmConnection.resx b/app/DD_Clipboard_Searcher/frmConnection.resx index 16e1179..68ca9e1 100644 --- a/app/DD_Clipboard_Searcher/frmConnection.resx +++ b/app/DD_Clipboard_Searcher/frmConnection.resx @@ -159,6 +159,9 @@ 17, 17 + + 17, 17 + 371, 17 @@ -231,6 +234,37 @@ mPAyQPfsiZyYZ8oDeGFBxYSXAbpnT+TEPFMewAsLKia8DNA9eyIn5pnyAF5YUDHhZVwiZ74HLlmgCfsi J+9/ho+Ab94FWgUeAma7YB954dpdoBJvhX2M7O4Cd4G7wPUKTEIl3wL7yAvX7gKHwTdtgdmGD2Dmm7YA PpX33+BfwD3xzarAGbjDnrjDfqThC1oLalOREus2AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFXRFWHRUaXRsZQBHYXVnZTtD + aXJjdWxhcjvZ1LzUAAABIUlEQVQ4T6WRsUoDQRRF5xvyA+sPWNkbCCFgIXb+gLJEUFgI2AbigrBoYxWw + TJVuu9iFVGJp5zekyh9M7lneSHYcwcXiLG/fu/fuzFvnvf8XyWYXks0uuLIsY0biWbyLnUFNj1lLf/hy + JJ7ERkxFX/QManrM0KBtBdBYiPntw+vgfPZWiJXYGtQFMzSmbUJCAKnzy1k9lLAW/hceP24uTtGapwng + Xhv7cjCvRS4yg/rl8/rs7utqWC/vx5yE64wIYDlTCTh2MJ/E25bxWKyFFwUevASw4b5M3JOAPDYHZMwt + YIUHLwH8pp6MLIuArKoqL1KnyCxgiwed42EBLoDZQiZxSKAVkID+JLxjCHUMSQ2H6Wb4NsUzCL4fg64k + m3/Huz2jOnVRTFWrbAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFXRFWHRUaXRsZQBHYXVnZTtD + aXJjdWxhcjvZ1LzUAAACwUlEQVRYR8WVP0hWURiHlRocbAhyFgRXEUdpCHRpKBrCVSHCNRFcCpSQRocQ + BBGCIBzEycXRtTmkwEnENmmTbwhvz/Nx3su5t+OfltvwwLm/8573995zzn3vQFVV/5Wi2CVFsUuKYpcU + xS4pil1SFLtkYH19/a6MwwJswhGcQi/hWM05Y4wt5fiLotjiCXyEr7ALSzADozCUcKzmnDHGusa1pZw1 + RTExBh/AN1uFidIWljA2rXGtOczVzt+n8fDs/WEfxr7NAWzBVNIHYRbW4ABO4DLhWM05Y4w1z1TKYS5z + Nvyk8ZAWPYdDWPY5MQf7UN2RNzCY7chyymnuhmfjAazSwEUSaDwGG9CDklGJL3Dvx6vZt7ABY6mIxZS7 + sRP1ADwntyrefBL2IE9+BjswDxMwnHCs9ho0fwdVYg8ms53Qo74TeQFeli0SxJvn5lewDdOxrdeB2RRs + wxXkRcROeCf0ahTg5+KNjQvntof5Bay0jW4DwxW4SAXIhroeyav/iUYBfrOrGMWFizP3zVeYewmPUmyR + dgGSioid6MGcOvF+onr2C7Br2Tg8Rz+f/LZvpwUP4Aws5j7UxkFunIOpxxG7sA+DxNsn9Bx3sa1z12AM + /YbD3AvXP3Pm5QVU8A0eJ60mN83BcBrOUgEyq84aO+aCA/v3kiKGNpIoYCeSaJD4DBZxBZ+gPpaILYHp + TlbAmhprbNubDrwQM4qY2s2igPlIoEHiIZyDRchv+AlrMBLxbTCdzwo4UCPefnDkwD/ZqCKmttQooO79 + zOc8hSggp/9mJTCdyAo4USPeH9ipA3+nQ4qY2tejgOFIwHybX6BpPDs+jvg2mA5nBVyqEe9ftOegLuA6 + mG/zHe5cQAni6wJc/C+4xjNv63G52vqNFKu7DRaOgEUcJ268hDdRFLukKHZJUeySotglRbFLimJ3VAN/ + AAb7J20pr6P2AAAAAElFTkSuQmCC \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmConnection.vb b/app/DD_Clipboard_Searcher/frmConnection.vb index 61dae7a..7daab8d 100644 --- a/app/DD_Clipboard_Searcher/frmConnection.vb +++ b/app/DD_Clipboard_Searcher/frmConnection.vb @@ -30,7 +30,7 @@ Public Class frmConnection MyDataset.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) ConnectionTest(SQL_PROVIDERComboBox.Text, chkWinAuth.Checked, SERVERTextBox.Text, USERNAMETextBox.Text, PASSWORDTextBox.Text, DATENBANKComboBox.Text) End Sub @@ -175,4 +175,7 @@ Public Class frmConnection TableAdapterManager.UpdateAll(MyDataset) End Sub + Private Sub BarButtonItem1_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + ConnectionTest(SQL_PROVIDERComboBox.Text, chkWinAuth.Checked, SERVERTextBox.Text, USERNAMETextBox.Text, PASSWORDTextBox.Text, DATENBANKComboBox.Text) + End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmDocView.vb b/app/DD_Clipboard_Searcher/frmDocView.vb index 6176295..dc8bab7 100644 --- a/app/DD_Clipboard_Searcher/frmDocView.vb +++ b/app/DD_Clipboard_Searcher/frmDocView.vb @@ -24,6 +24,7 @@ Public Class frmDocView Private Sub frmMain_Load(ByVal sender As System.Object, ByVal e As EventArgs) Handles MyBase.Load If GDPICTURE_LICENSE = String.Empty Then + Logger.Warn("GD Picture Missing! Please add a license to the Database!") MsgBox($"Lizenz für den Dokumenten Viewer wurde nicht konfiguriert.{vbNewLine}Bitte wenden Sie sich an Digital Data!", MsgBoxStyle.Exclamation, "Clipboard Watcher") Exit Sub End If @@ -60,17 +61,15 @@ Public Class frmDocView End If End Sub Public Sub Load_File_from_Path(filepath As String) - CloseDocument() _docPath = filepath - Me.ToolStripStatusLabel2.Text = _docPath + ToolStripStatusLabel2.Text = _docPath GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer GdViewer1.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter GdViewer1.DisplayFromFile(filepath) GdViewer1.Focus() UpdateMainUi() - End Sub Private Sub UpdateMainUi() diff --git a/app/DD_Clipboard_Searcher/frmLicense.vb b/app/DD_Clipboard_Searcher/frmLicense.vb index 3ebb78e..053be74 100644 --- a/app/DD_Clipboard_Searcher/frmLicense.vb +++ b/app/DD_Clipboard_Searcher/frmLicense.vb @@ -58,7 +58,7 @@ Public Class frmLicense End Sub Sub Refresh_Licence(Neu As Boolean) Try - clsLicense.Refresh_Licence(CLIENT_ID) + ClassLicense.Refresh_Licence(CLIENT_ID) txtNewlicences.Text = LICENSE_COUNT dtpGueltig_GI.Value = LICENSE_DATE diff --git a/app/DD_Clipboard_Searcher/frmProcessCapture.vb b/app/DD_Clipboard_Searcher/frmProcessCapture.vb index fe753c0..c501d34 100644 --- a/app/DD_Clipboard_Searcher/frmProcessCapture.vb +++ b/app/DD_Clipboard_Searcher/frmProcessCapture.vb @@ -6,16 +6,18 @@ Public Class frmProcessCapture Public WindowTitle As String Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick - clsWINDOWSApi.Get_ForegroundWindow_Info() + Dim oWindow = ClassWindowAPI.GetWindowInfo() + + 'clsWINDOWSApi.Get_ForegroundWindow_Info() Dim oProgramName As String = Assembly.GetEntryAssembly().GetName().Name - If CurrPROC_Name <> oProgramName Then - txtPID.Text = CurrPROC_PID - txtName.Text = CurrPROC_Name - txtWindowTitle.Text = CurrPROC_WindowTitle - ProcessId = CurrPROC_PID - ProcessName = CurrPROC_Name - WindowTitle = CurrPROC_WindowTitle + If oWindow.ProcessName <> oProgramName Then + txtPID.Text = oWindow.ProcessId + txtName.Text = oWindow.ProcessName + txtWindowTitle.Text = oWindow.WindowTitle + ProcessId = oWindow.ProcessId + ProcessName = oWindow.ProcessName + WindowTitle = oWindow.WindowTitle Button1.Enabled = True End If diff --git a/app/DD_Clipboard_Searcher/frmProfileMatch.vb b/app/DD_Clipboard_Searcher/frmProfileMatch.vb index 9167e65..224da95 100644 --- a/app/DD_Clipboard_Searcher/frmProfileMatch.vb +++ b/app/DD_Clipboard_Searcher/frmProfileMatch.vb @@ -38,8 +38,8 @@ Public Class frmProfileMatch ' Open Result Forms directly if only one match found If oCreatedTiles = 1 Then - Dim oProfileId As Integer = CURRENT_MATCHING_PROFILES.Select(Function(p) p.Guid).First() - OpenResultForms(oProfileId, ProfileType.ANY) + Dim oProfile As ProfileData = CURRENT_MATCHING_PROFILES.First() + OpenResultForms(oProfile.Guid, oProfile.ProfileType) ShouldHideInitially = True End If End Sub diff --git a/app/DD_Clipboard_Searcher/frmResultDoc.Designer.vb b/app/DD_Clipboard_Searcher/frmResultDoc.Designer.vb index 81cccc5..db6bd71 100644 --- a/app/DD_Clipboard_Searcher/frmResultDoc.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmResultDoc.Designer.vb @@ -143,11 +143,11 @@ Partial Class frmResultDoc Me.ToolStripButtonDocView.Size = New System.Drawing.Size(73, 22) Me.ToolStripButtonDocView.Text = "DocView" ' - 'ToolStripButton1 + 'btnBackToMatchForm ' Me.btnBackToMatchForm.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.control_start_blue Me.btnBackToMatchForm.ImageTransparentColor = System.Drawing.Color.Magenta - Me.btnBackToMatchForm.Name = "ToolStripButton1" + Me.btnBackToMatchForm.Name = "btnBackToMatchForm" Me.btnBackToMatchForm.Size = New System.Drawing.Size(157, 22) Me.btnBackToMatchForm.Text = "Zurück zur Profilauswahl" ' @@ -167,7 +167,7 @@ Partial Class frmResultDoc Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1) Me.XtraTabPageDoc1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1" - Me.XtraTabPageDoc1.Size = New System.Drawing.Size(927, 479) + Me.XtraTabPageDoc1.Size = New System.Drawing.Size(931, 482) Me.XtraTabPageDoc1.Text = "XtraTabPage1" ' 'GridControlDocSearch1 @@ -178,7 +178,7 @@ Partial Class frmResultDoc Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1 Me.GridControlDocSearch1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.GridControlDocSearch1.Name = "GridControlDocSearch1" - Me.GridControlDocSearch1.Size = New System.Drawing.Size(927, 479) + Me.GridControlDocSearch1.Size = New System.Drawing.Size(931, 482) Me.GridControlDocSearch1.TabIndex = 0 Me.GridControlDocSearch1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch1}) ' diff --git a/app/DD_Clipboard_Searcher/frmResultDoc.vb b/app/DD_Clipboard_Searcher/frmResultDoc.vb index be42096..4c7d6db 100644 --- a/app/DD_Clipboard_Searcher/frmResultDoc.vb +++ b/app/DD_Clipboard_Searcher/frmResultDoc.vb @@ -343,7 +343,7 @@ Public Class frmResultDoc Cursor = Cursors.WaitCursor For Each oRow As DataRow In clsWMDocGrid.DTDocuments.Rows - Dim oWindows As New Windows(LogConfig) + Dim oWindows As New ClassWindowsAPI(LogConfig) oWindows.ShowFileProperties(oRow.Item("DOC_PATH")) Next Cursor = Cursors.Default @@ -601,9 +601,9 @@ Public Class frmResultDoc Private Sub ToolStripButtonDocView_CheckedChanged(sender As Object, e As EventArgs) Handles ToolStripButtonDocView.CheckedChanged If ToolStripButtonDocView.Checked Then - ToolStripButtonDocView.Text = "DocView (Active)" + ToolStripButtonDocView.Text = "Datei Vorschau (Aktiv)" Else - ToolStripButtonDocView.Text = "DocView (Inactive)" + ToolStripButtonDocView.Text = "Datei Vorschau (Inaktiv)" End If End Sub diff --git a/app/DD_Clipboard_Searcher/frmResultSQL.Designer.vb b/app/DD_Clipboard_Searcher/frmResultSQL.Designer.vb index b98c362..daa5560 100644 --- a/app/DD_Clipboard_Searcher/frmResultSQL.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmResultSQL.Designer.vb @@ -131,7 +131,7 @@ Partial Class frmResultSQL Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1) Me.XtraTabPageDoc1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1" - Me.XtraTabPageDoc1.Size = New System.Drawing.Size(927, 479) + Me.XtraTabPageDoc1.Size = New System.Drawing.Size(931, 482) Me.XtraTabPageDoc1.Text = "XtraTabPage1" ' 'GridControlDocSearch1 @@ -144,7 +144,7 @@ Partial Class frmResultSQL Me.GridControlDocSearch1.MainView = Me.GridViewDataSearch1 Me.GridControlDocSearch1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.GridControlDocSearch1.Name = "GridControlDocSearch1" - Me.GridControlDocSearch1.Size = New System.Drawing.Size(927, 479) + Me.GridControlDocSearch1.Size = New System.Drawing.Size(931, 482) Me.GridControlDocSearch1.TabIndex = 0 Me.GridControlDocSearch1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDataSearch1}) ' diff --git a/app/DD_Clipboard_Searcher/frmStart.Designer.vb b/app/DD_Clipboard_Searcher/frmStart.Designer.vb index c5ff3d1..e711e69 100644 --- a/app/DD_Clipboard_Searcher/frmStart.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmStart.Designer.vb @@ -29,7 +29,8 @@ Partial Class frmStart Me.tsmiChangeState = New System.Windows.Forms.ToolStripMenuItem() Me.ClientÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.tslblUser = New System.Windows.Forms.ToolStripStatusLabel() + Me.labelUser = New System.Windows.Forms.ToolStripStatusLabel() + Me.labelVersion = New System.Windows.Forms.ToolStripStatusLabel() Me.TimerClose = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuStripForm = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MinimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -77,7 +78,7 @@ Partial Class frmStart ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblUser}) + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.labelUser, Me.labelVersion}) Me.StatusStrip1.Location = New System.Drawing.Point(0, 154) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(345, 22) @@ -85,11 +86,19 @@ Partial Class frmStart Me.StatusStrip1.TabIndex = 3 Me.StatusStrip1.Text = "StatusStrip1" ' - 'tslblUser + 'labelUser ' - Me.tslblUser.Image = CType(resources.GetObject("tslblUser.Image"), System.Drawing.Image) - Me.tslblUser.Name = "tslblUser" - Me.tslblUser.Size = New System.Drawing.Size(16, 17) + Me.labelUser.Image = CType(resources.GetObject("labelUser.Image"), System.Drawing.Image) + Me.labelUser.Name = "labelUser" + Me.labelUser.Size = New System.Drawing.Size(37, 17) + Me.labelUser.Text = "{0}" + ' + 'labelVersion + ' + Me.labelVersion.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.StatusAnnotations_Information_16xMD_color + Me.labelVersion.Name = "labelVersion" + Me.labelVersion.Size = New System.Drawing.Size(78, 17) + Me.labelVersion.Text = "Version {0}" ' 'TimerClose ' @@ -142,7 +151,7 @@ Partial Class frmStart Me.labelHotkey.Name = "labelHotkey" Me.labelHotkey.Size = New System.Drawing.Size(312, 39) Me.labelHotkey.TabIndex = 13 - Me.labelHotkey.Text = "STRG+C" + Me.labelHotkey.Text = "STRG+C {0}" Me.labelHotkey.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' 'btnUserConfig @@ -201,7 +210,7 @@ Partial Class frmStart Friend WithEvents cmstrpNotifyIcon As System.Windows.Forms.ContextMenuStrip Friend WithEvents tsmiChangeState As System.Windows.Forms.ToolStripMenuItem Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip - Friend WithEvents tslblUser As System.Windows.Forms.ToolStripStatusLabel + Friend WithEvents labelUser As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents TimerClose As System.Windows.Forms.Timer Friend WithEvents ContextMenuStripForm As System.Windows.Forms.ContextMenuStrip Friend WithEvents MinimierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem @@ -211,4 +220,5 @@ Partial Class frmStart Friend WithEvents labelHotkey As Label Friend WithEvents btnUserConfig As Button Friend WithEvents btnAdminConfig As Button + Friend WithEvents labelVersion As ToolStripStatusLabel End Class diff --git a/app/DD_Clipboard_Searcher/frmStart.resx b/app/DD_Clipboard_Searcher/frmStart.resx index 65ef72b..cca1f30 100644 --- a/app/DD_Clipboard_Searcher/frmStart.resx +++ b/app/DD_Clipboard_Searcher/frmStart.resx @@ -4638,7 +4638,7 @@ 299, 17 - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAASJJREFUWEftk8sNgzAQRFMKJVADXdAQbdAJ1SS5cuPqeKydaNlMhJSPiVBWehIa diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index 79e9575..be6fecd 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -54,8 +54,9 @@ Public Class frmStart End If End If - tslblUser.Text = USER_USERNAME - labelHotkey.Text = $"STRG+C {HotkeyFunctionKey.ToUpper}+{HotkeySearchKey.ToUpper}" + labelUser.Text = String.Format(labelUser.Text, USER_USERNAME) + labelVersion.Text = String.Format(labelVersion.Text, My.Application.Info.Version.ToString) + labelHotkey.Text = String.Format(labelHotkey.Text, $"{HotkeyFunctionKey.ToUpper}+{HotkeySearchKey.ToUpper}") End Sub Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -117,7 +118,7 @@ Public Class frmStart Dim oProfiles = oProfileFilter.Profiles.AsEnumerable() - oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, CurrPROC_Name) + oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, CURRENT_PROCESSNAME) oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents) oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, WindowTitle) oProfiles = oProfileFilter.FilterProfilesByWindowClipboardRegex(oProfiles, ClipboardContents) diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index 960a156..d724373 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -55,9 +55,9 @@ Module modCurrent Public CURR_FOCUSED_WINDOWNAME Public MONITORING_ACTIVE As Boolean = True - Public CurrPROC_PID As String - Public CurrPROC_Name As String - Public CurrPROC_WindowTitle As String + Public CURRENT_PROCESSID As String + Public CURRENT_PROCESSNAME As String + Public CURRENT_WINDOWTITLE As String Public CLIENT_SELECTED As Integer = 0 Public CurrDT_PROFILE_MATCH As DataTable