From 6945585ca3cd62df3d22fe31330575b4a2e2bd87 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Thu, 20 Feb 2025 08:26:52 +0100 Subject: [PATCH] MS Anpassungen Views und Spalten --- app/DD_Clipboard_Searcher/ClassDataASorDB.vb | 11 +- app/DD_Clipboard_Searcher/ClassInit.vb | 48 +- app/DD_Clipboard_Searcher/ClassLicense.vb | 4 +- .../My Project/AssemblyInfo.vb | 2 +- app/DD_Clipboard_Searcher/MyDataset.xsd | 21 +- app/DD_Clipboard_Searcher/MyDataset.xss | 2 +- .../ctrlApplicationAssignment.vb | 18 +- app/DD_Clipboard_Searcher/easyFLOW.vbproj | 9 + .../frmAdministration.Designer.vb | 783 ++++++++---------- .../frmAdministration.resx | 105 ++- .../frmAdministration.vb | 251 ++++-- app/DD_Clipboard_Searcher/frmConnection.vb | 2 +- .../frmGhostUser.Designer.vb | 76 ++ app/DD_Clipboard_Searcher/frmGhostUser.resx | 120 +++ app/DD_Clipboard_Searcher/frmGhostUser.vb | 15 + app/DD_Clipboard_Searcher/frmLicense.vb | 4 +- app/DD_Clipboard_Searcher/frmMain.Designer.vb | 2 +- app/DD_Clipboard_Searcher/frmMain.resx | 140 ++-- app/DD_Clipboard_Searcher/frmMain.vb | 18 +- app/DD_Clipboard_Searcher/modCurrent.vb | 3 +- 20 files changed, 897 insertions(+), 737 deletions(-) create mode 100644 app/DD_Clipboard_Searcher/frmGhostUser.Designer.vb create mode 100644 app/DD_Clipboard_Searcher/frmGhostUser.resx create mode 100644 app/DD_Clipboard_Searcher/frmGhostUser.vb diff --git a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb index 51cd8b2..0cc0014 100644 --- a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb +++ b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb @@ -1,4 +1,5 @@ -Imports DigitalData.Modules.EDMI.API.EDMIServiceReference +Imports DevExpress.Internal.WinApi.Windows.UI.Notifications +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DigitalData.Modules.Logging Public Class ClassDataASorDB @@ -22,7 +23,7 @@ Public Class ClassDataASorDB Return GetDatatable(pSQL, "", "", "", "DB") End Try Else - oReturnDT = Database.GetDatatable(pSQL) + oReturnDT = MyDB_DDECM.GetDatatable(pSQL) End If Return oReturnDT Catch ex As Exception @@ -34,7 +35,7 @@ Public Class ClassDataASorDB Try Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED) Dim DT_LOGIN_USER_MODULE As DataTable - DT_LOGIN_USER_MODULE = Database.GetDatatable(oSql) + DT_LOGIN_USER_MODULE = MyDB_DDECM.GetDatatable(oSql) If DT_LOGIN_USER_MODULE.Rows.Count = 0 Then Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True) @@ -71,6 +72,7 @@ Public Class ClassDataASorDB For Each oMode In oSplitWorkMode Logger.Debug($"oWorkingMode Parameter: {oMode}") If oMode = "NO_BASICCONF" Then + Logger.Info($"NO_BASICCONF will be set to false") BASIC_CONF_VISIBLE = False ElseIf oMode.StartsWith("NOMATCH_INFO") Then Try @@ -83,6 +85,7 @@ Public Class ClassDataASorDB ElseIf oMode.StartsWith("HotkeySearchKey") Then Try Dim oResult = oMode.Replace("HotkeySearchKey=", "") + Logger.Info($"HotkeySearchKey via function will be set to [{oResult}]") HotkeySearchKey = oResult HotkeySearchKey_via_Server = True Catch ex As Exception @@ -90,7 +93,7 @@ Public Class ClassDataASorDB End Try Else - Logger.Info($"Wrong oMode: {oMode}") + Logger.Info($"Wrong oMode [{oMode}]") End If Next Return True diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 65994e5..75b3a39 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -57,8 +57,8 @@ Public Class ClassInit End If Try - Database = New MSSQLServer(LogConfig, MyConnectionString) - If Database.DBInitialized = True Then + MyDB_DDECM = New MSSQLServer(LogConfig, MyConnectionString) + If MyDB_DDECM.DBInitialized = True Then Return True Else Return False @@ -162,7 +162,7 @@ Public Class ClassInit Try Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable - DT_CHECKUSER_MODULE = Database.GetDatatable(oSql) + DT_CHECKUSER_MODULE = MyDB_DDECM.GetDatatable(oSql) If DT_CHECKUSER_MODULE.Rows.Count = 0 Then Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True) @@ -207,7 +207,7 @@ Public Class ClassInit Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") Dim oMode As String For Each oMode In oSplitWorkMode - Logger.Debug($"oWorkingMode Parameter: {oMode}") + Logger.Debug($"oWorkingMode Parameter [{oMode}]") If oMode = "NO_BASICCONF" Then BASIC_CONF_VISIBLE = False ElseIf oMode.StartsWith("NOMATCH_INFO") Then @@ -322,17 +322,19 @@ Public Class ClassInit 'Database.GetDatatable(sql) Dim oSQL As String oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Clipboard-Watcher'" - Database.ExecuteNonQuery(oSQL) + MyDB_DDECM.ExecuteNonQuery(oSQL) oSQL = $"INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({USER_ID},1,'Clipboard-Watcher','{My.Application.Info.Version.ToString}','Environment.MachineName')" - Database.ExecuteNonQuery(oSQL) + MyDB_DDECM.ExecuteNonQuery(oSQL) If USER_IS_ADMIN = True Then If ESC_Hidden = True Then + frmGhostUser.ShowDialog() 'frmLoginUserSelect.ShowDialog() ESC_Hidden = False - If USER_USERNAME <> "" Then + If USER_USERNAME <> "" And GHOST_USERID <> 0 Then + Logger.Info("GHOST USER ACTIVE") InitUserLogin(USER_USERNAME) End If @@ -341,16 +343,16 @@ Public Class ClassInit ' pageAdmin.Visible = True End If - WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1") + WD_UNICODE = MyDB_DDECM.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1") oSQL = $"SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' and VERSION = '{My.Settings.GDPICTURE_VERSION}' AND ACTIVE = 1" - GDPICTURE_LICENSE = Database.GetScalarValue(oSQL) + GDPICTURE_LICENSE = MyDB_DDECM.GetScalarValue(oSQL) If GDPICTURE_LICENSE = String.Empty Then Logger.Info($"ATTENTION: GDPICTURE VERSION is nothing. [{oSQL}]") End If oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE" - BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL) + BASEDATA_DT_LANGUAGE = MyDB_DDECM.GetDatatable(oSQL) Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False) If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then @@ -365,7 +367,7 @@ Public Class ClassInit If USER_IS_ADMIN = False Then 'Anmeldung wieder herausnehmen oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Clipboard-Watcher'" - Database.ExecuteNonQuery(oSQL) + MyDB_DDECM.ExecuteNonQuery(oSQL) Logger.Info(" - logged out the user", False) Return False End If @@ -407,18 +409,18 @@ Public Class ClassInit End Sub Public Shared Function Refresh_Profile_Links() As String - Dim oWhereClause = $"USER_ID = {USER_ID}" - 'OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {USER_ID}))" - - Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID [GUID], PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE {oWhereClause}" - Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND ({oWhereClause})" - Dim oWindowSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_WINDOW T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}" - Dim oControlSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_CONTROL T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}" + Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID [GUID], PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE USER_ID = {USER_ID}" + Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND USER_ID = {USER_ID}" + Dim oWindowSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_WINDOW T INNER JOIN VWCW_USER_PROFILE T1 ON T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = T.USER_ID + WHERE T.USER_ID = {USER_ID}" + Dim oControlSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_CONTROL T INNER JOIN VWCW_USER_PROFILE T1 + ON T.PROFILE_ID = T1.PROFIL_ID AND T.USER_ID = T1.USER_ID WHERE T1.USER_ID = {USER_ID} " Try - DT_USER_PROFILES = Database.GetDatatable(ProfileSQL) + DT_USER_PROFILES = MyDB_DDECM.GetDatatable(ProfileSQL) - If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then + If DT_USER_PROFILES Is Nothing Or DT_USER_PROFILES.Rows.Count = 0 Then + Logger.Warn("Keine Profile für den User auswertbar. Konfiuration oder SQL prüfen: " + ProfileSQL) Return S.Es_wurden_noch_keine_Profile_für_den_aktuellen_Benutzer_konfiguriert_ End If Catch ex As Exception @@ -428,7 +430,7 @@ Public Class ClassInit Return S.Fehler_bei_der_Aktualisierung_ End Try Try - DTPROFILE_REL_PROCESS = Database.GetDatatable(oProcessSQL) + DTPROFILE_REL_PROCESS = MyDB_DDECM.GetDatatable(oProcessSQL) Catch ex As Exception Logger.Error(ex) MsgBox("Unexpected Error in Refresh_ProcessLinks: " & ex.Message, MsgBoxStyle.Critical) @@ -436,7 +438,7 @@ Public Class ClassInit Return S.Fehler_bei_der_Aktualisierung_ End Try Try - DTPROFILE_REL_WINDOW = Database.GetDatatable(oWindowSQL) + DTPROFILE_REL_WINDOW = MyDB_DDECM.GetDatatable(oWindowSQL) Catch ex As Exception Logger.Error(ex) MsgBox("Unexpected Error in Refresh_windowLinks: " & ex.Message, MsgBoxStyle.Critical) @@ -444,7 +446,7 @@ Public Class ClassInit Return S.Fehler_bei_der_Aktualisierung_ End Try Try - DTPROFILE_REL_CONTROL = Database.GetDatatable(oControlSQL) + DTPROFILE_REL_CONTROL = MyDB_DDECM.GetDatatable(oControlSQL) Catch ex As Exception Logger.Error(ex) MsgBox("Unexpected Error in Refresh_ControlLinks: " & ex.Message, MsgBoxStyle.Critical) diff --git a/app/DD_Clipboard_Searcher/ClassLicense.vb b/app/DD_Clipboard_Searcher/ClassLicense.vb index 6378c64..ed97ef4 100644 --- a/app/DD_Clipboard_Searcher/ClassLicense.vb +++ b/app/DD_Clipboard_Searcher/ClassLicense.vb @@ -6,11 +6,11 @@ Public Class ClassLicense Private Shared Sub Get_License(CLIENT_ID As Integer) Try Dim sql As String = String.Format("SELECT LICENSE FROM TBDD_MODULES WHERE SHORT_NAME = 'CW'") - lic_string = Database.GetScalarValue(sql) + lic_string = MyDB_DDECM.GetScalarValue(sql) Catch ex As Exception Try Dim sql As String = String.Format("SELECT LICENSE_DDCBSEARCHER FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID) - lic_string = Database.GetScalarValue(sql) + lic_string = MyDB_DDECM.GetScalarValue(sql) Catch ex1 As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Get_License:") End Try diff --git a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb index 26737b9..97186d1 100644 --- a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb +++ b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_Clipboard_Searcher/MyDataset.xsd b/app/DD_Clipboard_Searcher/MyDataset.xsd index 4ff93cf..b609d3d 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xsd +++ b/app/DD_Clipboard_Searcher/MyDataset.xsd @@ -699,8 +699,8 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - - SELECT * + + SELECT GUID, PROFIL_ID, PROFIL_NAME, REGEX_EXPRESSION, COMMENT, ACTIVE, PROFILE_TYPE, USER_ID, USER_SURNAME, USER_PRENAME, USERNAME FROM VWCW_USER_PROFILE WHERE (PROFIL_ID = @PROFILE_ID) @@ -722,6 +722,7 @@ WHERE (PROFIL_ID = @PROFILE_ID) + @@ -1183,6 +1184,7 @@ WHERE (PROFIL_ID = @PROFILE_ID) + @@ -1220,7 +1222,7 @@ WHERE (PROFIL_ID = @PROFILE_ID) - + @@ -1297,6 +1299,11 @@ WHERE (PROFIL_ID = @PROFILE_ID) + + + + + @@ -1304,10 +1311,10 @@ WHERE (PROFIL_ID = @PROFILE_ID) - - - - + + + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/MyDataset.xss b/app/DD_Clipboard_Searcher/MyDataset.xss index a35b108..7bb67af 100644 --- a/app/DD_Clipboard_Searcher/MyDataset.xss +++ b/app/DD_Clipboard_Searcher/MyDataset.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index bb0f178..fd579b5 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -70,13 +70,13 @@ Public Class ctrlApplicationAssignment If oProcessName <> "" Then Dim oSQL = String.Format("INSERT INTO TBCW_PROFILE_PROCESS (PROFILE_ID,PROC_NAME,ADDED_WHO) VALUES ({0},'{1}','{2}')", ProfileId, oProcessName, Environment.UserName) - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then Return False Else - Dim oNewProcessId = Database.GetScalarValue("SELECT MAX(GUID) FROM TBCW_PROFILE_PROCESS") + Dim oNewProcessId = MyDB_DDECM.GetScalarValue("SELECT MAX(GUID) FROM TBCW_PROFILE_PROCESS") oSQL = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO, PROCESS_ID) VALUES ('{0}', '^{1}$', '{2}' ,{3})", oWindowTitle, oWindowTitle, Environment.UserName, oNewProcessId) - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then Return False End If End If @@ -97,7 +97,7 @@ Public Class ctrlApplicationAssignment Try Dim oProcessId = GridViewProcessProfile.GetFocusedRowCellValue(GridViewProcessProfile.Columns("GUID")) Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0}", oProcessId) - If Database.ExecuteNonQuery(oSQL) Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) Then Process_Load(SelectedProfileId) Return True End If @@ -147,7 +147,7 @@ Public Class ctrlApplicationAssignment If oWindowTitle <> "" Then Dim insert = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO,PROCESS_ID) VALUES ('{0}', '^{1}$','{2}',{3})", oWindowTitle, oWindowTitle, Environment.UserName, CURRENT_PROCESSID) - If Database.ExecuteNonQuery(insert) = False Then + If MyDB_DDECM.ExecuteNonQuery(insert) = False Then Return False End If End If @@ -167,7 +167,7 @@ Public Class ctrlApplicationAssignment Try Dim oGuid = GridView_Window.GetFocusedRowCellValue(GridView_Window.Columns("GUID")) Dim oSQL = String.Format("EXEC PRCW_DELETE_WINDOW {0}", oGuid) - If Database.ExecuteNonQuery(oSQL) Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) Then Process_Load(SelectedProfileId) Return True End If @@ -246,7 +246,7 @@ Public Class ctrlApplicationAssignment {oForm.TopLeft.Top}, {oForm.TopLeft.Left}, {oForm.TopLeft.Right}, {oForm.TopLeft.Bottom} )" - If Database.ExecuteNonQuery(oSql) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSql) = False Then Return False End If @@ -336,7 +336,7 @@ Public Class ctrlApplicationAssignment WHERE GUID = {SelectedControlId} " - If Database.ExecuteNonQuery(oSql) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSql) = False Then Return False End If @@ -372,7 +372,7 @@ Public Class ctrlApplicationAssignment Try Dim oGuid = GridView_Control.GetFocusedRowCellValue(GridView_Control.Columns("GUID")) Dim oSQL = String.Format("DELETE FROM TBCW_PROF_REL_CONTROL WHERE GUID = {0}", oGuid) - If Database.ExecuteNonQuery(oSQL) Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) Then Window_Load() Return True End If diff --git a/app/DD_Clipboard_Searcher/easyFLOW.vbproj b/app/DD_Clipboard_Searcher/easyFLOW.vbproj index 60c64c0..a46e0fb 100644 --- a/app/DD_Clipboard_Searcher/easyFLOW.vbproj +++ b/app/DD_Clipboard_Searcher/easyFLOW.vbproj @@ -235,6 +235,12 @@ Form + + frmGhostUser.vb + + + Form + frmLicense.vb @@ -350,6 +356,9 @@ frmClientLogin.vb + + frmGhostUser.vb + frmLicense.vb diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index cbaa5d4..cff9ec3 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -31,7 +31,6 @@ Partial Class frmAdministration Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.TBWH_UserBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWCW_USER_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBCW_PROFILESTableAdapter = New easyFLOW.MyDatasetTableAdapters.TBCW_PROFILESTableAdapter() Me.TableAdapterManager = New easyFLOW.MyDatasetTableAdapters.TableAdapterManager() Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() @@ -45,7 +44,6 @@ Partial Class frmAdministration Me.TabPageProfileManagement = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.TabPageGeneralSettings = New DevExpress.XtraTab.XtraTabPage() - Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.txtProfileName = New DevExpress.XtraEditors.TextEdit() Me.textEdit4 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() @@ -101,20 +99,6 @@ Partial Class frmAdministration Me.textEdit5 = New DevExpress.XtraEditors.MemoEdit() Me.txtRegexTestString = New DevExpress.XtraEditors.TextEdit() Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.layoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.layoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.layoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.layoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.layoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - 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.LayoutControlItem35 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem36 = New DevExpress.XtraLayout.LayoutControlItem() Me.TabPageDocuments = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlDocs = New DevExpress.XtraLayout.LayoutControl() Me.CheckEdit3 = New DevExpress.XtraEditors.CheckEdit() @@ -201,7 +185,7 @@ Partial Class frmAdministration Me.TabPageGroupAssignment = New DevExpress.XtraTab.XtraTabPage() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.GridControlGroupInProfile = New DevExpress.XtraGrid.GridControl() - Me.cmsDelete = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cmsGroupZODelete = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ZuordnungEntfernenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VWCW_GROUP_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewGroupInProfile = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -217,6 +201,8 @@ Partial Class frmAdministration Me.TabPageUserAssignment = New DevExpress.XtraTab.XtraTabPage() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.GridControlUserInProfile = New DevExpress.XtraGrid.GridControl() + Me.cmsUserZODelete = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.UserEntfernenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridViewUserInProfile = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colGUID1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colUSERNAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -244,12 +230,21 @@ Partial Class frmAdministration Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label8 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label12 = New System.Windows.Forms.Label() + Me.Label13 = New System.Windows.Forms.Label() + Me.Label14 = New System.Windows.Forms.Label() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewProfiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_UserBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.VWCW_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -258,8 +253,6 @@ Partial Class frmAdministration CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.TabPageGeneralSettings.SuspendLayout() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl1.SuspendLayout() CType(Me.txtProfileName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -273,20 +266,6 @@ Partial Class frmAdministration CType(Me.PROFILE_IDTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtRegexTestString.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.layoutControlItem2, 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() - CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.layoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - 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() - CType(Me.LayoutControlItem35, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPageDocuments.SuspendLayout() CType(Me.LayoutControlDocs, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControlDocs.SuspendLayout() @@ -372,7 +351,7 @@ Partial Class frmAdministration Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() CType(Me.GridControlGroupInProfile, System.ComponentModel.ISupportInitialize).BeginInit() - Me.cmsDelete.SuspendLayout() + Me.cmsGroupZODelete.SuspendLayout() CType(Me.VWCW_GROUP_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewGroupInProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlGroupNotInProfile, System.ComponentModel.ISupportInitialize).BeginInit() @@ -384,6 +363,7 @@ Partial Class frmAdministration Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() CType(Me.GridControlUserInProfile, System.ComponentModel.ISupportInitialize).BeginInit() + Me.cmsUserZODelete.SuspendLayout() CType(Me.GridViewUserInProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlUserNotInProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewUserNotInProfile, System.ComponentModel.ISupportInitialize).BeginInit() @@ -419,7 +399,7 @@ Partial Class frmAdministration Me.GridControlProfiles.Location = New System.Drawing.Point(0, 0) Me.GridControlProfiles.MainView = Me.GridViewProfiles Me.GridControlProfiles.Name = "GridControlProfiles" - Me.GridControlProfiles.Size = New System.Drawing.Size(237, 452) + Me.GridControlProfiles.Size = New System.Drawing.Size(237, 594) Me.GridControlProfiles.TabIndex = 18 Me.GridControlProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfiles}) ' @@ -464,11 +444,6 @@ Partial Class frmAdministration Me.TBWH_UserBindingSource.DataMember = "TBWH_User" Me.TBWH_UserBindingSource.DataSource = Me.MyDataset ' - 'VWCW_USER_PROFILEBindingSource - ' - Me.VWCW_USER_PROFILEBindingSource.DataMember = "VWCW_USER_PROFILE" - Me.VWCW_USER_PROFILEBindingSource.DataSource = Me.MyDataset - ' 'TBCW_PROFILESTableAdapter ' Me.TBCW_PROFILESTableAdapter.ClearBeforeFill = True @@ -517,7 +492,7 @@ Partial Class frmAdministration Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.TabPageProfileManagement - Me.XtraTabControl3.Size = New System.Drawing.Size(1159, 452) + Me.XtraTabControl3.Size = New System.Drawing.Size(787, 594) Me.XtraTabControl3.TabIndex = 21 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageProfileManagement, Me.TabPageProfileAssignment}) ' @@ -527,7 +502,7 @@ Partial Class frmAdministration Me.TabPageProfileManagement.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProfileManagement.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageProfileManagement.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageProfileManagement.Name = "TabPageProfileManagement" - Me.TabPageProfileManagement.Size = New System.Drawing.Size(1157, 422) + Me.TabPageProfileManagement.Size = New System.Drawing.Size(785, 564) Me.TabPageProfileManagement.Text = "Profil-Verwaltung" ' 'XtraTabControl1 @@ -536,68 +511,64 @@ Partial Class frmAdministration Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.TabPageGeneralSettings - Me.XtraTabControl1.Size = New System.Drawing.Size(1157, 422) + Me.XtraTabControl1.Size = New System.Drawing.Size(785, 564) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageGeneralSettings, Me.TabPageDocuments, Me.TabPageData, Me.TabPageProcessAssignment}) ' 'TabPageGeneralSettings ' - Me.TabPageGeneralSettings.Controls.Add(Me.LayoutControl1) + Me.TabPageGeneralSettings.Controls.Add(Me.Label14) + Me.TabPageGeneralSettings.Controls.Add(Me.Label13) + Me.TabPageGeneralSettings.Controls.Add(Me.Label12) + Me.TabPageGeneralSettings.Controls.Add(Me.Label11) + Me.TabPageGeneralSettings.Controls.Add(Me.Label8) + Me.TabPageGeneralSettings.Controls.Add(Me.Label7) + Me.TabPageGeneralSettings.Controls.Add(Me.Label6) + Me.TabPageGeneralSettings.Controls.Add(Me.Label5) + Me.TabPageGeneralSettings.Controls.Add(Me.TextEdit6) + Me.TabPageGeneralSettings.Controls.Add(Me.CHANGEDWHOTextBox) + Me.TabPageGeneralSettings.Controls.Add(Me.TextEdit7) + Me.TabPageGeneralSettings.Controls.Add(Me.TextEdit8) + Me.TabPageGeneralSettings.Controls.Add(Me.Label4) + Me.TabPageGeneralSettings.Controls.Add(Me.Label3) + Me.TabPageGeneralSettings.Controls.Add(Me.textEdit4) + Me.TabPageGeneralSettings.Controls.Add(Me.SimpleButton1) + Me.TabPageGeneralSettings.Controls.Add(Me.CheckEdit1) + Me.TabPageGeneralSettings.Controls.Add(Me.txtRegexTestString) + Me.TabPageGeneralSettings.Controls.Add(Me.PROFILE_IDTextBox) + Me.TabPageGeneralSettings.Controls.Add(Me.textEdit5) + Me.TabPageGeneralSettings.Controls.Add(Me.textEdit2) + Me.TabPageGeneralSettings.Controls.Add(Me.txtProfileName) Me.TabPageGeneralSettings.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageGeneralSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageGeneralSettings.Name = "TabPageGeneralSettings" - Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1155, 396) + Me.TabPageGeneralSettings.Size = New System.Drawing.Size(783, 538) Me.TabPageGeneralSettings.Text = "Allgemein" ' - 'LayoutControl1 - ' - Me.LayoutControl1.Controls.Add(Me.txtProfileName) - Me.LayoutControl1.Controls.Add(Me.textEdit4) - Me.LayoutControl1.Controls.Add(Me.CheckEdit1) - Me.LayoutControl1.Controls.Add(Me.textEdit2) - Me.LayoutControl1.Controls.Add(Me.TextEdit8) - Me.LayoutControl1.Controls.Add(Me.TextEdit7) - Me.LayoutControl1.Controls.Add(Me.CHANGEDWHOTextBox) - Me.LayoutControl1.Controls.Add(Me.TextEdit6) - Me.LayoutControl1.Controls.Add(Me.PROFILE_IDTextBox) - Me.LayoutControl1.Controls.Add(Me.textEdit5) - Me.LayoutControl1.Controls.Add(Me.txtRegexTestString) - Me.LayoutControl1.Controls.Add(Me.SimpleButton1) - Me.LayoutControl1.Location = New System.Drawing.Point(8, 8) - Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1243, 199, 650, 400) - Me.LayoutControl1.Root = Me.LayoutControlGroup1 - Me.LayoutControl1.Size = New System.Drawing.Size(1022, 1040) - Me.LayoutControl1.TabIndex = 22 - Me.LayoutControl1.Text = "LayoutControl1" - ' 'txtProfileName ' Me.txtProfileName.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.txtProfileName.Location = New System.Drawing.Point(148, 82) + Me.txtProfileName.Location = New System.Drawing.Point(252, 31) Me.txtProfileName.Name = "txtProfileName" - Me.txtProfileName.Size = New System.Drawing.Size(854, 20) - Me.txtProfileName.StyleController = Me.LayoutControl1 + Me.txtProfileName.Size = New System.Drawing.Size(353, 20) Me.txtProfileName.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(148, 171) + Me.textEdit4.Location = New System.Drawing.Point(252, 70) Me.textEdit4.Name = "textEdit4" - Me.textEdit4.Size = New System.Drawing.Size(256, 20) - Me.textEdit4.StyleController = Me.LayoutControl1 + Me.textEdit4.Size = New System.Drawing.Size(452, 20) Me.textEdit4.TabIndex = 7 ' 'CheckEdit1 ' Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ACTIVE", True)) - Me.CheckEdit1.Location = New System.Drawing.Point(12, 12) + Me.CheckEdit1.Location = New System.Drawing.Point(21, 13) Me.CheckEdit1.MenuManager = Me.RibbonControl2 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Profil Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(998, 18) - Me.CheckEdit1.StyleController = Me.LayoutControl1 + Me.CheckEdit1.Size = New System.Drawing.Size(126, 18) Me.CheckEdit1.TabIndex = 10 ' 'RibbonControl2 @@ -611,7 +582,7 @@ Partial Class frmAdministration Me.RibbonControl2.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl2.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl2.ShowToolbarCustomizeItem = False - Me.RibbonControl2.Size = New System.Drawing.Size(1406, 158) + Me.RibbonControl2.Size = New System.Drawing.Size(1034, 158) Me.RibbonControl2.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl2.Toolbar.ShowCustomizeItem = False Me.RibbonControl2.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden @@ -917,15 +888,15 @@ Partial Class frmAdministration 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 610) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 752) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl2 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1406, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1034, 22) ' 'textEdit2 ' Me.textEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "PROFILE_TYPE", True)) - Me.textEdit2.Location = New System.Drawing.Point(148, 127) + Me.textEdit2.Location = New System.Drawing.Point(21, 70) 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])}) @@ -935,8 +906,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(854, 20) - Me.textEdit2.StyleController = Me.LayoutControl1 + Me.textEdit2.Size = New System.Drawing.Size(206, 20) Me.textEdit2.TabIndex = 5 ' 'TBWH_PROFILE_TYPEBindingSource @@ -947,242 +917,73 @@ 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(20, 623) + Me.TextEdit8.Location = New System.Drawing.Point(21, 211) Me.TextEdit8.Name = "TextEdit8" Me.TextEdit8.Properties.ReadOnly = True - Me.TextEdit8.Size = New System.Drawing.Size(480, 20) - Me.TextEdit8.StyleController = Me.LayoutControl1 + Me.TextEdit8.Size = New System.Drawing.Size(113, 20) Me.TextEdit8.TabIndex = 4 ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(520, 623) + Me.TextEdit7.Location = New System.Drawing.Point(21, 250) Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Properties.ReadOnly = True - Me.TextEdit7.Size = New System.Drawing.Size(482, 20) - Me.TextEdit7.StyleController = Me.LayoutControl1 + Me.TextEdit7.Size = New System.Drawing.Size(113, 20) Me.TextEdit7.TabIndex = 5 ' 'CHANGEDWHOTextBox ' Me.CHANGEDWHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(20, 679) + Me.CHANGEDWHOTextBox.Location = New System.Drawing.Point(154, 211) Me.CHANGEDWHOTextBox.Name = "CHANGEDWHOTextBox" Me.CHANGEDWHOTextBox.Properties.ReadOnly = True - Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(480, 20) - Me.CHANGEDWHOTextBox.StyleController = Me.LayoutControl1 + Me.CHANGEDWHOTextBox.Size = New System.Drawing.Size(129, 20) Me.CHANGEDWHOTextBox.TabIndex = 6 ' 'TextEdit6 ' Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit6.Location = New System.Drawing.Point(520, 679) + Me.TextEdit6.Location = New System.Drawing.Point(154, 250) Me.TextEdit6.Name = "TextEdit6" Me.TextEdit6.Properties.ReadOnly = True - Me.TextEdit6.Size = New System.Drawing.Size(482, 20) - Me.TextEdit6.StyleController = Me.LayoutControl1 + Me.TextEdit6.Size = New System.Drawing.Size(129, 20) Me.TextEdit6.TabIndex = 7 ' 'PROFILE_IDTextBox ' Me.PROFILE_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.PROFILE_IDTextBox.Location = New System.Drawing.Point(148, 42) + Me.PROFILE_IDTextBox.Location = New System.Drawing.Point(115, 31) Me.PROFILE_IDTextBox.MenuManager = Me.RibbonControl2 Me.PROFILE_IDTextBox.Name = "PROFILE_IDTextBox" Me.PROFILE_IDTextBox.Properties.ReadOnly = True - Me.PROFILE_IDTextBox.Size = New System.Drawing.Size(854, 20) - Me.PROFILE_IDTextBox.StyleController = Me.LayoutControl1 + Me.PROFILE_IDTextBox.Size = New System.Drawing.Size(74, 20) Me.PROFILE_IDTextBox.TabIndex = 11 ' 'textEdit5 ' Me.textEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.textEdit5.Location = New System.Drawing.Point(148, 215) + Me.textEdit5.Location = New System.Drawing.Point(21, 112) Me.textEdit5.Name = "textEdit5" - Me.textEdit5.Size = New System.Drawing.Size(854, 290) - Me.textEdit5.StyleController = Me.LayoutControl1 + Me.textEdit5.Size = New System.Drawing.Size(450, 80) Me.textEdit5.TabIndex = 8 ' 'txtRegexTestString ' - Me.txtRegexTestString.Location = New System.Drawing.Point(148, 525) + Me.txtRegexTestString.Location = New System.Drawing.Point(477, 111) Me.txtRegexTestString.MenuManager = Me.RibbonControl2 Me.txtRegexTestString.Name = "txtRegexTestString" - Me.txtRegexTestString.Size = New System.Drawing.Size(854, 20) - Me.txtRegexTestString.StyleController = Me.LayoutControl1 + Me.txtRegexTestString.Size = New System.Drawing.Size(227, 20) Me.txtRegexTestString.TabIndex = 12 ' 'SimpleButton1 ' - Me.SimpleButton1.Location = New System.Drawing.Point(20, 565) + Me.SimpleButton1.Location = New System.Drawing.Point(477, 137) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(982, 22) - Me.SimpleButton1.StyleController = Me.LayoutControl1 + Me.SimpleButton1.Size = New System.Drawing.Size(227, 28) Me.SimpleButton1.TabIndex = 13 Me.SimpleButton1.Text = "Regular Expression prüfen" ' - 'LayoutControlGroup1 - ' - Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.LayoutControlGroup1.GroupBordersVisible = False - 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.LayoutControlItem35, Me.LayoutControlItem36}) - Me.LayoutControlGroup1.Name = "Root" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(1022, 1040) - Me.LayoutControlGroup1.TextVisible = False - ' - 'layoutControlItem2 - ' - Me.layoutControlItem2.Control = Me.textEdit2 - Me.layoutControlItem2.CustomizationFormText = "Profil Typ" - Me.layoutControlItem2.Location = New System.Drawing.Point(0, 107) - Me.layoutControlItem2.MinSize = New System.Drawing.Size(149, 24) - Me.layoutControlItem2.Name = "layoutControlItem2" - Me.layoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem2.Size = New System.Drawing.Size(1002, 44) - Me.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom - Me.layoutControlItem2.Text = "Profil Typ" - Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Left - Me.layoutControlItem2.TextSize = New System.Drawing.Size(116, 13) - ' - 'layoutControlItem4 - ' - Me.layoutControlItem4.Control = Me.textEdit4 - Me.layoutControlItem4.CustomizationFormText = "Kommentar" - Me.layoutControlItem4.Location = New System.Drawing.Point(0, 151) - Me.layoutControlItem4.MaxSize = New System.Drawing.Size(404, 0) - Me.layoutControlItem4.MinSize = New System.Drawing.Size(149, 24) - Me.layoutControlItem4.Name = "layoutControlItem4" - Me.layoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem4.Size = New System.Drawing.Size(1002, 44) - Me.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom - Me.layoutControlItem4.Text = "Kommentar" - Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Left - Me.layoutControlItem4.TextSize = New System.Drawing.Size(116, 13) - ' - 'layoutControlItem5 - ' - Me.layoutControlItem5.Control = Me.textEdit5 - Me.layoutControlItem5.CustomizationFormText = "Regular Expression" - Me.layoutControlItem5.Location = New System.Drawing.Point(0, 195) - Me.layoutControlItem5.MinSize = New System.Drawing.Size(50, 25) - Me.layoutControlItem5.Name = "layoutControlItem5" - Me.layoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem5.Size = New System.Drawing.Size(1002, 310) - Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom - Me.layoutControlItem5.Text = "Regular Expression" - Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Left - Me.layoutControlItem5.TextSize = New System.Drawing.Size(116, 13) - ' - 'LayoutControlItem7 - ' - 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(1002, 22) - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem7.TextVisible = False - ' - 'layoutControlItem1 - ' - Me.layoutControlItem1.Control = Me.TextEdit8 - Me.layoutControlItem1.CustomizationFormText = "layoutControlItem1" - Me.layoutControlItem1.Location = New System.Drawing.Point(0, 587) - Me.layoutControlItem1.Name = "layoutControlItem1" - Me.layoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem1.Size = New System.Drawing.Size(500, 56) - Me.layoutControlItem1.Text = "Erstellt Wer" - Me.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top - Me.layoutControlItem1.TextSize = New System.Drawing.Size(116, 13) - ' - 'layoutControlItem6 - ' - Me.layoutControlItem6.Control = Me.TextEdit7 - Me.layoutControlItem6.CustomizationFormText = "layoutControlItem2" - Me.layoutControlItem6.Location = New System.Drawing.Point(500, 587) - Me.layoutControlItem6.Name = "layoutControlItem6" - Me.layoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem6.Size = New System.Drawing.Size(502, 56) - Me.layoutControlItem6.Text = "Erstellt wann" - Me.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top - Me.layoutControlItem6.TextSize = New System.Drawing.Size(116, 13) - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.CHANGEDWHOTextBox - Me.LayoutControlItem8.CustomizationFormText = "layoutControlItem3" - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 643) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(500, 56) - Me.LayoutControlItem8.Text = "Geändert wer" - Me.LayoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(116, 13) - ' - 'LayoutControlItem9 - ' - Me.LayoutControlItem9.Control = Me.TextEdit6 - Me.LayoutControlItem9.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem9.Location = New System.Drawing.Point(500, 643) - Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(502, 56) - Me.LayoutControlItem9.Text = "Geändert wann" - Me.LayoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(116, 13) - ' - 'LayoutControlItem20 - ' - Me.LayoutControlItem20.Control = Me.PROFILE_IDTextBox - Me.LayoutControlItem20.Location = New System.Drawing.Point(0, 22) - Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem20.Size = New System.Drawing.Size(1002, 40) - Me.LayoutControlItem20.Text = "ID" - Me.LayoutControlItem20.TextSize = New System.Drawing.Size(116, 13) - ' - 'EmptySpaceItem3 - ' - Me.EmptySpaceItem3.AllowHotTrack = False - Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 699) - Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(1002, 321) - Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0) - ' - 'layoutControlItem3 - ' - Me.layoutControlItem3.Control = Me.txtProfileName - Me.layoutControlItem3.CustomizationFormText = "Name" - Me.layoutControlItem3.Location = New System.Drawing.Point(0, 62) - Me.layoutControlItem3.MinSize = New System.Drawing.Size(149, 24) - Me.layoutControlItem3.Name = "layoutControlItem3" - Me.layoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.layoutControlItem3.Size = New System.Drawing.Size(1002, 45) - 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(116, 13) - ' - 'LayoutControlItem35 - ' - Me.LayoutControlItem35.Control = Me.txtRegexTestString - Me.LayoutControlItem35.Location = New System.Drawing.Point(0, 505) - Me.LayoutControlItem35.Name = "LayoutControlItem35" - Me.LayoutControlItem35.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem35.Size = New System.Drawing.Size(1002, 40) - Me.LayoutControlItem35.Text = "Regular Expression Test" - Me.LayoutControlItem35.TextSize = New System.Drawing.Size(116, 13) - ' - 'LayoutControlItem36 - ' - Me.LayoutControlItem36.Control = Me.SimpleButton1 - Me.LayoutControlItem36.Location = New System.Drawing.Point(0, 545) - Me.LayoutControlItem36.Name = "LayoutControlItem36" - Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem36.Size = New System.Drawing.Size(1002, 42) - Me.LayoutControlItem36.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem36.TextVisible = False - ' 'TabPageDocuments ' Me.TabPageDocuments.Controls.Add(Me.LayoutControlDocs) @@ -1190,7 +991,7 @@ Partial Class frmAdministration Me.TabPageDocuments.ImageOptions.SvgImage = CType(resources.GetObject("TabPageDocuments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageDocuments.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageDocuments.Name = "TabPageDocuments" - Me.TabPageDocuments.Size = New System.Drawing.Size(1155, 396) + Me.TabPageDocuments.Size = New System.Drawing.Size(755, 390) Me.TabPageDocuments.Text = "Dokument-Suchen" ' 'LayoutControlDocs @@ -1211,11 +1012,11 @@ Partial Class frmAdministration Me.LayoutControlDocs.Controls.Add(Me.ComboBoxEdit4) Me.LayoutControlDocs.Controls.Add(Me.SimpleButton3) Me.LayoutControlDocs.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControlDocs.Location = New System.Drawing.Point(134, 0) + Me.LayoutControlDocs.Location = New System.Drawing.Point(201, 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(1021, 396) + Me.LayoutControlDocs.Size = New System.Drawing.Size(554, 390) Me.LayoutControlDocs.TabIndex = 25 Me.LayoutControlDocs.Text = "LayoutControl2" ' @@ -1225,7 +1026,7 @@ Partial Class frmAdministration 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(306, 18) + Me.CheckEdit3.Size = New System.Drawing.Size(286, 18) Me.CheckEdit3.StyleController = Me.LayoutControlDocs Me.CheckEdit3.TabIndex = 8 ' @@ -1235,27 +1036,27 @@ Partial Class frmAdministration Me.TextEdit17.Location = New System.Drawing.Point(20, 218) Me.TextEdit17.Name = "TextEdit17" Me.TextEdit17.Properties.ReadOnly = True - Me.TextEdit17.Size = New System.Drawing.Size(134, 20) + Me.TextEdit17.Size = New System.Drawing.Size(125, 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(174, 218) + Me.TextEdit15.Location = New System.Drawing.Point(165, 218) Me.TextEdit15.Name = "TextEdit15" Me.TextEdit15.Properties.ReadOnly = True - Me.TextEdit15.Size = New System.Drawing.Size(136, 20) + Me.TextEdit15.Size = New System.Drawing.Size(125, 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(174, 274) + Me.TextEdit18.Location = New System.Drawing.Point(165, 274) Me.TextEdit18.Name = "TextEdit18" Me.TextEdit18.Properties.ReadOnly = True - Me.TextEdit18.Size = New System.Drawing.Size(136, 20) + Me.TextEdit18.Size = New System.Drawing.Size(125, 20) Me.TextEdit18.StyleController = Me.LayoutControlDocs Me.TextEdit18.TabIndex = 7 ' @@ -1265,7 +1066,7 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(20, 274) Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(134, 20) + Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(125, 20) Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControlDocs Me.CHANGED_WHOTextBox2.TabIndex = 6 ' @@ -1275,7 +1076,7 @@ Partial Class frmAdministration Me.txtDocSearchName.EditValue = "" Me.txtDocSearchName.Location = New System.Drawing.Point(157, 82) Me.txtDocSearchName.Name = "txtDocSearchName" - Me.txtDocSearchName.Size = New System.Drawing.Size(153, 20) + Me.txtDocSearchName.Size = New System.Drawing.Size(133, 20) Me.txtDocSearchName.StyleController = Me.LayoutControlDocs Me.txtDocSearchName.TabIndex = 9 ' @@ -1292,7 +1093,7 @@ Partial Class frmAdministration 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(153, 20) + Me.LookUpEdit1.Size = New System.Drawing.Size(133, 20) Me.LookUpEdit1.StyleController = Me.LayoutControlDocs Me.LookUpEdit1.TabIndex = 11 ' @@ -1304,22 +1105,22 @@ Partial Class frmAdministration '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(322, 54) + Me.MemoEdit5.Location = New System.Drawing.Point(302, 54) 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(687, 248) + Me.MemoEdit5.Size = New System.Drawing.Size(340, 248) 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(327, 385) + Me.MemoEdit6.Location = New System.Drawing.Point(22, 385) 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(682, 16) + Me.MemoEdit6.Size = New System.Drawing.Size(620, 16) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' @@ -1329,7 +1130,7 @@ Partial Class frmAdministration Me.txtDOC_GUID.Location = New System.Drawing.Point(157, 42) Me.txtDOC_GUID.Name = "txtDOC_GUID" Me.txtDOC_GUID.Properties.ReadOnly = True - Me.txtDOC_GUID.Size = New System.Drawing.Size(153, 20) + Me.txtDOC_GUID.Size = New System.Drawing.Size(133, 20) Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs Me.txtDOC_GUID.TabIndex = 14 ' @@ -1347,7 +1148,7 @@ Partial Class frmAdministration Me.TextEdit19.Properties.PopupSizeable = False Me.TextEdit19.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit19.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit19.Size = New System.Drawing.Size(153, 20) + Me.TextEdit19.Size = New System.Drawing.Size(133, 20) Me.TextEdit19.StyleController = Me.LayoutControlDocs Me.TextEdit19.TabIndex = 10 ' @@ -1358,38 +1159,38 @@ Partial Class frmAdministration ' 'ComboBoxEdit3 ' - Me.ComboBoxEdit3.Location = New System.Drawing.Point(459, 12) + Me.ComboBoxEdit3.Location = New System.Drawing.Point(439, 12) Me.ComboBoxEdit3.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit3.Name = "ComboBoxEdit3" Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit3.Size = New System.Drawing.Size(465, 20) + Me.ComboBoxEdit3.Size = New System.Drawing.Size(150, 20) Me.ComboBoxEdit3.StyleController = Me.LayoutControlDocs Me.ComboBoxEdit3.TabIndex = 15 ' 'SimpleButton2 ' - Me.SimpleButton2.Location = New System.Drawing.Point(928, 12) + Me.SimpleButton2.Location = New System.Drawing.Point(593, 12) Me.SimpleButton2.Name = "SimpleButton2" - Me.SimpleButton2.Size = New System.Drawing.Size(81, 22) + Me.SimpleButton2.Size = New System.Drawing.Size(49, 22) Me.SimpleButton2.StyleController = Me.LayoutControlDocs Me.SimpleButton2.TabIndex = 16 Me.SimpleButton2.Text = "Einfügen" ' 'ComboBoxEdit4 ' - Me.ComboBoxEdit4.Location = New System.Drawing.Point(464, 343) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(159, 343) Me.ComboBoxEdit4.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit4.Name = "ComboBoxEdit4" Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit4.Size = New System.Drawing.Size(460, 20) + Me.ComboBoxEdit4.Size = New System.Drawing.Size(406, 20) Me.ComboBoxEdit4.StyleController = Me.LayoutControlDocs Me.ComboBoxEdit4.TabIndex = 17 ' 'SimpleButton3 ' - Me.SimpleButton3.Location = New System.Drawing.Point(928, 343) + Me.SimpleButton3.Location = New System.Drawing.Point(569, 343) Me.SimpleButton3.Name = "SimpleButton3" - Me.SimpleButton3.Size = New System.Drawing.Size(81, 22) + Me.SimpleButton3.Size = New System.Drawing.Size(73, 22) Me.SimpleButton3.StyleController = Me.LayoutControlDocs Me.SimpleButton3.TabIndex = 18 Me.SimpleButton3.Text = "Einfügen" @@ -1400,7 +1201,7 @@ Partial Class frmAdministration Me.LayoutControlGroup2.GroupBordersVisible = False 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.LayoutControlItem37, Me.LayoutControlItem38, Me.LayoutControlItem39, Me.LayoutControlItem40, Me.SimpleLabelItem1, Me.SimpleSeparator2, Me.SimpleSeparator3}) Me.LayoutControlGroup2.Name = "Root" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1021, 413) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(654, 413) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem29 @@ -1410,7 +1211,7 @@ Partial Class frmAdministration Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 62) Me.LayoutControlItem29.Name = "LayoutControlItem29" Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem29.Size = New System.Drawing.Size(310, 40) + Me.LayoutControlItem29.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem29.Text = "Titel:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) ' @@ -1421,7 +1222,7 @@ Partial Class frmAdministration Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 102) Me.LayoutControlItem30.Name = "LayoutControlItem30" Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem30.Size = New System.Drawing.Size(310, 40) + Me.LayoutControlItem30.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem30.Text = "Position/Reihenfolge:" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) ' @@ -1432,7 +1233,7 @@ Partial Class frmAdministration Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 142) Me.LayoutControlItem31.Name = "LayoutControlItem31" Me.LayoutControlItem31.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem31.Size = New System.Drawing.Size(310, 40) + Me.LayoutControlItem31.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem31.Text = "Datenbank-Verbindung:" Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) ' @@ -1443,7 +1244,7 @@ Partial Class frmAdministration Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 182) Me.LayoutControlItem25.Name = "LayoutControlItem25" Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem25.Size = New System.Drawing.Size(154, 56) + Me.LayoutControlItem25.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem25.Text = "Erstellt wer:" Me.LayoutControlItem25.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem25.TextSize = New System.Drawing.Size(125, 13) @@ -1452,10 +1253,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem27.Control = Me.TextEdit18 Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem27.Location = New System.Drawing.Point(154, 238) + Me.LayoutControlItem27.Location = New System.Drawing.Point(145, 238) Me.LayoutControlItem27.Name = "LayoutControlItem27" Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem27.Size = New System.Drawing.Size(156, 56) + Me.LayoutControlItem27.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem27.Text = "Geändert wann:" Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) @@ -1464,10 +1265,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem26.Control = Me.TextEdit15 Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem26.Location = New System.Drawing.Point(154, 182) + Me.LayoutControlItem26.Location = New System.Drawing.Point(145, 182) Me.LayoutControlItem26.Name = "LayoutControlItem26" Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem26.Size = New System.Drawing.Size(156, 56) + Me.LayoutControlItem26.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem26.Text = "Erstellt wann:" Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) @@ -1477,16 +1278,16 @@ Partial Class frmAdministration Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 294) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(315, 98) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(10, 98) 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(315, 357) + Me.LayoutControlItem33.Location = New System.Drawing.Point(10, 357) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(686, 36) + Me.LayoutControlItem33.Size = New System.Drawing.Size(624, 36) 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) @@ -1495,9 +1296,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem32.Control = Me.MemoEdit5 Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" - Me.LayoutControlItem32.Location = New System.Drawing.Point(310, 26) + Me.LayoutControlItem32.Location = New System.Drawing.Point(290, 26) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(691, 268) + Me.LayoutControlItem32.Size = New System.Drawing.Size(344, 268) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1509,7 +1310,7 @@ Partial Class frmAdministration Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem34.Name = "LayoutControlItem34" Me.LayoutControlItem34.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem34.Size = New System.Drawing.Size(310, 40) + Me.LayoutControlItem34.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem34.Text = "ID:" Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) ' @@ -1519,7 +1320,7 @@ Partial Class frmAdministration Me.LayoutControlItem24.CustomizationFormText = "LayoutControlItem10" Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem24.Name = "LayoutControlItem24" - Me.LayoutControlItem24.Size = New System.Drawing.Size(310, 22) + Me.LayoutControlItem24.Size = New System.Drawing.Size(290, 22) Me.LayoutControlItem24.Text = "LayoutControlItem10" Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem24.TextVisible = False @@ -1531,7 +1332,7 @@ Partial Class frmAdministration Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem28.Name = "LayoutControlItem28" Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem28.Size = New System.Drawing.Size(154, 56) + Me.LayoutControlItem28.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem28.Text = "Geändert wer:" Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13) @@ -1539,36 +1340,36 @@ Partial Class frmAdministration 'LayoutControlItem37 ' Me.LayoutControlItem37.Control = Me.ComboBoxEdit3 - Me.LayoutControlItem37.Location = New System.Drawing.Point(310, 0) + Me.LayoutControlItem37.Location = New System.Drawing.Point(290, 0) Me.LayoutControlItem37.Name = "LayoutControlItem37" - Me.LayoutControlItem37.Size = New System.Drawing.Size(606, 26) + Me.LayoutControlItem37.Size = New System.Drawing.Size(291, 26) Me.LayoutControlItem37.Text = "Platzhalter" Me.LayoutControlItem37.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem38 ' Me.LayoutControlItem38.Control = Me.SimpleButton2 - Me.LayoutControlItem38.Location = New System.Drawing.Point(916, 0) + Me.LayoutControlItem38.Location = New System.Drawing.Point(581, 0) Me.LayoutControlItem38.Name = "LayoutControlItem38" - Me.LayoutControlItem38.Size = New System.Drawing.Size(85, 26) + Me.LayoutControlItem38.Size = New System.Drawing.Size(53, 26) Me.LayoutControlItem38.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem38.TextVisible = False ' 'LayoutControlItem39 ' Me.LayoutControlItem39.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem39.Location = New System.Drawing.Point(315, 331) + Me.LayoutControlItem39.Location = New System.Drawing.Point(10, 331) Me.LayoutControlItem39.Name = "LayoutControlItem39" - Me.LayoutControlItem39.Size = New System.Drawing.Size(601, 26) + Me.LayoutControlItem39.Size = New System.Drawing.Size(547, 26) Me.LayoutControlItem39.Text = "Platzhalter" Me.LayoutControlItem39.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem40 ' Me.LayoutControlItem40.Control = Me.SimpleButton3 - Me.LayoutControlItem40.Location = New System.Drawing.Point(916, 331) + Me.LayoutControlItem40.Location = New System.Drawing.Point(557, 331) Me.LayoutControlItem40.Name = "LayoutControlItem40" - Me.LayoutControlItem40.Size = New System.Drawing.Size(85, 26) + Me.LayoutControlItem40.Size = New System.Drawing.Size(77, 26) Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem40.TextVisible = False ' @@ -1576,9 +1377,9 @@ Partial Class frmAdministration ' Me.SimpleLabelItem1.AllowHotTrack = False Me.SimpleLabelItem1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleLabelItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleLabelItem1.Location = New System.Drawing.Point(315, 294) + Me.SimpleLabelItem1.Location = New System.Drawing.Point(10, 294) Me.SimpleLabelItem1.Name = "SimpleLabelItem1" - Me.SimpleLabelItem1.Size = New System.Drawing.Size(686, 36) + Me.SimpleLabelItem1.Size = New System.Drawing.Size(624, 36) Me.SimpleLabelItem1.Text = "Die folgenden Spalten müssen existieren: DocId (Eindeutige Id), Name (Dateiname) " & "und FULL_FILENAME (Absoluter Pfad)" Me.SimpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize @@ -1587,16 +1388,16 @@ Partial Class frmAdministration 'SimpleSeparator2 ' Me.SimpleSeparator2.AllowHotTrack = False - Me.SimpleSeparator2.Location = New System.Drawing.Point(315, 330) + Me.SimpleSeparator2.Location = New System.Drawing.Point(10, 330) Me.SimpleSeparator2.Name = "SimpleSeparator2" - Me.SimpleSeparator2.Size = New System.Drawing.Size(686, 1) + Me.SimpleSeparator2.Size = New System.Drawing.Size(624, 1) ' 'SimpleSeparator3 ' Me.SimpleSeparator3.AllowHotTrack = False Me.SimpleSeparator3.Location = New System.Drawing.Point(0, 392) Me.SimpleSeparator3.Name = "SimpleSeparator3" - Me.SimpleSeparator3.Size = New System.Drawing.Size(315, 1) + Me.SimpleSeparator3.Size = New System.Drawing.Size(10, 1) ' 'GridControl1 ' @@ -1606,7 +1407,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(134, 396) + Me.GridControl1.Size = New System.Drawing.Size(201, 390) Me.GridControl1.TabIndex = 26 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -1638,7 +1439,7 @@ Partial Class frmAdministration Me.TabPageData.ImageOptions.SvgImage = CType(resources.GetObject("TabPageData.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageData.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1155, 396) + Me.TabPageData.Size = New System.Drawing.Size(755, 390) Me.TabPageData.Text = "Daten-Suchen" ' 'LayoutControlData @@ -1659,11 +1460,11 @@ Partial Class frmAdministration Me.LayoutControlData.Controls.Add(Me.ComboBoxEdit6) Me.LayoutControlData.Controls.Add(Me.SimpleButton5) Me.LayoutControlData.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControlData.Location = New System.Drawing.Point(134, 0) + Me.LayoutControlData.Location = New System.Drawing.Point(201, 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(1021, 396) + Me.LayoutControlData.Size = New System.Drawing.Size(554, 390) Me.LayoutControlData.TabIndex = 27 Me.LayoutControlData.Text = "LayoutControl3" ' @@ -1673,17 +1474,17 @@ Partial Class frmAdministration Me.TextEdit12.Location = New System.Drawing.Point(20, 218) Me.TextEdit12.Name = "TextEdit12" Me.TextEdit12.Properties.ReadOnly = True - Me.TextEdit12.Size = New System.Drawing.Size(143, 20) + Me.TextEdit12.Size = New System.Drawing.Size(125, 20) Me.TextEdit12.StyleController = Me.LayoutControlData Me.TextEdit12.TabIndex = 4 ' 'TextEdit13 ' 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(183, 218) + Me.TextEdit13.Location = New System.Drawing.Point(165, 218) Me.TextEdit13.Name = "TextEdit13" Me.TextEdit13.Properties.ReadOnly = True - Me.TextEdit13.Size = New System.Drawing.Size(228, 20) + Me.TextEdit13.Size = New System.Drawing.Size(125, 20) Me.TextEdit13.StyleController = Me.LayoutControlData Me.TextEdit13.TabIndex = 5 ' @@ -1693,17 +1494,17 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(20, 274) Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" Me.CHANGED_WHOTextBox1.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(143, 20) + Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(125, 20) Me.CHANGED_WHOTextBox1.StyleController = Me.LayoutControlData Me.CHANGED_WHOTextBox1.TabIndex = 6 ' 'TextEdit11 ' 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(183, 274) + Me.TextEdit11.Location = New System.Drawing.Point(165, 274) Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(228, 20) + Me.TextEdit11.Size = New System.Drawing.Size(125, 20) Me.TextEdit11.StyleController = Me.LayoutControlData Me.TextEdit11.TabIndex = 7 ' @@ -1714,7 +1515,7 @@ Partial Class frmAdministration Me.CheckEdit2.MenuManager = Me.RibbonControl2 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Suche Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(407, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(286, 18) Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' @@ -1725,7 +1526,7 @@ Partial Class frmAdministration Me.txtDataSearchName.Location = New System.Drawing.Point(157, 82) Me.txtDataSearchName.MenuManager = Me.RibbonControl2 Me.txtDataSearchName.Name = "txtDataSearchName" - Me.txtDataSearchName.Size = New System.Drawing.Size(254, 20) + Me.txtDataSearchName.Size = New System.Drawing.Size(133, 20) Me.txtDataSearchName.StyleController = Me.LayoutControlData Me.txtDataSearchName.TabIndex = 9 ' @@ -1743,31 +1544,31 @@ 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(254, 20) + Me.ComboBoxEdit2.Size = New System.Drawing.Size(133, 20) Me.ComboBoxEdit2.StyleController = Me.LayoutControlData Me.ComboBoxEdit2.TabIndex = 11 ' 'MemoEdit3 ' Me.MemoEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit3.Location = New System.Drawing.Point(423, 54) + Me.MemoEdit3.Location = New System.Drawing.Point(302, 54) 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(586, 248) + Me.MemoEdit3.Size = New System.Drawing.Size(240, 248) 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, "COUNT_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(423, 348) + Me.MemoEdit4.Location = New System.Drawing.Point(302, 348) 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(586, 36) + Me.MemoEdit4.Size = New System.Drawing.Size(240, 30) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1778,7 +1579,7 @@ Partial Class frmAdministration Me.txtDATAGUID.MenuManager = Me.RibbonControl2 Me.txtDATAGUID.Name = "txtDATAGUID" Me.txtDATAGUID.Properties.ReadOnly = True - Me.txtDATAGUID.Size = New System.Drawing.Size(254, 20) + Me.txtDATAGUID.Size = New System.Drawing.Size(133, 20) Me.txtDATAGUID.StyleController = Me.LayoutControlData Me.txtDATAGUID.TabIndex = 14 ' @@ -1797,44 +1598,44 @@ Partial Class frmAdministration Me.TextEdit10.Properties.PopupSizeable = False Me.TextEdit10.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit10.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit10.Size = New System.Drawing.Size(254, 20) + Me.TextEdit10.Size = New System.Drawing.Size(133, 20) Me.TextEdit10.StyleController = Me.LayoutControlData Me.TextEdit10.TabIndex = 10 ' 'ComboBoxEdit5 ' - Me.ComboBoxEdit5.Location = New System.Drawing.Point(560, 12) + Me.ComboBoxEdit5.Location = New System.Drawing.Point(439, 12) Me.ComboBoxEdit5.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit5.Name = "ComboBoxEdit5" Me.ComboBoxEdit5.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit5.Size = New System.Drawing.Size(384, 20) + Me.ComboBoxEdit5.Size = New System.Drawing.Size(50, 20) Me.ComboBoxEdit5.StyleController = Me.LayoutControlData Me.ComboBoxEdit5.TabIndex = 15 ' 'SimpleButton4 ' - Me.SimpleButton4.Location = New System.Drawing.Point(948, 12) + Me.SimpleButton4.Location = New System.Drawing.Point(493, 12) Me.SimpleButton4.Name = "SimpleButton4" - Me.SimpleButton4.Size = New System.Drawing.Size(61, 22) + Me.SimpleButton4.Size = New System.Drawing.Size(49, 22) Me.SimpleButton4.StyleController = Me.LayoutControlData Me.SimpleButton4.TabIndex = 16 Me.SimpleButton4.Text = "Einfügen" ' 'ComboBoxEdit6 ' - Me.ComboBoxEdit6.Location = New System.Drawing.Point(560, 306) + Me.ComboBoxEdit6.Location = New System.Drawing.Point(439, 306) Me.ComboBoxEdit6.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit6.Name = "ComboBoxEdit6" Me.ComboBoxEdit6.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit6.Size = New System.Drawing.Size(384, 20) + Me.ComboBoxEdit6.Size = New System.Drawing.Size(50, 20) Me.ComboBoxEdit6.StyleController = Me.LayoutControlData Me.ComboBoxEdit6.TabIndex = 17 ' 'SimpleButton5 ' - Me.SimpleButton5.Location = New System.Drawing.Point(948, 306) + Me.SimpleButton5.Location = New System.Drawing.Point(493, 306) Me.SimpleButton5.Name = "SimpleButton5" - Me.SimpleButton5.Size = New System.Drawing.Size(61, 22) + Me.SimpleButton5.Size = New System.Drawing.Size(49, 22) Me.SimpleButton5.StyleController = Me.LayoutControlData Me.SimpleButton5.TabIndex = 18 Me.SimpleButton5.Text = "Einfügen" @@ -1845,7 +1646,7 @@ Partial Class frmAdministration 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.LayoutControlItem41, Me.LayoutControlItem42, Me.LayoutControlItem43, Me.LayoutControlItem44}) Me.LayoutControlGroup3.Name = "Root" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(1021, 396) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(554, 390) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1853,7 +1654,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(411, 22) + Me.LayoutControlItem10.Size = New System.Drawing.Size(290, 22) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' @@ -1864,7 +1665,7 @@ Partial Class frmAdministration Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 182) Me.LayoutControlItem14.Name = "LayoutControlItem14" Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem14.Size = New System.Drawing.Size(163, 56) + Me.LayoutControlItem14.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem14.Text = "Erstellt wer:" Me.LayoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem14.TextSize = New System.Drawing.Size(125, 13) @@ -1873,10 +1674,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem15.Control = Me.TextEdit13 Me.LayoutControlItem15.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem15.Location = New System.Drawing.Point(163, 182) + Me.LayoutControlItem15.Location = New System.Drawing.Point(145, 182) Me.LayoutControlItem15.Name = "LayoutControlItem15" Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem15.Size = New System.Drawing.Size(248, 56) + Me.LayoutControlItem15.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem15.Text = "Erstellt wann:" Me.LayoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem15.TextSize = New System.Drawing.Size(125, 13) @@ -1885,10 +1686,10 @@ Partial Class frmAdministration ' Me.LayoutControlItem17.Control = Me.TextEdit11 Me.LayoutControlItem17.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem17.Location = New System.Drawing.Point(163, 238) + Me.LayoutControlItem17.Location = New System.Drawing.Point(145, 238) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem17.Size = New System.Drawing.Size(248, 56) + Me.LayoutControlItem17.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem17.Text = "Geändert wann:" Me.LayoutControlItem17.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem17.TextSize = New System.Drawing.Size(125, 13) @@ -1900,7 +1701,7 @@ Partial Class frmAdministration Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem16.Name = "LayoutControlItem16" Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem16.Size = New System.Drawing.Size(163, 56) + Me.LayoutControlItem16.Size = New System.Drawing.Size(145, 56) Me.LayoutControlItem16.Text = "Geändert wer:" Me.LayoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem16.TextSize = New System.Drawing.Size(125, 13) @@ -1911,7 +1712,7 @@ Partial Class frmAdministration Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 62) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(411, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem11.Text = "Titel:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(125, 13) ' @@ -1921,7 +1722,7 @@ Partial Class frmAdministration Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 102) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem12.Size = New System.Drawing.Size(411, 40) + Me.LayoutControlItem12.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem12.Text = "Position/Reihenfolge:" Me.LayoutControlItem12.TextSize = New System.Drawing.Size(125, 13) ' @@ -1931,16 +1732,16 @@ Partial Class frmAdministration Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 142) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem13.Size = New System.Drawing.Size(411, 40) + Me.LayoutControlItem13.Size = New System.Drawing.Size(290, 40) 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(411, 26) + Me.LayoutControlItem21.Location = New System.Drawing.Point(290, 26) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(590, 268) + Me.LayoutControlItem21.Size = New System.Drawing.Size(244, 268) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1948,9 +1749,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(411, 320) + Me.LayoutControlItem22.Location = New System.Drawing.Point(290, 320) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(590, 56) + Me.LayoutControlItem22.Size = New System.Drawing.Size(244, 50) 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) @@ -1960,7 +1761,7 @@ Partial Class frmAdministration Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 294) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(411, 82) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(290, 76) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1969,43 +1770,43 @@ Partial Class frmAdministration Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem23.Name = "LayoutControlItem23" Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem23.Size = New System.Drawing.Size(411, 40) + Me.LayoutControlItem23.Size = New System.Drawing.Size(290, 40) Me.LayoutControlItem23.Text = "ID:" Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem41 ' Me.LayoutControlItem41.Control = Me.ComboBoxEdit5 - Me.LayoutControlItem41.Location = New System.Drawing.Point(411, 0) + Me.LayoutControlItem41.Location = New System.Drawing.Point(290, 0) Me.LayoutControlItem41.Name = "LayoutControlItem41" - Me.LayoutControlItem41.Size = New System.Drawing.Size(525, 26) + Me.LayoutControlItem41.Size = New System.Drawing.Size(191, 26) Me.LayoutControlItem41.Text = "Platzhalter" Me.LayoutControlItem41.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem42 ' Me.LayoutControlItem42.Control = Me.SimpleButton4 - Me.LayoutControlItem42.Location = New System.Drawing.Point(936, 0) + Me.LayoutControlItem42.Location = New System.Drawing.Point(481, 0) Me.LayoutControlItem42.Name = "LayoutControlItem42" - Me.LayoutControlItem42.Size = New System.Drawing.Size(65, 26) + Me.LayoutControlItem42.Size = New System.Drawing.Size(53, 26) Me.LayoutControlItem42.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem42.TextVisible = False ' 'LayoutControlItem43 ' Me.LayoutControlItem43.Control = Me.ComboBoxEdit6 - Me.LayoutControlItem43.Location = New System.Drawing.Point(411, 294) + Me.LayoutControlItem43.Location = New System.Drawing.Point(290, 294) Me.LayoutControlItem43.Name = "LayoutControlItem43" - Me.LayoutControlItem43.Size = New System.Drawing.Size(525, 26) + Me.LayoutControlItem43.Size = New System.Drawing.Size(191, 26) Me.LayoutControlItem43.Text = "Platzhalter" Me.LayoutControlItem43.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem44 ' Me.LayoutControlItem44.Control = Me.SimpleButton5 - Me.LayoutControlItem44.Location = New System.Drawing.Point(936, 294) + Me.LayoutControlItem44.Location = New System.Drawing.Point(481, 294) Me.LayoutControlItem44.Name = "LayoutControlItem44" - Me.LayoutControlItem44.Size = New System.Drawing.Size(65, 26) + Me.LayoutControlItem44.Size = New System.Drawing.Size(53, 26) Me.LayoutControlItem44.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem44.TextVisible = False ' @@ -2017,7 +1818,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(134, 396) + Me.GridControl2.Size = New System.Drawing.Size(201, 390) Me.GridControl2.TabIndex = 11 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -2048,7 +1849,7 @@ Partial Class frmAdministration Me.TabPageProcessAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageProcessAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1155, 396) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(755, 390) Me.TabPageProcessAssignment.Text = "Anwendungs-Zuordnung" ' 'CtrlApplicationAssignment1 @@ -2060,7 +1861,7 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.SelectedProcessId = 0 Me.CtrlApplicationAssignment1.SelectedProfileId = 0 Me.CtrlApplicationAssignment1.SelectedWindowId = 0 - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1155, 396) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(755, 390) Me.CtrlApplicationAssignment1.TabIndex = 3 ' 'TabPageProfileAssignment @@ -2069,7 +1870,7 @@ Partial Class frmAdministration Me.TabPageProfileAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProfileAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageProfileAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageProfileAssignment.Name = "TabPageProfileAssignment" - Me.TabPageProfileAssignment.Size = New System.Drawing.Size(1157, 422) + Me.TabPageProfileAssignment.Size = New System.Drawing.Size(757, 416) Me.TabPageProfileAssignment.Text = "Profil-Zuordnung" ' 'XtraTabControl2 @@ -2078,7 +1879,7 @@ Partial Class frmAdministration Me.XtraTabControl2.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.TabPageGroupAssignment - Me.XtraTabControl2.Size = New System.Drawing.Size(1157, 422) + Me.XtraTabControl2.Size = New System.Drawing.Size(757, 416) Me.XtraTabControl2.TabIndex = 0 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageUserAssignment, Me.TabPageGroupAssignment}) ' @@ -2088,7 +1889,7 @@ Partial Class frmAdministration Me.TabPageGroupAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageGroupAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1155, 396) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(755, 390) Me.TabPageGroupAssignment.Text = "Gruppen-Zuordnung" ' 'SplitContainer2 @@ -2107,30 +1908,28 @@ Partial Class frmAdministration ' Me.SplitContainer2.Panel2.Controls.Add(Me.GridControlGroupNotInProfile) Me.SplitContainer2.Panel2.Controls.Add(Me.Label10) - Me.SplitContainer2.Size = New System.Drawing.Size(1155, 396) - Me.SplitContainer2.SplitterDistance = 185 + Me.SplitContainer2.Size = New System.Drawing.Size(755, 390) + Me.SplitContainer2.SplitterDistance = 136 Me.SplitContainer2.TabIndex = 1 ' 'GridControlGroupInProfile ' Me.GridControlGroupInProfile.AllowDrop = True - Me.GridControlGroupInProfile.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GridControlGroupInProfile.ContextMenuStrip = Me.cmsDelete + Me.GridControlGroupInProfile.ContextMenuStrip = Me.cmsGroupZODelete Me.GridControlGroupInProfile.DataSource = Me.VWCW_GROUP_PROFILEBindingSource - Me.GridControlGroupInProfile.Location = New System.Drawing.Point(16, 33) + Me.GridControlGroupInProfile.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControlGroupInProfile.Location = New System.Drawing.Point(0, 30) Me.GridControlGroupInProfile.MainView = Me.GridViewGroupInProfile Me.GridControlGroupInProfile.Name = "GridControlGroupInProfile" - Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1136, 149) + Me.GridControlGroupInProfile.Size = New System.Drawing.Size(755, 106) Me.GridControlGroupInProfile.TabIndex = 1 Me.GridControlGroupInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupInProfile}) ' - 'cmsDelete + 'cmsGroupZODelete ' - Me.cmsDelete.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZuordnungEntfernenToolStripMenuItem}) - Me.cmsDelete.Name = "cmsDelete" - Me.cmsDelete.Size = New System.Drawing.Size(189, 26) + Me.cmsGroupZODelete.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZuordnungEntfernenToolStripMenuItem}) + Me.cmsGroupZODelete.Name = "cmsDelete" + Me.cmsGroupZODelete.Size = New System.Drawing.Size(189, 26) ' 'ZuordnungEntfernenToolStripMenuItem ' @@ -2181,22 +1980,20 @@ 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(1155, 30) + Me.Label9.Size = New System.Drawing.Size(755, 30) Me.Label9.TabIndex = 0 - Me.Label9.Text = "Zugeordnete Gruppen" + Me.Label9.Text = "Zugeordnete Gruppen (Rechtsklick für Entfernen)" Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'GridControlGroupNotInProfile ' Me.GridControlGroupNotInProfile.AllowDrop = True - Me.GridControlGroupNotInProfile.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GridControlGroupNotInProfile.DataSource = Me.TBWH_GROUPBindingSource - Me.GridControlGroupNotInProfile.Location = New System.Drawing.Point(16, 28) + Me.GridControlGroupNotInProfile.Dock = System.Windows.Forms.DockStyle.Fill + 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(1136, 175) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(755, 225) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' @@ -2244,7 +2041,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(1155, 25) + Me.Label10.Size = New System.Drawing.Size(755, 25) Me.Label10.TabIndex = 1 Me.Label10.Text = "Nicht zugeordnete Gruppen:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -2255,7 +2052,7 @@ Partial Class frmAdministration Me.TabPageUserAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageUserAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1155, 396) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(755, 390) Me.TabPageUserAssignment.Text = "Benutzer-Zuordnung" ' 'SplitContainer1 @@ -2274,21 +2071,34 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1155, 396) - Me.SplitContainer1.SplitterDistance = 168 + Me.SplitContainer1.Size = New System.Drawing.Size(755, 390) + Me.SplitContainer1.SplitterDistance = 138 Me.SplitContainer1.TabIndex = 99 ' 'GridControlUserInProfile ' Me.GridControlUserInProfile.AllowDrop = True - Me.GridControlUserInProfile.DataSource = Me.VWCW_USER_PROFILEBindingSource - Me.GridControlUserInProfile.Location = New System.Drawing.Point(3, 23) + Me.GridControlUserInProfile.ContextMenuStrip = Me.cmsUserZODelete + Me.GridControlUserInProfile.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControlUserInProfile.Location = New System.Drawing.Point(0, 20) Me.GridControlUserInProfile.MainView = Me.GridViewUserInProfile Me.GridControlUserInProfile.Name = "GridControlUserInProfile" - Me.GridControlUserInProfile.Size = New System.Drawing.Size(1142, 142) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(755, 118) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' + 'cmsUserZODelete + ' + Me.cmsUserZODelete.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserEntfernenToolStripMenuItem}) + Me.cmsUserZODelete.Name = "cmsUserZODelete" + Me.cmsUserZODelete.Size = New System.Drawing.Size(152, 26) + ' + 'UserEntfernenToolStripMenuItem + ' + Me.UserEntfernenToolStripMenuItem.Name = "UserEntfernenToolStripMenuItem" + Me.UserEntfernenToolStripMenuItem.Size = New System.Drawing.Size(151, 22) + Me.UserEntfernenToolStripMenuItem.Text = "User entfernen" + ' 'GridViewUserInProfile ' Me.GridViewUserInProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer)) @@ -2355,9 +2165,9 @@ 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(1155, 20) + Me.Label1.Size = New System.Drawing.Size(755, 20) Me.Label1.TabIndex = 94 - Me.Label1.Text = "Zugeordnete Benutzer:" + Me.Label1.Text = "Zugeordnete Benutzer (Rechtsklick für Entfernen)" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'GridControlUserNotInProfile @@ -2367,10 +2177,10 @@ Partial Class frmAdministration Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GridControlUserNotInProfile.DataSource = Me.TBWH_UserBindingSource - Me.GridControlUserNotInProfile.Location = New System.Drawing.Point(3, 24) + Me.GridControlUserNotInProfile.Location = New System.Drawing.Point(3, 34) Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1142, 196) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(742, 210) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -2430,9 +2240,9 @@ 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(1155, 11) + Me.Label2.Size = New System.Drawing.Size(755, 21) Me.Label2.TabIndex = 97 - Me.Label2.Text = "Nicht zugeordnete Benutzer:" + Me.Label2.Text = "Nicht zugeordnete Benutzer" Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'TBCW_PROF_DATA_SEARCHTableAdapter @@ -2476,7 +2286,7 @@ Partial Class frmAdministration ' Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1406, 452) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1034, 594) Me.SplitContainerControl1.SplitterPosition = 237 Me.SplitContainerControl1.TabIndex = 27 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -2529,12 +2339,102 @@ Partial Class frmAdministration Me.SimpleSeparator1.Name = "SimpleSeparator1" Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2) ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(112, 14) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(18, 13) + Me.Label3.TabIndex = 23 + Me.Label3.Text = "ID" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(249, 14) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(34, 13) + Me.Label4.TabIndex = 24 + Me.Label4.Text = "Name" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(18, 54) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(47, 13) + Me.Label5.TabIndex = 25 + Me.Label5.Text = "Profiltyp" + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(249, 54) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(61, 13) + Me.Label6.TabIndex = 26 + Me.Label6.Text = "Kommentar" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(18, 96) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(99, 13) + Me.Label7.TabIndex = 27 + Me.Label7.Text = "Regular Expression" + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(474, 96) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(154, 13) + Me.Label8.TabIndex = 28 + Me.Label8.Text = "Test String Regular Expression" + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(18, 195) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(61, 13) + Me.Label11.TabIndex = 29 + Me.Label11.Text = "Erstellt wer" + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(18, 234) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(69, 13) + Me.Label12.TabIndex = 30 + Me.Label12.Text = "Erstellt wann" + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(154, 234) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(81, 13) + Me.Label13.TabIndex = 31 + Me.Label13.Text = "Geändert wann" + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(154, 195) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(73, 13) + Me.Label14.TabIndex = 32 + Me.Label14.Text = "Geändert wer" + ' '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(1406, 632) + Me.ClientSize = New System.Drawing.Size(1034, 774) Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl2) @@ -2552,7 +2452,6 @@ Partial Class frmAdministration CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewProfiles, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_UserBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VWCW_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit() @@ -2561,8 +2460,7 @@ Partial Class frmAdministration CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.TabPageGeneralSettings.ResumeLayout(False) - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) + Me.TabPageGeneralSettings.PerformLayout() CType(Me.txtProfileName.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -2576,20 +2474,6 @@ Partial Class frmAdministration CType(Me.PROFILE_IDTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtRegexTestString.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.layoutControlItem2, 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() - CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.layoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - 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() - CType(Me.LayoutControlItem35, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPageDocuments.ResumeLayout(False) CType(Me.LayoutControlDocs, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControlDocs.ResumeLayout(False) @@ -2675,7 +2559,7 @@ Partial Class frmAdministration CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) CType(Me.GridControlGroupInProfile, System.ComponentModel.ISupportInitialize).EndInit() - Me.cmsDelete.ResumeLayout(False) + Me.cmsGroupZODelete.ResumeLayout(False) CType(Me.VWCW_GROUP_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewGroupInProfile, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlGroupNotInProfile, System.ComponentModel.ISupportInitialize).EndInit() @@ -2687,6 +2571,7 @@ Partial Class frmAdministration CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) CType(Me.GridControlUserInProfile, System.ComponentModel.ISupportInitialize).EndInit() + Me.cmsUserZODelete.ResumeLayout(False) CType(Me.GridViewUserInProfile, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlUserNotInProfile, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewUserNotInProfile, System.ComponentModel.ISupportInitialize).EndInit() @@ -2716,7 +2601,6 @@ Partial Class frmAdministration Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents OFDWindreamsuche As System.Windows.Forms.OpenFileDialog - Friend WithEvents VWCW_USER_PROFILEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents VWCW_USER_PROFILETableAdapter As easyFLOW.MyDatasetTableAdapters.VWCW_USER_PROFILETableAdapter Friend WithEvents TimerTest As System.Windows.Forms.Timer Friend WithEvents TBWH_UserBindingSource As System.Windows.Forms.BindingSource @@ -2787,7 +2671,6 @@ Partial Class frmAdministration Friend WithEvents TabPageProfileManagement As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents TabPageGeneralSettings As DevExpress.XtraTab.XtraTabPage - Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents txtProfileName As DevExpress.XtraEditors.TextEdit Friend WithEvents textEdit4 As DevExpress.XtraEditors.TextEdit Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit @@ -2798,18 +2681,6 @@ Partial Class frmAdministration Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit Friend WithEvents PROFILE_IDTextBox As DevExpress.XtraEditors.TextEdit Friend WithEvents textEdit5 As DevExpress.XtraEditors.MemoEdit - Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents layoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents layoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents layoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents layoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents layoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem20 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents EmptySpaceItem3 As DevExpress.XtraLayout.EmptySpaceItem - Friend WithEvents layoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TabPageDocuments As DevExpress.XtraTab.XtraTabPage Friend WithEvents LayoutControlDocs As DevExpress.XtraLayout.LayoutControl Friend WithEvents CheckEdit3 As DevExpress.XtraEditors.CheckEdit @@ -2899,8 +2770,6 @@ Partial Class frmAdministration Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager Friend WithEvents txtRegexTestString As DevExpress.XtraEditors.TextEdit Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton - Friend WithEvents LayoutControlItem35 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem36 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents ComboBoxEdit3 As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents LayoutControlItem37 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents SimpleButton2 As DevExpress.XtraEditors.SimpleButton @@ -2925,6 +2794,18 @@ Partial Class frmAdministration Friend WithEvents colName3 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colGROUP_ID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colGROUP_NAME As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents cmsDelete As ContextMenuStrip + Friend WithEvents cmsGroupZODelete As ContextMenuStrip Friend WithEvents ZuordnungEntfernenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cmsUserZODelete As ContextMenuStrip + Friend WithEvents UserEntfernenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Label6 As Label + Friend WithEvents Label5 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label14 As Label + Friend WithEvents Label13 As Label + Friend WithEvents Label12 As Label + Friend WithEvents Label11 As Label + Friend WithEvents Label8 As Label + Friend WithEvents Label7 As Label End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index 92a5a46..15b29de 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -118,46 +118,40 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 376, 17 + 127, 17 - 266, 17 - - - 266, 17 + 17, 17 - 1482, 17 - - - 17, 17 + 121, 54 - 594, 17 + 345, 17 - 804, 17 + 555, 17 - 974, 17 + 725, 17 - 1137, 17 + 888, 17 - 1378, 17 + 17, 54 - 1674, 17 + 313, 54 - 17, 54 + 475, 54 - 665, 54 + 17, 91 - 115, 54 + 573, 54 @@ -780,7 +774,7 @@ - 270, 91 + 270, 128 @@ -800,10 +794,10 @@ - 514, 91 + 514, 128 - 988, 91 + 165, 165 @@ -909,25 +903,15 @@ LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz - dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp - ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs - LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu - OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi - IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt - MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku - NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 - Zz4L - - + + 988, 128 + + + 769, 91 + + + 561, 91 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -952,6 +936,9 @@ MjAsMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 17, 165 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -976,29 +963,39 @@ MjAsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 17, 128 - - - 1417, 54 - - - 1209, 54 - + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs + LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu + OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi + IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt + MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku + NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 + Zz4L + + - 394, 54 + 852, 54 - 941, 54 + 293, 91 - 17, 91 + 17, 128 - 755, 91 + 755, 128 - 1248, 91 + 425, 165 163 diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index 16f53a0..f6e55d7 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -1,4 +1,6 @@ Imports System.Text.RegularExpressions +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DigitalData.Modules.Base Imports DigitalData.Modules.Database Imports DigitalData.Modules.Language @@ -187,8 +189,15 @@ Public Class frmAdministration Sub Refresh_ProfileData() Try - VWCW_USER_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString - VWCW_USER_PROFILETableAdapter.Fill(MyDataset.VWCW_USER_PROFILE, PROFILE_IDTextBox.Text) + Dim oSQL = $"SELECT GUID, USER_ID, USERNAME as Username, USER_SURNAME + ', ' + USER_PRENAME as Name FROM + VWCW_USER_PROFILE WHERE PROFIL_ID = {PROFILE_IDTextBox.Text}" + Dim oDT = MyDB_DDECM.GetDatatable(oSQL) + GridViewUserInProfile.Columns.Clear() + If Not IsNothing(oDT) Then + GridControlUserInProfile.DataSource = oDT + GridViewUserInProfile.Columns.Item("USER_ID").Visible = False + GridViewUserInProfile.Columns.Item("GUID").Visible = False + End If VWCW_GROUP_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString VWCW_GROUP_PROFILETableAdapter.Fill(MyDataset.VWCW_GROUP_PROFILE, PROFILE_IDTextBox.Text) @@ -223,7 +232,7 @@ Public Class frmAdministration For Each row As DataRow In MyDataset.TBWH_User.Rows If row.Item(0) = CBool(True) Then Dim insert = String.Format("INSERT INTO TBCW_USER_PROFILE (PROFILE_ID,USER_ID) VALUES ({0},{1})", PROFILE_IDTextBox.Text, row.Item(5)) - If Database.ExecuteNonQuery(insert) = False Then + If MyDB_DDECM.ExecuteNonQuery(insert) = False Then MsgBox("Could not insert the User-Definition....Check the logfile!", MsgBoxStyle.Exclamation) End If End If @@ -245,7 +254,7 @@ Public Class frmAdministration Dim Sql = String.Format("SELECT DISTINCT * FROM VWDD_USER_MODULE_CW WHERE GUID NOT IN (SELECT USER_ID FROM TBCW_USER_PROFILE WHERE PROFILE_ID = {0}) ORDER BY USERNAME", PROFILE_ID) - Dim DT_USER = Database.GetDatatable(Sql) + Dim DT_USER = MyDB_DDECM.GetDatatable(Sql) Try MyDataset.TBWH_User.Clear() @@ -273,7 +282,7 @@ Public Class frmAdministration Sub Refresh_Free_Groups(PROFILE_ID As Integer) Dim Sql = String.Format("SELECT DISTINCT * FROM TBDD_GROUPS WHERE INTERNAL = 0 AND GUID NOT IN (SELECT GROUP_ID FROM TBCW_GROUP_PROFILE WHERE PROFILE_ID = {0}) ORDER BY NAME", PROFILE_ID) - Dim oDataTable = Database.GetDatatable(Sql) + Dim oDataTable = MyDB_DDECM.GetDatatable(Sql) Try MyDataset.TBWH_GROUP.Clear() @@ -281,7 +290,7 @@ Public Class frmAdministration For Each row As DataRow In oDataTable.Rows Dim oNewRow As MyDataset.TBWH_GROUPRow oNewRow = MyDataset.TBWH_GROUP.NewTBWH_GROUPRow - oNewRow.NAME = row.Item("NAME") + oNewRow.Name = IIf(IsDBNull(row.Item("NAME")), "Null", row.Item("NAME")) oNewRow.GUID = row.Item("GUID") MyDataset.TBWH_GROUP.Rows.Add(oNewRow) Next @@ -290,27 +299,6 @@ Public Class frmAdministration End Try End Sub - Private Sub btndeleteUserConstructorRel_Click(sender As Object, e As EventArgs) - Try - Dim ID = GridViewUserInProfile.GetFocusedRowCellValue(GridViewUserInProfile.Columns("GUID")) - Try - Dim I As Integer = CInt(ID) - Catch ex As Exception - Exit Sub - End Try - Dim del = String.Format("DELETE FROM TBCW_USER_PROFILE WHERE GUID = {0}", ID) - If Database.ExecuteNonQuery(del) = True Then - Refresh_ProfileData() - If PROFILE_IDTextBox.Text <> "" Then - Refresh_Free_Users(PROFILE_IDTextBox.Text) - End If - - End If - Catch ex As Exception - MsgBox("Unexpected Error in deleting ProfileUserRelation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub - Private Sub Load_Profile_Process() If IsNothing(PROFILE_IDTextBox.Text) Or PROFILE_IDTextBox.Text = "" Then Exit Sub @@ -390,7 +378,7 @@ Public Class frmAdministration Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass Sie das Profil löschen wollen?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) ' wenn Speichern ja If result = MsgBoxResult.Yes Then - If Database.ExecuteNonQuery(swl) = True Then + If MyDB_DDECM.ExecuteNonQuery(swl) = True Then Refresh_ProfileScreen() End If End If @@ -686,7 +674,7 @@ Public Class frmAdministration Private Sub BarButtonItem26_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem26.ItemClick Dim oSQL As String = $"EXEC PRCW_COPY_PROFILE {PROFILE_IDTextBox.Text}, '{USER_USERNAME}'" - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then MsgBox("Profil konnte nicht kopiert werden! Mehr Informationen im Log.", MsgBoxStyle.Exclamation, Text) Else Refresh_ProfileScreen() @@ -741,63 +729,6 @@ Public Class frmAdministration End Sub - Private Sub GridControlUserNotInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserNotInProfile.DragDrop - Try - If PROFILE_IDTextBox.Text = String.Empty Then - Exit Sub - End If - - Dim oSelectedRows = GridViewUserInProfile.GetSelectedRows() - - For Each oRowHandle As Integer In oSelectedRows - Dim oRow As DataRow = GridViewUserInProfile.GetDataRow(oRowHandle) - Dim oGuid As Integer = oRow.Item("GUID") - Dim del = String.Format("DELETE FROM TBCW_USER_PROFILE WHERE GUID = {0}", oGuid) - If Database.ExecuteNonQuery(del) = False Then - MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) - End If - Next - - Refresh_Free_Users(PROFILE_IDTextBox.Text) - 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) - End Try - End Sub - - Private Sub GridControlUserInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserInProfile.DragDrop - Try - If PROFILE_IDTextBox.Text = String.Empty Then - Exit Sub - End If - - Dim oSelectedRows = GridViewUserNotInProfile.GetSelectedRows() - - For Each oRowHandle As Integer In oSelectedRows - Dim oRow As DataRow = GridViewUserNotInProfile.GetDataRow(oRowHandle) - Dim oGuid As Integer = oRow.Item("GUID") - Dim insert = String.Format("INSERT INTO TBCW_USER_PROFILE (PROFILE_ID,USER_ID) VALUES ({0},{1})", PROFILE_IDTextBox.Text, oGuid) - If Database.ExecuteNonQuery(insert) = False Then - MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) - End If - Next - - Refresh_Free_Users(PROFILE_IDTextBox.Text) - 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) - End Try - End Sub Private Sub GridControlGroupNotInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlGroupNotInProfile.DragDrop Try @@ -809,7 +740,7 @@ Public Class frmAdministration Dim oGroupId As Integer = oRow.GROUP_ID Dim oSQL As String = $"DELETE FROM TBCW_GROUP_PROFILE WHERE PROFILE_ID = {oProfileId} AND GROUP_ID = {oGroupId}" - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then MsgBox("Could not delete the Group-Definition....Check the logfile!", MsgBoxStyle.Exclamation) End If Next @@ -834,7 +765,7 @@ Public Class frmAdministration Dim oGroupId As Integer = oRow.GUID Dim oSQL As String = $"INSERT INTO TBCW_GROUP_PROFILE (PROFILE_ID,GROUP_ID) VALUES ({PROFILE_IDTextBox.Text},{oGroupId})" - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then MsgBox("Could not insert the Group-Definition....Check the logfile!", MsgBoxStyle.Exclamation) End If Next @@ -914,7 +845,7 @@ Public Class frmAdministration Dim oGroupId As Integer = oRow.GROUP_ID Dim oSQL As String = $"DELETE FROM TBCW_GROUP_PROFILE WHERE PROFILE_ID = {oProfileId} AND GROUP_ID = {oGroupId}" - If Database.ExecuteNonQuery(oSQL) = False Then + If MyDB_DDECM.ExecuteNonQuery(oSQL) = False Then MsgBox("Could not delete the Group-Definition via contextmenu....Check the logfile!", MsgBoxStyle.Exclamation) End If Next @@ -929,4 +860,146 @@ Public Class frmAdministration MsgBox("Unexpected Error in deleting Group-Rights via cms: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub + Private Sub UserEntfernenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UserEntfernenToolStripMenuItem.Click + FreeUserProfile + End Sub + Sub FreeUserProfile() + Try + If PROFILE_IDTextBox.Text = String.Empty Then + Exit Sub + End If + + Dim oSelectedRows = GridViewUserInProfile.GetSelectedRows() + + For Each oRowHandle As Integer In oSelectedRows + Dim oRow As DataRow = GridViewUserInProfile.GetDataRow(oRowHandle) + Dim oGuid As Integer = oRow.Item("USER_ID") + Dim del = String.Format("DELETE FROM TBCW_USER_PROFILE WHERE PROFILE_ID = {0} AND USER_ID = {1}", PROFILE_IDTextBox.Text, oGuid) + If MyDB_DDECM.ExecuteNonQuery(del) = False Then + MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) + End If + Next + + Refresh_Free_Users(PROFILE_IDTextBox.Text) + 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) + End Try + End Sub + + Private Sub GridControlUserInProfile_MouseDown(sender As Object, e As MouseEventArgs) Handles GridControlUserInProfile.MouseDown + 'Dim view As GridView = CType(sender, GridView) + 'Dim hitInfo As GridHitInfo = view.CalcHitInfo(e.Location) + + 'If hitInfo.InRow Then + ' Dim rowHandle As Integer = hitInfo.RowHandle + ' Dim data As Object = view.GetRow(rowHandle) + + ' If data IsNot Nothing Then + ' GridControl1.DoDragDrop(data, DragDropEffects.Move) + ' End If + 'End If + End Sub + + Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click + + End Sub + + Private Sub GridControlUserNotInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserNotInProfile.DragDrop + FreeUserProfile() + End Sub + + Private Sub GridControlUserInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserInProfile.DragDrop + Try + If PROFILE_IDTextBox.Text = String.Empty Then + Exit Sub + End If + + Dim oSelectedRows = GridViewUserNotInProfile.GetSelectedRows() + + For Each oRowHandle As Integer In oSelectedRows + Dim oRow As DataRow = GridViewUserNotInProfile.GetDataRow(oRowHandle) + Dim oGuid As Integer = oRow.Item("GUID") + Dim insert = String.Format("INSERT INTO TBCW_USER_PROFILE (PROFILE_ID,USER_ID) VALUES ({0},{1})", PROFILE_IDTextBox.Text, oGuid) + If MyDB_DDECM.ExecuteNonQuery(insert) = False Then + MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) + End If + Next + + Refresh_Free_Users(PROFILE_IDTextBox.Text) + 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) + End Try + End Sub + + + + 'Private Sub GridControlUserInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserInProfile.DragDrop + ' Try + ' If PROFILE_IDTextBox.Text = String.Empty Then + ' Exit Sub + ' End If + + ' Dim oSelectedRows = GridViewUserNotInProfile.GetSelectedRows() + + ' For Each oRowHandle As Integer In oSelectedRows + ' Dim oRow As DataRow = GridViewUserNotInProfile.GetDataRow(oRowHandle) + ' Dim oGuid As Integer = oRow.Item("GUID") + ' Dim insert = String.Format("INSERT INTO TBCW_USER_PROFILE (PROFILE_ID,USER_ID) VALUES ({0},{1})", PROFILE_IDTextBox.Text, oGuid) + ' If MyDB_DDECM.ExecuteNonQuery(insert) = False Then + ' MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) + ' End If + ' Next + + ' Refresh_Free_Users(PROFILE_IDTextBox.Text) + ' 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) + ' End Try + 'End Sub + + 'Private Sub GridControlUserNotInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserNotInProfile.DragDrop + ' Try + ' If PROFILE_IDTextBox.Text = String.Empty Then + ' Exit Sub + ' End If + + ' Dim oSelectedRows = GridViewUserInProfile.GetSelectedRows() + + ' For Each oRowHandle As Integer In oSelectedRows + ' Dim oRow As DataRow = GridViewUserInProfile.GetDataRow(oRowHandle) + ' Dim oGuid As Integer = oRow.Item("GUID") + ' Dim del = String.Format("DELETE FROM TBCW_USER_PROFILE WHERE GUID = {0}", oGuid) + ' If MyDB_DDECM.ExecuteNonQuery(del) = False Then + ' MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) + ' End If + ' Next + + ' Refresh_Free_Users(PROFILE_IDTextBox.Text) + ' 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) + ' End Try + 'End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmConnection.vb b/app/DD_Clipboard_Searcher/frmConnection.vb index aa141a8..f20634f 100644 --- a/app/DD_Clipboard_Searcher/frmConnection.vb +++ b/app/DD_Clipboard_Searcher/frmConnection.vb @@ -197,7 +197,7 @@ Public Class frmConnection Try If GUIDTextBox.Text <> String.Empty Then Dim oSQL = $"SELECT dbo.FNCW_GET_SEARCH_COUNT_FOR_CONNECTION({GUIDTextBox.Text})" - Dim oCount = Database.GetScalarValue(oSQL) + Dim oCount = MyDB_DDECM.GetScalarValue(oSQL) If oCount IsNot Nothing AndAlso oCount = 0 Then Dim oResult As MsgBoxResult = MsgBox("Wollen Sie die Verbindung wirklich löschen?", MsgBoxStyle.YesNo, Text) diff --git a/app/DD_Clipboard_Searcher/frmGhostUser.Designer.vb b/app/DD_Clipboard_Searcher/frmGhostUser.Designer.vb new file mode 100644 index 0000000..fc00caf --- /dev/null +++ b/app/DD_Clipboard_Searcher/frmGhostUser.Designer.vb @@ -0,0 +1,76 @@ + _ +Partial Class frmGhostUser + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(9, 8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(108, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Usernamen eingeben" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(12, 24) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(226, 20) + Me.TextBox1.TabIndex = 1 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(12, 50) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(226, 23) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Ghostmodus starten" + Me.Button1.UseVisualStyleBackColor = True + ' + 'frmGhostUser + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(252, 81) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.TextBox1) + Me.Controls.Add(Me.Label1) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmGhostUser" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Ghost User wählen" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents TextBox1 As TextBox + Friend WithEvents Button1 As Button +End Class diff --git a/app/DD_Clipboard_Searcher/frmGhostUser.resx b/app/DD_Clipboard_Searcher/frmGhostUser.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD_Clipboard_Searcher/frmGhostUser.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmGhostUser.vb b/app/DD_Clipboard_Searcher/frmGhostUser.vb new file mode 100644 index 0000000..613b13a --- /dev/null +++ b/app/DD_Clipboard_Searcher/frmGhostUser.vb @@ -0,0 +1,15 @@ +Public Class frmGhostUser + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If TextBox1.Text <> String.Empty Then + Dim osql = $"SELECT COALESCE(MAX(GUID),0) FROM TBDD_USER WHERE USERNAME = '{TextBox1.Text}'" + Dim oUSERID = MyDB_DDECM.GetScalarValue(osql) + If oUSERID = 0 Then + MsgBox("Username unbekannt!", MsgBoxStyle.Information) + Else + GHOST_USERID = oUSERID + USER_USERNAME = TextBox1.Text + Me.Close() + End If + End If + End Sub +End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmLicense.vb b/app/DD_Clipboard_Searcher/frmLicense.vb index f74281b..7b253b4 100644 --- a/app/DD_Clipboard_Searcher/frmLicense.vb +++ b/app/DD_Clipboard_Searcher/frmLicense.vb @@ -57,9 +57,9 @@ Public Class frmLicense Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & oDate, "#DigitalData35452!#") Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_CBSEARCHER = '" & result & "' WHERE GUID = {0}", CLIENT_ID) - If Database.ExecuteNonQuery(sql) = False Then + If MyDB_DDECM.ExecuteNonQuery(sql) = False Then sql = $"UPDATE TBDD_MODULES SET LICENSE = '{result}' where SHORT_NAME = 'CW'" - Database.ExecuteNonQuery(sql) + MyDB_DDECM.ExecuteNonQuery(sql) Refresh_Licence(True) Else MsgBox("Could not renew the license!!", MsgBoxStyle.Critical) diff --git a/app/DD_Clipboard_Searcher/frmMain.Designer.vb b/app/DD_Clipboard_Searcher/frmMain.Designer.vb index 5a5ba23..5a9ebfe 100644 --- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb @@ -215,7 +215,7 @@ Partial Class frmMain 'cmstrpNotifyIcon ' Me.cmstrpNotifyIcon.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FunktionenToolStripMenuItem, Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem}) + Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FunktionenToolStripMenuItem, Me.ClientÖffnenToolStripMenuItem, Me.tsmiChangeState, Me.ClientBeendenToolStripMenuItem}) Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon" resources.ApplyResources(Me.cmstrpNotifyIcon, "cmstrpNotifyIcon") ' diff --git a/app/DD_Clipboard_Searcher/frmMain.resx b/app/DD_Clipboard_Searcher/frmMain.resx index 54f41d5..3cd5c3e 100644 --- a/app/DD_Clipboard_Searcher/frmMain.resx +++ b/app/DD_Clipboard_Searcher/frmMain.resx @@ -375,58 +375,6 @@ RibbonPage2 - - labelStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 0 - - - labelRefresh - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 1 - - - Tahoma, 8.25pt, style=Bold - - - 209, 72 - - - 256, 129 - - - - 16 - - - Informationen - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Tahoma, 8.25pt @@ -434,8 +382,9 @@ 8, 40 - 242, 67 + 242, 68 + 0 @@ -484,6 +433,33 @@ 1 + + Tahoma, 8.25pt, style=Bold + + + 209, 72 + + + 256, 129 + + + 16 + + + Informationen + + + GroupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Label2 @@ -515,7 +491,7 @@ 12, 72 - 191, 59 + 191, 62 15 @@ -576,7 +552,7 @@ Tahoma, 15.75pt, style=Bold - 3, 29 + 3, 32 185, 27 @@ -614,32 +590,8 @@ 153, 17 - - 180, 22 - - - Funktionen - - - 180, 22 - - - easyFLOW stoppen - - - 180, 22 - - - In den Vordergrund - - - 180, 22 - - - easyFLOW beenden - - 181, 114 + 195, 92 cmstrpNotifyIcon @@ -750,12 +702,36 @@ True + + 194, 22 + + + Funktionen + 217, 22 Bisherigen Ablauf anzeigen + + 194, 22 + + + Überwachung stoppen + + + 194, 22 + + + In den Vordergrund + + + 194, 22 + + + easyFLOW beenden + 299, 17 @@ -788,7 +764,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAAbwBAQG8AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAcQBAQHEAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -5371,7 +5347,7 @@ iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DwAACw8BkvkDpQAAEkpJREFUeF7t3b+u5EgVx/F9hHkIHmDuvgDzADwA4QTkbE4yCfnkJJNstAEiQgRI + DgAACw4BQL7hQQAAEkpJREFUeF7t3b+u5EgVx/F9hHkIHmDuvgDzADwA4QTkbE4yCfnkJJNstAEiQgRI I0hIFo2EhETEBEQkbEJC0tTv3vas232623adss8pf4OPtFPbt2337fq5/vp+dTqdQvr2J0+vijfFu+JD 8bH4XJyAwPQd1XdV31l9d/UdfmV9xyMwC/egD6l4W+iDo6KjN/pO67ut73iYQDALt6IPovim+FRYHxrQ K33ndw8Ds7C1ctFqFikNrQ8GOBrVhTdWXWnNLGylXKQSj+Y9YFPdeGvVnVbMQm+6qPPFWRcN4NJmQWAW diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb index c448fd1..98b154d 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -63,7 +63,7 @@ Public Class frmMain LanguageEx.LogApplicationLanguage(Logger) - If Database.DBInitialized = True Then + If MyDB_DDECM.DBInitialized = True Then If ERROR_INIT <> "" Then If ERROR_INIT = "NO CLIENT" Then @@ -109,7 +109,7 @@ Public Class frmMain Else bbtnitemAdmin.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If - If USER_IS_ADMIN = False And BASIC_CONF_VISIBLE Then + If USER_IS_ADMIN = False And BASIC_CONF_VISIBLE = False Then RibbonPageGroup1.Visible = False RibbonControl1.Minimized = True End If @@ -145,7 +145,7 @@ Public Class frmMain End If Try Dim sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND (MODULE = 'easyFLOW' OR MODULE = 'Clipboard-Watcher')" - Database.ExecuteNonQuery(sql) + MyDB_DDECM.ExecuteNonQuery(sql) ClassWindowLocation.SaveFormLocationSize(Me, "") My.Settings.Save() Catch ex As Exception @@ -182,22 +182,22 @@ Public Class frmMain End If If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then - Logger.Warn("DT_USER_PROFILES is empty!") + Logger.Warn("DT_USER_PROFILES is Nothing/contains no rows!") Exit Sub End If If DTPROFILE_REL_PROCESS Is Nothing OrElse DTPROFILE_REL_PROCESS.Rows.Count = 0 Then - Logger.Warn("DTPROFILE_REL_PROCESS is empty!") + Logger.Warn("DTPROFILE_REL_PROCESS is Nothing/contains no rows!") Exit Sub End If If DTPROFILE_REL_WINDOW Is Nothing Then - Logger.Warn("DTPROFILE_REL_WINDOW is empty!") + Logger.Warn("DTPROFILE_REL_WINDOW is Nothing!") Exit Sub End If If DTPROFILE_REL_CONTROL Is Nothing Then - Logger.Warn("DTPROFILE_REL_CONTROL is empty!") + Logger.Warn("DTPROFILE_REL_CONTROL is Nothing!") Exit Sub End If @@ -372,7 +372,7 @@ Public Class frmMain } Dim oEnvironment As New Environment() With { - .Database = Database, + .Database = MyDB_DDECM, .Modules = Nothing, .User = oUser, .Settings = oSettings, @@ -398,7 +398,7 @@ Public Class frmMain End If Else If USER_IS_ADMIN = True And ERROR_INIT = "NO LICENSE" Then - MsgBox("As an admin You have access! Please inform Digital Data to add a valid license!", MsgBoxStyle.Exclamation, "No valid License") + MsgBox("As an admin You have access! Please inforFm Digital Data to add a valid license!", MsgBoxStyle.Exclamation, "No valid License") Else If Not USER_IS_ADMIN Then MsgBox("Application will close now!", MsgBoxStyle.Critical, "No valid License") diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index 11f23e6..e4794d9 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -7,7 +7,7 @@ Imports DigitalData.Modules.ZooFlow.Params Module modCurrent Public LogConfig As LogConfig Public Logger As Logger - Public Database As MSSQLServer + Public MyDB_DDECM As MSSQLServer Public DatabaseAppServ As MSSQLServer Public Automation As ClassAutomation Public AppTitle = "easyFLOW" @@ -90,4 +90,5 @@ Module modCurrent Public NOMATCH_INFO As Boolean = False Public NOTIFY_MODE As String = "NotifyIcon" Public BASEDATA_DT_LANGUAGE As DataTable + Public GHOST_USERID As Integer = 0 End Module